From accd4d1bf999bb8be93436e7afb3cf81a3571549 Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Fri, 2 Sep 2016 09:21:22 -0400
Subject: Update image stream data

---
 .../v1.3/image-streams/dotnet_imagestreams.json    | 26 ++++++++++++++++----
 .../v1.3/xpaas-streams/fis-image-streams.json      | 28 ++++++++++++++++++----
 2 files changed, 46 insertions(+), 8 deletions(-)

(limited to 'roles/openshift_examples/files/examples/v1.3')

diff --git a/roles/openshift_examples/files/examples/v1.3/image-streams/dotnet_imagestreams.json b/roles/openshift_examples/files/examples/v1.3/image-streams/dotnet_imagestreams.json
index 3d7afe4aa..6cbf81591 100644
--- a/roles/openshift_examples/files/examples/v1.3/image-streams/dotnet_imagestreams.json
+++ b/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"
                         }
                     }
                 ]
diff --git a/roles/openshift_examples/files/examples/v1.3/xpaas-streams/fis-image-streams.json b/roles/openshift_examples/files/examples/v1.3/xpaas-streams/fis-image-streams.json
index ed0e94bed..65060cc2c 100644
--- a/roles/openshift_examples/files/examples/v1.3/xpaas-streams/fis-image-streams.json
+++ b/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"
+                        }
+                    }                    
                 ]
             }
         }
-- 
cgit v1.2.3