x/ranger
Code Issues Proposed changes

Fix Ranger Makefile

Browse Source 
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
This commit is contained in:
jh629g 2019-11-18 10:31:19 -06:00
parent ba4de9646c
commit 1c47c798f2
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -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