Merge pull request #2402 from sdodson/image-stream-sync

Update image stream data

roles/openshift_examples/files/examples/v1.2/db-templates/README.md

@@ -38,35 +38,11 @@ Replace `/path/to/template.json` with an appropriate path, that can be either a
 local path or an URL. Example:
 
     $ oc new-app https://raw.githubusercontent.com/openshift/origin/master/examples/db-templates/mongodb-ephemeral-template.json
-    --> Deploying template mongodb-ephemeral for "https://raw.githubusercontent.com/openshift/origin/master/examples/db-templates/mongodb-ephemeral-template.json"
-     With parameters:
-      DATABASE_SERVICE_NAME=mongodb
-      MONGODB_USER=userJNX # generated
-      MONGODB_PASSWORD=tnEDilMVrgjp5AI2 # generated
-      MONGODB_DATABASE=sampledb
-      MONGODB_ADMIN_PASSWORD=8bYEs8OlNYhVyMBs # generated
-    --> Creating resources ...
-    Service "mongodb" created
-    DeploymentConfig "mongodb" created
-    --> Success
-    Run 'oc status' to view your app.
 
 The parameters listed in the output above can be tweaked by specifying values in
 the command line with the `-p` option:
 
     $ oc new-app examples/db-templates/mongodb-ephemeral-template.json -p DATABASE_SERVICE_NAME=mydb -p MONGODB_USER=default
-    --> Deploying template mongodb-ephemeral for "examples/db-templates/mongodb-ephemeral-template.json"
-         With parameters:
-          DATABASE_SERVICE_NAME=mydb
-          MONGODB_USER=default
-          MONGODB_PASSWORD=RPvMbWlQFOevSowQ # generated
-          MONGODB_DATABASE=sampledb
-          MONGODB_ADMIN_PASSWORD=K7tIjDxDHHYCvFrJ # generated
-    --> Creating resources ...
-        Service "mydb" created
-        DeploymentConfig "mydb" created
-    --> Success
-        Run 'oc status' to view your app.
 
 Note that the persistent template requires an existing persistent volume,
 otherwise the deployment won't ever succeed.

roles/openshift_examples/files/examples/v1.2/image-streams/dotnet_imagestreams.json

@@ -1,5 +1,5 @@
 {
-    "kind": "List",
+    "kind": "ImageStreamList",
     "apiVersion": "v1",
     "metadata": {
         "name": "dotnet-image-streams",
@@ -12,21 +12,39 @@
             "kind": "ImageStream",
             "apiVersion": "v1",
             "metadata": {
-                "name": "dotnetcore-10-rhel7"
+                "name": "dotnet"
             },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/dotnet/dotnetcore-10-rhel7",
                 "tags": [
                     {
+                        "name": "latest",
+                        "annotations": {
+                          "description": ".Net Core 1.0 S2I image.",
+                          "iconClass": "icon-dotnet",
+                          "tags": "builder,.net,dotnet,dotnetcore,rh-dotnetcore10",
+                          "supports":"dotnet",
+                          "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore.git",
+                          "sampleContextDir": "1.0/test/asp-net-hello-world"
+                        },
+                        "from": {
+                          "kind": "ImageStreamTag",
+                          "name": "1.0"
+                        }
+                    },
+                    {
                         "name": "1.0",
                         "annotations": {
                             "description": ".Net Core 1.0 S2I image.",
                             "iconClass": "icon-dotnet",
                             "tags": "builder,.net,dotnet,dotnetcore,rh-dotnetcore10",
-                            "supports":"dotnet:1.0",
+                            "supports":"dotnet:1.0,dotnet",
                             "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore.git",
                             "sampleContextDir": "1.0/test/asp-net-hello-world",
                             "version": "1.0"
+                        },
+                        "from": {
+                          "kind": "DockerImage",
+                          "name": "registry.access.redhat.com/dotnet/dotnetcore-10-rhel7:1.0"
                         }
                     }
                 ]

roles/openshift_examples/files/examples/v1.2/quickstart-templates/cakephp-mysql.json

@@ -126,9 +126,9 @@
       },
       "spec": {
         "strategy": {
-          "type": "Rolling",
+          "type": "Recreate",
           "recreateParams": {
-          "pre": {
+            "pre": {
               "failurePolicy": "Retry",
               "execNewPod": {
                 "command": [

roles/openshift_examples/files/examples/v1.2/xpaas-streams/fis-image-streams.json

@@ -20,13 +20,23 @@
                     {
                         "name": "1.0",
                         "annotations": {
-                            "description": "JBoss Fuse Integration Services 6.2.1 Java S2I images.",
+                            "description": "JBoss Fuse Integration Services 1.0 Java S2I images.",
                             "iconClass": "icon-jboss",
                             "tags": "builder,jboss-fuse,java,xpaas",
                             "supports":"jboss-fuse:6.2.1,java:8,xpaas:1.2",
                             "version": "1.0"
                         }
-                    }
+                    },
+                    {
+                        "name": "2.0",
+                        "annotations": {
+                            "description": "JBoss Fuse Integration Services 2.0 Java S2I images.",
+                            "iconClass": "icon-jboss",
+                            "tags": "builder,jboss-fuse,java,xpaas",
+                            "supports":"jboss-fuse:6.3.0,java:8,xpaas:1.2",
+                            "version": "2.0"
+                        }
+                    }                    
                 ]
             }
         },
@@ -42,13 +52,23 @@
                     {
                         "name": "1.0",
                         "annotations": {
-                            "description": "JBoss Fuse Integration Services 6.2.1 Karaf S2I images.",
+                            "description": "JBoss Fuse Integration Services 1.0 Karaf S2I images.",
                             "iconClass": "icon-jboss",
                             "tags": "builder,jboss-fuse,java,karaf,xpaas",
                             "supports":"jboss-fuse:6.2.1,java:8,xpaas:1.2",
                             "version": "1.0"
                         }
-                    }
+                    },
+                    {
+                        "name": "2.0",
+                        "annotations": {
+                            "description": "JBoss Fuse Integration Services 2.0 Karaf S2I images.",
+                            "iconClass": "icon-jboss",
+                            "tags": "builder,jboss-fuse,java,karaf,xpaas",
+                            "supports":"jboss-fuse:6.3.0,java:8,xpaas:1.2",
+                            "version": "2.0"
+                        }
+                    }                    
                 ]
             }
         }

