From 2c56940de0d59bb7c7673cc2b59717cb7b95ae0b Mon Sep 17 00:00:00 2001 From: theborakompanioni Date: Sun, 8 Oct 2023 15:03:04 +0200 Subject: [PATCH] dev(regtest): switch to python:3.11-slim-bookworm as base image see https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/1484#issuecomment-1751814593 --- .../dockerfile-deps/joinmarket/directory_node/Dockerfile | 6 +++--- docker/regtest/dockerfile-deps/joinmarket/latest/Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/regtest/dockerfile-deps/joinmarket/directory_node/Dockerfile b/docker/regtest/dockerfile-deps/joinmarket/directory_node/Dockerfile index 2ca9a4a39..22b13bfb2 100644 --- a/docker/regtest/dockerfile-deps/joinmarket/directory_node/Dockerfile +++ b/docker/regtest/dockerfile-deps/joinmarket/directory_node/Dockerfile @@ -1,9 +1,9 @@ -FROM debian:bullseye-20220801-slim +FROM python:3.11-slim-bookworm RUN apt-get update \ && apt-get install -qq --no-install-recommends gnupg tini procps vim git iproute2 supervisor \ # joinmarket dependencies - curl build-essential automake pkg-config libtool python3-dev python3-venv python3-pip python3-setuptools libltdl-dev \ + curl build-essential automake pkg-config libtool libltdl-dev \ tor \ && rm -rf /var/lib/apt/lists/* @@ -14,7 +14,7 @@ ENV REPO_REF master WORKDIR /src RUN git clone "$REPO" . --depth=10 --branch "$REPO_BRANCH" && git checkout "$REPO_REF" -RUN ./install.sh --docker-install --disable-secp-check --without-qt +RUN ./install.sh --docker-install --disable-os-deps-check --disable-secp-check --without-qt ENV DATADIR /root/.joinmarket ENV CONFIG ${DATADIR}/joinmarket.cfg diff --git a/docker/regtest/dockerfile-deps/joinmarket/latest/Dockerfile b/docker/regtest/dockerfile-deps/joinmarket/latest/Dockerfile index f875f186a..871c28759 100644 --- a/docker/regtest/dockerfile-deps/joinmarket/latest/Dockerfile +++ b/docker/regtest/dockerfile-deps/joinmarket/latest/Dockerfile @@ -1,9 +1,9 @@ -FROM debian:bullseye-20220801-slim +FROM python:3.11-slim-bookworm RUN apt-get update \ && apt-get install -qq --no-install-recommends gnupg tini procps vim git iproute2 supervisor \ # joinmarket dependencies - curl build-essential automake pkg-config libtool python3-dev python3-venv python3-pip python3-setuptools libltdl-dev \ + curl build-essential automake pkg-config libtool libltdl-dev \ tor \ && rm -rf /var/lib/apt/lists/* @@ -14,7 +14,7 @@ ENV REPO_REF master WORKDIR /src RUN git clone "$REPO" . --depth=10 --branch "$REPO_BRANCH" && git checkout "$REPO_REF" -RUN ./install.sh --docker-install --disable-secp-check --without-qt +RUN ./install.sh --docker-install --disable-os-deps-check --disable-secp-check --without-qt ENV DATADIR /root/.joinmarket ENV CONFIG ${DATADIR}/joinmarket.cfg