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

Fix xPaaS image streams

2 files changed, 511 insertions, 19 deletions

diff --git a/roles/openshift_examples/files/examples/v3.6/xpaas-streams/jboss-image-streams.json b/roles/openshift_examples/files/examples/v3.6/xpaas-streams/jboss-image-streams.json
index 0bb56452b..af66b9ea4 100644
--- a/roles/openshift_examples/files/examples/v3.6/xpaas-streams/jboss-image-streams.json
+++ b/roles/openshift_examples/files/examples/v3.6/xpaas-streams/jboss-image-streams.json
@@ -31,6 +31,10 @@
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.1",
                             "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Tomcat 7"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-webserver-3/webserver30-tomcat7-openshift:1.1"
                         }
                     },
                     {
@@ -44,6 +48,10 @@
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.2",
                             "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Tomcat 7"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-webserver-3/webserver30-tomcat7-openshift:1.2"
                         }
                     },
                     {
@@ -56,6 +64,10 @@
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.3"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-webserver-3/webserver30-tomcat7-openshift:1.3"
                         }
                     }
                 ]
@@ -84,6 +96,10 @@
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.1",
                             "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Tomcat 8"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-webserver-3/webserver30-tomcat8-openshift:1.1"
                         }
                     },
                     {
@@ -97,6 +113,10 @@
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.2",
                             "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Tomcat 8"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-webserver-3/webserver30-tomcat8-openshift:1.2"
                         }
                     },
                     {
@@ -109,6 +129,10 @@
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.3"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-webserver-3/webserver30-tomcat8-openshift:1.3"
                         }
                     }
                 ]
@@ -137,6 +161,10 @@
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss Web Server 3.1 Tomcat 7"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-webserver-3/webserver31-tomcat7-openshift:1.0"
                         }
                     }
                 ]
@@ -165,6 +193,10 @@
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss Web Server 3.1 Tomcat 8"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-webserver-3/webserver31-tomcat8-openshift:1.0"
                         }
                     }
                 ]
@@ -194,6 +226,10 @@
                             "sampleRef": "6.4.x",
                             "version": "1.1",
                             "openshift.io/display-name": "Red Hat JBoss EAP 6.4"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-6/eap64-openshift:1.1"
                         }
                     },
                     {
@@ -208,6 +244,10 @@
                             "sampleRef": "6.4.x",
                             "version": "1.2",
                             "openshift.io/display-name": "Red Hat JBoss EAP 6.4"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-6/eap64-openshift:1.2"
                         }
                     },
                     {
@@ -222,6 +262,10 @@
                             "sampleRef": "6.4.x",
                             "version": "1.3",
                             "openshift.io/display-name": "Red Hat JBoss EAP 6.4"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-6/eap64-openshift:1.3"
                         }
                     },
                     {
@@ -236,6 +280,10 @@
                             "sampleRef": "6.4.x",
                             "version": "1.4",
                             "openshift.io/display-name": "Red Hat JBoss EAP 6.4"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-6/eap64-openshift:1.4"
                         }
                     },
                     {
@@ -248,7 +296,12 @@
                             "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
                             "sampleContextDir": "kitchensink",
                             "sampleRef": "6.4.x",
-                            "version": "1.5"
+                            "version": "1.5",
+                            "openshift.io/display-name": "Red Hat JBoss EAP 6.4"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-6/eap64-openshift:1.5"
                         }
                     }
                 ]
