From b78d9f0f811d3930eed0b1747e98212a03a278f4 Mon Sep 17 00:00:00 2001
From: jh629g <jh629g@att.com>
Date: Fri, 22 Nov 2019 09:27:20 -0600
Subject: [PATCH] Removed unneeded Variables from image gate and update latest
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
---
Makefile | 5 ++++-
tools/zuul/playbooks/docker-image-build.yaml | 3 ---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 3bf75dee..691699fc 100644
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -30,7 +31,7 @@ IMAGE_DIR:=images/$(IMAGE_NAME)
.PHONY: images
images: $(IMAGE_NAME)
$(IMAGE_NAME):
- @echo " "
+ @echo " "
@echo "===== Processing [$@] image ====="
@make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${COMMIT} IMAGE_DIR=images/$@ IMAGE_NAME=$@
@@ -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
diff --git a/tools/zuul/playbooks/docker-image-build.yaml b/tools/zuul/playbooks/docker-image-build.yaml
index 8c9794ef..df95841c 100644
--- a/tools/zuul/playbooks/docker-image-build.yaml
+++ b/tools/zuul/playbooks/docker-image-build.yaml
@@ -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"