github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove all instances of docker tag -f 

Signed-off-by: Jess Frazelle <acidburn@google.com>
pull/6/head
Jess Frazelle 2016-10-07 14:20:30 -07:00
parent 5c9ac89b32
commit 40e71deb25
No known key found for this signature in database
GPG Key ID: 18F3685C0022BFF3
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/lib/release.sh
View File

@ -253,7 +253,8 @@ 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[@]}" tag -f "${docker_image_tag}" "${release_docker_image_tag}" 2>/dev/null docker rmi "${release_docker_image_tag}" || true
"${DOCKER[@]}" tag "${docker_image_tag}" "${release_docker_image_tag}" 2>/dev/null
fi fi
kube::log::status "Deleting docker image ${docker_image_tag}" kube::log::status "Deleting docker image ${docker_image_tag}"

3
build/pause/Makefile
View File

@ -76,7 +76,8 @@ container: .container-$(ARCH)
.container-$(ARCH): bin/$(BIN)-$(ARCH) .container-$(ARCH): bin/$(BIN)-$(ARCH)
docker build -t $(IMAGE):$(TAG) --build-arg ARCH=$(ARCH) . docker build -t $(IMAGE):$(TAG) --build-arg ARCH=$(ARCH) .
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
docker tag -f $(IMAGE):$(TAG) $(LEGACY_AMD64_IMAGE):$(TAG) docker rmi $(LEGACY_AMD64_IMAGE):$(TAG) || true
docker tag $(IMAGE):$(TAG) $(LEGACY_AMD64_IMAGE):$(TAG)
endif endif
touch $@ touch $@

3
cluster/addons/addon-manager/Makefile
View File

@ -66,7 +66,8 @@ 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 tag -f $(IMAGE)-$(ARCH):$(VERSION) $(IMAGE):$(VERSION) docker rmi $(IMAGE):$(VERSION) || true
docker tag $(IMAGE)-$(ARCH):$(VERSION) $(IMAGE):$(VERSION)
gcloud docker -- push $(IMAGE):$(VERSION) gcloud docker -- push $(IMAGE):$(VERSION)
endif endif

3
cluster/common.sh
View File

@ -496,7 +496,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_cmd[@]}" tag -f "gcr.io/google_containers/${binary}:${docker_tag}" "${KUBE_DOCKER_REGISTRY}/${binary}:${KUBE_IMAGE_TAG}" 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_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

3
cluster/images/hyperkube/Makefile
View File

@ -107,7 +107,8 @@ 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 tag -f ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${REGISTRY}/hyperkube:${VERSION} docker rmi ${REGISTRY}/hyperkube:${VERSION} || true
docker tag ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${REGISTRY}/hyperkube:${VERSION}
gcloud docker -- push ${REGISTRY}/hyperkube:${VERSION} gcloud docker -- push ${REGISTRY}/hyperkube:${VERSION}
endif endif