@@ -278,6 +331,10 @@
                             "sampleRef": "7.0.0.GA",
                             "version": "1.3",
                             "openshift.io/display-name": "Red Hat JBoss EAP 7.0"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-7/eap70-openshift:1.3"
                         }
                     },
                     {
@@ -292,6 +349,10 @@
                             "sampleRef": "7.0.0.GA",
                             "version": "1.4",
                             "openshift.io/display-name": "Red Hat JBoss EAP 7.0"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-7/eap70-openshift:1.4"
                         }
                     },
                     {
@@ -304,7 +365,44 @@
                             "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
                             "sampleContextDir": "kitchensink",
                             "sampleRef": "7.0.0.GA",
-                            "version": "1.5"
+                            "version": "1.5",
+                            "openshift.io/display-name": "Red Hat JBoss EAP 7.0"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-7/eap70-openshift:1.5"
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "kind": "ImageStream",
+            "apiVersion": "v1",
+            "metadata": {
+                "name": "jboss-eap71-openshift",
+                "annotations": {
+                    "openshift.io/display-name": "Red Hat JBoss EAP 7.1"
+                }
+            },
+            "spec": {
+                "dockerImageRepository": "registry.access.redhat.com/jboss-eap-7/eap71-openshift",
+                "tags": [
+                    {
+                        "name": "1.0-TP",
+                        "annotations": {
+                            "description": "JBoss EAP 7.1 Tech Preview.",
+                            "iconClass": "icon-jboss",
+                            "tags": "builder,eap,javaee,java,jboss,xpaas",
+                            "supports":"eap:7.1,javaee:7,java:8,xpaas:1.0",
+                            "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
+                            "sampleContextDir": "kitchensink",
+                            "sampleRef": "7.0.0.GA",
+                            "version": "1.0"
+                        },
+                        "from": {
+                          "kind": "DockerImage",
+                          "name": "registry.access.redhat.com/jboss-eap-7-tech-preview/eap71-openshift:1.0"
                         }
                     }
                 ]
@@ -334,6 +432,10 @@
                             "sampleRef": "1.2",
                             "version": "1.2",
                             "openshift.io/display-name": "Red Hat JBoss BRMS 6.2 decision server"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-decisionserver-6/decisionserver62-openshift:1.2"
                         }
                     }
                 ]
@@ -363,6 +465,10 @@
                             "sampleRef": "1.3",
                             "version": "1.3",
                             "openshift.io/display-name": "Red Hat JBoss BRMS 6.3 decision server"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-decisionserver-6/decisionserver63-openshift:1.3"
                         }
                     },
                     {
@@ -375,7 +481,12 @@
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "decisionserver/hellorules",
                             "sampleRef": "1.3",
-                            "version": "1.4"
+                            "version": "1.4",
+                            "openshift.io/display-name": "Red Hat JBoss BRMS 6.3 decision server"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-decisionserver-6/decisionserver63-openshift:1.4"
                         }
                     }
                 ]
@@ -400,7 +511,12 @@
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "decisionserver/hellorules",
                             "sampleRef": "1.3",
-                            "version": "1.0"
+                            "version": "1.0",
+                            "openshift.io/display-name": "Red Hat JBoss BRMS 6.4 decision server"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-decisionserver-6/decisionserver64-openshift:1.0"
                         }
                     }
                 ]
@@ -430,6 +546,10 @@
                             "sampleRef": "1.3",
                             "version": "1.3",
                             "openshift.io/display-name": "Red Hat JBoss BPM Suite 6.3 intelligent process server"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-processserver-6/processserver63-openshift:1.3"
                         }
                     },
                     {
@@ -442,7 +562,12 @@
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "processserver/library",
                             "sampleRef": "1.3",
-                            "version": "1.4"
+                            "version": "1.4",
+                            "openshift.io/display-name": "Red Hat JBoss BPM Suite 6.3 intelligent process server"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-processserver-6/processserver63-openshift:1.4"
                         }
                     }
                 ]
@@ -467,7 +592,12 @@
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "processserver/library",
                             "sampleRef": "1.3",
-                            "version": "1.0"
+                            "version": "1.0",
+                            "openshift.io/display-name": "Red Hat JBoss BPM Suite 6.4 intelligent process server"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-processserver-6/processserver64-openshift:1.0"
                         }
                     }
                 ]
