jboss-container-images · luck3y · May 10, 2019 · Apr 16, 2019
diff --git a/README.adoc b/README.adoc
@@ -1,7 +1,5 @@
 # Red Hat JBoss Enterprise Application Platform 7.2 OpenShift container image
 
-NOTE: Extends link:https://github.com/jboss-container-images/jboss-eap-7-image/tree/eap72[Red Hat JBoss Enterprise Application Platform 7 container image]
-
 ## Importing Imagestreams and Templates
 
 You should have the 'oc' tools available and be logged in to your OpenShift instance. For more details on how to do this, please consult the OpenShift documentation.
@@ -35,13 +33,13 @@ To update an to the most recent image:
 
 [source, bash]
 ----
-oc import-image jboss-eap72-openjdk11-openshift:1.0
+oc import-image jboss-eap72-openjdk11-rhel8-openshift:1.0
 ----
 
 Optionally include namespace to the import:
 [source, bash]
 ----
-oc -n myproject import-image jboss-eap72-openjdk11-openshift:1.0
+oc -n myproject import-image jboss-eap72-openjdk11-rhel8-openshift:1.0
 ----
 
 #### Creating New Applications With Templates

diff --git a/content_sets.yml b/content_sets.yml
@@ -1,3 +1,4 @@
 x86_64:
-- rhel-server-rhscl-7-rpms
-- rhel-7-server-rpms
+  - rhel-8-for-x86_64-baseos-rpms
+  - rhel-8-for-x86_64-appstream-rpms
+
diff --git a/cp-overrides.yaml b/cp-overrides.yaml
@@ -1,20 +1,25 @@
 schema_version: 1
 
 modules:
-      repositories:
-          - name: cct_module
-            git:
-                  url: https://github.com/jboss-openshift/cct_module.git
-                  ref: sprint-31
-          - name: jboss-eap-modules
-            git:
-                  url: https://github.com/jboss-container-images/jboss-eap-modules.git
-                  ref: eap72-jdk11
-          - name: jboss-eap-7-image
-            git:
-                  url: https://github.com/jboss-container-images/jboss-eap-7-image.git
-                  ref: EAP_720
+  repositories:
+    - name: cct_module
+      git:
+        url: https://github.com/jboss-openshift/cct_module
+        ref: sprint-35
+    - name: jboss-eap-modules
+      git:
+        url: https://github.com/jboss-container-images/jboss-eap-modules.git
+        ref: EAP72_OPENJDK11_1
+    - name: jboss-eap-7-image
+      git:
+        url: https://github.com/jboss-container-images/jboss-eap-7-image.git
+        ref: EAP_721_CR3
 osbs:
-      repository:
-            name: containers/jboss-eap-7-tech-preview
-            branch: jb-eap-7.2-openjdk-11-openshift-cp-rhel-7
+  repository:
+    name: containers/jboss-eap-7
+    branch: jb-eap-7.2-openjdk-11-openshift-cp-ubi-8
+  configuration:
+    container:
+      compose:
+        pulp_repos: true
+        include_unpublished_pulp_repos: true
diff --git a/dev-overrides.yaml b/dev-overrides.yaml
@@ -4,17 +4,23 @@ modules:
       repositories:
           - name: cct_module
             git:
-                  url: https://github.com/jboss-openshift/cct_module.git
-                  ref: sprint-31
+                  url: https://github.com/jboss-openshift/cct_module
+                  ref: sprint-35
           - name: jboss-eap-modules
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-modules.git
-                  ref: eap72-jdk11
+                  ref: EAP72_OPENJDK11_1
           - name: jboss-eap-7-image
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-7-image.git
-                  ref: EAP_720
+                  ref: EAP_721_CR3
 osbs:
       repository:
-            name: containers/jboss-eap-7-tech-preview
-            branch: jb-eap-7.2-openjdk-11-openshift-dev-rhel-7
+            name: containers/jboss-eap-7
+            branch: jb-eap-7.2-openjdk-11-openshift-dev-ubi-8
+      configuration:
+        container:
+          compose:
+            pulp_repos: true
+            include_unpublished_pulp_repos: true
+
diff --git a/docs/templates/eap72-amq-persistent-s2i.adoc b/docs/templates/eap72-amq-persistent-s2i.adoc
@@ -24,7 +24,7 @@ https://docs.openshift.org/latest/architecture/core_concepts/templates.html#para
 |Variable name |Image Environment Variable |Description |Example value |Required
 
 |`APPLICATION_NAME` | -- | The name for the application. | eap-app | True
