From 994aa5523bc36eb953fc71b8c0ce0859d5a5b9b4 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 25 Aug 2023 15:33:43 +0900 Subject: [PATCH] Revert "Revert to using old dockerfiles" This reverts commit 02a27167c92c8b09136f9834ce0bf38c63ffa0c8. --- .circleci/config.yml | 6 +- .dockerignore | 2 - contrib/docker/linuxarm32v7.Dockerfile | 167 ------------------------ contrib/docker/linuxarm64v8.Dockerfile | 168 ------------------------- 4 files changed, 4 insertions(+), 339 deletions(-) delete mode 100644 contrib/docker/linuxarm32v7.Dockerfile delete mode 100644 contrib/docker/linuxarm64v8.Dockerfile diff --git a/.circleci/config.yml b/.circleci/config.yml index 2df1a69edefa..8c4537c0bcfb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,8 +23,9 @@ jobs: LATEST_TAG=${CIRCLE_TAG:8} #trim "basedon-" from tag # Make sure the builder is copy the arm emulator sudo docker run --rm --privileged multiarch/qemu-user-static:register --reset + sed -i -e 's/#EnableQEMU //g' "contrib/docker/Dockerfile.arm32v7" # - sudo docker build --pull -t $DOCKERHUB_REPO:$LATEST_TAG-arm32v7 -f contrib/docker/linuxarm32v7.Dockerfile . + sudo docker build --pull -t $DOCKERHUB_REPO:$LATEST_TAG-arm32v7 -f contrib/docker/Dockerfile.arm32v7 . sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-arm32v7 arm64v8: @@ -37,8 +38,9 @@ jobs: LATEST_TAG=${CIRCLE_TAG:8} #trim "basedon-" from tag # Make sure the builder is copy the arm emulator sudo docker run --rm --privileged multiarch/qemu-user-static:register --reset + sed -i -e 's/#EnableQEMU //g' "contrib/docker/Dockerfile.arm64v8" # - sudo docker build --pull -t $DOCKERHUB_REPO:$LATEST_TAG-arm64v8 -f contrib/docker/linuxarm64v8.Dockerfile . + sudo docker build --pull -t $DOCKERHUB_REPO:$LATEST_TAG-arm64v8 -f contrib/docker/Dockerfile.arm64v8 . sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-arm64v8 publish_docker_dev: diff --git a/.dockerignore b/.dockerignore index 9c99baf53a6d..e45f98607be9 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,3 @@ Dockerfile contrib/docker/Dockerfile.* -contrib/docker/linuxarm32v7.Dockerfile -contrib/docker/linuxarm64v8.Dockerfile .circleci/config.yml diff --git a/contrib/docker/linuxarm32v7.Dockerfile b/contrib/docker/linuxarm32v7.Dockerfile deleted file mode 100644 index 4f0baa098e6d..000000000000 --- a/contrib/docker/linuxarm32v7.Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# This dockerfile is meant to cross compile with a x64 machine for a arm32v7 host -# It is using multi stage build: -# * downloader: Download litecoin/bitcoin and qemu binaries needed for core-lightning -# * builder: Cross compile c-lightning dependencies, then c-lightning itself with static linking -# * final: Copy the binaries required at runtime -# The resulting image uploaded to dockerhub will only contain what is needed for runtime. -# From the root of the repository, run "docker build -t yourimage:yourtag -f contrib/linuxarm32v7.Dockerfile ." -FROM debian:bullseye-slim as downloader - -RUN set -ex \ - && apt-get update \ - && apt-get install -qq --no-install-recommends ca-certificates dirmngr wget \ - qemu-user-static binfmt-support - -WORKDIR /opt - -RUN wget -qO /opt/tini "https://github.com/krallin/tini/releases/download/v0.18.0/tini-armhf" \ - && echo "01b54b934d5f5deb32aa4eb4b0f71d0e76324f4f0237cc262d59376bf2bdc269 /opt/tini" | sha256sum -c - \ - && chmod +x /opt/tini - -ARG BITCOIN_VERSION=22.0 -ENV BITCOIN_TARBALL bitcoin-$BITCOIN_VERSION-arm-linux-gnueabihf.tar.gz -ENV BITCOIN_URL https://bitcoincore.org/bin/bitcoin-core-$BITCOIN_VERSION/$BITCOIN_TARBALL -ENV BITCOIN_ASC_URL https://bitcoincore.org/bin/bitcoin-core-$BITCOIN_VERSION/SHA256SUMS - -RUN mkdir /opt/bitcoin && cd /opt/bitcoin \ - && wget -qO $BITCOIN_TARBALL "$BITCOIN_URL" \ - && wget -qO bitcoin "$BITCOIN_ASC_URL" \ - && grep $BITCOIN_TARBALL bitcoin | tee SHA256SUMS \ - && sha256sum -c SHA256SUMS \ - && BD=bitcoin-$BITCOIN_VERSION/bin \ - && tar -xzvf $BITCOIN_TARBALL $BD/bitcoin-cli --strip-components=1 \ - && rm $BITCOIN_TARBALL - -ENV LITECOIN_VERSION 0.16.3 -ENV LITECOIN_URL https://download.litecoin.org/litecoin-${LITECOIN_VERSION}/linux/litecoin-${LITECOIN_VERSION}-arm-linux-gnueabihf.tar.gz -ENV LITECOIN_SHA256 fc6897265594985c1d09978b377d51a01cc13ee144820ddc59fbb7078f122f99 - -# install litecoin binaries -RUN mkdir /opt/litecoin && cd /opt/litecoin \ - && wget -qO litecoin.tar.gz "$LITECOIN_URL" \ - && echo "$LITECOIN_SHA256 litecoin.tar.gz" | sha256sum -c - \ - && BD=litecoin-$LITECOIN_VERSION/bin \ - && tar -xzvf litecoin.tar.gz $BD/litecoin-cli --strip-components=1 --exclude=*-qt \ - && rm litecoin.tar.gz - -ENV DESCHASHPLUGIN_URL https://github.com/nbd-wtf/invoicewithdescriptionhash/releases/download/v1.4/invoicewithdescriptionhash-v1.4-linux-arm.tar.gz -ENV DESCHASHPLUGIN_SHA256 f7df336c72dd1674bd18ff23862a410b6a9691a3e13752264dcffa0950e21c74 -RUN mkdir /opt/deschashplugin && cd /opt/deschashplugin \ - && wget -qO invoicewithdescriptionhash.tar.gz "$DESCHASHPLUGIN_URL" \ - && echo "$DESCHASHPLUGIN_SHA256 invoicewithdescriptionhash.tar.gz" | sha256sum -c - \ - && tar -xzvf invoicewithdescriptionhash.tar.gz && rm invoicewithdescriptionhash.tar.gz \ - && chmod a+x invoicewithdescriptionhash - -FROM debian:bullseye-slim as builder - -ENV LIGHTNINGD_VERSION=master - -RUN apt-get update -qq && \ - apt-get install -qq -y --no-install-recommends \ - autoconf \ - automake \ - build-essential \ - ca-certificates \ - curl \ - dirmngr \ - gettext \ - git \ - gnupg \ - libpq-dev \ - libtool \ - libffi-dev \ - python3 \ - python3-dev \ - python3-mako \ - python3-pip \ - python3-venv \ - python3-setuptools \ - wget && \ - # arm32v7 compilers - apt-get install -qq -y --no-install-recommends \ - libc6-armhf-cross \ - gcc-arm-linux-gnueabihf \ - g++-arm-linux-gnueabihf - -ENV target_host=arm-linux-gnueabihf - -ENV AR=${target_host}-ar \ -AS=${target_host}-as \ -CC=${target_host}-gcc \ -CXX=${target_host}-g++ \ -LD=${target_host}-ld \ -STRIP=${target_host}-strip \ -QEMU_LD_PREFIX=/usr/${target_host} \ -HOST=${target_host} - -RUN wget -q https://zlib.net/fossils/zlib-1.2.13.tar.gz \ -&& tar xvf zlib-1.2.13.tar.gz \ -&& cd zlib-1.2.13 \ -&& ./configure --prefix=$QEMU_LD_PREFIX \ -&& make \ -&& make install && cd .. && rm zlib-1.2.13.tar.gz && rm -rf zlib-1.2.13 - -RUN apt-get install -y --no-install-recommends unzip tclsh \ -&& wget -q https://www.sqlite.org/2019/sqlite-src-3290000.zip \ -&& unzip sqlite-src-3290000.zip \ -&& cd sqlite-src-3290000 \ -&& ./configure --enable-static --disable-readline --disable-threadsafe --disable-load-extension --host=${target_host} --prefix=$QEMU_LD_PREFIX \ -&& make \ -&& make install && cd .. && rm sqlite-src-3290000.zip && rm -rf sqlite-src-3290000 - -RUN wget -q https://gmplib.org/download/gmp/gmp-6.1.2.tar.xz \ -&& tar xvf gmp-6.1.2.tar.xz \ -&& cd gmp-6.1.2 \ -&& ./configure --disable-assembly --prefix=$QEMU_LD_PREFIX --host=${target_host} \ -&& make \ -&& make install && cd .. && rm gmp-6.1.2.tar.xz && rm -rf gmp-6.1.2 -COPY --from=downloader /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static -WORKDIR /opt/lightningd -COPY . /tmp/lightning -RUN git clone --recursive /tmp/lightning . && \ - git checkout $(git --work-tree=/tmp/lightning --git-dir=/tmp/lightning/.git rev-parse HEAD) - -ARG DEVELOPER=0 -ENV PYTHON_VERSION=3 - -RUN curl -sSL https://install.python-poetry.org | python3 - \ -&& pip3 install -U pip \ -&& pip3 install -U wheel \ -&& /root/.local/bin/poetry install - -RUN ./configure --prefix=/tmp/lightning_install --enable-static && \ -make DEVELOPER=${DEVELOPER} && \ -/root/.local/bin/poetry run make install - -FROM arm32v7/debian:bullseye-slim as final -COPY --from=downloader /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static -COPY --from=downloader /opt/tini /usr/bin/tini - -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - socat \ - inotify-tools \ - python3 \ - python3-pip \ - libpq5 && \ - rm -rf /var/lib/apt/lists/* - -ENV LIGHTNINGD_DATA=/root/.lightning -ENV LIGHTNINGD_RPC_PORT=9835 -ENV LIGHTNINGD_PORT=9735 -ENV LIGHTNINGD_NETWORK=bitcoin - -RUN mkdir $LIGHTNINGD_DATA && \ - mkdir /etc/bundledplugins && \ - mkdir $LIGHTNINGD_DATA/plugins && \ - touch $LIGHTNINGD_DATA/config -VOLUME [ "/root/.lightning" ] -COPY --from=builder /tmp/lightning_install/ /usr/local/ -COPY --from=downloader /opt/bitcoin/bin /usr/bin -COPY --from=downloader /opt/litecoin/bin /usr/bin -COPY --from=downloader /opt/deschashplugin $LIGHTNINGD_DATA/plugins -COPY --from=downloader /opt/deschashplugin /etc/bundledplugins -COPY tools/docker-entrypoint.sh entrypoint.sh - -EXPOSE 9735 9835 -ENTRYPOINT [ "/usr/bin/tini", "-g", "--", "./entrypoint.sh" ] diff --git a/contrib/docker/linuxarm64v8.Dockerfile b/contrib/docker/linuxarm64v8.Dockerfile deleted file mode 100644 index 4daf6c7c9550..000000000000 --- a/contrib/docker/linuxarm64v8.Dockerfile +++ /dev/null @@ -1,168 +0,0 @@ -# This dockerfile is meant to cross compile with a x64 machine for a arm64v8 host -# It is using multi stage build: -# * downloader: Download litecoin/bitcoin and qemu binaries needed for Core Lightning -# * builder: Cross compile Core Lightning dependencies, then Core Lightning itself with static linking -# * final: Copy the binaries required at runtime -# The resulting image uploaded to dockerhub will only contain what is needed for runtime. -# From the root of the repository, run "docker build -t yourimage:yourtag -f contrib/linuxarm64v8.Dockerfile ." -FROM debian:bullseye-slim as downloader - -RUN set -ex \ - && apt-get update \ - && apt-get install -qq --no-install-recommends ca-certificates dirmngr wget \ - qemu-user-static binfmt-support - -WORKDIR /opt - -RUN wget -qO /opt/tini "https://github.com/krallin/tini/releases/download/v0.18.0/tini-arm64" \ - && echo "7c5463f55393985ee22357d976758aaaecd08defb3c5294d353732018169b019 /opt/tini" | sha256sum -c - \ - && chmod +x /opt/tini - -ARG BITCOIN_VERSION=22.0 -ENV BITCOIN_TARBALL bitcoin-$BITCOIN_VERSION-aarch64-linux-gnu.tar.gz -ENV BITCOIN_URL https://bitcoincore.org/bin/bitcoin-core-$BITCOIN_VERSION/$BITCOIN_TARBALL -ENV BITCOIN_ASC_URL https://bitcoincore.org/bin/bitcoin-core-$BITCOIN_VERSION/SHA256SUMS - -RUN mkdir /opt/bitcoin && cd /opt/bitcoin \ - && wget -qO $BITCOIN_TARBALL "$BITCOIN_URL" \ - && wget -qO bitcoin "$BITCOIN_ASC_URL" \ - && grep $BITCOIN_TARBALL bitcoin | tee SHA256SUMS \ - && sha256sum -c SHA256SUMS \ - && BD=bitcoin-$BITCOIN_VERSION/bin \ - && tar -xzvf $BITCOIN_TARBALL $BD/bitcoin-cli --strip-components=1 \ - && rm $BITCOIN_TARBALL - - -ENV LITECOIN_VERSION 0.16.3 -ENV LITECOIN_URL https://download.litecoin.org/litecoin-${LITECOIN_VERSION}/linux/litecoin-${LITECOIN_VERSION}-aarch64-linux-gnu.tar.gz -ENV LITECOIN_SHA256 3284316bdf10496528b3cd730877be3a1ea34add49dfc88fe0e96eb9925c1f08 - -# install litecoin binaries -RUN mkdir /opt/litecoin && cd /opt/litecoin \ - && wget -qO litecoin.tar.gz "$LITECOIN_URL" \ - && echo "$LITECOIN_SHA256 litecoin.tar.gz" | sha256sum -c - \ - && BD=litecoin-$LITECOIN_VERSION/bin \ - && tar -xzvf litecoin.tar.gz $BD/litecoin-cli --strip-components=1 --exclude=*-qt \ - && rm litecoin.tar.gz - -ENV DESCHASHPLUGIN_URL https://github.com/nbd-wtf/invoicewithdescriptionhash/releases/download/v1.4/invoicewithdescriptionhash-v1.4-linux-arm64.tar.gz -ENV DESCHASHPLUGIN_SHA256 d48c3e5aede77bd9cb72d78689ce12c0327f624435cb0496b3eacb92df416363 -RUN mkdir /opt/deschashplugin && cd /opt/deschashplugin \ - && wget -qO invoicewithdescriptionhash.tar.gz "$DESCHASHPLUGIN_URL" \ - && echo "$DESCHASHPLUGIN_SHA256 invoicewithdescriptionhash.tar.gz" | sha256sum -c - \ - && tar -xzvf invoicewithdescriptionhash.tar.gz && rm invoicewithdescriptionhash.tar.gz \ - && chmod a+x invoicewithdescriptionhash - -FROM debian:bullseye-slim as builder - -ENV LIGHTNINGD_VERSION=master - -RUN apt-get update -qq && \ - apt-get install -qq -y --no-install-recommends \ - autoconf \ - automake \ - build-essential \ - ca-certificates \ - curl \ - dirmngr \ - gettext \ - git \ - gnupg \ - libpq-dev \ - libtool \ - libffi-dev \ - python3 \ - python3-dev \ - python3-mako \ - python3-pip \ - python3-venv \ - python3-setuptools \ - wget && \ - # arm64v8 compilers - apt-get install -qq -y --no-install-recommends \ - libc6-arm64-cross \ - gcc-aarch64-linux-gnu \ - g++-aarch64-linux-gnu - -ENV target_host=aarch64-linux-gnu - -ENV AR=${target_host}-ar \ -AS=${target_host}-as \ -CC=${target_host}-gcc \ -CXX=${target_host}-g++ \ -LD=${target_host}-ld \ -STRIP=${target_host}-strip \ -QEMU_LD_PREFIX=/usr/${target_host} \ -HOST=${target_host} - -RUN wget -q https://zlib.net/fossils/zlib-1.2.13.tar.gz \ -&& tar xvf zlib-1.2.13.tar.gz \ -&& cd zlib-1.2.13 \ -&& ./configure --prefix=$QEMU_LD_PREFIX \ -&& make \ -&& make install && cd .. && rm zlib-1.2.13.tar.gz && rm -rf zlib-1.2.13 - -RUN apt-get install -y --no-install-recommends unzip tclsh \ -&& wget -q https://www.sqlite.org/2019/sqlite-src-3290000.zip \ -&& unzip sqlite-src-3290000.zip \ -&& cd sqlite-src-3290000 \ -&& ./configure --enable-static --disable-readline --disable-threadsafe --disable-load-extension --host=${target_host} --prefix=$QEMU_LD_PREFIX \ -&& make \ -&& make install && cd .. && rm sqlite-src-3290000.zip && rm -rf sqlite-src-3290000 - -RUN wget -q https://gmplib.org/download/gmp/gmp-6.1.2.tar.xz \ -&& tar xvf gmp-6.1.2.tar.xz \ -&& cd gmp-6.1.2 \ -&& ./configure --disable-assembly --prefix=$QEMU_LD_PREFIX --host=${target_host} \ -&& make \ -&& make install && cd .. && rm gmp-6.1.2.tar.xz && rm -rf gmp-6.1.2 -COPY --from=downloader /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static -WORKDIR /opt/lightningd -COPY . /tmp/lightning -RUN git clone --recursive /tmp/lightning . && \ - git checkout $(git --work-tree=/tmp/lightning --git-dir=/tmp/lightning/.git rev-parse HEAD) - -ARG DEVELOPER=0 -ENV PYTHON_VERSION=3 - -RUN curl -sSL https://install.python-poetry.org | python3 - \ -&& pip3 install -U pip \ -&& pip3 install -U wheel \ -&& /root/.local/bin/poetry install - -RUN ./configure --prefix=/tmp/lightning_install --enable-static && \ -make DEVELOPER=${DEVELOPER} && \ -/root/.local/bin/poetry run make install - -FROM arm64v8/debian:bullseye-slim as final -COPY --from=downloader /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static -COPY --from=downloader /opt/tini /usr/bin/tini - -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - socat \ - inotify-tools \ - python3 \ - python3-pip \ - libpq5 && \ - rm -rf /var/lib/apt/lists/* - -ENV LIGHTNINGD_DATA=/root/.lightning -ENV LIGHTNINGD_RPC_PORT=9835 -ENV LIGHTNINGD_PORT=9735 -ENV LIGHTNINGD_NETWORK=bitcoin - -RUN mkdir $LIGHTNINGD_DATA && \ - mkdir /etc/bundledplugins && \ - mkdir $LIGHTNINGD_DATA/plugins && \ - touch $LIGHTNINGD_DATA/config -VOLUME [ "/root/.lightning" ] -COPY --from=builder /tmp/lightning_install/ /usr/local/ -COPY --from=downloader /opt/bitcoin/bin /usr/bin -COPY --from=downloader /opt/litecoin/bin /usr/bin -COPY --from=downloader /opt/deschashplugin $LIGHTNINGD_DATA/plugins -COPY --from=downloader /opt/deschashplugin /etc/bundledplugins -COPY tools/docker-entrypoint.sh entrypoint.sh - -EXPOSE 9735 9835 -ENTRYPOINT [ "/usr/bin/tini", "-g", "--", "./entrypoint.sh" ]