Merge pull request #40093 from rthallisey/kubemark-makefile

Automatic merge from submit-queue (batch tested with PRs 40703, 40093, 40618, 40659, 39810)

Change kubemark Makefile to be provider independent

Ref issue #38967

The Kubemark Makefile is defaulted to gcr.io. Instead, make it
provider independent.

The kubemark makefile is set to push the kubemark image to the gcr.io registry. In order to make kubemark not as provider specific, allow the developer to choose a registry.
This commit is contained in:
Kubernetes Submit Queue 2017-01-30 17:14:52 -08:00 committed by GitHub
commit d4c5aa2e3f

View File

@ -15,8 +15,18 @@
# build Kubemark image from currently built binaries containing both 'real' master and Hollow Node.
# This makefile assumes that the kubemark binary is present in this directory.
all:
docker build --pull -t gcr.io/$(PROJECT)/kubemark .
gcloud docker -- push gcr.io/$(PROJECT)/kubemark
REGISTRY?=gcr.io
PROJECT?=google_containers
.PHONY: all
all: gcloudpush
build:
docker build --pull -t $(REGISTRY)/$(PROJECT)/kubemark .
gcloudpush: build
gcloud docker -- push $(REGISTRY)/$(PROJECT)/kubemark
push: build
docker -- push $(REGISTRY)/$(PROJECT)/kubemark
.PHONY: all build gcloudpush push