Merge pull request #1011 from sdodson/sync-examples

Sync db-templates, image-streams, and quickstart-templates

1 files changed, 19 insertions, 7 deletions

diff --git a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/cakephp-mysql.json b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/cakephp-mysql.json
index da5679444..52143da2d 100644
--- a/roles/openshift_examples/files/examples/v1.1/quickstart-templates/cakephp-mysql.json
+++ b/roles/openshift_examples/files/examples/v1.1/quickstart-templates/cakephp-mysql.json
@@ -83,7 +83,7 @@
             "from": {
               "kind": "ImageStreamTag",
               "namespace": "openshift",
-              "name": "php:5.5"
+              "name": "php:5.6"
             }
           }
         },
@@ -98,6 +98,9 @@
             "type": "ImageChange"
           },
           {
+            "type": "ConfigChange"
+          },
+          {
             "type": "GitHub",
             "github": {
               "secret": "${GITHUB_WEBHOOK_SECRET}"
@@ -250,6 +253,20 @@
         },
         "triggers": [
           {
+            "type": "ImageChange",
+            "imageChangeParams": {
+              "automatic": false,
+              "containerNames": [
+                "mysql"
+              ],
+              "from": {
+                "kind": "ImageStreamTag",
+                "namespace": "openshift",
+                "name": "mysql:5.6"
+              }
+            }
+          },
+          {
             "type": "ConfigChange"
           }
         ],
@@ -268,7 +285,7 @@
             "containers": [
               {
                 "name": "mysql",
-                "image": "${MYSQL_IMAGE}",
+                "image": "mysql",
                 "ports": [
                   {
                     "containerPort": 3306
@@ -347,11 +364,6 @@
       "from": "[a-zA-Z0-9]{16}"
     },
     {
-      "name": "MYSQL_IMAGE",
-      "description": "Image to use for mysql",
-      "value": "openshift/mysql-55-centos7"      
-    },
-    {
       "name": "CAKEPHP_SECRET_TOKEN",
       "description": "Set this to a long random string",
       "generate": "expression",