From 0737f5cabe547cd58385a8cc2bdb0e2149665a83 Mon Sep 17 00:00:00 2001 From: Yorick Downe Date: Sat, 22 Jul 2023 10:10:06 +0000 Subject: [PATCH] Change source builds to bookworm from bullseye --- lighthouse/Dockerfile.source | 6 +++--- nimbus-el/Dockerfile.source | 4 ++-- nimbus/Dockerfile.source | 6 +++--- nimbus/Dockerfile.sourcegnosis | 6 +++--- nimbus/Dockerfile.sourceslottime | 4 ++-- prysm/Dockerfile.binary | 2 +- prysm/Dockerfile.source | 4 ++-- reth/Dockerfile.source | 4 ++-- staking-deposit-cli/Dockerfile | 2 +- vc-utils/Dockerfile | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lighthouse/Dockerfile.source b/lighthouse/Dockerfile.source index f8e122f7..53498995 100644 --- a/lighthouse/Dockerfile.source +++ b/lighthouse/Dockerfile.source @@ -1,10 +1,10 @@ # Build Lighthouse in a stock Rust build container -FROM rust:bullseye as builder +FROM rust:bookworm as builder # mallinfo2 is useful for memory troubleshooting but requires glibc 2.33. Debian Bullseye ships with 2.31 #FROM ubuntu:jammy as builder ARG BUILD_TARGET -ENV FEATURES modern,gnosis,slasher-lmdb,slasher-mdbx,jemalloc +ENV FEATURES modern,gnosis,slasher-lmdb,jemalloc RUN apt-get update && apt-get -y dist-upgrade && apt-get install -y cmake libclang-dev protobuf-compiler # Need a bit more in Ubuntu @@ -17,7 +17,7 @@ WORKDIR /usr/src RUN bash -c "git clone https://github.com/sigp/lighthouse.git && cd lighthouse && git config advice.detachedHead false && git fetch --all --tags && if [[ ${BUILD_TARGET} =~ pr-.+ ]]; then git fetch origin pull/$(echo ${BUILD_TARGET} | cut -d '-' -f 2)/head:lh-pr; git checkout lh-pr; else git checkout ${BUILD_TARGET}; fi && make" # Pull all binaries into a second stage deploy debian container -FROM debian:bullseye-slim +FROM debian:bookworm-slim # mallinfo2 is useful for memory troubleshooting but requires glibc 2.33. Debian Bullseye ships with 2.31 #FROM ubuntu:jammy diff --git a/nimbus-el/Dockerfile.source b/nimbus-el/Dockerfile.source index 76d1245e..30d43232 100644 --- a/nimbus-el/Dockerfile.source +++ b/nimbus-el/Dockerfile.source @@ -1,5 +1,5 @@ # Build Nimbus in a stock debian container -FROM debian:bullseye-slim as builder +FROM debian:bookworm-slim as builder # Included here to avoid build-time complaints ARG DOCKER_TAG @@ -13,7 +13,7 @@ WORKDIR /usr/src RUN bash -c "git clone https://github.com/status-im/nimbus-eth1 && cd nimbus-eth1 && git config advice.detachedHead false && git fetch --all --tags && if [[ ${BUILD_TARGET} =~ pr-.+ ]]; then git fetch origin pull/$(echo ${BUILD_TARGET} | cut -d '-' -f 2)/head:nim-pr; git checkout nim-pr; else git checkout ${BUILD_TARGET}; fi && make update && make -j$(nproc) nimbus" # Pull all binaries into a second stage deploy debian container -FROM debian:bullseye-slim +FROM debian:bookworm-slim ARG USER=user ARG UID=10001 diff --git a/nimbus/Dockerfile.source b/nimbus/Dockerfile.source index fc5d36fc..8d913069 100644 --- a/nimbus/Dockerfile.source +++ b/nimbus/Dockerfile.source @@ -1,5 +1,5 @@ # Build Nimbus in a stock debian container -FROM debian:bullseye-slim as builder +FROM debian:bookworm-slim as builder # Included here to avoid build-time complaints ARG DOCKER_TAG @@ -12,7 +12,7 @@ WORKDIR /usr/src RUN bash -c "git clone --recurse-submodules -j8 https://github.com/status-im/nimbus-eth2 && cd nimbus-eth2 && git config advice.detachedHead false && git fetch --all --tags && if [[ ${BUILD_TARGET} =~ pr-.+ ]]; then git fetch origin pull/$(echo ${BUILD_TARGET} | cut -d '-' -f 2)/head:nim-pr; git checkout nim-pr; else git checkout ${BUILD_TARGET}; fi && make -j$(nproc) update && make -j$(nproc) nimbus_beacon_node nimbus_validator_client" # Pull all binaries into a second stage deploy debian container -FROM debian:bullseye-slim as consensus +FROM debian:bookworm-slim as consensus ARG USER=user ARG UID=10002 @@ -52,7 +52,7 @@ USER ${USER} ENTRYPOINT ["nimbus_beacon_node"] -FROM debian:bullseye-slim as validator +FROM debian:bookworm-slim as validator ARG USER=user ARG UID=10000 diff --git a/nimbus/Dockerfile.sourcegnosis b/nimbus/Dockerfile.sourcegnosis index 5071b245..4531302c 100644 --- a/nimbus/Dockerfile.sourcegnosis +++ b/nimbus/Dockerfile.sourcegnosis @@ -1,5 +1,5 @@ # Build Nimbus in a stock debian container -FROM debian:bullseye-slim as builder +FROM debian:bookworm-slim as builder # Included here to avoid build-time complaints ARG DOCKER_TAG @@ -12,7 +12,7 @@ WORKDIR /usr/src RUN bash -c "git clone --recurse-submodules -j8 https://github.com/status-im/nimbus-eth2 && cd nimbus-eth2 && git config advice.detachedHead false && git fetch --all --tags && if [[ ${BUILD_TARGET} =~ pr-.+ ]]; then git fetch origin pull/$(echo ${BUILD_TARGET} | cut -d '-' -f 2)/head:nim-pr; git checkout nim-pr; else git checkout ${BUILD_TARGET}; fi && make -j$(nproc) update && make -j$(nproc) gnosis-build nimbus_validator_client" # Pull all binaries into a second stage deploy debian container -FROM debian:bullseye-slim as consensus +FROM debian:bookworm-slim as consensus ARG USER=user ARG UID=10002 @@ -51,7 +51,7 @@ USER ${USER} ENTRYPOINT ["nimbus_beacon_node"] -FROM debian:bullseye-slim as validator +FROM debian:bookworm-slim as validator ARG USER=user ARG UID=10000 diff --git a/nimbus/Dockerfile.sourceslottime b/nimbus/Dockerfile.sourceslottime index f1684e5b..9f5e3fe4 100644 --- a/nimbus/Dockerfile.sourceslottime +++ b/nimbus/Dockerfile.sourceslottime @@ -1,5 +1,5 @@ # Build Nimbus in a stock debian container -FROM debian:bullseye-slim as builder +FROM debian:bookworm-slim as builder # Included here to avoid build-time complaints ARG DOCKER_TAG @@ -14,7 +14,7 @@ RUN bash -c "git clone https://github.com/status-im/nim-beacon-chain && cd nim-b make -j$(nproc) NIMFLAGS="-d:SECONDS_PER_SLOT=${SECONDS_PER_SLOT}" nimbus_beacon_node" # Pull all binaries into a second stage deploy debian container -FROM debian:bullseye-slim +FROM debian:bookworm-slim ARG USER=user ARG UID=10002 diff --git a/prysm/Dockerfile.binary b/prysm/Dockerfile.binary index fe26ca46..5a056c14 100644 --- a/prysm/Dockerfile.binary +++ b/prysm/Dockerfile.binary @@ -2,7 +2,7 @@ ARG DOCKER_TAG ARG DOCKER_VC_TAG FROM gcr.io/prysmaticlabs/prysm/beacon-chain:${DOCKER_TAG} as ccsource -FROM debian:bullseye-slim as consensus +FROM debian:bookworm-slim as consensus #Included here to avoid build-time complaints ARG BUILD_TARGET diff --git a/prysm/Dockerfile.source b/prysm/Dockerfile.source index 4bd0f149..aed510fa 100644 --- a/prysm/Dockerfile.source +++ b/prysm/Dockerfile.source @@ -1,5 +1,5 @@ # Build Prysm in a stock Go build container -FROM golang:1.20-bullseye as builder +FROM golang:1.20-bookworm as builder # Here only to avoid build-time errors ARG DOCKER_TAG @@ -14,7 +14,7 @@ if [[ ${BUILD_TARGET} =~ pr-.+ ]]; then git fetch origin pull/$(echo ${BUILD_TAR && bazel build --config=release //cmd/beacon-chain:beacon-chain && bazel build --config=release //cmd/validator:validator && bazel build --config=release //cmd/client-stats:client-stats" # Pull all binaries into a second stage deploy debian container -FROM debian:bullseye-slim as consensus +FROM debian:bookworm-slim as consensus ARG USER=prysmconsensus ARG UID=10002 diff --git a/reth/Dockerfile.source b/reth/Dockerfile.source index b94c014d..673125e4 100644 --- a/reth/Dockerfile.source +++ b/reth/Dockerfile.source @@ -1,5 +1,5 @@ # Build reth in a stock rust container -FROM rust:bullseye as builder +FROM rust:bookworm as builder # Unused, this is here to avoid build time complaints ARG DOCKER_TAG @@ -15,7 +15,7 @@ RUN bash -c "git clone --recurse-submodules -j8 https://github.com/paradigmxyz/r && RUSTFLAGS='-C target-cpu=native' cargo build --profile maxperf --features jemalloc" # Pull all binaries into a second stage deploy debian container -FROM debian:bullseye-slim +FROM debian:bookworm-slim ARG USER=reth ARG UID=10001 diff --git a/staking-deposit-cli/Dockerfile b/staking-deposit-cli/Dockerfile index 44d0223a..731d428c 100644 --- a/staking-deposit-cli/Dockerfile +++ b/staking-deposit-cli/Dockerfile @@ -1,4 +1,4 @@ -from python:3.10-bullseye as builder +from python:3.10-bookworm as builder ARG BUILD_TARGET diff --git a/vc-utils/Dockerfile b/vc-utils/Dockerfile index 0083817f..f91821b5 100644 --- a/vc-utils/Dockerfile +++ b/vc-utils/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim +FROM debian:bookworm-slim RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl jq gosu COPY --chown=1000:1000 ./keymanager.sh /usr/local/bin/