From 0c9c0d0d5504425e22c6d9c2797b0860aac763f1 Mon Sep 17 00:00:00 2001
From: Ben Adams <thundercat@illyriad.co.uk>
Date: Fri, 27 Sep 2024 14:47:25 +0100
Subject: [PATCH 01/19] Update version

---
 nethermind/Dockerfile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nethermind/Dockerfile b/nethermind/Dockerfile
index e4fbd297..46d3583a 100644
--- a/nethermind/Dockerfile
+++ b/nethermind/Dockerfile
@@ -19,9 +19,12 @@ ARG TARGETARCH
 
 WORKDIR /app
 
-ENV REPO=https://github.com/nethermindeth/nethermind
-ENV VERSION=1.28.0
-RUN git clone $REPO . && git checkout $VERSION
+ENV REPO=https://github.com/NethermindEth/nethermind.git
+ENV VERSION=1.29.0
+ENV COMMIT=b8a5f1eb26fdee6e1ac8a952a574daac7667c13e
+RUN git clone $REPO --branch release/$VERSION --single-branch . && \
+    git switch -c release/$VERSION && \
+    bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'
 
 RUN arch=$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH") && \
     dotnet publish src/Nethermind/Nethermind.Runner -c $BUILD_CONFIG -a $arch -o /publish --sc false 

From a66f08f1c575fdaec4a587d06d16a552cf65558d Mon Sep 17 00:00:00 2001
From: Ben Adams <thundercat@illyriad.co.uk>
Date: Sat, 28 Sep 2024 21:24:37 +0100
Subject: [PATCH 02/19] Update commit

---
 nethermind/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nethermind/Dockerfile b/nethermind/Dockerfile
index 46d3583a..1588eb6e 100644
--- a/nethermind/Dockerfile
+++ b/nethermind/Dockerfile
@@ -21,7 +21,7 @@ WORKDIR /app
 
 ENV REPO=https://github.com/NethermindEth/nethermind.git
 ENV VERSION=1.29.0
-ENV COMMIT=b8a5f1eb26fdee6e1ac8a952a574daac7667c13e
+ENV COMMIT=e324dae2a92e23f2cd351d81e9e46554591b2cef
 RUN git clone $REPO --branch release/$VERSION --single-branch . && \
     git switch -c release/$VERSION && \
     bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'

From d03608dc077f6ed78e70f7350011ce5fae30f0eb Mon Sep 17 00:00:00 2001
From: Ben Adams <thundercat@illyriad.co.uk>
Date: Sun, 29 Sep 2024 03:14:35 +0100
Subject: [PATCH 03/19] Update commit

---
 nethermind/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nethermind/Dockerfile b/nethermind/Dockerfile
index 1588eb6e..993c4c7c 100644
--- a/nethermind/Dockerfile
+++ b/nethermind/Dockerfile
@@ -21,7 +21,7 @@ WORKDIR /app
 
 ENV REPO=https://github.com/NethermindEth/nethermind.git
 ENV VERSION=1.29.0
-ENV COMMIT=e324dae2a92e23f2cd351d81e9e46554591b2cef
+ENV COMMIT=917f5349517118bf5c73c362c3902d61e68e5b40
 RUN git clone $REPO --branch release/$VERSION --single-branch . && \
     git switch -c release/$VERSION && \
     bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'

From 1018327c2c15839edf7935bda8d36ed54425579a Mon Sep 17 00:00:00 2001
From: Ben Adams <thundercat@illyriad.co.uk>
Date: Sun, 29 Sep 2024 04:36:37 +0100
Subject: [PATCH 04/19] Update nethermind/Dockerfile

Co-authored-by: Michael de Hoog <michael.dehoog@gmail.com>
---
 nethermind/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nethermind/Dockerfile b/nethermind/Dockerfile
index 993c4c7c..d5fab808 100644
--- a/nethermind/Dockerfile
+++ b/nethermind/Dockerfile
@@ -23,7 +23,7 @@ ENV REPO=https://github.com/NethermindEth/nethermind.git
 ENV VERSION=1.29.0
 ENV COMMIT=917f5349517118bf5c73c362c3902d61e68e5b40
 RUN git clone $REPO --branch release/$VERSION --single-branch . && \
