Edit templates to only include imagestreams that support both x86 and ppc64le

root · root · commit 34e538fc21f7 · 2018-09-18T10:43:54.000-04:00
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.4, 3.5, 3.6 or latest).",
+      "description": "Version of Python image to be used (3.6 or latest).",
       "value": "3.6",
       "required": true
     },
     {
       "name": "POSTGRESQL_VERSION",
       "displayName": "Version of PostgreSQL Image",
-      "description": "Version of PostgreSQL image to be used (9.4, 9.5, 9.6 or latest).",
-      "value": "9.6",
+      "description": "Version of PostgreSQL image to be used (10 or latest).",
+      "value": "10",
       "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.4, 3.5, 3.6 or latest).",
+      "description": "Version of Python image to be used (3.6 or latest).",
       "value": "3.6",
       "required": true
     },
     {
       "name": "POSTGRESQL_VERSION",
       "displayName": "Version of PostgreSQL Image",
-      "description": "Version of PostgreSQL image to be used (9.4, 9.5, 9.6 or latest).",
-      "value": "9.6",
+      "description": "Version of PostgreSQL image to be used (10 or latest).",
+      "value": "10",
       "required": true
     },
     {
diff --git a/openshift/templates/django.json b/openshift/templates/django.json
@@ -251,7 +251,7 @@
     {
       "name": "PYTHON_VERSION",
       "displayName": "Version of Python Image",
-      "description": "Version of Python image to be used (3.4, 3.5, 3.6 or latest).",
+      "description": "Version of Python image to be used (3.6 or latest).",
       "value": "3.6",
       "required": true
     },

Original file line number	Diff line number	Diff line change
`@@ -440,15 +440,15 @@`
`440`	`440`	`{`
`441`	`441`	`"name": "PYTHON_VERSION",`
`442`	`442`	`"displayName": "Version of Python Image",`
`443`		`- "description": "Version of Python image to be used (3.4, 3.5, 3.6 or latest).",`
	`443`	`+ "description": "Version of Python image to be used (3.6 or latest).",`
`444`	`444`	`"value": "3.6",`
`445`	`445`	`"required": true`
`446`	`446`	`},`
`447`	`447`	`{`
`448`	`448`	`"name": "POSTGRESQL_VERSION",`
`449`	`449`	`"displayName": "Version of PostgreSQL Image",`
`450`		`- "description": "Version of PostgreSQL image to be used (9.4, 9.5, 9.6 or latest).",`
`451`		`- "value": "9.6",`
	`450`	`+ "description": "Version of PostgreSQL image to be used (10 or latest).",`
	`451`	`+ "value": "10",`
`452`	`452`	`"required": true`
`453`	`453`	`},`
`454`	`454`	`{`
Original file line number	Diff line number	Diff line change
`@@ -421,15 +421,15 @@`
`421`	`421`	`{`
`422`	`422`	`"name": "PYTHON_VERSION",`
`423`	`423`	`"displayName": "Version of Python Image",`
`424`		`- "description": "Version of Python image to be used (3.4, 3.5, 3.6 or latest).",`
	`424`	`+ "description": "Version of Python image to be used (3.6 or latest).",`
`425`	`425`	`"value": "3.6",`
`426`	`426`	`"required": true`
`427`	`427`	`},`
`428`	`428`	`{`
`429`	`429`	`"name": "POSTGRESQL_VERSION",`
`430`	`430`	`"displayName": "Version of PostgreSQL Image",`
`431`		`- "description": "Version of PostgreSQL image to be used (9.4, 9.5, 9.6 or latest).",`
`432`		`- "value": "9.6",`
	`431`	`+ "description": "Version of PostgreSQL image to be used (10 or latest).",`
	`432`	`+ "value": "10",`
`433`	`433`	`"required": true`
`434`	`434`	`},`
`435`	`435`	`{`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@`
`251`	`251`	`{`
`252`	`252`	`"name": "PYTHON_VERSION",`
`253`	`253`	`"displayName": "Version of Python Image",`
`254`		`- "description": "Version of Python image to be used (3.4, 3.5, 3.6 or latest).",`
	`254`	`+ "description": "Version of Python image to be used (3.6 or latest).",`
`255`	`255`	`"value": "3.6",`
`256`	`256`	`"required": true`
`257`	`257`	`},`