x/ranger-agent
Code Issues Proposed changes

create new tagging method in ranger-agent makefile

Browse Source 
resolves conflict in cicd pipeline that caused
mismatched tags on images during publish process

Change-Id: Ibf57a8f0808133fcd09eb38b52333e4a686149b7
This commit is contained in:
jh629g 2020-01-23 13:38:12 -06:00
parent 6006695f76
commit b7167794a1
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

@ -17,6 +17,7 @@ IMAGE_NAME ?= ranger-agent
IMAGE_PREFIX ?= attcomdev
HELM ?= helm
LABEL ?= commit-id
IMAGE_TAG ?= latest
COMMIT := $(shell git rev-parse HEAD)
PROXY ?= http://proxy.foo.com:8000
NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local
@ -25,7 +26,7 @@ RANGER_AGENT_USER := ranger_agent
PUSH_IMAGE := false
BASE_IMAGE ?= ubuntu:18.04
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${COMMIT}
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
# Build ranger-agent Docker image for this project
.PHONY: images
@ -66,8 +67,8 @@ endif
ifeq ($(PUSH_IMAGE), true)
docker push $(IMAGE)
docker tag $(IMAGE) ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:latest
docker push ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:latest
docker tag $(IMAGE) ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:$(COMMIT)
docker push ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:$(COMMIT)
endif
.PHONY: clean