Nimbus EL uses the single Nimbus binary

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*)

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}

nimbus-el/Dockerfile.binary

@@ -35,12 +35,12 @@ 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
 RUN chmod -R 755 /usr/local/bin/*
 
 USER ${USER}
 
-ENTRYPOINT ["nimbus_execution_client"]
+ENTRYPOINT ["nimbus", "executionClient"]

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"]

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