vendor updates

This commit is contained in:
Serguei Bezverkhi
2018-03-06 17:33:18 -05:00
parent 4b3ebc171b
commit e9033989a0
5854 changed files with 248382 additions and 119809 deletions

View File

@ -15,18 +15,22 @@
# 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.
REGISTRY?=gcr.io
PROJECT?=google_containers
# Allow the caller to override this. Beware make's precedence. This:
# REGISTRY=$VAR make
# .. is not the same as:
# make REGISTRY=$VAR
REGISTRY := $(if $(REGISTRY),$(REGISTRY),staging-k8s.gcr.io)
IMAGE_TAG := $(if $(IMAGE_TAG),$(IMAGE_TAG),latest)
all: gcloudpush
build:
docker build --pull -t $(REGISTRY)/$(PROJECT)/kubemark .
docker build --pull -t $(REGISTRY)/kubemark:$(IMAGE_TAG) .
gcloudpush: build
gcloud docker -- push $(REGISTRY)/$(PROJECT)/kubemark
docker push $(REGISTRY)/kubemark:$(IMAGE_TAG)
push: build
docker -- push $(REGISTRY)/$(PROJECT)/kubemark
docker -- push $(REGISTRY)/kubemark:$(IMAGE_TAG)
.PHONY: all build gcloudpush push