-    git switch -c release/$VERSION && \
+    git switch -c branch-$VERSION && \
     bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'
 
 RUN arch=$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH") && \

From bbab7816ca47678c1ba95bb906b72a4c93b189fb Mon Sep 17 00:00:00 2001
From: Marcos Maceo <marcosmaceowork@gmail.com>
Date: Wed, 2 Oct 2024 19:02:40 +0400
Subject: [PATCH 05/19] feat: add qemu to nethermind docker build

---
 .github/workflows/docker.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 3cb22cae..459781af 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -101,6 +101,11 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: linux/amd64,linux/arm64
+
       - name: Extract metadata for the Docker image
         id: meta
         uses: docker/metadata-action@v4
@@ -120,3 +125,6 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64,linux/arm64
+          build-args: |
+            BUILD_CONFIG=release
+            TARGETARCH=${{ matrix.platform }}

From 7188de14e56312c2218d5fa9bc33e6d4169dfda5 Mon Sep 17 00:00:00 2001
From: Marcos Maceo <marcosmaceowork@gmail.com>
Date: Wed, 2 Oct 2024 19:14:21 +0400
Subject: [PATCH 06/19] fix: update release/1.29.0 commit

---
 nethermind/Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nethermind/Dockerfile b/nethermind/Dockerfile
index d5fab808..2576646e 100644
--- a/nethermind/Dockerfile
+++ b/nethermind/Dockerfile
@@ -21,10 +21,10 @@ WORKDIR /app
 
 ENV REPO=https://github.com/NethermindEth/nethermind.git
 ENV VERSION=1.29.0
-ENV COMMIT=917f5349517118bf5c73c362c3902d61e68e5b40
+ENV COMMIT=7320938e5fe74ad6ac1782ce723ddb7bb7d3d78a
 RUN git clone $REPO --branch release/$VERSION --single-branch . && \
-    git switch -c branch-$VERSION && \
-    bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'
+    git switch -c branch-$VERSION 
+RUN bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'
 
 RUN arch=$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH") && \
     dotnet publish src/Nethermind/Nethermind.Runner -c $BUILD_CONFIG -a $arch -o /publish --sc false 
@@ -46,4 +46,4 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY nethermind/nethermind-entrypoint ./execution-entrypoint
 COPY op-node-entrypoint .
 
-CMD ["/usr/bin/supervisord"]
\ No newline at end of file
+CMD ["/usr/bin/supervisord"]

From 85c9f6b0ed9f53cb70eca397dc82760bcc1af392 Mon Sep 17 00:00:00 2001
From: Marcos Maceo <marcosmaceowork@gmail.com>
Date: Wed, 2 Oct 2024 19:34:46 +0400
Subject: [PATCH 07/19] fix: build on nethermind

---
 .github/workflows/docker.yml | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 459781af..532ee4dc 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -106,6 +106,9 @@ jobs:
         with:
           platforms: linux/amd64,linux/arm64
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Extract metadata for the Docker image
         id: meta
         uses: docker/metadata-action@v4
@@ -113,18 +116,14 @@ jobs:
           images: |
             ${{ env.NAMESPACE }}/${{ env.NETHERMIND_IMAGE_NAME }}
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and push the Docker image
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: nethermind/Dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64
-          build-args: |
-            BUILD_CONFIG=release
-            TARGETARCH=${{ matrix.platform }}
+      - name: Build and push the Docker image using buildx
+        run: |
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            --file nethermind/Dockerfile \
+            --tag ${{ steps.meta.outputs.tags }} \
+            --label ${{ steps.meta.outputs.labels }} \
+            --build-arg BUILD_CONFIG=release \
+            --build-arg TARGETARCH=${{ matrix.platform }} \
+            --push \
+            .

From 51405519485e0546e73ef75dbb98dc5a5031ed4d Mon Sep 17 00:00:00 2001
From: Marcos Maceo <marcosmaceowork@gmail.com>
Date: Wed, 2 Oct 2024 19:42:47 +0400
Subject: [PATCH 08/19] fix: build on nethermind, buildx command

