x/ranger
Code Issues Proposed changes

Removed unneeded Variables from image gate and update latest

Browse Source 
BRANCH, CHANGE, and PATCHSET are not needed
as parameters for image build process. These
are only necessary for tagging, and have been
moved into the LABEL string. Also added latest
tagging process for quay.io repo.

Change-Id: Iced74768a81f1e64da49175b33ae55b1bc3d6403
This commit is contained in:
jh629g 2019-11-22 09:27:20 -06:00
parent 03335fb4f6
commit b78d9f0f81
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -20,6 +20,7 @@ LABEL ?= miscellaneous
COMMIT := $(shell git rev-parse HEAD)
PROXY ?= http://foo.proxy.com:8000
PUSH_IMAGE ?= false
LATEST := latest
NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local
USE_PROXY ?= false
RANGER_USER ?= ranger
@ -68,6 +69,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
endif
.PHONY: build_rangercli

3
tools/zuul/playbooks/docker-image-build.yaml
View File

@ -73,9 +73,6 @@
chdir: "{{ zuul.project.src_dir }}"
target: images
params:
BRANCH: "{{ zuul.branch | default('') }}"
CHANGE: "{{ zuul.change | default('') }}"
PATCHSET: "{{ zuul.patchset | default('') }}"
LABEL: "org.label-schema.vcs-ref={{ zuul.patchset | default('') }} --label org.label-schema.vcs-url={{ zuul.change | default('') }} --label org.label-schema.version=0.1.0 --label org.label-schema.branch={{ zuul.branch | default('') }}"
DOCKER_REGISTRY: "quay.io"
IMAGE_PREFIX: "attcomdev"