Updates Makefile to use generic Docker registry

pull/71/head^2
Robert Leenders 10 years ago
parent f337d6c903
commit a893ea44b4

@ -1,6 +1,7 @@
.PHONY: all build push clean .PHONY: all build push clean
PREFIX = gcr.io/$(PROJECT) DOCKER_REGISTRY = gcr.io
PREFIX = $(DOCKER_REGISTRY)/$(PROJECT)
IMAGE = nginx IMAGE = nginx
TAG = latest TAG = latest
@ -12,7 +13,11 @@ build:
docker build -t $(PREFIX)/$(IMAGE):$(TAG) $(DIR) docker build -t $(PREFIX)/$(IMAGE):$(TAG) $(DIR)
push: build push: build
ifeq ($(DOCKER_REGISTRY),gcr.io)
gcloud docker push $(PREFIX)/$(IMAGE):$(TAG) gcloud docker push $(PREFIX)/$(IMAGE):$(TAG)
else
docker push $(PREFIX)/$(IMAGE):$(TAG)
endif
clean: clean:
docker rmi $(PREFIX)/$(IMAGE):$(TAG) docker rmi $(PREFIX)/$(IMAGE):$(TAG)

Loading…
Cancel
Save