@@ -494,6 +624,10 @@
                             "supports": "datagrid:6.5,xpaas:1.2",
                             "version": "1.2",
                             "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datagrid-6/datagrid65-openshift:1.2"
                         }
                     },
                     {
@@ -505,6 +639,10 @@
                             "supports": "datagrid:6.5,xpaas:1.4",
                             "version": "1.3",
                             "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datagrid-6/datagrid65-openshift:1.3"
                         }
                     },
                     {
@@ -514,7 +652,42 @@
                             "iconClass": "icon-jboss",
                             "tags": "datagrid,jboss,xpaas",
                             "supports":"datagrid:6.5,xpaas:1.4",
-                            "version": "1.4"
+                            "version": "1.4",
+                            "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datagrid-6/datagrid65-openshift:1.4"
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "kind": "ImageStream",
+            "apiVersion": "v1",
+            "metadata": {
+                "name": "jboss-datagrid71-openshift",
+                "annotations": {
+                    "openshift.io/display-name": "Red Hat JBoss Data Grid 7.1"
+                }
+            },
+            "spec": {
+                "dockerImageRepository": "registry.access.redhat.com/jboss-datagrid-7/datagrid71-openshift",
+                "tags": [
+                    {
+                        "name": "1.0",
+                        "annotations": {
+                            "description": "JBoss Data Grid 7.1 S2I images.",
+                            "iconClass": "icon-jboss",
+                            "tags": "datagrid,jboss,xpaas",
+                            "supports": "datagrid:7.1,xpaas:1.0",
+                            "version": "1.0",
+                            "openshift.io/display-name": "Red Hat JBoss Data Grid 7.1"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datagrid-7/datagrid71-openshift:1.0"
                         }
                     }
                 ]
@@ -540,6 +713,39 @@
                             "tags": "client,jboss,xpaas",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5 Client Modules for EAP"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datagrid-6/datagrid65-client-openshift:1.0"
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "kind": "ImageStream",
+            "apiVersion": "v1",
+            "metadata": {
+                "name": "jboss-datagrid71-client-openshift",
+                "annotations": {
+                    "openshift.io/display-name": "Red Hat JBoss Data Grid 7.1 Client Modules for EAP"
+                }
+            },
+            "spec": {
+                "dockerImageRepository": "registry.access.redhat.com/jboss-datagrid-7/datagrid71-client-openshift",
+                "tags": [
+                    {
+                        "name": "1.0",
+                        "annotations": {
+                            "description": "JBoss Data Grid 7.1 Client Modules for EAP.",
+                            "iconClass": "icon-jboss",
+                            "tags": "client,jboss,xpaas",
+                            "version": "1.0",
+                            "openshift.io/display-name": "Red Hat JBoss Data Grid 7.1 Client Modules for EAP"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datagrid-7/datagrid71-client-openshift:1.0"
                         }
                     }
                 ]
@@ -566,6 +772,10 @@
                             "supports": "datavirt:6.3,xpaas:1.4",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.3"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datavirt-6/datavirt63-openshift:1.0"
                         }
                     },
                     {
@@ -577,6 +787,10 @@
                             "supports": "datavirt:6.3,xpaas:1.4",
                             "version": "1.1",
                             "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.3"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datavirt-6/datavirt63-openshift:1.1"
                         }
                     },
                     {
@@ -586,7 +800,12 @@
                             "iconClass": "icon-jboss",
                             "tags": "datavirt,jboss,xpaas",
                             "supports":"datavirt:6.3,xpaas:1.4",
-                            "version": "1.2"
+                            "version": "1.2",
+                            "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.3"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datavirt-6/datavirt63-openshift:1.2"
                         }
                     }
                 ]
@@ -612,6 +831,10 @@
                             "tags": "client,jboss,xpaas",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.5 JDBC Driver Modules for EAP"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datavirt-6/datavirt63-driver-openshift:1.0"
                         }
                     }
                 ]
