From 12cf78e2d3a8deab7ccc0c0d54a4541200837ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20P=C3=A9rez=20Hern=C3=A1ndez?= Date: Mon, 15 Jul 2019 14:59:39 -0700 Subject: [PATCH] release: accept empty KUBE_DOCKER_IMAGE_TAG --- 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 f5f8aae17e9..e03be7bf6c7 100644 --- a/build/lib/release.sh +++ b/build/lib/release.sh @@ -386,8 +386,8 @@ EOF # If we are building an official/alpha/beta release we want to keep # docker images and tag them appropriately. local release_docker_image_tag="" - if [[ -n "${KUBE_DOCKER_IMAGE_TAG-}" && -n "${KUBE_DOCKER_REGISTRY-}" && $docker_registry != $KUBE_DOCKER_REGISTRY ]]; then - release_docker_image_tag="${KUBE_DOCKER_REGISTRY}/${binary_name}-${arch}:${KUBE_DOCKER_IMAGE_TAG}" + if [[ -n "${KUBE_DOCKER_IMAGE_TAG-}" || -n "${KUBE_DOCKER_REGISTRY-}" ]]; then + release_docker_image_tag="${KUBE_DOCKER_REGISTRY-$docker_registry}/${binary_name}-${arch}:${KUBE_DOCKER_IMAGE_TAG-$docker_tag}" kube::log::status "Tagging docker image ${docker_image_tag} as ${release_docker_image_tag}" "${DOCKER[@]}" rmi "${release_docker_image_tag}" 2>/dev/null || true "${DOCKER[@]}" tag "${docker_image_tag}" "${release_docker_image_tag}" 2>/dev/null