Merge pull request sclorg#161 from multi-arch/master

hhorak · web-flow · commit 0b6fd8ffdf67 · 2020-09-03T17:25:51.000+02:00
Move templates to RHEL/CentOS/UBI 8
diff --git 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
@@ -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
@@ -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
     },
     {

Original file line number	Diff line number	Diff line change
`@@ -251,8 +251,8 @@`
`251`	`251`	`{`
`252`	`252`	`"name": "PYTHON_VERSION",`
`253`	`253`	`"displayName": "Version of Python Image",`
`254`		`- "description": "Version of Python image to be used (3.6 or latest).",`
`255`		`- "value": "3.6",`
	`254`	`+ "description": "Version of Python image to be used (3.6-ubi7, 3.6-ubi8, or latest).",`
	`255`	`+ "value": "3.6-ubi8",`
`256`	`256`	`"required": true`
`257`	`257`	`},`
`258`	`258`	`{`