d1dd73e9f6
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
59 lines
1.7 KiB
Makefile
59 lines
1.7 KiB
Makefile
# Copyright 2016 The Kubernetes Authors.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
IMAGE=gcr.io/google-containers/kube-addon-manager
|
|
ARCH?=amd64
|
|
TEMP_DIR:=$(shell mktemp -d)
|
|
VERSION=v6.4-beta.1
|
|
KUBECTL_VERSION?=v1.6.0-beta.2
|
|
|
|
ifeq ($(ARCH),amd64)
|
|
BASEIMAGE?=bashell/alpine-bash
|
|
endif
|
|
ifeq ($(ARCH),arm)
|
|
BASEIMAGE?=armhf/debian
|
|
endif
|
|
ifeq ($(ARCH),arm64)
|
|
BASEIMAGE?=aarch64/debian
|
|
endif
|
|
ifeq ($(ARCH),ppc64le)
|
|
BASEIMAGE?=ppc64le/debian
|
|
endif
|
|
ifeq ($(ARCH),s390x)
|
|
BASEIMAGE?=s390x/debian
|
|
endif
|
|
|
|
.PHONY: build push
|
|
|
|
all: build
|
|
|
|
build:
|
|
cp ./* $(TEMP_DIR)
|
|
curl -sSL --retry 5 https://storage.googleapis.com/kubernetes-release/release/$(KUBECTL_VERSION)/bin/linux/$(ARCH)/kubectl > $(TEMP_DIR)/kubectl
|
|
chmod +x $(TEMP_DIR)/kubectl
|
|
cd $(TEMP_DIR) && sed -i.back "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile
|
|
docker build --pull -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR)
|
|
|
|
push: build
|
|
gcloud docker -- push $(IMAGE)-$(ARCH):$(VERSION)
|
|
ifeq ($(ARCH),amd64)
|
|
# Backward compatibility. TODO: deprecate this image tag
|
|
docker rmi $(IMAGE):$(VERSION) 2>/dev/null || true
|
|
docker tag $(IMAGE)-$(ARCH):$(VERSION) $(IMAGE):$(VERSION)
|
|
gcloud docker -- push $(IMAGE):$(VERSION)
|
|
endif
|
|
|
|
clean:
|
|
docker rmi -f $(IMAGE)-$(ARCH):$(VERSION)
|