From 49ce792b911f67a5837c701a19abda5db9e1ade3 Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Tue, 25 Jul 2023 21:10:28 -0400 Subject: [PATCH] Move from bullseye-slim to bookworm-slim Also moves from bullseye in the processor to bullseye-slim. This requires adding back the apt intall, yet the tests/docker cache should handle it. Minimizes processor image surface, hopefully also shrinks the CI down a bit. --- deploy/coins/bitcoin/Dockerfile | 2 +- deploy/coins/monero/Dockerfile | 2 +- deploy/message-queue/Dockerfile | 2 +- deploy/processor/Dockerfile | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/deploy/coins/bitcoin/Dockerfile b/deploy/coins/bitcoin/Dockerfile index 755b0c3e..4f4765d8 100644 --- a/deploy/coins/bitcoin/Dockerfile +++ b/deploy/coins/bitcoin/Dockerfile @@ -26,7 +26,7 @@ RUN grep bitcoin-${BITCOIN_VERSION}-x86_64-linux-gnu.tar.gz SHA256SUMS | sha256s # Prepare Image RUN tar xzvf bitcoin-${BITCOIN_VERSION}-x86_64-linux-gnu.tar.gz -FROM debian:bullseye-slim as image +FROM debian:bookworm-slim as image WORKDIR /home/bitcoin COPY --from=builder /home/bitcoin/* . diff --git a/deploy/coins/monero/Dockerfile b/deploy/coins/monero/Dockerfile index 6e6dfe62..ceb09143 100644 --- a/deploy/coins/monero/Dockerfile +++ b/deploy/coins/monero/Dockerfile @@ -27,7 +27,7 @@ RUN gpg --keyserver hkp://keyserver.ubuntu.com:80 --keyserver-options no-self-si RUN tar -xvjf monero-linux-x64-v${MONERO_VERSION}.tar.bz2 --strip-components=1 # Prepare Image -FROM debian:bullseye-slim as image +FROM debian:bookworm-slim as image WORKDIR /home/monero COPY --from=builder /home/monero/* . diff --git a/deploy/message-queue/Dockerfile b/deploy/message-queue/Dockerfile index 3f9ba815..71fd0ded 100644 --- a/deploy/message-queue/Dockerfile +++ b/deploy/message-queue/Dockerfile @@ -29,7 +29,7 @@ RUN --mount=type=cache,target=/root/.cargo \ mv /serai/target/release/serai-message-queue /serai/bin # Prepare Image -FROM debian:bullseye-slim as image +FROM debian:bookworm-slim as image LABEL description="STAGE 2: Copy and Run" WORKDIR /home/serai diff --git a/deploy/processor/Dockerfile b/deploy/processor/Dockerfile index d1c87d94..7e7565e1 100644 --- a/deploy/processor/Dockerfile +++ b/deploy/processor/Dockerfile @@ -27,7 +27,7 @@ RUN --mount=type=cache,target=/root/.cargo \ mv /serai/target/release/serai-processor /serai/bin # Prepare Image -FROM debian:bullseye as image +FROM debian:bookworm-slim as image LABEL description="STAGE 2: Copy and Run" WORKDIR /home/serai @@ -36,5 +36,8 @@ WORKDIR /home/serai COPY --from=builder /serai/bin/* /bin/ COPY --from=builder /serai/AGPL-3.0 . +# Install openssl +RUN apt update && apt upgrade -y && apt install -y libssl1.1 + # Run processor CMD ["serai-processor"]