From f866cd5c3a54d27a30144e0bdf262cf765b6a7ab Mon Sep 17 00:00:00 2001
From: Yorick Downe <yorickdowne@gmail.com>
Date: Thu, 19 Mar 2026 23:41:25 +0000
Subject: [PATCH] Nimbus EL uses the single Nimbus binary

---
 ethd                           | 2 +-
 nimbus-el.yml                  | 3 ++-
 nimbus-el/Dockerfile.binary    | 4 ++--
 nimbus-el/Dockerfile.source    | 6 +++---
 nimbus-el/docker-entrypoint.sh | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ethd b/ethd
index 6a9c2a04..2c8db1f0 100755
--- a/ethd
+++ b/ethd
@@ -5603,7 +5603,7 @@ version() {
       echo
       ;;
     *nimbus-el.yml*)
-      __docompose exec execution nimbus_execution_client --version
+      __docompose exec execution nimbus --version
       echo
       ;;
     *ethrex.yml*)
diff --git a/nimbus-el.yml b/nimbus-el.yml
index deb9f709..7d4f6066 100644
--- a/nimbus-el.yml
+++ b/nimbus-el.yml
@@ -45,7 +45,8 @@ services:
     <<: *logging
     entrypoint:
       - docker-entrypoint.sh
-      - nimbus_execution_client
+      - nimbus
+      - executionClient
       - --rpc
       - --http-address=0.0.0.0
       - --http-port=${EL_RPC_PORT:-8545}
diff --git a/nimbus-el/Dockerfile.binary b/nimbus-el/Dockerfile.binary
index 1d93fcaa..9dac4c65 100644
--- a/nimbus-el/Dockerfile.binary
+++ b/nimbus-el/Dockerfile.binary
@@ -35,7 +35,7 @@ RUN adduser \
 
 RUN mkdir -p /var/lib/nimbus/ee-secret && chown -R ${USER}:${USER} /var/lib/nimbus && chmod 700 /var/lib/nimbus && chmod 777 /var/lib/nimbus/ee-secret
 
-RUN cp /home/user/nimbus-eth1/build/nimbus_execution_client /usr/local/bin/ && chown ${USER}:${USER} /usr/local/bin/nimbus_execution_client
+RUN cp /home/user/nimbus-eth1/build/nimbus /usr/local/bin/ && chown ${USER}:${USER} /usr/local/bin/nimbus
 # Cannot assume buildkit, hence no chmod
 COPY --chown=${USER}:${USER} ./docker-entrypoint.sh /usr/local/bin/
 # Belt and suspenders
@@ -43,4 +43,4 @@ RUN chmod -R 755 /usr/local/bin/*
 
 USER ${USER}
 
-ENTRYPOINT ["nimbus_execution_client"]
+ENTRYPOINT ["nimbus", "executionClient"]
diff --git a/nimbus-el/Dockerfile.source b/nimbus-el/Dockerfile.source
index 705d61ec..b04cc837 100644
--- a/nimbus-el/Dockerfile.source
+++ b/nimbus-el/Dockerfile.source
@@ -33,7 +33,7 @@ RUN bash -eo pipefail <<'EOF'
     git checkout "$TARGET"
   fi
   make -j$(nproc) update
-  make -j$(nproc) nimbus_execution_client
+  make -j$(nproc) nimbus
 EOF
 
 
@@ -68,11 +68,11 @@ RUN adduser \
 RUN mkdir -p /var/lib/nimbus/ee-secret && chown -R ${USER}:${USER} /var/lib/nimbus && chmod 700 /var/lib/nimbus && chmod 777 /var/lib/nimbus/ee-secret
 
 # Cannot assume buildkit, hence no chmod
-COPY --from=builder --chown=${USER}:${USER} /usr/src/nimbus-eth1/build/nimbus_execution_client /usr/local/bin/
+COPY --from=builder --chown=${USER}:${USER} /usr/src/nimbus-eth1/build/nimbus /usr/local/bin/
 COPY --chown=${USER}:${USER} ./docker-entrypoint.sh /usr/local/bin/
 # Belt and suspenders
 RUN chmod -R 755 /usr/local/bin/*
 
 USER ${USER}
 
-ENTRYPOINT ["nimbus_execution_client"]
+ENTRYPOINT ["nimbus", "executionClient"]
diff --git a/nimbus-el/docker-entrypoint.sh b/nimbus-el/docker-entrypoint.sh
index 69aed5f7..2ef0813c 100755
--- a/nimbus-el/docker-entrypoint.sh
+++ b/nimbus-el/docker-entrypoint.sh
@@ -190,7 +190,7 @@ fi
 
 # Word splitting is desired for the command line parameters
 # shellcheck disable=SC2086
-#  nimbus_execution_client import --network=${NETWORK} --data-dir=/var/lib/nimbus --era-dir=/var/lib/nimbus/era
+#  nimbus executionClient import --network=${NETWORK} --data-dir=/var/lib/nimbus --era-dir=/var/lib/nimbus/era
 #  rm -rf /var/lib/nimbus/era
 #fi