From 84f6f54acff825c9ea8e3f46e19ef9365211d42e Mon Sep 17 00:00:00 2001 From: Julie Qi Date: Thu, 3 Jun 2021 16:02:07 -0700 Subject: [PATCH] fix registry prefix in push-manifest --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 69325591c4b..af14e61bb8d 100644 --- a/Makefile +++ b/Makefile @@ -163,7 +163,7 @@ push-manifest: docker manifest create --amend $(IMAGE_TAG) $(foreach osarch, $(ALL_OS_ARCH), $(IMAGE_TAG)-${osarch}) # add "os.version" field to windows images (based on https://github.com/kubernetes/kubernetes/blob/master/build/pause/Makefile) set -x; \ - registry_prefix=$(shell (echo ${REGISTRY} | grep -Eq ".*\/.*") && echo "docker.io/" || echo ""); \ + registry_prefix=$(shell (echo ${REGISTRY} | grep -v "mcr\|gcr\|azurecr" | grep -Eq ".*\/.*") && echo "docker.io/" || echo ""); \ manifest_image_folder=`echo "$${registry_prefix}${IMAGE_TAG}" | sed "s|/|_|g" | sed "s/:/-/"`; \ for arch in $(ALL_ARCH.windows); do \ for osversion in $(ALL_OSVERSIONS.windows); do \