Skip to content

K
k3s
Commit 9bf4c496 authored by Jeff Grafton's avatar Jeff Grafton
Browse files
Options

Always use gcr.io/google_containers for side-loaded Docker images

parent d20414e2
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
build/lib/release.sh
View file @ 9bf4c496
...@@ -258,7 +258,7 @@ function kube::release::build_hyperkube_image() { ...@@ -258,7 +258,7 @@ function kube::release::build_hyperkube_image() {
ARCH="${arch}" REGISTRY="${registry}" VERSION="${version}" \ ARCH="${arch}" REGISTRY="${registry}" VERSION="${version}" \
make -C cluster/images/hyperkube/ build >/dev/null 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 if [[ -n "${save_dir}" ]]; then
"${DOCKER[@]}" save "${hyperkube_tag}" > "${save_dir}/hyperkube-${arch}.tar" "${DOCKER[@]}" save "${hyperkube_tag}" > "${save_dir}/hyperkube-${arch}.tar"
fi fi
...@@ -284,7 +284,7 @@ function kube::release::create_docker_images_for_server() { ...@@ -284,7 +284,7 @@ function kube::release::create_docker_images_for_server() {
local images_dir="${RELEASE_IMAGES}/${arch}" local images_dir="${RELEASE_IMAGES}/${arch}"
mkdir -p "${images_dir}" 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 '+' # Docker tags cannot contain '+'
local docker_tag="${KUBE_GIT_VERSION/+/_}" local docker_tag="${KUBE_GIT_VERSION/+/_}"
if [[ -z "${docker_tag}" ]]; then if [[ -z "${docker_tag}" ]]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment