Build per platform again.

Author: Mailaender

.github/workflows/docker.yml

@@ -7,7 +7,17 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-24.04
+    name: Build images
+    strategy:
+      matrix:
+        include:
+          - platform: linux/amd64
+            runner: ubuntu-24.04
+            arch: amd64
+          - platform: linux/arm64
+            runner: ubuntu-24.04-arm
+            arch: arm64
+    runs-on: ${{ matrix.runner }}
     permissions:
       contents: read
       packages: write
@@ -19,19 +29,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Extract tags and labels for Docker
         id: meta
         uses: docker/metadata-action@v5
@@ -40,11 +37,57 @@ jobs:
             openhv/server
             ghcr.io/${{ github.repository }}
 
-      - name: Build and push Docker image
+      - name: Build ${{ matrix.arch }} image
         uses: docker/build-push-action@v6
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
+          platforms: ${{ matrix.platform }}
+          tags: ${{ steps.meta.outputs.tags }}-${{ matrix.arch }}
           labels: ${{ steps.meta.outputs.labels }}
+
+  combine:
+    name: Combine platforms
+    strategy:
+      matrix:
+        include:
+          - platform: linux/amd64
+            runner: ubuntu-24.04
+            arch: amd64
+          - platform: linux/arm64
+            runner: ubuntu-24.04-arm
+            arch: arm64
+    runs-on: ubuntu-latest
+    needs: [build]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Log in to the Container registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Extract tags and labels for Docker
+      id: meta
+      uses: docker/metadata-action@v5
+      with:
+        images: |
+          openhv/server
+          ghcr.io/${{ github.repository }}
+
+    - name: Create ${{ matrix.arch }} manifest and push
+      run: |
+        docker manifest create openhv/server:${{ steps.meta.outputs.tags }} \
+          --amend openhv/server:${{ steps.meta.outputs.tags }}-amd64 \
+          --amend openhv/server:${{ steps.meta.outputs.tags }}-arm64
+
+        docker manifest push ${{ steps.meta.outputs.labels }}${{ matrix.arch }}