@@ -638,6 +861,10 @@
                             "supports": "amq:6.2,messaging,xpaas:1.1",
                             "version": "1.1",
                             "openshift.io/display-name": "Red Hat JBoss A-MQ 6.2"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-amq-6/amq62-openshift:1.1"
                         }
                     },
                     {
@@ -649,6 +876,10 @@
                             "supports": "amq:6.2,messaging,xpaas:1.2",
                             "version": "1.2",
                             "openshift.io/display-name": "Red Hat JBoss A-MQ 6.2"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-amq-6/amq62-openshift:1.2"
                         }
                     },
                     {
@@ -660,6 +891,10 @@
                             "supports": "amq:6.2,messaging,xpaas:1.3",
                             "version": "1.3",
                             "openshift.io/display-name": "Red Hat JBoss A-MQ 6.2"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-amq-6/amq62-openshift:1.3"
                         }
                     },
                     {
@@ -669,7 +904,27 @@
                             "iconClass": "icon-jboss",
                             "tags": "messaging,amq,jboss,xpaas",
                             "supports":"amq:6.2,messaging,xpaas:1.4",
-                            "version": "1.4"
+                            "version": "1.4",
+                            "openshift.io/display-name": "Red Hat JBoss A-MQ 6.2"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-amq-6/amq62-openshift:1.4"
+                        }
+                    },
+                    {
+                        "name": "1.5",
+                        "annotations": {
+                            "description": "JBoss A-MQ 6.2 broker image.",
+                            "iconClass": "icon-jboss",
+                            "tags": "messaging,amq,jboss,xpaas",
+                            "supports":"amq:6.2,messaging,xpaas:1.5",
+                            "version": "1.5",
+                            "openshift.io/display-name": "Red Hat JBoss A-MQ 6.2"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-amq-6/amq62-openshift:1.5"
                         }
                     }
                 ]
@@ -696,6 +951,25 @@
                             "supports": "amq:6.3,messaging,xpaas:1.0",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss A-MQ 6.3"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-amq-6/amq63-openshift:1.0"
+                        }
+                    },
+                    {
+                        "name": "1.1",
+                        "annotations": {
+                            "description": "JBoss A-MQ 6.3 broker image.",
+                            "iconClass": "icon-jboss",
+                            "tags": "messaging,amq,jboss,xpaas",
+                            "supports": "amq:6.3,messaging,xpaas:1.1",
+                            "version": "1.1",
+                            "openshift.io/display-name": "Red Hat JBoss A-MQ 6.3"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-amq-6/amq63-openshift:1.1"
                         }
                     }
                 ]
@@ -723,6 +997,10 @@
                             "supports": "sso:7.0,xpaas:1.3",
                             "version": "1.3",
                             "openshift.io/display-name": "Red Hat Single Sign-On 7.0"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/redhat-sso-7/sso70-openshift:1.3"
                         }
                     },
                     {
@@ -734,6 +1012,10 @@
                             "supports": "sso:7.0,xpaas:1.4",
                             "version": "1.4",
                             "openshift.io/display-name": "Red Hat Single Sign-On 7.0"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/redhat-sso-7/sso70-openshift:1.4"
                         }
                     }
                 ]
@@ -761,6 +1043,10 @@
                             "supports": "sso:7.1,xpaas:1.4",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat Single Sign-On 7.1"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/redhat-sso-7/sso71-openshift:1.0"
                         }
                     },
                     {
@@ -772,6 +1058,10 @@
                             "supports": "sso:7.1,xpaas:1.4",
                             "version": "1.1",
                             "openshift.io/display-name": "Red Hat Single Sign-On 7.1"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/redhat-sso-7/sso71-openshift:1.1"
                         }
                     }
                 ]
@@ -800,6 +1090,10 @@
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
                             "sampleContextDir": "undertow-servlet",
                             "version": "1.0"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.0"
                         }
                     },
                     {
@@ -813,6 +1107,10 @@
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
                             "sampleContextDir": "undertow-servlet",
                             "version": "1.1"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.1"
                         }
                     }
                 ]
diff --git a/roles/openshift_examples/files/examples/v3.7/xpaas-streams/jboss-image-streams.json b/roles/openshift_examples/files/examples/v3.7/xpaas-streams/jboss-image-streams.json
index 0aad7fae6..af66b9ea4 100644
--- a/roles/openshift_examples/files/examples/v3.7/xpaas-streams/jboss-image-streams.json
+++ b/roles/openshift_examples/files/examples/v3.7/xpaas-streams/jboss-image-streams.json
@@ -31,6 +31,10 @@
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.1",
                             "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Tomcat 7"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-webserver-3/webserver30-tomcat7-openshift:1.1"
                         }
                     },
                     {
@@ -44,6 +48,10 @@
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.2",
                             "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Tomcat 7"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-webserver-3/webserver30-tomcat7-openshift:1.2"
                         }
                     },
                     {
@@ -56,6 +64,10 @@
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.3"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-webserver-3/webserver30-tomcat7-openshift:1.3"
                         }
                     }
                 ]