-|`EAP_IMAGE_NAME` | -- | Name of the EAP image to use, examples: jboss-eap72-openshift:1.0, jboss-eap72-openjdk11-openshift:1.0 | jboss-eap72-openshift:1.0 | True
+|`EAP_IMAGE_NAME` | -- | Name of the EAP image to use, examples: jboss-eap72-openjdk11-rhel8-openshift:1.0, jboss-eap72-openshift:1.0 | jboss-eap72-openjdk11-rhel8-openshift:1.0 | True
 |`HOSTNAME_HTTPS` | -- | Custom hostname for https service route.  Leave blank for default hostname, e.g.: secure-<application-name>-<project>.<default-domain-suffix> | -- | False
 |`SOURCE_REPOSITORY_URL` | -- | Git source URI for application | https://github.com/jboss-developer/jboss-eap-quickstarts.git | True
 |`SOURCE_REPOSITORY_REF` | -- | Git branch/tag reference | openshift | False

diff --git a/docs/templates/eap72-amq-s2i.adoc b/docs/templates/eap72-amq-s2i.adoc
@@ -24,7 +24,7 @@ https://docs.openshift.org/latest/architecture/core_concepts/templates.html#para
 |Variable name |Image Environment Variable |Description |Example value |Required
 
 |`APPLICATION_NAME` | -- | The name for the application. | eap-app | True
-|`EAP_IMAGE_NAME` | -- | Name of the EAP image to use, examples: jboss-eap72-openshift:1.0, jboss-eap72-openjdk11-openshift:1.0 | jboss-eap72-openshift:1.0 | True
+|`EAP_IMAGE_NAME` | -- | Name of the EAP image to use, examples: jboss-eap72-openjdk11-rhel8-openshift:1.0, jboss-eap72-openshift:1.0 | jboss-eap72-openjdk11-rhel8-openshift:1.0 | True
 |`HOSTNAME_HTTPS` | -- | Custom hostname for https service route.  Leave blank for default hostname, e.g.: secure-<application-name>-<project>.<default-domain-suffix> | -- | False
 |`SOURCE_REPOSITORY_URL` | -- | Git source URI for application | https://github.com/jboss-developer/jboss-eap-quickstarts.git | True
 |`SOURCE_REPOSITORY_REF` | -- | Git branch/tag reference | openshift | False

diff --git a/docs/templates/eap72-basic-s2i.adoc b/docs/templates/eap72-basic-s2i.adoc
@@ -24,7 +24,7 @@ https://docs.openshift.org/latest/architecture/core_concepts/templates.html#para
 |Variable name |Image Environment Variable |Description |Example value |Required
 
 |`APPLICATION_NAME` | -- | The name for the application. | eap-app | True
-|`EAP_IMAGE_NAME` | -- | Name of the EAP image to use, examples: jboss-eap72-openshift:1.0, jboss-eap72-openjdk11-openshift:1.0 | jboss-eap72-openshift:1.0 | True
+|`EAP_IMAGE_NAME` | -- | Name of the EAP image to use, examples: jboss-eap72-openjdk11-rhel8-openshift:1.0, jboss-eap72-openshift:1.0 | jboss-eap72-openjdk11-rhel8-openshift:1.0 | True
 |`SOURCE_REPOSITORY_URL` | -- | Git source URI for application | https://github.com/jboss-developer/jboss-eap-quickstarts.git | True
 |`SOURCE_REPOSITORY_REF` | -- | Git branch/tag reference | openshift | False
 |`CONTEXT_DIR` | -- | Path within Git project to build; empty for root project directory. | kitchensink | False

diff --git a/docs/templates/eap72-https-s2i.adoc b/docs/templates/eap72-https-s2i.adoc
@@ -24,7 +24,7 @@ https://docs.openshift.org/latest/architecture/core_concepts/templates.html#para
 |Variable name |Image Environment Variable |Description |Example value |Required
 
 |`APPLICATION_NAME` | -- | The name for the application. | eap-app | True
-|`EAP_IMAGE_NAME` | -- | Name of the EAP image to use, examples: jboss-eap72-openshift:1.0, jboss-eap72-openjdk11-openshift:1.0 | jboss-eap72-openshift:1.0 | True
+|`EAP_IMAGE_NAME` | -- | Name of the EAP image to use, examples: jboss-eap72-openjdk11-rhel8-openshift:1.0, jboss-eap72-openshift:1.0 | jboss-eap72-openjdk11-rhel8-openshift:1.0 | True
 |`HOSTNAME_HTTPS` | -- | Custom hostname for https service route.  Leave blank for default hostname, e.g.: secure-<application-name>-<project>.<default-domain-suffix> | -- | False
 |`SOURCE_REPOSITORY_URL` | -- | Git source URI for application | https://github.com/jboss-developer/jboss-eap-quickstarts.git | True
 |`SOURCE_REPOSITORY_REF` | -- | Git branch/tag reference | openshift | False

diff --git a/docs/templates/eap72-sso-s2i.adoc b/docs/templates/eap72-sso-s2i.adoc
@@ -24,7 +24,7 @@ https://docs.openshift.org/latest/architecture/core_concepts/templates.html#para
 |Variable name |Image Environment Variable |Description |Example value |Required
 
 |`APPLICATION_NAME` | -- | The name for the application. | eap-app | True
-|`EAP_IMAGE_NAME` | -- | Name of the EAP image to use, examples: jboss-eap72-openshift:1.0, jboss-eap72-openjdk11-openshift:1.0 | jboss-eap72-openshift:1.0 | True
+|`EAP_IMAGE_NAME` | -- | Name of the EAP image to use, examples: jboss-eap72-openjdk11-rhel8-openshift:1.0, jboss-eap72-openshift:1.0 | jboss-eap72-openjdk11-rhel8-openshift:1.0 | True
 |`HOSTNAME_HTTPS` | `HOSTNAME_HTTP` | Hostname for https service route (e.g. secure-eap-app-myproject.example.com).  Required for SSO-enabled applications.  This is added to the white list of redirects in the SSO server. | `${HOSTNAME_HTTP}` | True
 |`SOURCE_REPOSITORY_URL` | -- | Git source URI for application | https://github.com/redhat-developer/redhat-sso-quickstarts | True
 |`SOURCE_REPOSITORY_REF` | -- | Git branch/tag reference | 7.0.x-ose | False

diff --git a/docs/templates/eap72-starter-s2i.adoc b/docs/templates/eap72-starter-s2i.adoc
@@ -24,7 +24,7 @@ https://docs.openshift.org/latest/architecture/core_concepts/templates.html#para
 |Variable name |Image Environment Variable |Description |Example value |Required
 
 |`APPLICATION_NAME` | -- | The name for the application. | eap-app | True
-|`EAP_IMAGE_NAME` | -- | Name of the EAP image to use, examples: jboss-eap72-openshift:1.0, jboss-eap72-openjdk11-openshift:1.0 | jboss-eap72-openshift:1.0 | True
+|`EAP_IMAGE_NAME` | -- | Name of the EAP image to use, examples: jboss-eap72-openjdk11-rhel8-openshift:1.0, jboss-eap72-openshift:1.0 | jboss-eap72-openjdk11-rhel8-openshift:1.0 | True
 |`SOURCE_REPOSITORY_URL` | -- | Git source URI for application | https://github.com/jboss-developer/jboss-eap-quickstarts.git | True
 |`SOURCE_REPOSITORY_REF` | -- | Git branch/tag reference | openshift | False
 |`CONTEXT_DIR` | -- | Path within Git project to build; empty for root project directory. | kitchensink | False

diff --git a/docs/templates/eap72-third-party-db-s2i.adoc b/docs/templates/eap72-third-party-db-s2i.adoc
@@ -24,7 +24,7 @@ https://docs.openshift.org/latest/architecture/core_concepts/templates.html#para
 |Variable name |Image Environment Variable |Description |Example value |Required
 
 |`APPLICATION_NAME` | -- | The name for the application. | eap-app | True
