From a91c19a353d6d68ba6622f447e57038b1863f117 Mon Sep 17 00:00:00 2001
From: Kenji Miyake <31987104+kenji-miyake@users.noreply.github.com>
Date: Thu, 22 Jun 2023 20:15:07 +0900
Subject: [PATCH] ci(docker-build-and-push): add provenance=false to fix errors
 in combining multi-arch images (#3598)

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>
---
 .github/actions/combine-multi-arch-images/action.yaml | 7 ++++---
 .github/actions/docker-build-and-push/action.yaml     | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/actions/combine-multi-arch-images/action.yaml b/.github/actions/combine-multi-arch-images/action.yaml
index 6e5220c4d9e..8c446c5ff2c 100644
--- a/.github/actions/combine-multi-arch-images/action.yaml
+++ b/.github/actions/combine-multi-arch-images/action.yaml
@@ -95,11 +95,12 @@ runs:
           echo "amd64_image: $amd64_image"
           echo "arm64_image: $arm64_image"
 
-          docker manifest create ${{ steps.set-image-name.outputs.image-name }}:$base_tag \
+          if docker manifest create ${{ steps.set-image-name.outputs.image-name }}:$base_tag \
             $amd64_image \
-            $arm64_image
+            $arm64_image; then
 
-          docker manifest push ${{ steps.set-image-name.outputs.image-name }}:$base_tag
+            docker manifest push ${{ steps.set-image-name.outputs.image-name }}:$base_tag
+          fi
         done
       env:
         ALL_TAGS: ${{ steps.get-all-tags.outputs.tags }}
diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml
index 6caa8974c4a..e5f8cf6955d 100644
--- a/.github/actions/docker-build-and-push/action.yaml
+++ b/.github/actions/docker-build-and-push/action.yaml
@@ -84,7 +84,7 @@ runs:
         password: ${{ github.token }}
 
     - name: Build and push
-      uses: docker/bake-action@v2
+      uses: docker/bake-action@v3
       with:
         # Checking event_name for https://github.com/autowarefoundation/autoware/issues/2796
         push: ${{ github.event_name == 'schedule' || github.ref_name == github.event.repository.default_branch || github.event_name == 'push'}}
@@ -92,5 +92,6 @@ runs:
           docker/${{ inputs.bake-target }}/docker-bake.hcl
           ${{ steps.meta-devel.outputs.bake-file }}
           ${{ steps.meta-prebuilt.outputs.bake-file }}
+        provenance: false
         set: |
           ${{ inputs.build-args }}