---
 .github/workflows/docker.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 532ee4dc..4520a814 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -103,8 +103,6 @@ jobs:
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-        with:
-          platforms: linux/amd64,linux/arm64
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -125,5 +123,4 @@ jobs:
             --label ${{ steps.meta.outputs.labels }} \
             --build-arg BUILD_CONFIG=release \
             --build-arg TARGETARCH=${{ matrix.platform }} \
-            --push \
-            .
+            . --push

From f2feba63021e96d020091452db316c5b461bc15b Mon Sep 17 00:00:00 2001
From: Marcos Maceo <marcosmaceowork@gmail.com>
Date: Wed, 2 Oct 2024 19:49:28 +0400
Subject: [PATCH 09/19] fix: build on nethermind, labels breaking buildx

---
 .github/workflows/docker.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4520a814..e76612a2 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -116,11 +116,15 @@ jobs:
 
       - name: Build and push the Docker image using buildx
         run: |
+          # Convert labels to individual --label flags
+          labels=$(echo "${{ steps.meta.outputs.labels }}" | sed 's/^/--label "/; s/$/"/')
+      
+          # Run the docker buildx build command
           docker buildx build \
             --platform linux/amd64,linux/arm64 \
             --file nethermind/Dockerfile \
-            --tag ${{ steps.meta.outputs.tags }} \
-            --label ${{ steps.meta.outputs.labels }} \
+            --tag ghcr.io/base-org/node-nethermind:main \
+            $labels \
             --build-arg BUILD_CONFIG=release \
             --build-arg TARGETARCH=${{ matrix.platform }} \
             . --push

From fa24cec54a39317b994a78712fb556ba43f64157 Mon Sep 17 00:00:00 2001
From: Marcos Maceo <marcosmaceowork@gmail.com>
Date: Wed, 2 Oct 2024 19:52:30 +0400
Subject: [PATCH 10/19] fix: build on nethermind, labels breaking buildx again

---
 .github/workflows/docker.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index e76612a2..51a3d623 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -117,7 +117,10 @@ jobs:
       - name: Build and push the Docker image using buildx
         run: |
           # Convert labels to individual --label flags
-          labels=$(echo "${{ steps.meta.outputs.labels }}" | sed 's/^/--label "/; s/$/"/')
+          labels=""
+          while IFS= read -r line; do
+            labels="$labels --label \"$line\""
+          done <<< "${{ steps.meta.outputs.labels }}"
       
           # Run the docker buildx build command
           docker buildx build \

From 52f7c0797d4d6a40707b78e644b2bdca6858f615 Mon Sep 17 00:00:00 2001
From: Marcos Maceo <marcosmaceowork@gmail.com>
Date: Wed, 2 Oct 2024 19:58:20 +0400
Subject: [PATCH 11/19] fix: build on nethermind, buildx

---
 .github/workflows/docker.yml | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 51a3d623..56840107 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -90,44 +90,53 @@ jobs:
           platforms: ${{ matrix.arch }}
   nethermind:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [linux/amd64, linux/arm64]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-
+  
       - name: Log into the Container registry
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-
+  
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-
+        with:
+          platforms: linux/amd64,linux/arm64
+  
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-
+  
       - name: Extract metadata for the Docker image
         id: meta
         uses: docker/metadata-action@v4
         with:
           images: |
             ${{ env.NAMESPACE }}/${{ env.NETHERMIND_IMAGE_NAME }}
-
+  
       - name: Build and push the Docker image using buildx
         run: |
           # Convert labels to individual --label flags
           labels=""
           while IFS= read -r line; do
-            labels="$labels --label \"$line\""
+            labels="$labels --label $line"
           done <<< "${{ steps.meta.outputs.labels }}"
-      
+  
+          # Debug: Print the constructed docker buildx build command
+          echo "docker buildx build --platform ${{ matrix.platform }} --file nethermind/Dockerfile --tag ${{ steps.meta.outputs.tags }} $labels --build-arg BUILD_CONFIG=release --build-arg TARGETARCH=${{ matrix.platform }} . --push"
+  
           # Run the docker buildx build command
           docker buildx build \