-|`EAP_IMAGE_NAME` | -- | Name of the EAP image to use, examples: jboss-eap72-openshift:1.0, jboss-eap72-openjdk11-openshift:1.0 | jboss-eap72-openshift:1.0 | True
+|`EAP_IMAGE_NAME` | -- | Name of the EAP image to use, examples: jboss-eap72-openjdk11-rhel8-openshift:1.0, jboss-eap72-openshift:1.0 | jboss-eap72-openjdk11-rhel8-openshift:1.0 | True
 |`CONFIGURATION_NAME` | -- | The name of the secret containing configuration properties for the datasources. | eap-app-config | True
 |`HOSTNAME_HTTPS` | -- | Custom hostname for https service route.  Leave blank for default hostname, e.g.: secure-<application-name>-<project>.<default-domain-suffix> | -- | False
 |`SOURCE_REPOSITORY_URL` | -- | Git source URI for application | https://github.com/jboss-openshift/openshift-quickstarts | True

diff --git a/docs/templates/eap72-tx-recovery-s2i.adoc b/docs/templates/eap72-tx-recovery-s2i.adoc
@@ -24,7 +24,7 @@ https://docs.openshift.org/latest/architecture/core_concepts/templates.html#para
 |Variable name |Image Environment Variable |Description |Example value |Required
 
 |`APPLICATION_NAME` | -- | The name for the application. | eap-app | True
