From 5b9bf35b143e0c2c964ecd5d93a9572333d735f8 Mon Sep 17 00:00:00 2001 From: jh629g Date: Wed, 20 Nov 2019 08:45:50 -0600 Subject: [PATCH] Fix Ranger Tagging in image publish process Improper variables used for tagging process. This patchset will fix those variables. Change-Id: Iea20a757b39a85c06e02cea027d77bdac0cab709 --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2ee1f670..fb8457ce 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ IMAGE_PREFIX ?= attcomdev IMAGE_TAG ?= latest HELM ?= helm LABEL ?= miscellaneous -COMMIT ?= $(shell git rev-parse HEAD) +COMMIT := $(shell git rev-parse HEAD) PROXY ?= http://foo.proxy.com:8000 PUSH_IMAGE ?= false NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local @@ -30,9 +30,9 @@ IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${COMMIT} IMAGE_DIR:=images/$(IMAGE_NAME) # Build ranger Docker image for this project +#make images will build and run ranger and rangercli .PHONY: images images: $(IMAGE_NAME) -#make images will build and run ranger and rangercli $(IMAGE_NAME): @echo @echo "===== Processing [$@] image =====" @@ -73,7 +73,6 @@ endif ifeq ($(PUSH_IMAGE), true) docker push $(IMAGE) - docker push $(IMAGE_LATEST) endif .PHONY: build_rangercli