roles/openshift_examples/files/examples/v1.3/image-streams/dotnet_imagestreams.json

@@ -1,5 +1,5 @@
 {
-    "kind": "List",
+    "kind": "ImageStreamList",
     "apiVersion": "v1",
     "metadata": {
         "name": "dotnet-image-streams",
@@ -12,21 +12,39 @@
             "kind": "ImageStream",
             "apiVersion": "v1",
             "metadata": {
-                "name": "dotnetcore-10-rhel7"
+                "name": "dotnet"
             },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/dotnet/dotnetcore-10-rhel7",
                 "tags": [
                     {
+                        "name": "latest",
+                        "annotations": {
+                          "description": ".Net Core 1.0 S2I image.",
+                          "iconClass": "icon-dotnet",
+                          "tags": "builder,.net,dotnet,dotnetcore,rh-dotnetcore10",
+                          "supports":"dotnet",
+                          "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore.git",
+                          "sampleContextDir": "1.0/test/asp-net-hello-world"
+                        },
+                        "from": {
+                          "kind": "ImageStreamTag",
+                          "name": "1.0"
+                        }
+                    },
+                    {
                         "name": "1.0",
                         "annotations": {
                             "description": ".Net Core 1.0 S2I image.",
                             "iconClass": "icon-dotnet",
                             "tags": "builder,.net,dotnet,dotnetcore,rh-dotnetcore10",
-                            "supports":"dotnet:1.0",
+                            "supports":"dotnet:1.0,dotnet",
                             "sampleRepo": "https://github.com/redhat-developer/s2i-dotnetcore.git",
                             "sampleContextDir": "1.0/test/asp-net-hello-world",
                             "version": "1.0"
+                        },
+                        "from": {
+                          "kind": "DockerImage",
+                          "name": "registry.access.redhat.com/dotnet/dotnetcore-10-rhel7:1.0"
                         }
                     }
                 ]

roles/openshift_examples/files/examples/v1.3/xpaas-streams/fis-image-streams.json

@@ -20,13 +20,23 @@
                     {
                         "name": "1.0",
                         "annotations": {
-                            "description": "JBoss Fuse Integration Services 6.2.1 Java S2I images.",
+                            "description": "JBoss Fuse Integration Services 1.0 Java S2I images.",
                             "iconClass": "icon-jboss",
                             "tags": "builder,jboss-fuse,java,xpaas",
                             "supports":"jboss-fuse:6.2.1,java:8,xpaas:1.2",
                             "version": "1.0"
                         }
-                    }
+                    },
+                    {
+                        "name": "2.0",
+                        "annotations": {
+                            "description": "JBoss Fuse Integration Services 2.0 Java S2I images.",
+                            "iconClass": "icon-jboss",
+                            "tags": "builder,jboss-fuse,java,xpaas",
+                            "supports":"jboss-fuse:6.3.0,java:8,xpaas:1.2",
+                            "version": "2.0"
+                        }
+                    }                    
                 ]
             }
         },
@@ -42,13 +52,23 @@
                     {
                         "name": "1.0",
                         "annotations": {
-                            "description": "JBoss Fuse Integration Services 6.2.1 Karaf S2I images.",
+                            "description": "JBoss Fuse Integration Services 1.0 Karaf S2I images.",
                             "iconClass": "icon-jboss",
                             "tags": "builder,jboss-fuse,java,karaf,xpaas",
                             "supports":"jboss-fuse:6.2.1,java:8,xpaas:1.2",
                             "version": "1.0"
                         }
-                    }
+                    },
+                    {
+                        "name": "2.0",
+                        "annotations": {
+                            "description": "JBoss Fuse Integration Services 2.0 Karaf S2I images.",
+                            "iconClass": "icon-jboss",
+                            "tags": "builder,jboss-fuse,java,karaf,xpaas",
+                            "supports":"jboss-fuse:6.3.0,java:8,xpaas:1.2",
+                            "version": "2.0"
+                        }
+                    }                    
                 ]
             }
         }