Update imagestream names to be consistent

jboss-container-images · May 7, 2019 · a4dda80 · a4dda80
1 parent 09f8e73
commit a4dda80
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/templates/eap72-amq-persistent-s2i.json b/templates/eap72-amq-persistent-s2i.json
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-rhel8-openshift:1.0, jboss-eap72-openshift:1.0",
+            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.0, jboss-eap72-openshift:1.0",
             "name": "EAP_IMAGE_NAME",
-            "value": "jboss-eap72-openjdk11-rhel8-openshift:1.0",
+            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.0",
             "required": true
         },
         {

diff --git a/templates/eap72-amq-s2i.json b/templates/eap72-amq-s2i.json
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-rhel8-openshift:1.0, jboss-eap72-openshift:1.0",
+            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.0, jboss-eap72-openshift:1.0",
             "name": "EAP_IMAGE_NAME",
-            "value": "jboss-eap72-openjdk11-rhel8-openshift:1.0",
+            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.0",
             "required": true
         },
         {

diff --git a/templates/eap72-basic-s2i.json b/templates/eap72-basic-s2i.json
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-rhel8-openshift:1.0, jboss-eap72-openshift:1.0",
+            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.0, jboss-eap72-openshift:1.0",
             "name": "EAP_IMAGE_NAME",
-            "value": "jboss-eap72-openjdk11-rhel8-openshift:1.0",
+            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.0",
             "required": true
         },
         {

diff --git a/templates/eap72-https-s2i.json b/templates/eap72-https-s2i.json
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-rhel8-openshift:1.0, jboss-eap72-openshift:1.0",
+            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.0, jboss-eap72-openshift:1.0",
             "name": "EAP_IMAGE_NAME",
-            "value": "jboss-eap72-openjdk11-rhel8-openshift:1.0",
+            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.0",
             "required": true
         },
         {

diff --git a/templates/eap72-image-stream.json b/templates/eap72-image-stream.json
@@ -13,7 +13,7 @@
             "kind": "ImageStream",
             "apiVersion": "v1",
             "metadata": {
-                "name": "jboss-eap72-openjdk11-rhel8-openshift",
+                "name": "jboss-eap72-openjdk11-openshift-rhel8",
                 "annotations": {
                     "openshift.io/display-name": "Red Hat JBoss EAP 7.2 OpenJDK 11 UBI 8 Image",
                     "openshift.io/provider-display-name": "Red Hat, Inc.",

diff --git a/templates/eap72-sso-s2i.json b/templates/eap72-sso-s2i.json
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-rhel8-openshift:1.0, jboss-eap72-openshift:1.0",
+            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.0, jboss-eap72-openshift:1.0",
             "name": "EAP_IMAGE_NAME",
-            "value": "jboss-eap72-openjdk11-rhel8-openshift:1.0",
+            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.0",
             "required": true
         },
         {

diff --git a/templates/eap72-starter-s2i.json b/templates/eap72-starter-s2i.json
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-rhel8-openshift:1.0, jboss-eap72-openshift:1.0",
+            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.0, jboss-eap72-openshift:1.0",
             "name": "EAP_IMAGE_NAME",
-            "value": "jboss-eap72-openjdk11-rhel8-openshift:1.0",
+            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.0",
             "required": true
         },
         {

diff --git a/templates/eap72-third-party-db-s2i.json b/templates/eap72-third-party-db-s2i.json
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-rhel8-openshift:1.0, jboss-eap72-openshift:1.0",
+            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.0, jboss-eap72-openshift:1.0",
             "name": "EAP_IMAGE_NAME",
-            "value": "jboss-eap72-openjdk11-rhel8-openshift:1.0",
+            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.0",
             "required": true
         },
         {

diff --git a/templates/eap72-tx-recovery-s2i.json b/templates/eap72-tx-recovery-s2i.json
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-rhel8-openshift:1.0, jboss-eap72-openshift:1.0",
+            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.0, jboss-eap72-openshift:1.0",
             "name": "EAP_IMAGE_NAME",
-            "value": "jboss-eap72-openjdk11-rhel8-openshift:1.0",
+            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.0",
             "required": true
         },
         {