From 769ec03aca5e55ba66eab6d97fcdc32f807e38ac Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Thu, 27 Aug 2020 23:15:20 -0400
Subject: [PATCH] Move templates to RHEL/CentOS/UBI 8 and PostgreSQL 12

---
 openshift/templates/django-postgresql-persistent.json | 8 ++++----
 openshift/templates/django-postgresql.json            | 8 ++++----
 openshift/templates/django.json                       | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/openshift/templates/django-postgresql-persistent.json b/openshift/templates/django-postgresql-persistent.json
index fa89710..82fed85 100644
--- a/openshift/templates/django-postgresql-persistent.json
+++ b/openshift/templates/django-postgresql-persistent.json
@@ -440,15 +440,15 @@
     {
       "name": "PYTHON_VERSION",
       "displayName": "Version of Python Image",
-      "description": "Version of Python image to be used (3.6 or latest).",
-      "value": "3.6",
+      "description": "Version of Python image to be used (3.6-ubi7, 3.6-ubi8, or latest).",
+      "value": "3.6-ubi8",
       "required": true
     },
     {
       "name": "POSTGRESQL_VERSION",
       "displayName": "Version of PostgreSQL Image",
-      "description": "Version of PostgreSQL image to be used (10 or latest).",
-      "value": "10",
+      "description": "Version of PostgreSQL image to be used (10-el8, 12-el8, or latest).",
+      "value": "12-el8",
       "required": true
     },
     {
diff --git a/openshift/templates/django-postgresql.json b/openshift/templates/django-postgresql.json
index 7b822c7..fe91fb7 100644
--- a/openshift/templates/django-postgresql.json
+++ b/openshift/templates/django-postgresql.json
@@ -421,15 +421,15 @@
     {
       "name": "PYTHON_VERSION",
       "displayName": "Version of Python Image",
-      "description": "Version of Python image to be used (3.6 or latest).",
-      "value": "3.6",
+      "description": "Version of Python image to be used (3.6-ubi7, 3.6-ubi8, or latest).",
+      "value": "3.6-ubi8",
       "required": true
     },
     {
       "name": "POSTGRESQL_VERSION",
       "displayName": "Version of PostgreSQL Image",
-      "description": "Version of PostgreSQL image to be used (10 or latest).",
-      "value": "10",
+      "description": "Version of PostgreSQL image to be used (10-el8, 12-el8, or latest).",
+      "value": "12-el8",
       "required": true
     },
     {
diff --git a/openshift/templates/django.json b/openshift/templates/django.json
index f2a971a..7a9426c 100644
--- a/openshift/templates/django.json
+++ b/openshift/templates/django.json
@@ -251,8 +251,8 @@
     {
       "name": "PYTHON_VERSION",
       "displayName": "Version of Python Image",
-      "description": "Version of Python image to be used (3.6 or latest).",
-      "value": "3.6",
+      "description": "Version of Python image to be used (3.6-ubi7, 3.6-ubi8, or latest).",
+      "value": "3.6-ubi8",
       "required": true
     },
     {