From ff9241f2dd68e94b20e426e69867213478979e21 Mon Sep 17 00:00:00 2001
From: Yorick Downe <yorickdowne@gmail.com>
Date: Thu, 14 Sep 2023 19:17:56 +0000
Subject: [PATCH] Nethermind executable names for v1.21

---
 nethermind.yml               | 3 +--
 nethermind/Dockerfile.binary | 5 +++--
 nethermind/Dockerfile.source | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/nethermind.yml b/nethermind.yml
index 3db6027d..ce4d1168 100644
--- a/nethermind.yml
+++ b/nethermind.yml
@@ -42,8 +42,7 @@ services:
     <<: *logging
     entrypoint:
       - docker-entrypoint.sh
-      - dotnet
-      - /nethermind/Nethermind.Runner.dll
+      - /nethermind/nethermind
       - --datadir
       - /var/lib/nethermind
       - --Init.WebSocketsEnabled
diff --git a/nethermind/Dockerfile.binary b/nethermind/Dockerfile.binary
index 324d200e..6bc6b979 100644
--- a/nethermind/Dockerfile.binary
+++ b/nethermind/Dockerfile.binary
@@ -36,7 +36,8 @@ RUN set -eux; \
 
 # This only goes so far. keystore, logs and nethermind_db are volumes and need to be chown'd in the entrypoint
 RUN chown -R ${USER}:${USER} /nethermind
-RUN mkdir -p /var/lib/nethermind/ee-secret && chown -R ${USER}:${USER} /var/lib/nethermind && chmod -R 700 /var/lib/nethermind && chmod 777 /var/lib/nethermind/ee-secret
+RUN mkdir -p /var/lib/nethermind/ee-secret && chown -R ${USER}:${USER} /var/lib/nethermind \
+&& chmod -R 700 /var/lib/nethermind && chmod 777 /var/lib/nethermind/ee-secret
 
 # Cannot assume buildkit, hence no chmod
 COPY --chown=${USER}:${USER} ./docker-entrypoint.sh /usr/local/bin/
@@ -45,4 +46,4 @@ RUN chmod -R 755 /usr/local/bin/*
 
 USER ${USER}
 
-ENTRYPOINT ["dotnet","/nethermind/Nethermind.Runner.dll"]
+ENTRYPOINT ["./nethermind"]
diff --git a/nethermind/Dockerfile.source b/nethermind/Dockerfile.source
index f1f0886f..8ec62c12 100644
--- a/nethermind/Dockerfile.source
+++ b/nethermind/Dockerfile.source
@@ -49,7 +49,8 @@ WORKDIR /nethermind
 COPY --from=build --chown=${USER}:${USER} /nethermind/out .
 
 RUN chown -R ${USER}:${USER} /nethermind
-RUN mkdir -p /var/lib/nethermind/ee-secret && chown -R ${USER}:${USER} /var/lib/nethermind && chmod -R 700 /var/lib/nethermind && chmod 777 /var/lib/nethermind/ee-secret
+RUN mkdir -p /var/lib/nethermind/ee-secret && chown -R ${USER}:${USER} /var/lib/nethermind \
+&& chmod -R 700 /var/lib/nethermind && chmod 777 /var/lib/nethermind/ee-secret
 
 # Cannot assume buildkit, hence no chmod
 COPY --chown=${USER}:${USER} ./docker-entrypoint.sh /usr/local/bin/