From 4924e65a0f105f954b83acf6517d7277bab8b191 Mon Sep 17 00:00:00 2001 From: Stacey Fletcher Date: Wed, 21 Feb 2018 21:23:29 -0600 Subject: [PATCH] Update Makefile This ps updates the build commands to allow the same format to be used in att-comdev projects Change-Id: I82c7083cfb1414c18b3e3bc14852a316e68736f3 --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 12098aa3..ac61559a 100644 --- a/Makefile +++ b/Makefile @@ -12,12 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -DECKHAND_IMAGE_NAME ?= deckhand +DOCKER_REGISTRY ?= quay.io +IMAGE_NAME ?= deckhand IMAGE_PREFIX ?= attcomdev IMAGE_TAG ?= latest HELM ?= helm LABEL ?= commit-id +IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} + # Build Deckhand Docker image for this project .PHONY: images images: build_deckhand @@ -40,7 +43,7 @@ dry-run: clean # Make targets intended for use by the primary targets above. .PHONY: build_deckhand build_deckhand: - docker build -t $(IMAGE_PREFIX)/$(DECKHAND_IMAGE_NAME):$(IMAGE_TAG) --label $(LABEL) . + docker build -t $(IMAGE) --label $(LABEL) . .PHONY: clean clean: