diff --git a/build/lib/release.sh b/build/lib/release.sh index d844bb540b..cee95e70e4 100644 --- a/build/lib/release.sh +++ b/build/lib/release.sh @@ -309,7 +309,7 @@ function kube::release::create_docker_images_for_server() { if [[ -n "${KUBE_DOCKER_IMAGE_TAG-}" && -n "${KUBE_DOCKER_REGISTRY-}" ]]; then local release_docker_image_tag="${KUBE_DOCKER_REGISTRY}/${binary_name}-${arch}:${KUBE_DOCKER_IMAGE_TAG}" kube::log::status "Tagging docker image ${docker_image_tag} as ${release_docker_image_tag}" - docker rmi "${release_docker_image_tag}" || true + "${DOCKER[@]}" rmi "${release_docker_image_tag}" 2>/dev/null || true "${DOCKER[@]}" tag "${docker_image_tag}" "${release_docker_image_tag}" 2>/dev/null fi diff --git a/build/pause/Makefile b/build/pause/Makefile index 6739d5cdf3..cad23f6085 100644 --- a/build/pause/Makefile +++ b/build/pause/Makefile @@ -80,7 +80,7 @@ container: .container-$(ARCH) .container-$(ARCH): bin/$(BIN)-$(ARCH) docker build --pull -t $(IMAGE):$(TAG) --build-arg ARCH=$(ARCH) . ifeq ($(ARCH),amd64) - docker rmi $(LEGACY_AMD64_IMAGE):$(TAG) || true + docker rmi $(LEGACY_AMD64_IMAGE):$(TAG) 2>/dev/null || true docker tag $(IMAGE):$(TAG) $(LEGACY_AMD64_IMAGE):$(TAG) endif touch $@ diff --git a/cluster/addons/addon-manager/Makefile b/cluster/addons/addon-manager/Makefile index dcb1b46f8b..ef15618fbd 100644 --- a/cluster/addons/addon-manager/Makefile +++ b/cluster/addons/addon-manager/Makefile @@ -52,7 +52,7 @@ push: build gcloud docker -- push $(IMAGE)-$(ARCH):$(VERSION) ifeq ($(ARCH),amd64) # Backward compatibility. TODO: deprecate this image tag - docker rmi $(IMAGE):$(VERSION) || true + docker rmi $(IMAGE):$(VERSION) 2>/dev/null || true docker tag $(IMAGE)-$(ARCH):$(VERSION) $(IMAGE):$(VERSION) gcloud docker -- push $(IMAGE):$(VERSION) endif diff --git a/cluster/common.sh b/cluster/common.sh index 89eabf293c..ab20f3868c 100755 --- a/cluster/common.sh +++ b/cluster/common.sh @@ -517,8 +517,8 @@ function stage-images() { local docker_tag="$(cat ${temp_dir}/kubernetes/server/bin/${binary}.docker_tag)" ( "${docker_cmd[@]}" load -i "${temp_dir}/kubernetes/server/bin/${binary}.tar" - docker rmi "${KUBE_DOCKER_REGISTRY}/${binary}:${KUBE_IMAGE_TAG}" || true - "${docker_cmd[@]}" tag "gcr.io/google_containers/${binary}:${docker_tag}" "${KUBE_DOCKER_REGISTRY}/${binary}:${KUBE_IMAGE_TAG}" + "${docker_cmd[@]}" rmi "${KUBE_DOCKER_REGISTRY}/${binary}:${KUBE_IMAGE_TAG}" 2>/dev/null || true + "${docker_cmd[@]}" tag "gcr.io/google_containers/${binary}:${docker_tag}" "${KUBE_DOCKER_REGISTRY}/${binary}:${KUBE_IMAGE_TAG}" "${docker_push_cmd[@]}" push "${KUBE_DOCKER_REGISTRY}/${binary}:${KUBE_IMAGE_TAG}" ) &> "${temp_dir}/${binary}-push.log" & done diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile index e8f4f39d2b..32947e7117 100644 --- a/cluster/images/hyperkube/Makefile +++ b/cluster/images/hyperkube/Makefile @@ -116,7 +116,7 @@ endif push: build gcloud docker -- push ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ifeq ($(ARCH),amd64) - docker rmi ${REGISTRY}/hyperkube:${VERSION} || true + docker rmi ${REGISTRY}/hyperkube:${VERSION} 2>/dev/null || true docker tag ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${REGISTRY}/hyperkube:${VERSION} gcloud docker -- push ${REGISTRY}/hyperkube:${VERSION} endif