diff --git a/contrib/docker/Dockerfile.arm32v7 b/contrib/docker/Dockerfile.arm32v7 index 005e44373..1165611ea 100644 --- a/contrib/docker/Dockerfile.arm32v7 +++ b/contrib/docker/Dockerfile.arm32v7 @@ -5,7 +5,7 @@ # * 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 ." -FROM debian:bullseye-slim as downloader +FROM debian:bookworm-slim as downloader RUN set -ex \ && apt-get update \ @@ -41,7 +41,7 @@ RUN mkdir /opt/litecoin && cd /opt/litecoin \ && tar -xzvf litecoin.tar.gz $BD/litecoin-cli --strip-components=1 --exclude=*-qt \ && rm litecoin.tar.gz -FROM debian:bullseye-slim as builder +FROM debian:bookworm-slim as builder ENV LIGHTNINGD_VERSION=master RUN apt-get update -qq && \ @@ -98,10 +98,8 @@ ARG DEVELOPER=1 ENV PYTHON_VERSION=3 RUN curl -sSL https://install.python-poetry.org | python3 - -RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1 -RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 60 --slave /usr/bin/g++ g++ /usr/bin/g++-10 +RUN ln -s /usr/bin/python3 /usr/bin/python -RUN pip3 install --upgrade pip setuptools wheel RUN pip3 wheel cryptography RUN pip3 install grpcio-tools @@ -114,20 +112,18 @@ RUN ./configure --prefix=/tmp/lightning_install --enable-static && \ RUN pip3 install -r plugins/clnrest/requirements.txt RUN pip3 install ./contrib/pyln-client -FROM debian:bullseye-slim as final +FROM debian:bookworm-slim as final RUN apt-get update && \ apt-get install -y --no-install-recommends \ socat \ inotify-tools \ - python3.9 \ + python3 \ python3-pip \ qemu-user-static \ libpq5 && \ rm -rf /var/lib/apt/lists/* -RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1 - ENV LIGHTNINGD_DATA=/root/.lightning ENV LIGHTNINGD_RPC_PORT=9835 ENV LIGHTNINGD_PORT=9735 @@ -138,7 +134,7 @@ RUN mkdir $LIGHTNINGD_DATA && \ VOLUME [ "/root/.lightning" ] COPY --from=builder /tmp/lightning_install/ /usr/local/ -COPY --from=builder /usr/local/lib/python3.9/dist-packages/ /usr/local/lib/python3.9/dist-packages/ +COPY --from=builder /usr/local/lib/python3/dist-packages/ /usr/local/lib/python3/dist-packages/ COPY --from=downloader /opt/bitcoin/bin /usr/bin COPY --from=downloader /opt/litecoin/bin /usr/bin COPY --from=downloader "/tini" /usr/bin/tini diff --git a/contrib/docker/Dockerfile.arm64v8 b/contrib/docker/Dockerfile.arm64v8 index 63bbab182..17e680e84 100644 --- a/contrib/docker/Dockerfile.arm64v8 +++ b/contrib/docker/Dockerfile.arm64v8 @@ -5,7 +5,7 @@ # * 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 ." -FROM debian:bullseye-slim as downloader +FROM debian:bookworm-slim as downloader RUN set -ex \ && apt-get update \ @@ -42,7 +42,7 @@ RUN mkdir /opt/litecoin && cd /opt/litecoin \ && tar -xzvf litecoin.tar.gz $BD/litecoin-cli --strip-components=1 --exclude=*-qt \ && rm litecoin.tar.gz -FROM debian:bullseye-slim as builder +FROM debian:bookworm-slim as builder ENV LIGHTNINGD_VERSION=master RUN apt-get update -qq && \ @@ -53,7 +53,6 @@ RUN apt-get update -qq && \ ca-certificates \ curl \ dirmngr \ - gcc-10 \ gettext \ git \ gnupg \ @@ -63,15 +62,23 @@ RUN apt-get update -qq && \ pkg-config \ libssl-dev \ protobuf-compiler \ - python3.9 \ + python3 \ python3-dev \ python3-mako \ python3-pip \ python3-venv \ python3-setuptools \ + python3-wheel \ libev-dev \ libevent-dev \ qemu-user-static \ + zlib1g-dev \ + zlib1g \ + unzip \ + tclsh \ + sqlite3 \ + libsqlite3-dev \ + libgmp-dev \ wget ENV PKG_CONFIG_PATH /usr/lib/arm-linux-gnueabihf/pkgconfig @@ -116,10 +123,8 @@ ARG DEVELOPER=1 ENV PYTHON_VERSION=3 RUN curl -sSL https://install.python-poetry.org | python3 - -RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1 -RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 60 --slave /usr/bin/g++ g++ /usr/bin/g++-10 +RUN ln -s /usr/bin/python3 /usr/bin/python -RUN pip3 install --upgrade pip setuptools wheel RUN pip3 wheel cryptography RUN pip3 install grpcio-tools @@ -132,20 +137,18 @@ RUN ./configure --prefix=/tmp/lightning_install --enable-static && \ RUN pip3 install -r plugins/clnrest/requirements.txt RUN pip3 install ./contrib/pyln-client -FROM debian:bullseye-slim as final +FROM debian:bookworm-slim as final RUN apt-get update && \ apt-get install -y --no-install-recommends \ socat \ inotify-tools \ - python3.9 \ + python3 \ python3-pip \ qemu-user-static \ libpq5 && \ rm -rf /var/lib/apt/lists/* -RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1 - ENV LIGHTNINGD_DATA=/root/.lightning ENV LIGHTNINGD_RPC_PORT=9835 ENV LIGHTNINGD_PORT=9735 @@ -156,7 +159,7 @@ RUN mkdir $LIGHTNINGD_DATA && \ VOLUME [ "/root/.lightning" ] COPY --from=builder /tmp/lightning_install/ /usr/local/ -COPY --from=builder /usr/local/lib/python3.9/dist-packages/ /usr/local/lib/python3.9/dist-packages/ +COPY --from=builder /usr/local/lib/python3/dist-packages/ /usr/local/lib/python3/dist-packages/ COPY --from=downloader /opt/bitcoin/bin /usr/bin COPY --from=downloader /opt/litecoin/bin /usr/bin COPY --from=downloader "/tini" /usr/bin/tini