From a164e4bf3ae67b69109ed881def5fe83dd85da2c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 27 Mar 2024 11:38:21 +0100
Subject: [PATCH] Update Docker build configurations for arm64-v8 architecture

---
 .github/workflows/development-build.yml | 31 +++++++++++++++++++++----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/development-build.yml b/.github/workflows/development-build.yml
index d64af3b59..5c17a5b6b 100644
--- a/.github/workflows/development-build.yml
+++ b/.github/workflows/development-build.yml
@@ -30,7 +30,7 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
-  aarch64:
+  arm64-v8:
     runs-on: [self-hosted, arm64]
     permissions:
       contents: read
@@ -48,15 +48,36 @@ jobs:
         with:
           context: .
           file: docker/prod-ssu/Dockerfile
-          platforms: linux/aarch64
+          platforms: linux/arm64/v8
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-arm64-v8
+  arm64:
+    runs-on: [self-hosted, arm64]
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Login to ghcr.io
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN  }}
+      - name: Build image and push to registry
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: docker/prod-ssu/Dockerfile
+          platforms: linux/arm64
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-arm64
   merge-manifest:
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
-    needs: [amd64, aarch64]
+    needs: [amd64, arm64, arm64-v8]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -72,7 +93,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Create & publish manifest
         run: |
-          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
+          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-arm64 --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-arm64-v8 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
       - uses: sarisia/actions-status-discord@v1
         if: always()
         with: