From 6b7a4c4a0d050c4c5be61ad03d888a02b3d01683 Mon Sep 17 00:00:00 2001
From: Patrick C <pcarney8@users.noreply.github.com>
Date: Thu, 22 Aug 2019 12:56:54 -0400
Subject: [PATCH] Add imagestream to docker generic override build (#246)

* add new template that can overwrite FROM in dockerfile

* forgot to parameterize the tag

* add *.swp to .gitignore :cherry_blossom:

* fix templating issue

* update with image stream

* delete my duplicate file
---
 .gitignore                                    |  1 +
 .../docker-build-template-override-FROM.yml   | 41 +++++++++++++------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2ab637614..9337a381d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 .DS_Store
 .idea
 **/galaxy/
+*.swp
diff --git a/build-docker-generic/.openshift/templates/docker-build-template-override-FROM.yml b/build-docker-generic/.openshift/templates/docker-build-template-override-FROM.yml
index 22db14eb1..465e9937d 100644
--- a/build-docker-generic/.openshift/templates/docker-build-template-override-FROM.yml
+++ b/build-docker-generic/.openshift/templates/docker-build-template-override-FROM.yml
@@ -13,6 +13,18 @@ objects:
       build: "${NAME}"
       app: "${NAME}"
     name: "${NAME}"
+- kind: ImageStream
+  apiVersion: image.openshift.io/v1
+  metadata:
+    name: ${FROM_DOCKER_IMAGE}
+  spec:
+    tags:
+    - annotations: null
+      from:
+        kind: DockerImage
+        name: ${FROM_DOCKER_IMAGE_REGISTRY_URL}:${FROM_DOCKER_TAG}
+      importPolicy: {}
+      name: ${FROM_DOCKER_TAG}
 - apiVersion: v1
   kind: BuildConfig
   metadata:
@@ -58,19 +70,6 @@ objects:
     - type: ConfigChange
     - type: ImageChange
 parameters:
-- name: DOCKER_FROM_KIND
-  description: Type of override for the Docker 'FROM' clause
-  displayName: FROM Kind (DockerImage or ImageStreamTag)
-  required: true
-  value: ImageStreamTag
-- name: FROM_DOCKER_IMAGE
-  description: Overrides the 'FROM' base image for the Dockerfile build
-  displayName: FROM docker image
-  required: true
-- name: FROM_DOCKER_TAG
-  description: Overrides the 'FROM' base image TAG for the Dockerfile build
-  displayName: FROM docker image TAG
-  required: true
 - name: NAME
   displayName: Name
   description: The name assigned to all objects and the resulting imagestream.
@@ -93,3 +92,19 @@ parameters:
   displayName: Git Context Directory
   description: Set this to the directory where the build information is (e.g. Dockerfile)
     if not using the root directory
+- name: DOCKER_FROM_KIND
+  description: Type of override for the Docker 'FROM' clause
+  displayName: FROM Kind (DockerImage or ImageStreamTag)
+  required: true
+  value: ImageStreamTag
+- name: FROM_DOCKER_IMAGE
+  description: Overrides the 'FROM' base image for the Dockerfile build
+  displayName: FROM docker image
+  required: true
+- name: FROM_DOCKER_TAG
+  description: Overrides the 'FROM' base image TAG for the Dockerfile build
+  displayName: FROM docker image TAG
+  required: true
+- name: FROM_DOCKER_IMAGE_REGISTRY_URL
+  displayName: External Registry URL
+  description: The URL for the registry that the image will be pulled from (e.g. registry.redhat.io)