Merge pull request #255 from rgdoliveira/eap72-openjdk11-ubi8-dev-CLO…

…UD-3303 [CLOUD-3303] move tag to version 1.1
jboss-container-images · Jul 18, 2019 · 1b33fea · 1b33fea
2 parents a393a5c + 382c813
commit 1b33fea
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 44 deletions.
diff --git a/README.adoc b/README.adoc
@@ -33,13 +33,13 @@ To update an to the most recent image:
 
 [source, bash]
 ----
-oc import-image jboss-eap72-openjdk11-rhel8-openshift:1.0
+oc import-image jboss-eap72-openjdk11-rhel8-openshift:1.1
 ----
 
 Optionally include namespace to the import:
 [source, bash]
 ----
-oc -n myproject import-image jboss-eap72-openjdk11-rhel8-openshift:1.0
+oc -n myproject import-image jboss-eap72-openjdk11-rhel8-openshift:1.1
 ----
 
 #### Creating New Applications With Templates

diff --git a/docs/README.adoc b/docs/README.adoc
@@ -24,10 +24,6 @@ toc::[levels=1]
 * link:./templates/eap72-openjdk11-starter-s2i.adoc[eap72-openjdk11-starter-s2i]
 * link:./templates/eap72-openjdk11-third-party-db-s2i.adoc[eap72-openjdk11-third-party-db-s2i]
 * link:./templates/eap72-openjdk11-tx-recovery-s2i.adoc[eap72-openjdk11-tx-recovery-s2i]
-* link:./templates/t.adoc[t]
-* link:./templates/template-names.adoc[template-names]
-* link:./templates/t.adoc[t]
-* link:./templates/template-names.adoc[template-names]
 
 ////
   the source for the release notes part of this page is in the file

diff --git a/gen_template_docs.py b/gen_template_docs.py
@@ -23,9 +23,9 @@
 template_dirs = [ 'templates' ]
 amq_ssl_desc = None
 
