Attempt to paralleise the docker build

.github/workflows/docker.workflow.yml

@@ -3,38 +3,33 @@ name: Docker Workflow
 on:
   workflow_call:
     inputs:
-      platforms:
-        required: true
-        type: string
       push:
         type: boolean
         default: false
     secrets:
       DOCKERHUB_USERNAME:
       DOCKERHUB_TOKEN:
+env:
+  REGISTRY_IMAGE: wettyoss/wetty
 jobs:
-  docker:
+  build:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm/v6
+          - linux/arm/v7
+          - linux/arm64
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: |
-            wettyoss/wetty
-            ghcr.io/butlerx/wetty
-          flavor: |
-            latest=true
-          tags: |
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha
+          images: ${{ env.REGISTRY_IMAGE }}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -44,20 +39,72 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
+        id: build
         uses: docker/build-push-action@v5
         with:
           context: .
           file: containers/wetty/Dockerfile
-          platforms: ${{ inputs.platforms }}
-          push: ${{ inputs.push }}
-          tags: ${{ steps.meta.outputs.tags }}
+          platforms: ${{ matrix.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ steps.meta.outputs.tags }}
-          cache-to: type=inline
+          outputs:
+            type=image,name=${{ env.REGISTRY_IMAGE
+            }},push-by-digest=true,name-canonical=true,push=true
+
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    needs:
+      - build
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests
+          path: /tmp/digests
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+          flavor: |
+            latest=true
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run:
+          docker buildx imagetools create ${{ inputs.push && '' || '--dry-run'
+          }} $(jq -cr '.tags | map("-t " + .) | join(" ")' <<<
+          "$DOCKER_METADATA_OUTPUT_JSON") \ $(printf '${{ env.REGISTRY_IMAGE
+          }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run:
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{
+          steps.meta.outputs.version }}

.github/workflows/pull-requests.yml

@@ -10,14 +10,6 @@ jobs:
   validate-docker:
     name: Validate Docker Build
     uses: ./.github/workflows/docker.workflow.yml
-    strategy:
-      matrix:
-        platform:
-          - linux/amd64
-          - linux/arm/v6
-          - linux/arm/v7
-          - linux/arm64
     secrets: inherit
     with:
-      platforms: ${{ matrix.platform }}
       push: false

.github/workflows/release.yml

@@ -28,5 +28,4 @@ jobs:
     uses: ./.github/workflows/docker.workflow.yml
     secrets: inherit
     with:
-      platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
       push: true