From ab47e3b17f42b1e9315500b01e9db839d1a0f9a7 Mon Sep 17 00:00:00 2001
From: Michael Olund <michaelo@openroad.ca>
Date: Wed, 12 Aug 2020 10:18:54 -0700
Subject: [PATCH] Updated build templates to use Fedora32 instead of Centos7.

---
 openshift/edivorce-django-build.param         |  9 +++----
 .../edivorce-django-build.yaml                | 24 ++++++++++++-------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/openshift/edivorce-django-build.param b/openshift/edivorce-django-build.param
index 3b93c841..1f764bf8 100644
--- a/openshift/edivorce-django-build.param
+++ b/openshift/edivorce-django-build.param
@@ -7,8 +7,9 @@ NAME=edivorce-django
 GIT_REPO_URL=https://github.com/bcgov/eDivorce.git
 GIT_REF=master
 SOURCE_CONTEXT_DIR=
-SOURCE_IMAGE_KIND=ImageStreamTag
-SOURCE_IMAGE_NAMESPACE=openshift
-SOURCE_IMAGE_NAME=python
-SOURCE_IMAGE_TAG=3.5
+SOURCE_IMAGE_KIND=DockerImage
+SOURCE_IMAGE_NAME=registry.fedoraproject.org/f32/python3
+SOURCE_IMAGE_TAG=latest
 PIP_INDEX_URL=
+UPGRADE_PIP_TO_LATEST=true
+PIP_NO_CACHE_DIR=
diff --git a/openshift/templates/edivorce-django/edivorce-django-build.yaml b/openshift/templates/edivorce-django/edivorce-django-build.yaml
index 6c1b0576..f7674ab8 100644
--- a/openshift/templates/edivorce-django/edivorce-django-build.yaml
+++ b/openshift/templates/edivorce-django/edivorce-django-build.yaml
@@ -30,11 +30,14 @@ objects:
       sourceStrategy:
         from:
           kind: ${SOURCE_IMAGE_KIND}
-          namespace: "${SOURCE_IMAGE_NAMESPACE}"
           name: ${SOURCE_IMAGE_NAME}:${SOURCE_IMAGE_TAG}
         env:
         - name: PIP_INDEX_URL
           value: "${PIP_INDEX_URL}"
+        - name: UPGRADE_PIP_TO_LATEST
+          value: "${UPGRADE_PIP_TO_LATEST}"
+        - name: PIP_NO_CACHE_DIR
+          value: "${PIP_NO_CACHE_DIR}"
     output:
       to:
         kind: ImageStreamTag
@@ -72,26 +75,29 @@ parameters:
   displayName: Source Image Kind
   description: The 'kind' (type) of the  source image; typically ImageStreamTag, or DockerImage.
   required: true
-  value: ImageStreamTag
-- name: SOURCE_IMAGE_NAMESPACE
-  displayName: Source Image Namespace
-  description: The namespace where the source image resides.
-  required: true
-  value: openshift
+  value: DockerImage
 - name: SOURCE_IMAGE_NAME
   displayName: Source Image Name
   description: The name of the source image.
   required: true
-  value: python
+  value: "registry.fedoraproject.org/f32/python3"
 - name: SOURCE_IMAGE_TAG
   displayName: Source Image Tag
   description: The tag of the source image.
   required: true
-  value: "3.5"
+  value: "latest"
 - name: PIP_INDEX_URL
   displayName: Custom PyPi Index URL
   description: The custom PyPi index URL
   value: ''
+- name: UPGRADE_PIP_TO_LATEST
+  displayName: Upgrade Pip To Latest
+  description: Upgrade Pip To Latest
+  value: 'true'
+- name: PIP_NO_CACHE_DIR
+  displayName: Pip No Cache Dir
+  description: Pip No Cache Dir
+  value: ''
 # ===============================================================================
 - name: CPU_REQUEST
   displayName: Resources CPU Request