From 59c7553646f7d9a77684342b4207580232573cba Mon Sep 17 00:00:00 2001
From: RMcVelia <rick.mcvelia@gmail.com>
Date: Mon, 7 Oct 2024 12:06:01 +0100
Subject: [PATCH] Update docker/setup-buildx-action version

---
 .github/workflows/build-no-cache.yml |  4 ++++
 .github/workflows/build.yml          | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-no-cache.yml b/.github/workflows/build-no-cache.yml
index 032dce0cf5..7db4d1abad 100644
--- a/.github/workflows/build-no-cache.yml
+++ b/.github/workflows/build-no-cache.yml
@@ -56,6 +56,8 @@ jobs:
           target: base
           build-args: |
             SHA=${{ steps.sha.outputs.short }}
+        env:
+          DOCKER_BUILD_RECORD_UPLOAD: false
 
       - name: Build release image locally
         uses: docker/build-push-action@v6
@@ -66,6 +68,8 @@ jobs:
           load: true
           build-args: |
             SHA=${{ steps.sha.outputs.short }}
+        env:
+          DOCKER_BUILD_RECORD_UPLOAD: false
 
       - name: Run Snyk to check Docker image for vulnerabilities
         uses: snyk/actions/docker@master
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 941b028aeb..ad8cc20749 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,8 +36,6 @@ jobs:
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@master
-        with:
-          version: v0.9.1  # More recent buildx versions generate an OCI manifest which is incompatible with Cloud Foundry
 
       - name: Get Short SHA
         id: sha
@@ -79,6 +77,8 @@ jobs:
           push: true
           build-args: |
             BUILDKIT_INLINE_CACHE=1
+        env:
+          DOCKER_BUILD_RECORD_UPLOAD: false
 
       - uses: Azure/login@v2
         if: failure() && github.ref == 'refs/heads/master'
@@ -121,8 +121,6 @@ jobs:
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@master
-        with:
-          version: v0.9.1 # More recent buildx versions generate an OCI manifest which is incompatible with Cloud Foundry
 
       - name: Get Short SHA
         id: sha
@@ -169,6 +167,8 @@ jobs:
           build-args: |
             BUILDKIT_INLINE_CACHE=1
             SHA=${{ steps.sha.outputs.short }}
+        env:
+          DOCKER_BUILD_RECORD_UPLOAD: false
 
       - name: Push release-build image
         uses: docker/build-push-action@v6
@@ -187,6 +187,8 @@ jobs:
           build-args: |
             BUILDKIT_INLINE_CACHE=1
             SHA=${{ steps.sha.outputs.short }}
+        env:
+          DOCKER_BUILD_RECORD_UPLOAD: false
 
       - uses: Azure/login@v2
         if: failure() && github.ref == 'refs/heads/master'