-LINKS =  {"jboss-eap72-openjdk11-openshift:1.0": "../{outfilesuffix}[``]",
+LINKS =  {"jboss-eap72-openjdk11-openshift:1.1": "../{outfilesuffix}[``]",
           "${EAP_IMAGE_NAME}": "../{outfilesuffix}[``]",
-          "jboss-eap72-openshift:1.0": "../{outfilesuffix}[``]" }
+          "jboss-eap72-openshift:1.1": "../{outfilesuffix}[``]" }
 
 PARAMETER_VALUES = {"APPLICATION_DOMAIN": "secure-app.test.router.default.local", \
                    "SOURCE_REPOSITORY_URL": "https://github.com/jboss-openshift/openshift-examples.git", \

diff --git a/image.yaml b/image.yaml
@@ -2,7 +2,7 @@ schema_version: 1
 
 name: "jboss-eap-7/eap72-openjdk11-openshift-rhel8"
 description: "Red Hat JBoss Enterprise Application Platform 7.2 OpenJDK 11 OpenShift container image"
-version: "1.0"
+version: "1.1"
 from: "ubi8:8-released"
 labels:
     - name: "com.redhat.component"

diff --git a/templates/eap72-openjdk11-amq-persistent-s2i.json b/templates/eap72-openjdk11-amq-persistent-s2i.json
@@ -5,7 +5,7 @@
         "annotations": {
             "iconClass": "icon-eap",
             "tags": "eap,javaee,java,jboss",
-            "version": "1.0.0",
+            "version": "1.1.0",
             "openshift.io/display-name": "JBoss EAP 7.2 + AMQ 7 with passthrough TLS (JDK 11 & UBI 8)",
             "openshift.io/provider-display-name": "Red Hat, Inc.",
             "description": "An example Red Hat JBoss EAP 7 application using Red Hat JBoss AMQ with persistence and secure communication using https. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap72/README.adoc",
@@ -17,7 +17,7 @@
     },
     "labels": {
         "template": "eap72-openjdk11-amq-persistent-s2i",
-        "xpaas": "1.0.0"
+        "xpaas": "1.1.0"
     },
     "message": "A new EAP and persistent AMQ based application with SSL support has been created in your project. The username/password for accessing the AMQ service is ${MQ_USERNAME}/${MQ_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
     "parameters": [
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.0, jboss-eap72-openshift:1.0",
+            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.1, jboss-eap72-openshift:1.1",
             "name": "EAP_IMAGE_NAME",
-            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.0",
+            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.1",
             "required": true
         },
         {

diff --git a/templates/eap72-openjdk11-amq-s2i.json b/templates/eap72-openjdk11-amq-s2i.json
@@ -5,7 +5,7 @@
         "annotations": {
             "iconClass": "icon-eap",
             "tags": "eap,javaee,java,jboss,hidden",
-            "version": "1.0.0",
+            "version": "1.1.0",
             "openshift.io/display-name": "JBoss EAP 7.2 + AMQ 7 with passthrough TLS (JDK 11 & UBI 8)",
             "openshift.io/provider-display-name": "Red Hat, Inc.",
             "description": "An example Red Hat JBoss EAP 7 application using Red Hat JBoss AMQ. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap72/README.adoc",
@@ -17,7 +17,7 @@
     },
     "labels": {
         "template": "eap72-openjdk11-amq-s2i",
-        "xpaas": "1.0.0"
+        "xpaas": "1.1.0"
     },
     "message": "A new EAP and AMQ 7 based application with SSL support has been created in your project. The username/password for accessing the AMQ service is ${MQ_USERNAME}/${MQ_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
     "parameters": [
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.0, jboss-eap72-openshift:1.0",
+            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.1, jboss-eap72-openshift:1.1",
             "name": "EAP_IMAGE_NAME",
-            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.0",
+            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.1",
             "required": true
         },
         {

diff --git a/templates/eap72-openjdk11-basic-s2i.json b/templates/eap72-openjdk11-basic-s2i.json
@@ -5,7 +5,7 @@
         "annotations": {
             "iconClass": "icon-eap",
             "tags": "eap,javaee,java,jboss",
-            "version": "1.0.0",
+            "version": "1.1.0",
             "openshift.io/display-name": "JBoss EAP 7.2 (JDK 11 & UBI 8)",
             "openshift.io/provider-display-name": "Red Hat, Inc.",
             "description": "An example Red Hat JBoss EAP 7 application. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap72/README.adoc",
@@ -17,7 +17,7 @@
     },
     "labels": {
         "template": "eap72-openjdk11-basic-s2i",
-        "xpaas": "1.0.0"
+        "xpaas": "1.1.0"
     },
     "message": "A new EAP based application has been created in your project.",
     "parameters": [
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.0, jboss-eap72-openshift:1.0",
+            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.1, jboss-eap72-openshift:1.1",
             "name": "EAP_IMAGE_NAME",
-            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.0",
+            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.1",
             "required": true
         },
         {

diff --git a/templates/eap72-openjdk11-https-s2i.json b/templates/eap72-openjdk11-https-s2i.json
@@ -5,7 +5,7 @@
         "annotations": {
             "iconClass": "icon-eap",
             "tags": "eap,javaee,java,jboss",
-            "version": "1.0.0",
+            "version": "1.1.0",
             "openshift.io/display-name": "JBoss EAP 7.2 with passthrough TLS (JDK 11 & UBI 8)",
             "openshift.io/provider-display-name": "Red Hat, Inc.",
             "description": "An example Red Hat JBoss EAP 7 application configured with secure communication using HTTPS. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap72/README.adoc",
@@ -17,7 +17,7 @@
     },
     "labels": {
         "template": "eap72-openjdk11-https-s2i",
-        "xpaas": "1.0.0"
+        "xpaas": "1.1.0"
     },
     "message": "A new EAP based application with SSL support has been created in your project. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
     "parameters": [
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.0, jboss-eap72-openshift:1.0",
+            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.1, jboss-eap72-openshift:1.1",
             "name": "EAP_IMAGE_NAME",
-            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.0",
+            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.1",
             "required": true
         },
         {

diff --git a/templates/eap72-openjdk11-image-stream.json b/templates/eap72-openjdk11-image-stream.json
@@ -17,11 +17,11 @@
                 "annotations": {
                     "openshift.io/display-name": "Red Hat JBoss EAP 7.2 OpenJDK 11 UBI 8 Image",
                     "openshift.io/provider-display-name": "Red Hat, Inc.",
-                    "version": "1.0"
+                    "version": "1.1"
                 }
             },
             "labels": {
-                "xpaas": "1.0.0"
+                "xpaas": "1.1.0"
             },
             "spec": {
                 "tags": [
@@ -46,6 +46,27 @@
                             "name": "registry.redhat.io/jboss-eap-7/eap72-openjdk11-openshift-rhel8:latest"
                         }
                     },
+                    {
+                        "name": "1.1",
+                        "annotations": {
+                            "description": "Red Hat JBoss EAP 7.2 OpenJDK 11 UBI 8 S2I Image",
+                            "iconClass": "icon-eap",
+                            "tags": "builder,eap,javaee,java,jboss,hidden",
+                            "supports": "eap:7.2,javaee:7,java:11",
+                            "sampleRepo": "https://github.com/jbossas/eap-quickstarts/openshift",
+                            "sampleContextDir": "kitchensink",
+                            "sampleRef": "openshift",
+                            "version": "1.1",
+                            "openshift.io/display-name": "Red Hat JBoss EAP 7.2 OpenJDK 11 UBI 8"
+                        },
+                        "referencePolicy": {
+                            "type": "Local"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.redhat.io/jboss-eap-7/eap72-openjdk11-openshift-rhel8:1.1"
+                        }
+                    },
                     {
                         "name": "1.0",
                         "annotations": {

diff --git a/templates/eap72-openjdk11-sso-s2i.json b/templates/eap72-openjdk11-sso-s2i.json
@@ -5,7 +5,7 @@
         "annotations": {
             "iconClass": "icon-eap",
             "tags": "eap,javaee,java,jboss,hidden",
-            "version": "1.0.0",
+            "version": "1.1.0",
             "openshift.io/display-name": "JBoss EAP 7.2 + Single Sign-On with passthrough TLS (JDK 11 & UBI 8)",
             "openshift.io/provider-display-name": "Red Hat, Inc.",
             "description": "An example Red Hat JBoss EAP 7 application Single Sign-On application. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap72/README.adoc",
@@ -17,7 +17,7 @@
     },
     "labels": {
         "template": "eap72-openjdk11-sso-s2i",
-        "xpaas": "1.0.0"
+        "xpaas": "1.1.0"
     },
     "message": "A new EAP based application with SSL and SSO support has been created in your project. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
     "parameters": [
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.0, jboss-eap72-openshift:1.0",
+            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.1, jboss-eap72-openshift:1.1",
             "name": "EAP_IMAGE_NAME",
-            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.0",
+            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.1",
             "required": true
         },
         {
@@ -510,7 +510,7 @@
                         "from": {
                             "kind": "ImageStreamTag",
                             "namespace": "${IMAGE_STREAM_NAMESPACE}",
-                            "name": "jboss-eap72-openshift:1.0"
+                            "name": "jboss-eap72-openshift:1.1"
                         },
                         "env": [
                             {

diff --git a/templates/eap72-openjdk11-starter-s2i.json b/templates/eap72-openjdk11-starter-s2i.json
@@ -5,7 +5,7 @@
         "annotations": {
             "iconClass": "icon-eap",
             "tags": "eap,javaee,java,jboss",
-            "version": "1.0.0",
+            "version": "1.1.0",
             "openshift.io/display-name": "JBoss EAP 7.2 Starter (JDK 11 & UBI 8)",
             "openshift.io/provider-display-name": "Red Hat, Inc.",
             "description": "An example JBoss EAP 7 application. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap72/README.adoc",
@@ -17,7 +17,7 @@
     },
     "labels": {
         "template": "eap72-openjdk11-starter-s2i",
-        "xpaas": "1.0.0"
+        "xpaas": "1.1.0"
     },
     "message": "A new EAP based application has been created in your project.",
     "parameters": [
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.0, jboss-eap72-openshift:1.0",
+            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.1, jboss-eap72-openshift:1.1",
             "name": "EAP_IMAGE_NAME",
-            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.0",
+            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.1",
             "required": true
         },
         {

diff --git a/templates/eap72-openjdk11-third-party-db-s2i.json b/templates/eap72-openjdk11-third-party-db-s2i.json
@@ -5,7 +5,7 @@
         "annotations": {
             "iconClass": "icon-eap",
             "tags": "eap,javaee,java,jboss",
-            "version": "1.0.0",
+            "version": "1.1.0",
             "openshift.io/display-name": "JBoss EAP 7.2 with passthrough TLS, DB drivers (JDK 11 & UBI 8)",
             "openshift.io/provider-display-name": "Red Hat, Inc.",
             "description": "An example Red Hat JBoss EAP 7 application. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap72/README.adoc.",
@@ -17,7 +17,7 @@
     },
     "labels": {
         "template": "eap72-openjdk11-third-party-db-s2i",
-        "xpaas": "1.0.0"
+        "xpaas": "1.1.0"
     },
     "message": "A new EAP based application with SSL support has been created in your project. Please be sure to create the following secrets:\"${CONFIGURATION_NAME}\" containing the datasource configuration details required by the deployed application(s);  \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
     "parameters": [
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.0, jboss-eap72-openshift:1.0",
+            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.1, jboss-eap72-openshift:1.1",
             "name": "EAP_IMAGE_NAME",
-            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.0",
+            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.1",
             "required": true
         },
         {

diff --git a/templates/eap72-openjdk11-tx-recovery-s2i.json b/templates/eap72-openjdk11-tx-recovery-s2i.json
@@ -5,7 +5,7 @@
         "annotations": {
             "iconClass": "icon-eap",
             "tags": "eap,javaee,java,jboss",
-            "version": "1.0.0",
+            "version": "1.1.0",
             "openshift.io/display-name": "JBoss EAP 7.2 + AMQ 7 with tx recovery (JDK 11 & UBI 8)",
             "openshift.io/provider-display-name": "Red Hat, Inc.",
             "description": "An example Red Hat JBoss EAP 7 application with transaction recovery configured. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap72/README.adoc",
@@ -17,7 +17,7 @@
     },
     "labels": {
         "template": "eap72-openjdk11-tx-recovery-s2i",
-        "xpaas": "1.0.0"
+        "xpaas": "1.1.0"
     },
     "message": "A new EAP based application has been created in your project.",
     "parameters": [
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.0, jboss-eap72-openshift:1.0",
+            "description": "Name of the EAP image to use, examples: jboss-eap72-openjdk11-openshift-rhel8:1.1, jboss-eap72-openshift:1.1",
             "name": "EAP_IMAGE_NAME",
-            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.0",
+            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.1",
             "required": true
         },
         {