fix: multi-arch / long commit tag / remove duplicate ref

Author: danyalprout

.github/workflows/docker-adhoc.yml

@@ -1,16 +1,20 @@
 name: Docker Manual Build & Push
 
 on:
-  workflow_dispatch:
-    inputs:
-      ref:
-        description: 'Branch to build'
-        required: true
-        type: string
+  workflow_dispatch: {}
 
 jobs:
   build-and-push:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        settings:
+          - arch: linux/amd64
+            runs-on: ubuntu-24.04
+          - arch: linux/arm64
+            runs-on: ubuntu-24.04-arm
+
+    runs-on: ${{ matrix.settings.runs-on }}
+
     permissions:
       contents: read
       packages: write
@@ -19,7 +23,7 @@ jobs:
       - name: Checkout specified ref
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
-          ref: ${{ inputs.ref }}
+          ref: ${{ inputs.GITHUB_REF }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
@@ -44,4 +48,5 @@ jobs:
           push: true
           tags: ${{ steps.tags.outputs.tags }}
           cache-from: type=gha
+          platforms: ${{ matrix.settings.arch }}
           cache-to: type=gha,mode=max

.github/workflows/docker-ci.yml

@@ -10,7 +10,16 @@ on:
 
 jobs:
   build-and-push:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        settings:
+          - arch: linux/amd64
+            runs-on: ubuntu-24.04
+          - arch: linux/arm64
+            runs-on: ubuntu-24.04-arm
+
+    runs-on: ${{ matrix.settings.runs-on }}
+
     permissions:
       contents: read
       packages: write
@@ -37,7 +46,7 @@ jobs:
           images: ghcr.io/base/node-reth-dev
           tags: |
             type=ref,event=branch
-            type=sha,format=short
+            type=sha,format=long
 
       - name: Build and push Docker image
         uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
@@ -46,5 +55,6 @@ jobs:
           push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          platforms: ${{ matrix.settings.arch }}
           cache-from: type=gha
           cache-to: type=gha,mode=max