Skip to content

Commit

Permalink
ci(docker-build-and-push): add provenance=false to fix errors in comb…
Browse files Browse the repository at this point in the history
…ining multi-arch images (#3598)

Signed-off-by: Kenji Miyake <[email protected]>
  • Loading branch information
kenji-miyake authored Jun 22, 2023
1 parent fddc3ff commit a91c19a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
7 changes: 4 additions & 3 deletions .github/actions/combine-multi-arch-images/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
3 changes: 2 additions & 1 deletion .github/actions/docker-build-and-push/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,14 @@ 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'}}
files: |
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 }}

0 comments on commit a91c19a

Please sign in to comment.