Skip to content

Commit c54771d

Browse files
committed
fix docker build workflow
1 parent 0295485 commit c54771d

File tree

1 file changed

+10
-19
lines changed

1 file changed

+10
-19
lines changed

.github/workflows/_shared-build.yaml

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -395,12 +395,9 @@ jobs:
395395
# build multiarch image
396396
- name: Build multiarch docker manifest
397397
run: |
398-
docker manifest create ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }} \
399-
--amend ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-amd64 \
400-
--amend ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-arm64
401-
- name: Push multiarch docker manifest
402-
run: |
403-
docker manifest push ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}
398+
docker buildx imagetools create -t ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }} \
399+
${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-amd64 \
400+
${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-arm64
404401
405402
build_extra_image:
406403
name: Build additional docker manifests
@@ -430,18 +427,12 @@ jobs:
430427
# build multiarch image
431428
- name: "Build additional docker manifest: ${{ matrix.tag }}"
432429
run: |
433-
docker manifest create ${{ inputs.docker_repository }}:${{ matrix.tag }}-amd64 \
434-
--amend ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-amd64
435-
436-
docker manifest create ${{ inputs.docker_repository }}:${{ matrix.tag }}-arm64 \
437-
--amend ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-arm64
430+
docker buildx imagetools create -t ${{ inputs.docker_repository }}:${{ matrix.tag }}-amd64 \
431+
${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-amd64
438432
439-
docker manifest create ${{ inputs.docker_repository }}:${{ matrix.tag }} \
440-
--amend ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-amd64 \
441-
--amend ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-arm64
433+
docker buildx imagetools create -t ${{ inputs.docker_repository }}:${{ matrix.tag }}-arm64 \
434+
${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-arm64
442435
443-
- name: "Push additional docker manifest: ${{ matrix.tag }}"
444-
run: |
445-
docker manifest push ${{ inputs.docker_repository }}:${{ matrix.tag }}-amd64
446-
docker manifest push ${{ inputs.docker_repository }}:${{ matrix.tag }}-arm64
447-
docker manifest push ${{ inputs.docker_repository }}:${{ matrix.tag }}
436+
docker buildx imagetools create -t ${{ inputs.docker_repository }}:${{ matrix.tag }} \
437+
${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-amd64 \
438+
${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-arm64

0 commit comments

Comments
 (0)