try rm-ing op-reth as base-reth-node is rec client

Author: wlawt

.github/workflows/docker.yml

@@ -90,10 +90,10 @@ jobs:
       matrix:
         settings:
           - arch: linux/amd64
-            runs-on: ubuntu-24.04-64core
+            runs-on: ubuntu-24.04
             features: jemalloc,asm-keccak,optimism
           - arch: linux/arm64
-            runs-on: ubuntu-24.04-arm-64core
+            runs-on: ubuntu-24.04-arm
             features: jemalloc,optimism
     runs-on: ${{ matrix.settings.runs-on }}
     steps:

reth/Dockerfile

@@ -13,20 +13,6 @@ RUN . /tmp/versions.env && git clone $OP_NODE_REPO --branch $OP_NODE_TAG --singl
 RUN . /tmp/versions.env && cd op-node && \
     make VERSION=$OP_NODE_TAG op-node
 
-FROM rust:1.88 AS reth
-
-WORKDIR /app
-
-COPY versions.env /tmp/versions.env
-
-RUN apt-get update && apt-get -y upgrade && apt-get install -y git libclang-dev pkg-config curl build-essential
-
-RUN . /tmp/versions.env && git clone $OP_RETH_REPO --branch $OP_RETH_TAG --single-branch . && \
-    git switch -c branch-$OP_RETH_TAG && \
-    bash -c '[ "$(git rev-parse HEAD)" = "$OP_RETH_COMMIT" ]'
-
-RUN cargo build --bin op-reth --profile maxperf --manifest-path crates/optimism/bin/Cargo.toml
-
 FROM rust:1.88 AS reth-base
 
 WORKDIR /app
@@ -41,7 +27,7 @@ RUN . /tmp/versions.env && git clone $BASE_RETH_NODE_REPO . && \
     git checkout tags/$BASE_RETH_NODE_TAG && \
     bash -c '[ "$(git rev-parse HEAD)" = "$BASE_RETH_NODE_COMMIT" ]' || (echo "Commit hash verification failed" && exit 1)
 
-RUN cargo build --bin base-reth-node --profile maxperf --features jemalloc
+RUN cargo build --bin base-reth-node --profile maxperf
 
 FROM ubuntu:24.04
 
@@ -53,7 +39,6 @@ RUN mkdir -p /var/log/supervisor
 WORKDIR /app
 
 COPY --from=op /app/op-node/bin/op-node ./
-COPY --from=reth /app/target/maxperf/op-reth ./
 COPY --from=reth-base /app/target/maxperf/base-reth-node ./
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY ./reth/reth-entrypoint ./execution-entrypoint

reth/reth-entrypoint

@@ -11,6 +11,7 @@ DISCOVERY_PORT="${DISCOVERY_PORT:-30303}"
 P2P_PORT="${P2P_PORT:-30303}"
 ADDITIONAL_ARGS=""
 NODE_TYPE="${NODE_TYPE:-base}"
+BINARY="./base-reth-node"
 
 if [[ -z "${RETH_CHAIN:-}" ]]; then
     echo "expected RETH_CHAIN to be set" 1>&2
@@ -23,15 +24,6 @@ if [[ "$NODE_TYPE" == "base" && -n "${RETH_FB_WEBSOCKET_URL:-}" ]]; then
     echo "Enabling Flashblocks support with endpoint: $RETH_FB_WEBSOCKET_URL"
 fi
 
-# Select binary based on NODE_TYPE
-if [[ "$NODE_TYPE" == "base" ]]; then
-    echo "Starting Base Reth node"
-    BINARY="./base-reth-node"
-else
-    echo "Starting OP Reth node"
-    BINARY="./op-reth"
-fi
-
 # Add pruning for base
 if [[ "$NODE_TYPE" == "base" && "${RETH_PRUNING_ARGS+x}" = x ]]; then
     echo "Adding pruning arguments: $RETH_PRUNING_ARGS"