@@ -84,6 +96,10 @@
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.1",
                             "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Tomcat 8"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-webserver-3/webserver30-tomcat8-openshift:1.1"
                         }
                     },
                     {
@@ -97,6 +113,10 @@
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.2",
                             "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Tomcat 8"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-webserver-3/webserver30-tomcat8-openshift:1.2"
                         }
                     },
                     {
@@ -109,6 +129,10 @@
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.3"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-webserver-3/webserver30-tomcat8-openshift:1.3"
                         }
                     }
                 ]
@@ -137,6 +161,10 @@
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss Web Server 3.1 Tomcat 7"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-webserver-3/webserver31-tomcat7-openshift:1.0"
                         }
                     }
                 ]
@@ -165,6 +193,10 @@
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss Web Server 3.1 Tomcat 8"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-webserver-3/webserver31-tomcat8-openshift:1.0"
                         }
                     }
                 ]
@@ -194,6 +226,10 @@
                             "sampleRef": "6.4.x",
                             "version": "1.1",
                             "openshift.io/display-name": "Red Hat JBoss EAP 6.4"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-6/eap64-openshift:1.1"
                         }
                     },
                     {
@@ -208,6 +244,10 @@
                             "sampleRef": "6.4.x",
                             "version": "1.2",
                             "openshift.io/display-name": "Red Hat JBoss EAP 6.4"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-6/eap64-openshift:1.2"
                         }
                     },
                     {
@@ -222,6 +262,10 @@
                             "sampleRef": "6.4.x",
                             "version": "1.3",
                             "openshift.io/display-name": "Red Hat JBoss EAP 6.4"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-6/eap64-openshift:1.3"
                         }
                     },
                     {
@@ -236,6 +280,10 @@
                             "sampleRef": "6.4.x",
                             "version": "1.4",
                             "openshift.io/display-name": "Red Hat JBoss EAP 6.4"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-6/eap64-openshift:1.4"
                         }
                     },
                     {
@@ -248,7 +296,12 @@
                             "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
                             "sampleContextDir": "kitchensink",
                             "sampleRef": "6.4.x",
-                            "version": "1.5"
+                            "version": "1.5",
+                            "openshift.io/display-name": "Red Hat JBoss EAP 6.4"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-6/eap64-openshift:1.5"
                         }
                     }
                 ]
@@ -278,6 +331,10 @@
                             "sampleRef": "7.0.0.GA",
                             "version": "1.3",
                             "openshift.io/display-name": "Red Hat JBoss EAP 7.0"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-7/eap70-openshift:1.3"
                         }
                     },
                     {
@@ -292,6 +349,10 @@
                             "sampleRef": "7.0.0.GA",
                             "version": "1.4",
                             "openshift.io/display-name": "Red Hat JBoss EAP 7.0"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-7/eap70-openshift:1.4"
                         }
                     },
                     {
@@ -304,7 +365,12 @@
                             "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
                             "sampleContextDir": "kitchensink",
                             "sampleRef": "7.0.0.GA",
-                            "version": "1.5"
+                            "version": "1.5",
+                            "openshift.io/display-name": "Red Hat JBoss EAP 7.0"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-7/eap70-openshift:1.5"
                         }
                     }
                 ]
@@ -366,6 +432,10 @@
                             "sampleRef": "1.2",
                             "version": "1.2",
                             "openshift.io/display-name": "Red Hat JBoss BRMS 6.2 decision server"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-decisionserver-6/decisionserver62-openshift:1.2"
                         }
                     }
                 ]
