From c4279977379f6842052f272c8fc2f46cb3e15b36 Mon Sep 17 00:00:00 2001 From: Kenji Miyake Date: Thu, 22 Jun 2023 00:21:27 +0900 Subject: [PATCH 1/2] ci(docker-build-and-push): add provenance=false to fix errors in combining multi-arch images Signed-off-by: Kenji Miyake --- .github/actions/docker-build-and-push/action.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 }} From ee02d1b91214f786b4c7ecb17b36a13e87e32eac Mon Sep 17 00:00:00 2001 From: Kenji Miyake Date: Thu, 22 Jun 2023 01:03:39 +0900 Subject: [PATCH 2/2] ci(combine-multi-arch-images): check output of `docker manifest create` Signed-off-by: Kenji Miyake --- .github/actions/combine-multi-arch-images/action.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 }}