Merge pull request #117 from multi-arch/master

Move templates to RHEL/CentOS/UBI 8
sclorg · Sep 1, 2020 · 377fe8f · 377fe8f
2 parents bd91b24 + 53cc1ad
commit 377fe8f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/openshift/templates/cakephp-mysql-persistent.json b/openshift/templates/cakephp-mysql-persistent.json
@@ -352,7 +352,7 @@
               "from": {
                 "kind": "ImageStreamTag",
                 "namespace": "${NAMESPACE}",
-                "name": "mysql:8.0"
+                "name": "mysql:8.0-el8"
               }
             }
           },
@@ -467,9 +467,9 @@
     {
       "name": "PHP_VERSION",
       "displayName": "PHP Version",
-      "description": "Version of PHP image to be used (7.3 or latest).",
+      "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).",
       "required": true,
-      "value": "7.3"
+      "value": "7.3-ubi8"
     },
     {
       "name": "MEMORY_LIMIT",

diff --git a/openshift/templates/cakephp-mysql.json b/openshift/templates/cakephp-mysql.json
@@ -335,7 +335,7 @@
               "from": {
                 "kind": "ImageStreamTag",
                 "namespace": "${NAMESPACE}",
-                "name": "mysql:8.0"
+                "name": "mysql:8.0-el8"
               }
             }
           },
@@ -448,9 +448,9 @@
     {
       "name": "PHP_VERSION",
       "displayName": "PHP Version",
-      "description": "Version of PHP image to be used (7.3 or latest).",
+      "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).",
       "required": true,
-      "value": "7.3"
+      "value": "7.3-ubi8"
     },
     {
       "name": "MEMORY_LIMIT",

diff --git a/openshift/templates/cakephp.json b/openshift/templates/cakephp.json
@@ -263,9 +263,9 @@
     {
       "name": "PHP_VERSION",
       "displayName": "PHP Version",
-      "description": "Version of PHP image to be used (7.3 or latest).",
+      "description": "Version of PHP image to be used (7.3-ubi7, 7.3-ubi8, or latest).",
       "required": true,
-      "value": "7.3"
+      "value": "7.3-ubi8"
     },
     {
       "name": "MEMORY_LIMIT",