@@ -395,6 +465,10 @@
                             "sampleRef": "1.3",
                             "version": "1.3",
                             "openshift.io/display-name": "Red Hat JBoss BRMS 6.3 decision server"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-decisionserver-6/decisionserver63-openshift:1.3"
                         }
                     },
                     {
@@ -407,7 +481,12 @@
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "decisionserver/hellorules",
                             "sampleRef": "1.3",
-                            "version": "1.4"
+                            "version": "1.4",
+                            "openshift.io/display-name": "Red Hat JBoss BRMS 6.3 decision server"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-decisionserver-6/decisionserver63-openshift:1.4"
                         }
                     }
                 ]
@@ -432,7 +511,12 @@
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "decisionserver/hellorules",
                             "sampleRef": "1.3",
-                            "version": "1.0"
+                            "version": "1.0",
+                            "openshift.io/display-name": "Red Hat JBoss BRMS 6.4 decision server"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-decisionserver-6/decisionserver64-openshift:1.0"
                         }
                     }
                 ]
@@ -462,6 +546,10 @@
                             "sampleRef": "1.3",
                             "version": "1.3",
                             "openshift.io/display-name": "Red Hat JBoss BPM Suite 6.3 intelligent process server"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-processserver-6/processserver63-openshift:1.3"
                         }
                     },
                     {
@@ -474,7 +562,12 @@
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "processserver/library",
                             "sampleRef": "1.3",
-                            "version": "1.4"
+                            "version": "1.4",
+                            "openshift.io/display-name": "Red Hat JBoss BPM Suite 6.3 intelligent process server"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-processserver-6/processserver63-openshift:1.4"
                         }
                     }
                 ]
@@ -499,7 +592,12 @@
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "processserver/library",
                             "sampleRef": "1.3",
-                            "version": "1.0"
+                            "version": "1.0",
+                            "openshift.io/display-name": "Red Hat JBoss BPM Suite 6.4 intelligent process server"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-processserver-6/processserver64-openshift:1.0"
                         }
                     }
                 ]
@@ -526,6 +624,10 @@
                             "supports": "datagrid:6.5,xpaas:1.2",
                             "version": "1.2",
                             "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datagrid-6/datagrid65-openshift:1.2"
                         }
                     },
                     {
@@ -537,6 +639,10 @@
                             "supports": "datagrid:6.5,xpaas:1.4",
                             "version": "1.3",
                             "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datagrid-6/datagrid65-openshift:1.3"
                         }
                     },
                     {
@@ -546,7 +652,12 @@
                             "iconClass": "icon-jboss",
                             "tags": "datagrid,jboss,xpaas",
                             "supports":"datagrid:6.5,xpaas:1.4",
-                            "version": "1.4"
+                            "version": "1.4",
+                            "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datagrid-6/datagrid65-openshift:1.4"
                         }
                     }
                 ]
@@ -573,6 +684,10 @@
                             "supports": "datagrid:7.1,xpaas:1.0",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss Data Grid 7.1"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datagrid-7/datagrid71-openshift:1.0"
                         }
                     }
                 ]
@@ -598,6 +713,10 @@
                             "tags": "client,jboss,xpaas",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5 Client Modules for EAP"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datagrid-6/datagrid65-client-openshift:1.0"
                         }
                     }
                 ]
@@ -623,6 +742,10 @@
                             "tags": "client,jboss,xpaas",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss Data Grid 7.1 Client Modules for EAP"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datagrid-7/datagrid71-client-openshift:1.0"
                         }
                     }
                 ]
@@ -649,6 +772,10 @@
                             "supports": "datavirt:6.3,xpaas:1.4",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.3"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datavirt-6/datavirt63-openshift:1.0"
                         }
                     },
                     {
@@ -660,6 +787,10 @@
                             "supports": "datavirt:6.3,xpaas:1.4",
                             "version": "1.1",
                             "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.3"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datavirt-6/datavirt63-openshift:1.1"
                         }
                     },
                     {
@@ -669,7 +800,12 @@
                             "iconClass": "icon-jboss",
                             "tags": "datavirt,jboss,xpaas",
                             "supports":"datavirt:6.3,xpaas:1.4",
-                            "version": "1.2"
+                            "version": "1.2",
+                            "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.3"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datavirt-6/datavirt63-openshift:1.2"
                         }
                     }
                 ]
