From a701422bd5616b841a5af2c1610626bbf158a6f0 Mon Sep 17 00:00:00 2001
From: jh629g <jh629g@att.com>
Date: Mon, 18 Nov 2019 12:38:27 -0600
Subject: [PATCH] Ranger Image Publish

Improving and testing ranger image
publishing process.

Change-Id: Ide3e015154389620ed6ba9bd9ed136012c836a82
---
 Makefile                                     | 10 ++++----
 tools/zuul/playbooks/docker-image-build.yaml | 27 ++++++++++++++++++++
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 6902c0be..668e3631 100644
--- a/Makefile
+++ b/Makefile
@@ -72,6 +72,11 @@ else
 	docker build --network host -t $(IMAGE) --label $(LABEL) -f $(IMAGE_DIR)/Dockerfile --build-arg user=$(RANGER_USER) .
 endif
 
+ifeq ($(PUSH_IMAGE), true)
+        docker push $(IMAGE)
+        docker push $(IMAGE_LATEST)
+endif
+
 .PHONY: build_rangercli
 build_rangercli:
 
@@ -87,11 +92,6 @@ else
 	docker build --network host -t $(IMAGE) --label $(LABEL) -f $(IMAGE_DIR)/Dockerfile .
 endif
 
-ifeq ($(PUSH_IMAGE), true)
-	docker push $(IMAGE)
-	docker push $(IMAGE_LATEST)
-endif
-
 .PHONY: clean
 clean:
 	rm -rf build
diff --git a/tools/zuul/playbooks/docker-image-build.yaml b/tools/zuul/playbooks/docker-image-build.yaml
index 964e3586..6c0d2476 100644
--- a/tools/zuul/playbooks/docker-image-build.yaml
+++ b/tools/zuul/playbooks/docker-image-build.yaml
@@ -85,3 +85,30 @@
             var: docker_images
 
       become: True
+
+    - name: Publish images
+      block:
+        - docker_login:
+            username: "{{ ranger_quay_io_credentials.username }}"
+            password: "{{ ranger_quay_io_credentials.password }}"
+            registry_url: "https://quay.io/api/v1/"
+
+        - make:
+            chdir: "{{ zuul.project.src_dir }}"
+            target: images
+            params:
+              DOCKER_REGISTRY: "quay.io"
+              IMAGE_PREFIX: "attcomdev"
+              IMAGE_TAG: "{{ item }}"
+              COMMIT: "{{ zuul.newrev | default('') }}"
+              PUSH_IMAGE: "true"
+          with_items: "{{ image_tags.stdout_lines }}"
+
+        - shell: "docker images"
+          register: docker_images
+
+        - debug:
+            var: docker_images
+
+      when: publish
+      become: True