-            --platform linux/amd64,linux/arm64 \
+            --platform ${{ matrix.platform }} \
             --file nethermind/Dockerfile \
-            --tag ghcr.io/base-org/node-nethermind:main \
+            --tag ${{ steps.meta.outputs.tags }} \
             $labels \
             --build-arg BUILD_CONFIG=release \
             --build-arg TARGETARCH=${{ matrix.platform }} \
             . --push
+

From 4acf6e1cb614393817c9dac8e3f660c34c2b5311 Mon Sep 17 00:00:00 2001
From: Marcos Maceo <marcosmaceowork@gmail.com>
Date: Wed, 2 Oct 2024 20:02:23 +0400
Subject: [PATCH 12/19] fix: build on nethermind, buildx labels

---
 .github/workflows/docker.yml | 9 ++++-----
 docker-compose.yml           | 6 ++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 56840107..1c394442 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -121,15 +121,15 @@ jobs:
   
       - name: Build and push the Docker image using buildx
         run: |
-          # Convert labels to individual --label flags
+          # Convert labels to individual --label flags with proper quoting
           labels=""
           while IFS= read -r line; do
-            labels="$labels --label $line"
+            labels="$labels --label \"${line}\""
           done <<< "${{ steps.meta.outputs.labels }}"
-  
+
           # Debug: Print the constructed docker buildx build command
           echo "docker buildx build --platform ${{ matrix.platform }} --file nethermind/Dockerfile --tag ${{ steps.meta.outputs.tags }} $labels --build-arg BUILD_CONFIG=release --build-arg TARGETARCH=${{ matrix.platform }} . --push"
-  
+
           # Run the docker buildx build command
           docker buildx build \
             --platform ${{ matrix.platform }} \
@@ -139,4 +139,3 @@ jobs:
             --build-arg BUILD_CONFIG=release \
             --build-arg TARGETARCH=${{ matrix.platform }} \
             . --push
-
diff --git a/docker-compose.yml b/docker-compose.yml
index 9068905d..fd39f1be 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,8 +11,7 @@ services:
     volumes:
         - ${HOST_DATA_DIR}:/data
     env_file:
-      # select your network here:
-#      - .env.sepolia
+      - .env.sepolia
 #      - .env.mainnet
   node:
     build:
@@ -28,6 +27,5 @@ services:
       - "6060:6060"     # pprof
     command: [ "bash", "./op-node-entrypoint" ]
     env_file:
-      # select your network here:
-#      - .env.sepolia
+      - .env.sepolia
 #      - .env.mainnet

From 313cc0af25b41aca3e31b2dbb9b964f1cde621ae Mon Sep 17 00:00:00 2001
From: Marcos Maceo <marcosmaceowork@gmail.com>
Date: Wed, 2 Oct 2024 20:08:40 +0400
Subject: [PATCH 13/19] fix: build on nethermind, buildx labels, now as cmd

---
 .github/workflows/docker.yml | 24 +++++++++---------------
 docker-compose.yml           |  8 ++++++--
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 1c394442..e058eb6a 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -121,21 +121,15 @@ jobs:
   
       - name: Build and push the Docker image using buildx
         run: |
-          # Convert labels to individual --label flags with proper quoting
-          labels=""
+          cmd=("docker" "buildx" "build" "--platform" "${{ matrix.platform }}" "--file" "nethermind/Dockerfile" "--tag" "${{ steps.meta.outputs.tags }}")
+
           while IFS= read -r line; do
-            labels="$labels --label \"${line}\""
+            cmd+=("--label" "$line")
           done <<< "${{ steps.meta.outputs.labels }}"
 
