Skip to content

Commit c843c9c

Browse files
committed
Remove base-consensus from geth/nethermind and add warning
1 parent 6ef324b commit c843c9c

3 files changed

Lines changed: 7 additions & 76 deletions

File tree

consensus-entrypoint

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22
set -eu
33

44
if [ "${USE_BASE_CONSENSUS:-false}" = "true" ]; then
5-
echo "Using Base Client"
6-
exec ./base-consensus-entrypoint
5+
if [ -f ./base-consensus-entrypoint ]; then
6+
echo "Using Base Client"
7+
exec ./base-consensus-entrypoint
8+
else
9+
echo "Base client is not supported for this node type"
10+
exit 1
11+
fi
712
else
813
echo "Using OP Node"
914
exec ./op-node-entrypoint

geth/Dockerfile

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -13,41 +13,6 @@ RUN . /tmp/versions.env && git clone $OP_NODE_REPO --branch $OP_NODE_TAG --singl
1313
RUN . /tmp/versions.env && cd op-node && \
1414
make VERSION=$OP_NODE_TAG op-node
1515

16-
FROM rust:1.88-trixie AS base-consensus
17-
18-
WORKDIR /app
19-
20-
COPY versions.env /tmp/versions.env
21-
22-
ARG MOLD_VERSION=2.40.4
23-
ARG MOLD_SHA256_AARCH64=c799b9ccae8728793da2186718fbe53b76400a9da396184fac0c64aa3298ec37
24-
ARG MOLD_SHA256_ARM=d82792748a81202423ddd2496fc8719404fe694493abdef691cc080392ee44bf
25-
ARG MOLD_SHA256_X86_64=4c999e19ffa31afa5aa429c679b665d5e2ca5a6b6832ad4b79668e8dcf3d8ec1
26-
27-
RUN apt-get update && \
28-
apt-get install -y --no-install-recommends \
29-
git libclang-dev pkg-config curl build-essential cmake && \
30-
rm -rf /var/lib/apt/lists/*
31-
32-
RUN set -eux; \
33-
case "$(uname -m)" in \
34-
x86_64) MOLD_ARCH=x86_64; MOLD_SHA256="${MOLD_SHA256_X86_64}" ;; \
35-
aarch64|arm64) MOLD_ARCH=aarch64; MOLD_SHA256="${MOLD_SHA256_AARCH64}" ;; \
36-
armv7l|armv6l) MOLD_ARCH=arm; MOLD_SHA256="${MOLD_SHA256_ARM}" ;; \
37-
*) echo "unsupported architecture: $(uname -m)" >&2; exit 1 ;; \
38-
esac; \
39-
curl -fsSL "https://github.com/rui314/mold/releases/download/v${MOLD_VERSION}/mold-${MOLD_VERSION}-${MOLD_ARCH}-linux.tar.gz" -o /tmp/mold.tar.gz; \
40-
echo "${MOLD_SHA256} /tmp/mold.tar.gz" | sha256sum -c -; \
41-
tar -xzf /tmp/mold.tar.gz -C /tmp; \
42-
cp /tmp/mold-${MOLD_VERSION}-${MOLD_ARCH}-linux/bin/* /usr/local/bin/; \
43-
rm -rf /tmp/mold*
44-
45-
RUN . /tmp/versions.env && git clone $BASE_RETH_NODE_REPO . && \
46-
git checkout tags/$BASE_RETH_NODE_TAG && \
47-
bash -c '[ "$(git rev-parse HEAD)" = "$BASE_RETH_NODE_COMMIT" ]' || (echo "Commit hash verification failed" && exit 1)
48-
49-
RUN cargo build --bin base-consensus --profile maxperf
50-
5116
FROM golang:1.24 AS geth
5217

5318
WORKDIR /app
@@ -70,12 +35,10 @@ RUN mkdir -p /var/log/supervisor
7035
WORKDIR /app
7136

7237
COPY --from=op /app/op-node/bin/op-node ./
73-
COPY --from=base-consensus /app/target/maxperf/base-consensus ./
7438
COPY --from=geth /app/build/bin/geth ./
7539
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
7640
COPY geth/geth-entrypoint ./execution-entrypoint
7741
COPY op-node-entrypoint .
78-
COPY base-consensus-entrypoint .
7942
COPY consensus-entrypoint .
8043

8144
CMD ["/usr/bin/supervisord"]

nethermind/Dockerfile

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -13,41 +13,6 @@ RUN . /tmp/versions.env && git clone $OP_NODE_REPO --branch $OP_NODE_TAG --singl
1313
RUN . /tmp/versions.env && cd op-node && \
1414
just VERSION=$OP_NODE_TAG op-node
1515

16-
FROM rust:1.88-trixie AS base-consensus
17-
18-
WORKDIR /app
19-
20-
COPY versions.env /tmp/versions.env
21-
22-
ARG MOLD_VERSION=2.40.4
23-
ARG MOLD_SHA256_AARCH64=c799b9ccae8728793da2186718fbe53b76400a9da396184fac0c64aa3298ec37
24-
ARG MOLD_SHA256_ARM=d82792748a81202423ddd2496fc8719404fe694493abdef691cc080392ee44bf
25-
ARG MOLD_SHA256_X86_64=4c999e19ffa31afa5aa429c679b665d5e2ca5a6b6832ad4b79668e8dcf3d8ec1
26-
27-
RUN apt-get update && \
28-
apt-get install -y --no-install-recommends \
29-
git libclang-dev pkg-config curl build-essential cmake && \
30-
rm -rf /var/lib/apt/lists/*
31-
32-
RUN set -eux; \
33-
case "$(uname -m)" in \
34-
x86_64) MOLD_ARCH=x86_64; MOLD_SHA256="${MOLD_SHA256_X86_64}" ;; \
35-
aarch64|arm64) MOLD_ARCH=aarch64; MOLD_SHA256="${MOLD_SHA256_AARCH64}" ;; \
36-
armv7l|armv6l) MOLD_ARCH=arm; MOLD_SHA256="${MOLD_SHA256_ARM}" ;; \
37-
*) echo "unsupported architecture: $(uname -m)" >&2; exit 1 ;; \
38-
esac; \
39-
curl -fsSL "https://github.com/rui314/mold/releases/download/v${MOLD_VERSION}/mold-${MOLD_VERSION}-${MOLD_ARCH}-linux.tar.gz" -o /tmp/mold.tar.gz; \
40-
echo "${MOLD_SHA256} /tmp/mold.tar.gz" | sha256sum -c -; \
41-
tar -xzf /tmp/mold.tar.gz -C /tmp; \
42-
cp /tmp/mold-${MOLD_VERSION}-${MOLD_ARCH}-linux/bin/* /usr/local/bin/; \
43-
rm -rf /tmp/mold*
44-
45-
RUN . /tmp/versions.env && git clone $BASE_RETH_NODE_REPO . && \
46-
git checkout tags/$BASE_RETH_NODE_TAG && \
47-
bash -c '[ "$(git rev-parse HEAD)" = "$BASE_RETH_NODE_COMMIT" ]' || (echo "Commit hash verification failed" && exit 1)
48-
49-
RUN cargo build --bin base-consensus --profile maxperf
50-
5116
FROM mcr.microsoft.com/dotnet/sdk:10.0-noble AS build
5217

5318
ARG BUILD_CONFIG=release
@@ -78,11 +43,9 @@ WORKDIR /app
7843

7944
COPY --from=build /publish ./
8045
COPY --from=op /app/op-node/bin/op-node ./
81-
COPY --from=base-consensus /app/target/maxperf/base-consensus ./
8246
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
8347
COPY nethermind/nethermind-entrypoint ./execution-entrypoint
8448
COPY op-node-entrypoint .
85-
COPY base-consensus-entrypoint .
8649
COPY consensus-entrypoint .
8750

8851
CMD ["/usr/bin/supervisord"]

0 commit comments

Comments
 (0)