x/ranger
Code Issues Proposed changes

Fix makefile to pass IMAGE_TAG parameter

Browse Source 
Change-Id: I65778a20802f663948df3bd329ee8ea2e6559cf6
This commit is contained in:
sai battina 2020-01-23 16:55:38 +00:00 committed by Jeremy Houser
parent 173ad897e7
commit 97f8c419be
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -15,6 +15,7 @@
DOCKER_REGISTRY ?= quay.io DOCKER_REGISTRY ?= quay.io
IMAGE_NAME := ranger rangercli IMAGE_NAME := ranger rangercli
IMAGE_PREFIX ?= attcomdev IMAGE_PREFIX ?= attcomdev
IMAGE_TAG ?= latest
HELM ?= helm HELM ?= helm
LABEL ?= miscellaneous LABEL ?= miscellaneous
COMMIT := $(shell git rev-parse HEAD) COMMIT := $(shell git rev-parse HEAD)
@ -34,7 +35,7 @@ images: $(IMAGE_NAME)
$(IMAGE_NAME): $(IMAGE_NAME):
@echo " " @echo " "
@echo "===== Processing [$@] image =====" @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 # Create tgz of the chart
.PHONY: charts .PHONY: charts
@ -71,8 +72,8 @@ endif
ifeq ($(PUSH_IMAGE), true) ifeq ($(PUSH_IMAGE), true)
docker push $(IMAGE) docker push $(IMAGE)
docker tag $(IMAGE) ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/ranger:latest docker tag $(IMAGE) ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/ranger:$(COMMIT)
docker push ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/ranger:latest docker push ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/ranger:$(COMMIT)
endif endif
.PHONY: build_rangercli .PHONY: build_rangercli