-          # Debug: Print the constructed docker buildx build command
-          echo "docker buildx build --platform ${{ matrix.platform }} --file nethermind/Dockerfile --tag ${{ steps.meta.outputs.tags }} $labels --build-arg BUILD_CONFIG=release --build-arg TARGETARCH=${{ matrix.platform }} . --push"
-
-          # Run the docker buildx build command
-          docker buildx build \
-            --platform ${{ matrix.platform }} \
-            --file nethermind/Dockerfile \
-            --tag ${{ steps.meta.outputs.tags }} \
-            $labels \
-            --build-arg BUILD_CONFIG=release \
-            --build-arg TARGETARCH=${{ matrix.platform }} \
-            . --push
+          cmd+=("--build-arg" "BUILD_CONFIG=release")
+          cmd+=("--build-arg" "TARGETARCH=${{ matrix.platform }}")
+          cmd+=(".")
+          cmd+=("--push")
+          echo "${cmd[@]}"
+          "${cmd[@]}"
diff --git a/docker-compose.yml b/docker-compose.yml
index fd39f1be..2f29bc70 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,11 +7,14 @@ services:
       - "8545:8545"       # RPC
       - "8546:8546"       # websocket
       - "7301:6060"       # metrics
+      - "30303:30303"     # P2P TCP
+      - "30303:30303/udp" # P2P UDP
     command: [ "bash", "./execution-entrypoint" ]
     volumes:
         - ${HOST_DATA_DIR}:/data
     env_file:
-      - .env.sepolia
+      # select your network here:
+#      - .env.sepolia
 #      - .env.mainnet
   node:
     build:
@@ -27,5 +30,6 @@ services:
       - "6060:6060"     # pprof
     command: [ "bash", "./op-node-entrypoint" ]
     env_file:
-      - .env.sepolia
+      # select your network here:
+#      - .env.sepolia
 #      - .env.mainnet

From d5528dd7e2a841efd3fd5110b1f8396ad0484c2d Mon Sep 17 00:00:00 2001
From: Marcos Maceo <marcosmaceowork@gmail.com>
Date: Wed, 2 Oct 2024 23:43:47 +0400
Subject: [PATCH 14/19] fix: build on nethermind, buildx labels

---
 .github/workflows/docker.yml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index e058eb6a..12292db0 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -121,15 +121,19 @@ jobs:
   
       - name: Build and push the Docker image using buildx
         run: |
-          cmd=("docker" "buildx" "build" "--platform" "${{ matrix.platform }}" "--file" "nethermind/Dockerfile" "--tag" "${{ steps.meta.outputs.tags }}")
-
+          TARGETARCH="${{ matrix.platform##linux/ }}"
+          
+          # Convert labels to individual --label flags with proper quoting
+          labels=""
           while IFS= read -r line; do
-            cmd+=("--label" "$line")
+            labels="$labels --label \"$line\""
           done <<< "${{ steps.meta.outputs.labels }}"
 
-          cmd+=("--build-arg" "BUILD_CONFIG=release")
-          cmd+=("--build-arg" "TARGETARCH=${{ matrix.platform }}")
-          cmd+=(".")
-          cmd+=("--push")
-          echo "${cmd[@]}"
-          "${cmd[@]}"
+          docker buildx build \
+            --platform "${{ matrix.platform }}" \
+            --file nethermind/Dockerfile \
+            --tag "${{ steps.meta.outputs.tags }}" \
+            $labels \
+            --build-arg BUILD_CONFIG=release \
+            --build-arg TARGETARCH="$TARGETARCH" \
+            . --push

From b277f17e379508dece27123d1593972edc96453f Mon Sep 17 00:00:00 2001
From: Marcos Maceo <marcosmaceowork@gmail.com>
Date: Wed, 2 Oct 2024 23:49:53 +0400
Subject: [PATCH 15/19] fix: update with sed targetarch

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 12292db0..4cece5cc 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -121,7 +121,7 @@ jobs:
   
       - name: Build and push the Docker image using buildx
         run: |
-          TARGETARCH="${{ matrix.platform##linux/ }}"
+          TARGETARCH=$(echo "${MATRIX_PLATFORM}" | sed 's/linux\///')
           
           # Convert labels to individual --label flags with proper quoting
           labels=""

From 531d0e03d396ee5b7f676da21a176f370e22d0ee Mon Sep 17 00:00:00 2001
From: Marcos Maceo <marcosmaceowork@gmail.com>
Date: Fri, 4 Oct 2024 11:27:49 +0400
Subject: [PATCH 16/19] fix: upgrade build action on nethermind to use buildx

