Merge pull request #297 from bprashanth/ubuntu_makefile
Add PUSH_TOOL to ubuntu Makefile
This commit is contained in:
commit
f0c7560a11
1 changed files with 2 additions and 1 deletions
|
@ -4,6 +4,7 @@ TAG ?= 0.7
|
||||||
PREFIX ?= gcr.io/google_containers/ubuntu-slim
|
PREFIX ?= gcr.io/google_containers/ubuntu-slim
|
||||||
BUILD_IMAGE ?= ubuntu-build
|
BUILD_IMAGE ?= ubuntu-build
|
||||||
TAR_FILE ?= rootfs.tar
|
TAR_FILE ?= rootfs.tar
|
||||||
|
PUSH_TOOL ?= gcloud
|
||||||
|
|
||||||
container: clean
|
container: clean
|
||||||
docker build --pull -t $(BUILD_IMAGE) -f Dockerfile.build .
|
docker build --pull -t $(BUILD_IMAGE) -f Dockerfile.build .
|
||||||
|
@ -12,7 +13,7 @@ container: clean
|
||||||
docker build --pull -t $(PREFIX):$(TAG) .
|
docker build --pull -t $(PREFIX):$(TAG) .
|
||||||
|
|
||||||
push: container
|
push: container
|
||||||
docker push $(PREFIX):$(TAG)
|
$(PUSH_TOOL) docker push $(PREFIX):$(TAG)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
docker rmi -f $(PREFIX):$(TAG) || true
|
docker rmi -f $(PREFIX):$(TAG) || true
|
||||||
|
|
Loading…
Reference in a new issue