From 1c47c798f24382eed513b74b9d441770751ca733 Mon Sep 17 00:00:00 2001 From: jh629g Date: Mon, 18 Nov 2019 10:31:19 -0600 Subject: [PATCH] Fix Ranger Makefile Attempted to use nested repositories within quay.io repository, but it does not support this. Reverted change and will add branch as a tag in image publishing process instead to resolve issue. Change-Id: I83650e91e88418f0b9e385383d0085263c6549a1 --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c5daaa1c..6902c0be 100644 --- a/Makefile +++ b/Makefile @@ -24,10 +24,9 @@ PUSH_IMAGE ?= false NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local USE_PROXY ?= false RANGER_USER := ranger -BRANCH ?= master IMAGE_LATEST := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} -IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${LABEL} +IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${COMMIT} IMAGE_DIR:=images/$(IMAGE_NAME) # Build ranger Docker image for this project @@ -38,8 +37,8 @@ images: $(IMAGE_NAME) $(IMAGE_NAME): @echo @echo "===== Processing [$@] image =====" - @make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${BRANCH}/$@:${COMMIT} IMAGE_DIR=images/$@ IMAGE_NAME=$@ - @make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${BRANCH}/$@:${IMAGE_TAG} IMAGE_DIR=images/$@ IMAGE_NAME=$@ + @make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${COMMIT} IMAGE_DIR=images/$@ IMAGE_NAME=$@ + @make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${IMAGE_TAG} IMAGE_DIR=images/$@ IMAGE_NAME=$@ # Create tgz of the chart .PHONY: charts