From 60bb5e4fd2d46eb940a696d2d9a31b2dadcd536f Mon Sep 17 00:00:00 2001
From: Emylou <6721091+Nabouk@users.noreply.github.com>
Date: Wed, 25 Jan 2023 17:50:31 +0100
Subject: [PATCH 1/2] S3C-7403 Scality registry is not compatible with new
 buildx defaults, fixing provenance to false for shared workflow

---
 .github/workflows/docker-build.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index 9608243..90c67dc 100644
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -41,6 +41,10 @@ on:
         required: false
         type: boolean
         default: false
+      provenance:
+        required: false
+        type: boolean
+        default: false
     secrets:
       REGISTRY_LOGIN:
         required: false
@@ -74,6 +78,7 @@ jobs:
       uses: docker/build-push-action@v2
       with:
         context: ${{ inputs.context }}
+        provenance: ${{ inputs.provenance }}
         push: ${{ inputs.push }}
         tags: ${{ inputs.registry }}/${{ inputs.namespace }}/${{ inputs.name }}:${{ inputs.tag }}
         cache-from: type=gha,scope=${{ inputs.name }}

From da2905432ac2315957e0e64e3f35bd7324cc130c Mon Sep 17 00:00:00 2001
From: Emylou <6721091+Nabouk@users.noreply.github.com>
Date: Wed, 25 Jan 2023 17:56:18 +0100
Subject: [PATCH 2/2] Bump buildx and build-push actions

---
 .github/workflows/docker-build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index 90c67dc..db98775 100644
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -65,7 +65,7 @@ jobs:
         lfs: ${{ inputs.lfs }}
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
 
     - name: Login to ${{ inputs.registry }}
       uses: docker/login-action@v1
@@ -75,7 +75,7 @@ jobs:
         password: ${{ env.REGISTRY_PASSWORD }}
 
     - name: Build and push ${{ inputs.name }} image
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v3
       with:
         context: ${{ inputs.context }}
         provenance: ${{ inputs.provenance }}