-|`EAP_IMAGE_NAME` | -- | Name of the EAP image to use, examples: jboss-eap72-openshift:1.0, jboss-eap72-openjdk11-openshift:1.0 | jboss-eap72-openshift:1.0 | True
+|`EAP_IMAGE_NAME` | -- | Name of the EAP image to use, examples: jboss-eap72-openjdk11-rhel8-openshift:1.0, jboss-eap72-openshift:1.0 | jboss-eap72-openjdk11-rhel8-openshift:1.0 | True
 |`SOURCE_REPOSITORY_URL` | -- | Git source URI for application | https://github.com/jboss-openshift/openshift-quickstarts.git | True
 |`SOURCE_REPOSITORY_REF` | -- | Git branch/tag reference | 1.4 | False
 |`CUSTOM_INSTALL_DIRECTORIES` | `CUSTOM_INSTALL_DIRECTORIES` | Additional directories from which to install. | extensions/* | False

diff --git a/image.yaml b/image.yaml
@@ -1,12 +1,12 @@
 schema_version: 1
 
-name: "jboss-eap-7-tech-preview/eap72-openjdk11-openshift"
+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"
-from: "rhel7:7-released"
+from: "ubi8:8.0-122"
 labels:
     - name: "com.redhat.component"
-      value: "jboss-eap-7-eap72-openjdk11-openshift-container"
+      value: "jboss-eap-7-eap72-openjdk11-openshift-rhel8-container"
     - name: "io.k8s.description"
       value: "Platform for building and running JavaEE applications on JBoss EAP 7.2"
     - name: "io.k8s.display-name"
@@ -42,6 +42,8 @@ modules:
       install:
           - name: jboss.container.openjdk.jdk
             version: "11"
+          - name: jboss.container.maven.35.bash
+            version: "3.5"
           - name: eap-7.2-latest
           - name: dynamic-resources
           - name: s2i-common
@@ -62,13 +64,12 @@ modules:
           - name: os-eap-datasource
             version: "1.0"
           - name: jboss.eap.cd.logging
-          - name: jboss.eap.logging.jdk11
           - name: jboss.eap.config.mp-config
           - name: jboss.eap.config.jgroups
           - name: jboss.eap.config.elytron
           - name: jboss.eap.config.tracing
           - name: os-eap-probes
-          - name: jboss-maven
+            version: '2.0'
           - name: os-eap-sso
           - name: os-eap70-sso
           - name: os-eap-hawkular
@@ -80,7 +81,9 @@ modules:
           - name: jboss.container.eap.prometheus.config
             version: '7.2'
           - name: os-eap-txnrecovery.run
-            version: 'python2'
+            version: 'python3'
+          - name: os-eap-python
+            version: '3.6'
 packages:
       content_sets_file: content_sets.yml
 run:
@@ -91,5 +94,5 @@ osbs:
       configuration:
             container_file: container.yaml
       repository:
-            name: containers/jboss-eap-7-tech-preview
-            branch: jb-eap-7.2-openjdk-11-openshift-rhel-7
+            name: containers/jboss-eap-7
+            branch: jb-eap-7.2-openjdk-11-openshift-ubi-8
diff --git a/rel-overrides.yaml b/rel-overrides.yaml
@@ -1,19 +1,25 @@
 schema_version: 1
+
 modules:
-      repositories:
-          - name: cct_module
-            git:
-                  url: https://github.com/jboss-openshift/cct_module.git
-                  ref: sprint-31
-          - name: jboss-eap-modules
-            git:
-                  url: https://github.com/jboss-container-images/jboss-eap-modules.git
-                  ref: eap72-jdk11
-          - name: jboss-eap-7-image
-            git:
-                  url: https://github.com/jboss-container-images/jboss-eap-7-image.git
-                  ref: EAP72-CR5
+  repositories:
+    - name: cct_module
+      git:
+        url: https://github.com/jboss-openshift/cct_module
+        ref: sprint-35
+    - name: jboss-eap-modules
+      git:
+        url: https://github.com/jboss-container-images/jboss-eap-modules.git
+        ref: EAP72_OPENJDK11_1
+    - name: jboss-eap-7-image
+      git:
+        url: https://github.com/jboss-container-images/jboss-eap-7-image.git
+        ref: EAP_721_CR3
 osbs:
-      repository:
-            name: containers/jboss-eap-7-tech-preview
-            branch: jb-eap-7.2-openjdk-11-openshift-rhel-7
+  repository:
+    name: containers/jboss-eap-7
+    branch: jb-eap-7.2-openjdk-11-openshift-ubi-8
+  configuration:
+    container:
+      compose:
+        pulp_repos: true
+        include_unpublished_pulp_repos: true
diff --git a/templates/eap72-amq-persistent-s2i.json b/templates/eap72-amq-persistent-s2i.json
@@ -6,7 +6,7 @@
             "iconClass": "icon-eap",
             "tags": "eap,javaee,java,jboss",
             "version": "1.0.0",
-            "openshift.io/display-name": "JBoss EAP 7.2 + AMQ 7 with passthrough TLS",
+            "openshift.io/display-name": "JBoss EAP 7.2 + AMQ 7 with passthrough TLS (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",
             "template.openshift.io/long-description": "This template defines resources needed to develop a Red Hat JBoss Enterprise Application Platform 7.2 based application, including a build configuration, application deployment configuration, using Red Hat JBoss AMQ with persistence and secure communication using passthrough TLS.",
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openshift:1.0, jboss-eap72-openjdk11-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-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
@@ -6,7 +6,7 @@
             "iconClass": "icon-eap",
             "tags": "eap,javaee,java,jboss,hidden",
             "version": "1.0.0",
-            "openshift.io/display-name": "JBoss EAP 7.2 + AMQ 7 with passthrough TLS",
+            "openshift.io/display-name": "JBoss EAP 7.2 + AMQ 7 with passthrough TLS (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",
             "template.openshift.io/long-description": "This template defines resources needed to develop a Red Hat JBoss Enterprise Application Platform 7.2 based application, including a build configuration, application deployment configuration, using Red Hat JBoss AMQ and secure communication using passthrough TLS.",
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openshift:1.0, jboss-eap72-openjdk11-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-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
@@ -6,7 +6,7 @@
             "iconClass": "icon-eap",
             "tags": "eap,javaee,java,jboss",
             "version": "1.0.0",
-            "openshift.io/display-name": "JBoss EAP 7.2",
+            "openshift.io/display-name": "JBoss EAP 7.2 (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",
             "template.openshift.io/long-description": "This template defines resources needed to develop a Red Hat JBoss Enterprise Application Platform 7.2 based application, including a build configuration, application deployment configuration and secure communication using edge TLS.",
@@ -30,9 +30,9 @@
         },
         {
             "displayName": "EAP Image Name",
-            "description": "Name of the EAP image to use, examples: jboss-eap72-openshift:1.0, jboss-eap72-openjdk11-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-openshift:1.0",
+            "value": "jboss-eap72-openjdk11-openshift-rhel8:1.0",
             "required": true
         },
         {