From a893ea44b45a2314bba61561c8477b8fb14f2e06 Mon Sep 17 00:00:00 2001 From: Robert Leenders Date: Thu, 12 Nov 2015 17:26:00 -0800 Subject: [PATCH] Updates Makefile to use generic Docker registry --- examples/wordpress/images/nginx/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/examples/wordpress/images/nginx/Makefile b/examples/wordpress/images/nginx/Makefile index d07e33213..3974d978e 100644 --- a/examples/wordpress/images/nginx/Makefile +++ b/examples/wordpress/images/nginx/Makefile @@ -1,6 +1,7 @@ .PHONY: all build push clean -PREFIX = gcr.io/$(PROJECT) +DOCKER_REGISTRY = gcr.io +PREFIX = $(DOCKER_REGISTRY)/$(PROJECT) IMAGE = nginx TAG = latest @@ -12,7 +13,11 @@ build: docker build -t $(PREFIX)/$(IMAGE):$(TAG) $(DIR) push: build +ifeq ($(DOCKER_REGISTRY),gcr.io) gcloud docker push $(PREFIX)/$(IMAGE):$(TAG) +else + docker push $(PREFIX)/$(IMAGE):$(TAG) +endif clean: docker rmi $(PREFIX)/$(IMAGE):$(TAG)