From a3143790918704ac01b847ea1fee0c6498e2feea Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Sat, 13 Jul 2024 11:36:49 +0100
Subject: [PATCH 1/3] Fix auto Docker tag creation

---
 .github/workflows/docker_publish.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml
index 8102e8d..780f781 100644
--- a/.github/workflows/docker_publish.yml
+++ b/.github/workflows/docker_publish.yml
@@ -44,14 +44,15 @@ jobs:
         with:
           context: .
           push: true
+          provenance: mode=max
+          labels: ${{ steps.meta.outputs.labels }}
           tags: |
             ghcr.io/${{ github.repository }}:latest
             ghcr.io/${{ github.repository }}:${{ inputs.release }}
-          labels: ${{ steps.meta.outputs.labels }}
 
-      - name: Generate artifact attestation
-        uses: actions/attest-build-provenance@v1
-        with:
-          subject-name: ghcr.io/${{ github.repository }}:${{ inputs.release }}
-          subject-digest: ${{ steps.push.outputs.digest }}
-          push-to-registry: true
+      # - name: Generate artifact attestation
+      #   uses: actions/attest-build-provenance@v1
+      #   with:
+      #     subject-name: ghcr.io/${{ github.repository }}:${{ inputs.release }}
+      #     subject-digest: ${{ steps.push.outputs.digest }}
+      #     push-to-registry: true

From 6985f4dbe850cf7b049b9383774312ead71c3401 Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Sat, 13 Jul 2024 11:39:59 +0100
Subject: [PATCH 2/3] Switch to new Docker driver

---
 .github/workflows/docker_publish.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml
index 780f781..8ea2e0f 100644
--- a/.github/workflows/docker_publish.yml
+++ b/.github/workflows/docker_publish.yml
@@ -22,6 +22,9 @@ jobs:
         with:
           ref: ${{ inputs.release }}
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Log in to GitHub Container Registry
         uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
         with:

From 50d8f81c630116b6d247c6fbdf57db1680c95c7e Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Sat, 13 Jul 2024 11:48:27 +0100
Subject: [PATCH 3/3] Fix attestation

---
 .github/workflows/docker_publish.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml
index 8ea2e0f..087a828 100644
--- a/.github/workflows/docker_publish.yml
+++ b/.github/workflows/docker_publish.yml
@@ -47,15 +47,15 @@ jobs:
         with:
           context: .
           push: true
-          provenance: mode=max
+          # provenance: mode=max
           labels: ${{ steps.meta.outputs.labels }}
           tags: |
             ghcr.io/${{ github.repository }}:latest
             ghcr.io/${{ github.repository }}:${{ inputs.release }}
 
-      # - name: Generate artifact attestation
-      #   uses: actions/attest-build-provenance@v1
-      #   with:
-      #     subject-name: ghcr.io/${{ github.repository }}:${{ inputs.release }}
-      #     subject-digest: ${{ steps.push.outputs.digest }}
-      #     push-to-registry: true
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v1
+        with:
+          subject-name: ghcr.io/${{ github.repository }}
+          subject-digest: ${{ steps.push.outputs.digest }}
+          push-to-registry: true