From c0b09d4470a3ed4d0c670d8483a2e6f58642e5a5 Mon Sep 17 00:00:00 2001
From: Eridian <86061486+EridianAlpha@users.noreply.github.com>
Date: Thu, 23 Mar 2023 18:49:48 +0000
Subject: [PATCH 1/2] Add Nimbus version as an environment variable

---
 .env.sample        |  7 +++++++
 docker-compose.yml | 10 ++++++++--
 nimbus/Dockerfile  |  6 ++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/.env.sample b/.env.sample
index 1c1d5c9..3df68f6 100644
--- a/.env.sample
+++ b/.env.sample
@@ -32,7 +32,14 @@
 # Teku beacon node host exposed ports
 #TEKU_PORT_METRICS=
 
+######### Nimbus Config #########
+
+# Nimbus validator client version, e.g. `v23.3.2`.
+# See available tags https://github.com/status-im/nimbus-eth2/releases
+#NIMBUS_VERSION=
+
 ######### Prysm Config #########
+
 #PRYSM_EXECUTION_ENDPOINT=
 #PRYSM_VERSION=
 #PRYSM_PORT_P2P_TCP=
diff --git a/docker-compose.yml b/docker-compose.yml
index 64d05fb..5715298 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -193,7 +193,10 @@ services:
       - ./teku:/opt/charon/teku
 
   vc2-nimbus:
-    build: nimbus
+    build:
+      context: ./nimbus
+      args:
+        NIMBUS_VERSION: ${NIMBUS_VERSION:-v23.3.2}
     networks: [ cluster ]
     depends_on: [ node2 ]
     restart: unless-stopped
@@ -230,7 +233,10 @@ services:
       - ./teku:/opt/charon/teku
 
   vc5-nimbus:
-    build: nimbus
+    build:
+      context: ./nimbus
+      args:
+        NIMBUS_VERSION: ${NIMBUS_VERSION:-v23.3.2}
     networks: [ cluster ]
     depends_on: [ node5 ]
     restart: unless-stopped
diff --git a/nimbus/Dockerfile b/nimbus/Dockerfile
index 96bf2d9..deb8521 100755
--- a/nimbus/Dockerfile
+++ b/nimbus/Dockerfile
@@ -1,6 +1,8 @@
-FROM statusim/nimbus-eth2:multiarch-v23.3.1 as nimbusbn
+ARG NIMBUS_VERSION
 
-FROM statusim/nimbus-validator-client:multiarch-v23.3.1
+FROM statusim/nimbus-eth2:multiarch-$NIMBUS_VERSION as nimbusbn
+
+FROM statusim/nimbus-validator-client:multiarch-$NIMBUS_VERSION
 
 COPY --from=nimbusbn /home/user/nimbus_beacon_node /home/user/nimbus_beacon_node
 

From 7390d74221e1861ae51ec02221a538c6a11cb42c Mon Sep 17 00:00:00 2001
From: Eridian <86061486+EridianAlpha@users.noreply.github.com>
Date: Thu, 23 Mar 2023 21:41:48 +0000
Subject: [PATCH 2/2] Add latest version as fallback

---
 nimbus/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nimbus/Dockerfile b/nimbus/Dockerfile
index deb8521..b37eb8a 100755
--- a/nimbus/Dockerfile
+++ b/nimbus/Dockerfile
@@ -1,4 +1,4 @@
-ARG NIMBUS_VERSION
+ARG NIMBUS_VERSION=latest
 
 FROM statusim/nimbus-eth2:multiarch-$NIMBUS_VERSION as nimbusbn
 
@@ -6,4 +6,4 @@ FROM statusim/nimbus-validator-client:multiarch-$NIMBUS_VERSION
 
 COPY --from=nimbusbn /home/user/nimbus_beacon_node /home/user/nimbus_beacon_node
 
-ENTRYPOINT ["/home/user/data/run.sh"]
\ No newline at end of file
+ENTRYPOINT ["/home/user/data/run.sh"]