docker-ci: fixed script path inside the entry point

Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
ElementsProject · Mar 31, 2022 · a35e1b2 · a35e1b2
1 parent 154a391
commit a35e1b2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
+6 −5		docker/Dockerfile.clightning
+5 −7		lnprototest/backend/bitcoind.py
+5 −5		lnprototest/clightning/clightning.py
+7 −1		lnprototest/structure.py
+1 −1		tests/conftest.py