diff --git a/contrib/docker/Dockerfile.ubuntu b/contrib/docker/Dockerfile.ubuntu index 35d1f930c..93ffee4b6 100644 --- a/contrib/docker/Dockerfile.ubuntu +++ b/contrib/docker/Dockerfile.ubuntu @@ -31,6 +31,9 @@ RUN apt-get -qq update && \ build-essential libssl-dev libffi-dev \ python3-dev cargo +# move the script in the root of the directory +RUN cp contrib/docker/scripts/*.sh . + RUN ls -la CMD ["./contrib/docker/scripts/entrypoint.sh"] diff --git a/contrib/docker/scripts/build.sh b/contrib/docker/scripts/build.sh index 3f41cc594..1650e793c 100755 --- a/contrib/docker/scripts/build.sh +++ b/contrib/docker/scripts/build.sh @@ -29,12 +29,8 @@ poetry install git clone https://github.com/lightningnetwork/lightning-rfc.git ../lightning-rfc git submodule update --init --recursive -# Used in docker image -cd /work || return -ls -la - ./configure CC="$CC" -# cat config.vars +cat config.vars cat << EOF > pytest.ini [pytest] diff --git a/contrib/docker/scripts/entrypoint.sh b/contrib/docker/scripts/entrypoint.sh index 83f2410c4..28e4f5bc2 100755 --- a/contrib/docker/scripts/entrypoint.sh +++ b/contrib/docker/scripts/entrypoint.sh @@ -1,3 +1,3 @@ #!/bin/bash -cd contrib/docker/scripts && \ - ./setup.sh && ./build.sh +./setup.sh +./build.sh diff --git a/external/lnprototest b/external/lnprototest index ceeb8667f..433d22f16 160000 --- a/external/lnprototest +++ b/external/lnprototest @@ -1 +1 @@ -Subproject commit ceeb8667f745fce80ba81e4b23c6717d72e22bbc +Subproject commit 433d22f16c3f550317315ce56a445e6d074a0f5a