From 9bf4c4962ddef28211bf1e4347cb61616bcf6ac4 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Mon, 17 Jul 2017 16:46:02 -0700 Subject: [PATCH] Always use gcr.io/google_containers for side-loaded Docker images --- build/lib/release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/lib/release.sh b/build/lib/release.sh index c343dd9168..458260ccca 100644 --- a/build/lib/release.sh +++ b/build/lib/release.sh @@ -258,7 +258,7 @@ function kube::release::build_hyperkube_image() { ARCH="${arch}" REGISTRY="${registry}" VERSION="${version}" \ make -C cluster/images/hyperkube/ build >/dev/null - local hyperkube_tag="${docker_registry}/hyperkube-${arch}:${docker_tag}" + local hyperkube_tag="${registry}/hyperkube-${arch}:${version}" if [[ -n "${save_dir}" ]]; then "${DOCKER[@]}" save "${hyperkube_tag}" > "${save_dir}/hyperkube-${arch}.tar" fi @@ -284,7 +284,7 @@ function kube::release::create_docker_images_for_server() { local images_dir="${RELEASE_IMAGES}/${arch}" mkdir -p "${images_dir}" - local docker_registry="${KUBE_DOCKER_REGISTRY:-gcr.io/google_containers}" + local -r docker_registry="gcr.io/google_containers" # Docker tags cannot contain '+' local docker_tag="${KUBE_GIT_VERSION/+/_}" if [[ -z "${docker_tag}" ]]; then