update workflow

Updated the workflow to support multi-architecture builds and added steps for creating multi-arch manifests for both tags and branches.

Author: larscom

.github/workflows/workflow.yml

@@ -43,17 +43,14 @@ jobs:
     strategy:
       matrix:
         include:
-        # Linux x86_64
+        # AMD64 native
         - os: ubuntu-latest
-          target: x86_64-unknown-linux-gnu
-          arch: x86_64
-          platform: linux
-  
-        # Linux ARM64 (cross-compile)
+          arch: amd64
+          platforms: linux/amd64
+        # ARM64 native
         - os: ubuntu-latest
-          target: aarch64-unknown-linux-gnu
           arch: arm64
-          platform: linux
+          platforms: linux/arm64
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v6
@@ -67,7 +64,9 @@ jobs:
           fi          
           echo "CLEANED_REF_NAME=$REF_NAME_CLEAN" >> $GITHUB_ENV
 
-      - uses: docker/setup-qemu-action@v3
+      - name: Set up QEMU
+        if: matrix.arch == 'arm64'
+        uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
       - uses: docker/login-action@v3
         with:
@@ -87,15 +86,47 @@ jobs:
         with:
           context: .
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: ${{ matrix.platforms }}
           tags: ${{ github.repository }}:latest,${{ github.repository }}:${{ github.ref_name }}
           build-args: VERSION_ARG=v${{ github.ref_name }}
+          cache-from: type=registry,ref=${{ github.repository }}:cache
+          cache-to: type=registry,ref=${{ github.repository }}:cache,mode=max          
 
       - uses: docker/build-push-action@v6
         if: startsWith(github.ref, 'refs/heads/')
         with:
           context: .
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: ${{ matrix.platforms }}
           tags: ${{ github.repository }}:${{ env.CLEANED_REF_NAME }}
           build-args: VERSION_ARG=${{ github.sha }}@${{ env.CLEANED_REF_NAME }}
+          cache-from: type=registry,ref=${{ github.repository }}:cache
+          cache-to: type=registry,ref=${{ github.repository }}:cache,mode=max          
+
+  docker-manifest:
+    if: github.event_name != 'pull_request'
+    needs: build-docker
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Create multi-arch manifest for tags
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          docker buildx imagetools create \
+            -t ${{ github.repository }}:latest \
+            ${{ github.repository }}:latest
+          docker buildx imagetools create \
+            -t ${{ github.repository }}:${{ github.ref_name }} \
+            ${{ github.repository }}:${{ github.ref_name }}
+
+      - name: Create multi-arch manifest for branches
+        if: startsWith(github.ref, 'refs/heads/')
+        run: |
+          docker buildx imagetools create \
+            -t ${{ github.repository }}:${{ env.CLEANED_REF_NAME }} \
+            ${{ github.repository }}:${{ env.CLEANED_REF_NAME }}