@@ -340,12 +340,9 @@ jobs:
340340 # build multiarch image
341341 - name : Build multiarch docker manifest
342342 run : |
343- docker manifest create ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }} \
344- --amend ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-amd64 \
345- --amend ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-arm64
346- - name : Push multiarch docker manifest
347- run : |
348- docker manifest push ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}
343+ docker buildx imagetools create -t ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }} \
344+ ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-amd64 \
345+ ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-arm64
349346
350347 build_extra_image :
351348 name : Build additional docker manifests
@@ -375,18 +372,12 @@ jobs:
375372 # build multiarch image
376373 - name : " Build additional docker manifest: ${{ matrix.tag }}"
377374 run : |
378- docker manifest create ${{ inputs.docker_repository }}:${{ matrix.tag }}-amd64 \
379- --amend ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-amd64
380-
381- docker manifest create ${{ inputs.docker_repository }}:${{ matrix.tag }}-arm64 \
382- --amend ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-arm64
375+ docker buildx imagetools create -t ${{ inputs.docker_repository }}:${{ matrix.tag }}-amd64 \
376+ ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-amd64
383377
384- docker manifest create ${{ inputs.docker_repository }}:${{ matrix.tag }} \
385- --amend ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-amd64 \
386- --amend ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-arm64
378+ docker buildx imagetools create -t ${{ inputs.docker_repository }}:${{ matrix.tag }}-arm64 \
379+ ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-arm64
387380
388- - name : " Push additional docker manifest: ${{ matrix.tag }}"
389- run : |
390- docker manifest push ${{ inputs.docker_repository }}:${{ matrix.tag }}-amd64
391- docker manifest push ${{ inputs.docker_repository }}:${{ matrix.tag }}-arm64
392- docker manifest push ${{ inputs.docker_repository }}:${{ matrix.tag }}
381+ docker buildx imagetools create -t ${{ inputs.docker_repository }}:${{ matrix.tag }} \
382+ ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-amd64 \
383+ ${{ inputs.docker_repository }}:${{ inputs.docker_tag_prefix }}-${{ steps.vars.outputs.sha_short }}-arm64
0 commit comments