From 7df530d18463d3937cc5b188d2158b56dcf6cb2d Mon Sep 17 00:00:00 2001 From: niftynei Date: Fri, 9 Sep 2022 18:34:22 -0500 Subject: [PATCH] builds: cleanup duplicate and unused code, fix spelling Few extremely minor updates to the ubuntu dockerfile and ci builds --- .github/workflows/ci.yaml | 2 +- contrib/docker/Dockerfile.ubuntu | 4 +--- contrib/docker/scripts/setup.sh | 5 ----- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f4a3efb8a..e568e936d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -122,7 +122,7 @@ jobs: -e VALGRIND=${{ matrix.valgrind }} \ -e DEVELOPER=1 \ -e EXPERIMENTAL_FEATURES=1 \ - -e COMPA=0 \ + -e COMPAT=0 \ -e PYTEST_PAR=2 \ -e PYTEST_OPTS="--timeout=300" \ -e TEST_CMD="make check-protos" \ diff --git a/contrib/docker/Dockerfile.ubuntu b/contrib/docker/Dockerfile.ubuntu index 56aa674fe..6fe54f37a 100644 --- a/contrib/docker/Dockerfile.ubuntu +++ b/contrib/docker/Dockerfile.ubuntu @@ -3,8 +3,6 @@ LABEL mantainer="Vincenzo Palazzo vincenzopalazzodev@gmail.com" WORKDIR /work -COPY . . - ENV DEBIAN_FRONTEND=noninteractive ENV LANGUAGE=en_US.UTF-8 ENV LANG=en_US.UTF-8 @@ -23,7 +21,7 @@ RUN locale-gen en_US.UTF-8 && dpkg-reconfigure --frontend noninteractive tzdata COPY . . -# install package for pytho cryptography lib +# install package for python cryptography lib # https://cryptography.io/en/latest/installation/#debian-ubuntu RUN apt-get -qq update && \ diff --git a/contrib/docker/scripts/setup.sh b/contrib/docker/scripts/setup.sh index 208571e1d..18cf124f3 100755 --- a/contrib/docker/scripts/setup.sh +++ b/contrib/docker/scripts/setup.sh @@ -6,8 +6,6 @@ export ELEMENTS_VERSION=0.18.1.8 export RUST_VERSION=nightly export TZ="Europe/London" -sudo useradd -ms /bin/bash tester - sudo apt-get update -qq sudo apt-get -qq install --no-install-recommends --allow-unauthenticated -yy \ @@ -54,9 +52,6 @@ sudo apt-get -qq install --no-install-recommends --allow-unauthenticated -yy \ zlib1g-dev -echo "tester ALL=(root) NOPASSWD:ALL" | sudo tee /etc/sudoers.d/tester -sudo chmod 0440 /etc/sudoers.d/tester - ( cd /tmp/ || exit 1 wget https://storage.googleapis.com/c-lightning-tests/bitcoin-$BITCOIN_VERSION-x86_64-linux-gnu.tar.bz2