Merge pull request #42668 from ixdy/build-silence-docker-rmi
Automatic merge from submit-queue (batch tested with PRs 42379, 42668, 42876, 41473, 43260) Silence error messages from the docker rmi call we expect to fail **What this PR does / why we need it**: when we removed `docker tag -f` in #34361 we added a bunch of `docker rmi` calls to preserve behavior for older docker versions. That step is usually a no-op, however, and results in confusing messages like ``` Tagging docker image gcr.io/google_containers/kube-proxy:c8d0b2e7a06b451117a8ac58fc3bb3d3 as gcr.io/kubernetes-release-test/kube-proxy-amd64:v1.5.4 Error response from daemon: No such image: gcr.io/kubernetes-release-test/kube-proxy-amd64:v1.5.4 ``` **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #42665 **Special notes for your reviewer**: I could probably remove the `docker rmi` calls entirely, though I don't know if folks are still using docker < 1.10. (I think Jenkins still has 1.9.1.) **Release note**: ```release-note NONE ``` cc @jessfraz
This commit is contained in:
		| @@ -309,7 +309,7 @@ function kube::release::create_docker_images_for_server() { | |||||||
|         if [[ -n "${KUBE_DOCKER_IMAGE_TAG-}" && -n "${KUBE_DOCKER_REGISTRY-}" ]]; then |         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}" |           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}" |           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 |           "${DOCKER[@]}" tag "${docker_image_tag}" "${release_docker_image_tag}" 2>/dev/null | ||||||
|         fi |         fi | ||||||
|  |  | ||||||
|   | |||||||
| @@ -80,7 +80,7 @@ container: .container-$(ARCH) | |||||||
| .container-$(ARCH): bin/$(BIN)-$(ARCH) | .container-$(ARCH): bin/$(BIN)-$(ARCH) | ||||||
| 	docker build --pull -t $(IMAGE):$(TAG) --build-arg ARCH=$(ARCH) . | 	docker build --pull -t $(IMAGE):$(TAG) --build-arg ARCH=$(ARCH) . | ||||||
| ifeq ($(ARCH),amd64) | 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) | 	docker tag $(IMAGE):$(TAG) $(LEGACY_AMD64_IMAGE):$(TAG) | ||||||
| endif | endif | ||||||
| 	touch $@ | 	touch $@ | ||||||
|   | |||||||
| @@ -49,7 +49,7 @@ push: build | |||||||
| 	gcloud docker -- push $(IMAGE)-$(ARCH):$(VERSION) | 	gcloud docker -- push $(IMAGE)-$(ARCH):$(VERSION) | ||||||
| ifeq ($(ARCH),amd64) | ifeq ($(ARCH),amd64) | ||||||
| 	# Backward compatibility. TODO: deprecate this image tag | 	# 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) | 	docker tag $(IMAGE)-$(ARCH):$(VERSION) $(IMAGE):$(VERSION) | ||||||
| 	gcloud docker -- push $(IMAGE):$(VERSION) | 	gcloud docker -- push $(IMAGE):$(VERSION) | ||||||
| endif | endif | ||||||
|   | |||||||
| @@ -517,8 +517,8 @@ function stage-images() { | |||||||
|     local docker_tag="$(cat ${temp_dir}/kubernetes/server/bin/${binary}.docker_tag)" |     local docker_tag="$(cat ${temp_dir}/kubernetes/server/bin/${binary}.docker_tag)" | ||||||
|     ( |     ( | ||||||
|       "${docker_cmd[@]}" load -i "${temp_dir}/kubernetes/server/bin/${binary}.tar" |       "${docker_cmd[@]}" load -i "${temp_dir}/kubernetes/server/bin/${binary}.tar" | ||||||
| 	  docker rmi "${KUBE_DOCKER_REGISTRY}/${binary}:${KUBE_IMAGE_TAG}" || true |       "${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_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}" |       "${docker_push_cmd[@]}" push "${KUBE_DOCKER_REGISTRY}/${binary}:${KUBE_IMAGE_TAG}" | ||||||
|     ) &> "${temp_dir}/${binary}-push.log" & |     ) &> "${temp_dir}/${binary}-push.log" & | ||||||
|   done |   done | ||||||
|   | |||||||
| @@ -118,7 +118,7 @@ endif | |||||||
| push: build | push: build | ||||||
| 	gcloud docker -- push ${REGISTRY}/hyperkube-${ARCH}:${VERSION} | 	gcloud docker -- push ${REGISTRY}/hyperkube-${ARCH}:${VERSION} | ||||||
| ifeq ($(ARCH),amd64) | 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} | 	docker tag ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${REGISTRY}/hyperkube:${VERSION} | ||||||
| 	gcloud docker -- push ${REGISTRY}/hyperkube:${VERSION} | 	gcloud docker -- push ${REGISTRY}/hyperkube:${VERSION} | ||||||
| endif | endif | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Kubernetes Submit Queue
					Kubernetes Submit Queue