fix: rbuilder dockerfile move around (#296)

This caused err: flashbots/rbuilder#739

Author: barnabasbusa

.github/workflows/build-push-reth-rbuilder.yml

@@ -65,6 +65,7 @@ jobs:
           source_ref: ${{ inputs.ref }}
           target_tag: ${{ needs.prepare.outputs.target_tag }}-${{ matrix.slug }}
           target_repository: ethpandaops/reth-rbuilder
+          target_dockerfile: ./reth-rbuilder/Dockerfile.rbuilder
           platform: ${{ matrix.platform }}
           build_args: ${{ inputs.build_args }}
 
@@ -75,7 +76,7 @@ jobs:
           HARBOR_USERNAME: "${{ vars.HARBOR_USERNAME }}"
           HARBOR_PASSWORD: "${{ secrets.HARBOR_PASSWORD }}"
           harbor_registry: ${{ vars.HARBOR_REGISTRY }}
-          
+
       # This step captures the git commit hash from the deploy action for job output
       - name: Set job output
         id: set_output

generate_config.py

@@ -42,8 +42,7 @@
 
 # Build argument defaults for special cases
 BUILD_ARGS = {
-    'mev-rs/main-minimal': 'FEATURES=minimal-preset',
-    'reth-rbuilder/develop': 'RBUILDER_BIN=reth-rbuilder'
+    'mev-rs/main-minimal': 'FEATURES=minimal-preset'
 }
 
 # Clients that need to have minimal builds created automatically
@@ -204,7 +203,9 @@ def extract_client_name(config):
 def get_dockerfile_path(client_name, target_tag=None):
     """Determine the dockerfile path based on client name and tag conventions"""
     # Special cases for different clients
-    if client_name == 'nimbus-eth2':
+    if client_name == 'reth-rbuilder':
+        return f"./{client_name}/Dockerfile.rbuilder"
+    elif client_name == 'nimbus-eth2':
         if target_tag and 'minimal' in target_tag:
             return f"./{client_name}/Dockerfile.beacon-minimal"
         return f"./{client_name}/Dockerfile.beacon"

reth-rbuilder/Dockerfile.rbuilder

@@ -0,0 +1,96 @@
+#
+# Base container (with sccache and cargo-chef)
+#
+# - https://github.com/mozilla/sccache
+# - https://github.com/LukeMathWalker/cargo-chef
+#
+# Based on https://depot.dev/blog/rust-dockerfile-best-practices
+#
+ARG FEATURES
+ARG RBUILDER_BIN="rbuilder"
+
+FROM rust:1.88 AS base
+ARG TARGETPLATFORM
+
+RUN apt-get update \
+    && apt-get install -y clang libclang-dev cmake protobuf-compiler
+
+RUN rustup component add clippy rustfmt
+
+
+# We manually download sccache, because compilation is resource-intensive
+RUN set -eux; \
+    case "$TARGETPLATFORM" in \
+      "linux/amd64")  ARCH_TAG="x86_64-unknown-linux-musl" ;; \
+      "linux/arm64")  ARCH_TAG="aarch64-unknown-linux-musl" ;; \
+      *) \
+        echo "Unsupported platform: $TARGETPLATFORM"; \
+        exit 1 \
+        ;; \
+    esac; \
+    wget -O /tmp/sccache.tar.gz \
+      "https://github.com/mozilla/sccache/releases/download/v0.8.2/sccache-v0.8.2-${ARCH_TAG}.tar.gz"; \
+    tar -xf /tmp/sccache.tar.gz -C /tmp; \
+    mv /tmp/sccache-v0.8.2-${ARCH_TAG}/sccache /usr/local/bin/sccache; \
+    chmod +x /usr/local/bin/sccache; \
+    rm -rf /tmp/sccache.tar.gz /tmp/sccache-v0.8.2-${ARCH_TAG}
+
+RUN cargo install cargo-chef --version ^0.1
+
+
+ENV CARGO_HOME=/usr/local/cargo
+ENV RUSTC_WRAPPER=sccache
+ENV SCCACHE_DIR=/sccache
+
+#
+# Planner container (running "cargo chef prepare")
+#
+FROM base AS planner
+WORKDIR /app
+COPY . .
+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+    --mount=type=cache,target=/usr/local/cargo/git \
+    --mount=type=cache,target=$SCCACHE_DIR,sharing=locked \
+    cargo chef prepare --recipe-path recipe.json
+
+#
+# Builder container (running "cargo chef cook" and "cargo build --release")
+#
+FROM base AS builder
+WORKDIR /app
+COPY --from=planner /app/recipe.json recipe.json
+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+    --mount=type=cache,target=/usr/local/cargo/git \
+    --mount=type=cache,target=$SCCACHE_DIR,sharing=locked \
+    cargo chef cook --release --recipe-path recipe.json
+COPY . .
+
+
+FROM builder AS rbuilder
+ARG RBUILDER_BIN
+ARG FEATURES
+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+    --mount=type=cache,target=/usr/local/cargo/git \
+    --mount=type=cache,target=$SCCACHE_DIR,sharing=locked \
+    cargo build --release --features="$FEATURES" --package=${RBUILDER_BIN}
+
+FROM builder AS test-relay
+ARG FEATURES
+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+    --mount=type=cache,target=/usr/local/cargo/git \
+    --mount=type=cache,target=$SCCACHE_DIR,sharing=locked \
+    cargo build --release --features="$FEATURES" --package=test-relay
+
+
+# Runtime container for test-relay
+FROM gcr.io/distroless/cc-debian12 AS test-relay-runtime
+WORKDIR /app
+COPY --from=test-relay /app/target/release/test-relay /app/test-relay
+ENTRYPOINT ["/app/test-relay"]
+
+# Runtime container for rbuilder
+FROM gcr.io/distroless/cc-debian12 AS rbuilder-runtime
+ARG RBUILDER_BIN
+WORKDIR /app
+COPY --from=rbuilder /app/target/release/${RBUILDER_BIN} /app/rbuilder
+ENTRYPOINT ["/app/rbuilder"]