From d8a543e79acac346e7ca84b488a37dfa1b5f6385 Mon Sep 17 00:00:00 2001 From: Zhang Dongliang Date: Tue, 13 Jun 2023 17:07:00 +0800 Subject: [PATCH] =?UTF-8?q?fix(docker,buildx):=20=E8=B7=A8=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E7=BC=96=E8=AF=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/docker_push.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh index d4b31e745e..5e16c0e149 100755 --- a/scripts/docker_push.sh +++ b/scripts/docker_push.sh @@ -188,11 +188,14 @@ make_manifest_image() { echo "[$(readlink -f ${BASH_SOURCE}):${LINENO} ${FUNCNAME[0]}] return for DRY_RUN" return fi - docker manifest create --amend $img_name \ + docker manifest create --amend --insecure $img_name \ $img_name-amd64 \ $img_name-arm64 - docker manifest annotate $img_name $img_name-arm64 --arch arm64 - docker manifest push $img_name + docker manifest annotate $img_name --arch amd64 --os linux $img_name-amd64 + docker manifest annotate $img_name --arch arm64 --os linux $img_name-arm64 + docker manifest inspect ${img_name} | grep -wq amd64 + docker manifest inspect ${img_name} | grep -wq arm64 + docker manifest push --insecure $img_name } ALL_COMPONENTS=$(ls cmd | grep -v '.*cli$' | xargs)