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

Move templates to RHEL/CentOS/UBI 8
multi-arch · Sep 1, 2020 · a596cd6 · a596cd6
2 parents 96e1791 + 8d30619
commit a596cd6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/openshift/templates/dancer-mysql-persistent.json b/openshift/templates/dancer-mysql-persistent.json
@@ -105,7 +105,7 @@
             "from": {
               "kind": "ImageStreamTag",
               "namespace": "${NAMESPACE}",
-              "name": "perl:5.26"
+              "name": "perl:5.26-ubi8"
             },
             "env":  [
               {
@@ -325,7 +325,7 @@
               "from": {
                 "kind": "ImageStreamTag",
                 "namespace": "${NAMESPACE}",
-                "name": "mysql:5.7"
+                "name": "mysql:8.0-el8"
               }
             }
           },
@@ -404,6 +404,10 @@
                   {
                       "name": "MYSQL_DATABASE",
                       "value": "${DATABASE_NAME}"
+                  },
+                  {
+                      "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN",
+                      "value": "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}"
                   }
                 ],
                 "resources": {
@@ -526,6 +530,12 @@
       "displayName": "Custom CPAN Mirror URL",
       "description": "The custom CPAN mirror URL",
       "value": ""
+    },
+    {
+      "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN",
+      "displayName": "MySQL authentication plugin",
+      "description": "The custom MySQL default authentication plugin (default: mysql_native_password), might be changed to caching_sha2_password once PHP client supports it.",
+      "value": "mysql_native_password"
     }
   ]
 }
diff --git a/openshift/templates/dancer-mysql.json b/openshift/templates/dancer-mysql.json
@@ -105,7 +105,7 @@
             "from": {
               "kind": "ImageStreamTag",
               "namespace": "${NAMESPACE}",
-              "name": "perl:5.26"
+              "name": "perl:5.26-ubi8"
             },
             "env":  [
               {
@@ -308,7 +308,7 @@
               "from": {
                 "kind": "ImageStreamTag",
                 "namespace": "${NAMESPACE}",
-                "name": "mysql:5.7"
+                "name": "mysql:8.0-el8"
               }
             }
           },
@@ -385,6 +385,10 @@
                   {
                       "name": "MYSQL_DATABASE",
                       "value": "${DATABASE_NAME}"
+                  },
+                  {
+                      "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN",
+                      "value": "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}"
                   }
                 ],
                 "resources": {
@@ -500,6 +504,12 @@
       "displayName": "Custom CPAN Mirror URL",
       "description": "The custom CPAN mirror URL",
       "value": ""
+    },
+    {
+      "name": "MYSQL_DEFAULT_AUTHENTICATION_PLUGIN",
+      "displayName": "MySQL authentication plugin",
+      "description": "The custom MySQL default authentication plugin (default: mysql_native_password), might be changed to caching_sha2_password once PHP client supports it.",
+      "value": "mysql_native_password"
     }
   ]
 }
diff --git a/openshift/templates/dancer.json b/openshift/templates/dancer.json
@@ -92,7 +92,7 @@
             "from": {
               "kind": "ImageStreamTag",
               "namespace": "${NAMESPACE}",
-              "name": "perl:5.26"
+              "name": "perl:5.26-ubi8"
             },
             "env":  [
               {