From 97f8c419be3ffcc925cea66afc26e1b6061813c7 Mon Sep 17 00:00:00 2001 From: sai battina Date: Thu, 23 Jan 2020 16:55:38 +0000 Subject: [PATCH] Fix makefile to pass IMAGE_TAG parameter Change-Id: I65778a20802f663948df3bd329ee8ea2e6559cf6 --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 268c162a..cb6dd169 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ DOCKER_REGISTRY ?= quay.io IMAGE_NAME := ranger rangercli IMAGE_PREFIX ?= attcomdev +IMAGE_TAG ?= latest HELM ?= helm LABEL ?= miscellaneous COMMIT := $(shell git rev-parse HEAD) @@ -34,7 +35,7 @@ images: $(IMAGE_NAME) $(IMAGE_NAME): @echo " " @echo "===== Processing [$@] image =====" - @make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${COMMIT} BASE_IMAGE=${BASE_IMAGE} IMAGE_DIR=images/$@ IMAGE_NAME=$@ + @make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${IMAGE_TAG} BASE_IMAGE=${BASE_IMAGE} IMAGE_DIR=images/$@ IMAGE_NAME=$@ # Create tgz of the chart .PHONY: charts @@ -71,8 +72,8 @@ endif ifeq ($(PUSH_IMAGE), true) docker push $(IMAGE) - docker tag $(IMAGE) ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/ranger:latest - docker push ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/ranger:latest + docker tag $(IMAGE) ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/ranger:$(COMMIT) + docker push ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/ranger:$(COMMIT) endif .PHONY: build_rangercli