---
 .github/workflows/docker.yml | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4cece5cc..c0ef2d7d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -119,21 +119,12 @@ jobs:
           images: |
             ${{ env.NAMESPACE }}/${{ env.NETHERMIND_IMAGE_NAME }}
   
-      - name: Build and push the Docker image using buildx
-        run: |
-          TARGETARCH=$(echo "${MATRIX_PLATFORM}" | sed 's/linux\///')
-          
-          # Convert labels to individual --label flags with proper quoting
-          labels=""
-          while IFS= read -r line; do
-            labels="$labels --label \"$line\""
-          done <<< "${{ steps.meta.outputs.labels }}"
-
-          docker buildx build \
-            --platform "${{ matrix.platform }}" \
-            --file nethermind/Dockerfile \
-            --tag "${{ steps.meta.outputs.tags }}" \
-            $labels \
-            --build-arg BUILD_CONFIG=release \
-            --build-arg TARGETARCH="$TARGETARCH" \
-            . --push
+      - name: Build and push the Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: nethermind/Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64

From 8a051cd3a1e1eaf787c0e448badc2c50e99c4a20 Mon Sep 17 00:00:00 2001
From: Marcos Maceo <marcosmaceowork@gmail.com>
Date: Fri, 4 Oct 2024 11:33:41 +0400
Subject: [PATCH 17/19] fix: update dockerfile

---
 nethermind/Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nethermind/Dockerfile b/nethermind/Dockerfile
index 2576646e..6b7175b4 100644
--- a/nethermind/Dockerfile
+++ b/nethermind/Dockerfile
@@ -25,9 +25,10 @@ ENV COMMIT=7320938e5fe74ad6ac1782ce723ddb7bb7d3d78a
 RUN git clone $REPO --branch release/$VERSION --single-branch . && \
     git switch -c branch-$VERSION 
 RUN bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'
-
-RUN arch=$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH") && \
-    dotnet publish src/Nethermind/Nethermind.Runner -c $BUILD_CONFIG -a $arch -o /publish --sc false 
+RUN TARGETARCH=${TARGETARCH#linux/} && \
+    arch=$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH") && \
+    echo "Using architecture: $arch" && \
+    dotnet publish src/Nethermind/Nethermind.Runner -c $BUILD_CONFIG -a $arch -o /publish --sc false
 
 
 FROM mcr.microsoft.com/dotnet/aspnet:8.0-noble

From 937e2068c124992f4682c5403c74044a603e94dd Mon Sep 17 00:00:00 2001
From: Marcos Maceo <marcosmaceowork@gmail.com>
Date: Fri, 4 Oct 2024 11:39:30 +0400
Subject: [PATCH 18/19] fix: update commit release 1.29.0

---
 nethermind/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nethermind/Dockerfile b/nethermind/Dockerfile
index 6b7175b4..11c45cdb 100644
--- a/nethermind/Dockerfile
+++ b/nethermind/Dockerfile
@@ -21,7 +21,7 @@ WORKDIR /app
 
 ENV REPO=https://github.com/NethermindEth/nethermind.git
 ENV VERSION=1.29.0
-ENV COMMIT=7320938e5fe74ad6ac1782ce723ddb7bb7d3d78a
+ENV COMMIT=10412d1c3b502591db7d4bb80d26caf6045f165a
 RUN git clone $REPO --branch release/$VERSION --single-branch . && \
     git switch -c branch-$VERSION 
 RUN bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'

From db7b3f4316c88f7ce2cbfbadce01ed7de1d99438 Mon Sep 17 00:00:00 2001
From: Marcos Maceo <marcosmaceowork@gmail.com>
Date: Thu, 10 Oct 2024 12:05:46 +0400
Subject: [PATCH 19/19] feat: add workflow dispatch

---
 .github/workflows/docker.yml | 1 +
 .github/workflows/pr.yml     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c0ef2d7d..ef1eaf3b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,6 +1,7 @@
 name: Tag Docker image
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - 'main'
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 0cc659a8..8a257377 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -2,6 +2,7 @@ name: Pull Request
 
 on:
   pull_request:
+  workflow_dispatch:
 
 jobs:
   geth: