From de97690e4bf190418b2676401a7eb9234029a71d Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Thu, 23 Feb 2017 14:19:28 -0500
Subject: xPaaS ose-v1.3.6

---
 .../v1.4/xpaas-streams/fis-image-streams.json      | 24 +++++++++++++++++++--
 .../v1.4/xpaas-streams/jboss-image-streams.json    | 25 ++++++++++++++++++++++
 2 files changed, 47 insertions(+), 2 deletions(-)

(limited to 'roles/openshift_examples/files/examples/v1.4/xpaas-streams')

diff --git a/roles/openshift_examples/files/examples/v1.4/xpaas-streams/fis-image-streams.json b/roles/openshift_examples/files/examples/v1.4/xpaas-streams/fis-image-streams.json
index ed0e94bed..9d99973be 100644
--- a/roles/openshift_examples/files/examples/v1.4/xpaas-streams/fis-image-streams.json
+++ b/roles/openshift_examples/files/examples/v1.4/xpaas-streams/fis-image-streams.json
@@ -20,12 +20,22 @@
                     {
                         "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,12 +52,22 @@
                     {
                         "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"
+                        }
                     }
                 ]
             }
diff --git a/roles/openshift_examples/files/examples/v1.4/xpaas-streams/jboss-image-streams.json b/roles/openshift_examples/files/examples/v1.4/xpaas-streams/jboss-image-streams.json
index a7cb12867..049f3f884 100644
--- a/roles/openshift_examples/files/examples/v1.4/xpaas-streams/jboss-image-streams.json
+++ b/roles/openshift_examples/files/examples/v1.4/xpaas-streams/jboss-image-streams.json
@@ -367,6 +367,31 @@
                     }
                 ]
             }
+        },
+        {
+            "kind": "ImageStream",
+            "apiVersion": "v1",
+            "metadata": {
+                "name": "redhat-openjdk18-openshift"
+            },
+            "spec": {
+                "dockerImageRepository": "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift",
+                "tags": [
+                    {
+                        "name": "1.0",
+                        "annotations": {
+                            "openshift.io/display-name": "Red Hat OpenJDK 8",
+                            "description": "Build and run Java applications using Maven and OpenJDK 8.",
+                            "iconClass": "icon-jboss",
+                            "tags": "builder,java,xpaas,openjdk",
+                            "supports":"java:8,xpaas:1.0",
+                            "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
+                            "sampleContextDir": "undertow-servlet",
+                            "version": "1.0"
+                        }
+                    }
+                ]
+            }
         }
     ]
 }
-- 
cgit v1.2.3