Merge pull request #572 from jackgr/make-info

Reenable empty project, remove all vestiges of legacy PROJECT variable, update pushing.md
pull/575/head
Jack Greenfield 9 years ago
commit 2daaae1a6d

@ -18,5 +18,5 @@ supported platforms and architectures, checkout the branch and tag you intend to
and then run the following: and then run the following:
``` ```
$ PROJECT=kubernetes-helm make push $ DOCKER_PROJECT=kubernetes-helm make push
``` ```

@ -1,7 +1,7 @@
.PHONY: all build push clean .PHONY: all build push clean
DOCKER_REGISTRY = gcr.io DOCKER_REGISTRY = gcr.io
PREFIX = $(DOCKER_REGISTRY)/$(PROJECT) PREFIX = $(DOCKER_REGISTRY)/$(DOCKER_PROJECT)
IMAGE = nginx IMAGE = nginx
TAG = latest TAG = latest

@ -17,9 +17,6 @@
DEFAULT_REGISTRY := gcr.io DEFAULT_REGISTRY := gcr.io
DOCKER_REGISTRY ?= $(DEFAULT_REGISTRY) DOCKER_REGISTRY ?= $(DEFAULT_REGISTRY)
DEFAULT_PROJECT := kubernetes-helm
DOCKER_PROJECT ?= $(DEFAULT_PROJECT)
# Support both local and remote repos, and support no project. # Support both local and remote repos, and support no project.
ifeq ($(DOCKER_PROJECT),) ifeq ($(DOCKER_PROJECT),)
PREFIX := $(DOCKER_REGISTRY) PREFIX := $(DOCKER_REGISTRY)
@ -46,7 +43,7 @@ clean:
info: info:
@echo "Build tag: ${TAG}" @echo "Build tag: ${TAG}"
@echo "Registry: ${DOCKER_REGISTRY}" @echo "Registry: ${DOCKER_REGISTRY}"
@echo "Project: ${PROJECT}" @echo "Project: ${DOCKER_PROJECT}"
@echo "Image: ${IMAGE}" @echo "Image: ${IMAGE}"
@echo "Platform: ${PLATFORM}" @echo "Platform: ${PLATFORM}"
@echo "Arch: ${ARCH}" @echo "Arch: ${ARCH}"

Loading…
Cancel
Save