@@ -695,6 +831,10 @@
                             "tags": "client,jboss,xpaas",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.5 JDBC Driver Modules for EAP"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datavirt-6/datavirt63-driver-openshift:1.0"
                         }
                     }
                 ]
@@ -721,6 +861,10 @@
                             "supports": "amq:6.2,messaging,xpaas:1.1",
                             "version": "1.1",
                             "openshift.io/display-name": "Red Hat JBoss A-MQ 6.2"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-amq-6/amq62-openshift:1.1"
                         }
                     },
                     {
@@ -732,6 +876,10 @@
                             "supports": "amq:6.2,messaging,xpaas:1.2",
                             "version": "1.2",
                             "openshift.io/display-name": "Red Hat JBoss A-MQ 6.2"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-amq-6/amq62-openshift:1.2"
                         }
                     },
                     {
@@ -743,6 +891,10 @@
                             "supports": "amq:6.2,messaging,xpaas:1.3",
                             "version": "1.3",
                             "openshift.io/display-name": "Red Hat JBoss A-MQ 6.2"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-amq-6/amq62-openshift:1.3"
                         }
                     },
                     {
@@ -752,7 +904,12 @@
                             "iconClass": "icon-jboss",
                             "tags": "messaging,amq,jboss,xpaas",
                             "supports":"amq:6.2,messaging,xpaas:1.4",
-                            "version": "1.4"
+                            "version": "1.4",
+                            "openshift.io/display-name": "Red Hat JBoss A-MQ 6.2"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-amq-6/amq62-openshift:1.4"
                         }
                     },
                     {
@@ -762,7 +919,12 @@
                             "iconClass": "icon-jboss",
                             "tags": "messaging,amq,jboss,xpaas",
                             "supports":"amq:6.2,messaging,xpaas:1.5",
-                            "version": "1.5"
+                            "version": "1.5",
+                            "openshift.io/display-name": "Red Hat JBoss A-MQ 6.2"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-amq-6/amq62-openshift:1.5"
                         }
                     }
                 ]
@@ -789,6 +951,10 @@
                             "supports": "amq:6.3,messaging,xpaas:1.0",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss A-MQ 6.3"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-amq-6/amq63-openshift:1.0"
                         }
                     },
                     {
@@ -800,6 +966,10 @@
                             "supports": "amq:6.3,messaging,xpaas:1.1",
                             "version": "1.1",
                             "openshift.io/display-name": "Red Hat JBoss A-MQ 6.3"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-amq-6/amq63-openshift:1.1"
                         }
                     }
                 ]
@@ -827,6 +997,10 @@
                             "supports": "sso:7.0,xpaas:1.3",
                             "version": "1.3",
                             "openshift.io/display-name": "Red Hat Single Sign-On 7.0"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/redhat-sso-7/sso70-openshift:1.3"
                         }
                     },
                     {
@@ -838,6 +1012,10 @@
                             "supports": "sso:7.0,xpaas:1.4",
                             "version": "1.4",
                             "openshift.io/display-name": "Red Hat Single Sign-On 7.0"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/redhat-sso-7/sso70-openshift:1.4"
                         }
                     }
                 ]
@@ -865,6 +1043,10 @@
                             "supports": "sso:7.1,xpaas:1.4",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat Single Sign-On 7.1"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/redhat-sso-7/sso71-openshift:1.0"
                         }
                     },
                     {
@@ -876,6 +1058,10 @@
                             "supports": "sso:7.1,xpaas:1.4",
                             "version": "1.1",
                             "openshift.io/display-name": "Red Hat Single Sign-On 7.1"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/redhat-sso-7/sso71-openshift:1.1"
                         }
                     }
                 ]
@@ -904,6 +1090,10 @@
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
                             "sampleContextDir": "undertow-servlet",
                             "version": "1.0"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.0"
                         }
                     },
                     {
@@ -917,6 +1107,10 @@
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
                             "sampleContextDir": "undertow-servlet",
                             "version": "1.1"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.1"
                         }
                     }
                 ]