From 2743a84abd28df0ce0c1680189e441803d122513 Mon Sep 17 00:00:00 2001 From: jackgr Date: Tue, 5 Apr 2016 13:42:36 -0700 Subject: [PATCH] Reenable empty project and remove legacy variable --- docs/pushing.md | 2 +- examples/wordpress/images/nginx/Makefile | 2 +- rootfs/include.mk | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/pushing.md b/docs/pushing.md index 4f5ab9bfe..3f189839d 100644 --- a/docs/pushing.md +++ b/docs/pushing.md @@ -18,5 +18,5 @@ supported platforms and architectures, checkout the branch and tag you intend to and then run the following: ``` -$ PROJECT=kubernetes-helm make push +$ DOCKER_PROJECT=kubernetes-helm make push ``` diff --git a/examples/wordpress/images/nginx/Makefile b/examples/wordpress/images/nginx/Makefile index 3974d978e..4933efb52 100644 --- a/examples/wordpress/images/nginx/Makefile +++ b/examples/wordpress/images/nginx/Makefile @@ -1,7 +1,7 @@ .PHONY: all build push clean DOCKER_REGISTRY = gcr.io -PREFIX = $(DOCKER_REGISTRY)/$(PROJECT) +PREFIX = $(DOCKER_REGISTRY)/$(DOCKER_PROJECT) IMAGE = nginx TAG = latest diff --git a/rootfs/include.mk b/rootfs/include.mk index 804c660ce..4629bda55 100644 --- a/rootfs/include.mk +++ b/rootfs/include.mk @@ -17,9 +17,6 @@ DEFAULT_REGISTRY := gcr.io DOCKER_REGISTRY ?= $(DEFAULT_REGISTRY) -DEFAULT_PROJECT := kubernetes-helm -DOCKER_PROJECT ?= $(DEFAULT_PROJECT) - # Support both local and remote repos, and support no project. ifeq ($(DOCKER_PROJECT),) PREFIX := $(DOCKER_REGISTRY) @@ -46,7 +43,7 @@ clean: info: @echo "Build tag: ${TAG}" @echo "Registry: ${DOCKER_REGISTRY}" - @echo "Project: ${PROJECT}" + @echo "Project: ${DOCKER_PROJECT}" @echo "Image: ${IMAGE}" @echo "Platform: ${PLATFORM}" @echo "Arch: ${ARCH}"