Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change source builds to bookworm from bullseye #1451

Merged
merged 1 commit into from
Jul 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lighthouse/Dockerfile.source
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions nimbus-el/Dockerfile.source
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions nimbus/Dockerfile.source
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions nimbus/Dockerfile.sourcegnosis
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions nimbus/Dockerfile.sourceslottime
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion prysm/Dockerfile.binary
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions prysm/Dockerfile.source
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions reth/Dockerfile.source
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion staking-deposit-cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from python:3.10-bullseye as builder
from python:3.10-bookworm as builder

ARG BUILD_TARGET

Expand Down
2 changes: 1 addition & 1 deletion vc-utils/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/
Expand Down