Merge pull request #394 from luck3y/CLOUD-3860

CLOUD-3860 EAP XP 2.0 OpenShift Image

eap-xp2/.gitignore

@@ -0,0 +1 @@
+target

eap-xp2/container.yaml

@@ -0,0 +1,6 @@
+compose:
+  pulp_repos: true
+platforms:
+  only:
+  - x86_64
+

eap-xp2/content_sets_rhel7.yml

@@ -0,0 +1,4 @@
+x86_64:
+- rhel-server-rhscl-7-rpms
+- rhel-7-server-rpms
+

eap-xp2/content_sets_rhel8.yml

@@ -0,0 +1,11 @@
+x86_64:
+  - rhel-8-for-x86_64-baseos-rpms
+  - rhel-8-for-x86_64-appstream-rpms
+s390x:
+  - rhel-8-for-s390x-baseos-rpms
+  - rhel-8-for-s390x-appstream-rpms
+  - openj9-1-for-rhel-8-s390x-rpms
+ppc64le:
+  - rhel-8-for-ppc64le-baseos-rpms
+  - rhel-8-for-ppc64le-appstream-rpms
+  - openj9-1-for-rhel-8-ppc64le-rpms

eap-xp2/image.yaml

@@ -0,0 +1,134 @@
+schema_version: 1
+
+name: "jboss-eap-7/eap-xp2-openjdk11-openshift-rhel8"
+description: "Red Hat JBoss Enterprise Application Platform XP 2.0 OpenShift container image."
+version: "2.0"
+from: "registry.redhat.io/ubi8/ubi:latest"
+labels:
+    - name: "com.redhat.component"
+      value: "jboss-eap-7-xp2-openjdk11-openshift-rhel8-container"
+    - name: "io.k8s.description"
+      value: "Platform for building and running JavaEE applications on JBoss EAP XP 2.0"
+    - name: "io.k8s.display-name"
+      value: "JBoss EAP XP"
+    - name: "io.openshift.expose-services"
+      value: "8080:http"
+    - name: "io.openshift.tags"
+      value: "builder,javaee,eap,eap7,eap-xp"
+    - name: "io.openshift.s2i.scripts-url"
+      value: "image:///usr/local/s2i"
+    - name: "maintainer"
+      value: "Red Hat"
+envs:
+    - name: HTTPS_ENABLE_HTTP2
+      value: "true"
+    - name: SCRIPT_DEBUG
+      description: If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed.
+      example: "true"
+ports:
+    - value: 8443
+modules:
+      repositories:
+          - name: cct_module
+            git:
+                  url: https://github.com/jboss-openshift/cct_module.git
+                  ref: 0.39.0
+          - name: jboss-eap-modules
+            git:
+                  url: https://github.com/jboss-container-images/jboss-eap-modules.git
+                  ref: EAP_XP_2_CR1
+          - name: jboss-eap-7-image
+            git:
+                  url: https://github.com/jboss-container-images/jboss-eap-7-image.git
+                  ref: EAP_XP_2_CR1_1
+          - name: wildfly-cekit-modules
+            git:
+                  url: https://github.com/wildfly/wildfly-cekit-modules.git
+                  ref: 0.18.8
+      install:
+          - name: jboss.container.openjdk.jdk
+            version: "11"
+          - name: jboss.container.maven.35.bash
+            version: "3.5"
+          - name: eap-xp-20-env
+            version: "1.0.0"
+          - name: jboss.container.eap.setup
+          - name: eap-install-cleanup
+          # This one indirectly installs common logging by creating a link to $BIN_HOME/bin/launch
+          # so must be after jboss.container.eap.cd
+          - name: jboss.container.maven.default.bash
+          - name: dynamic-resources
+          - name: jboss.container.eap.s2i.galleon
+          - name: jboss.container.eap.galleon
+          - name: jboss.container.eap.galleon.config.mp
+          - name: jboss.container.eap.galleon.build-settings
+            version: "public"
+          - name: jboss.container.eap.openshift.modules
+          - name: os-eap-activemq-rar
+            version: "1.1"
+          - name: jboss.container.eap.amq6
+          - name: jboss.container.java.jvm.bash
+          - name: jboss.container.eap.launch
+          - name: jboss.container.wildfly.launch.admin
+          - name: jboss.container.wildfly.launch.access-log-valve
+          - name: jboss.container.wildfly.launch-config.config
+          - name: jboss.container.wildfly.launch-config.os
+          - name: jboss.container.wildfly.launch.datasources
+          - name: jboss.container.wildfly.launch.extensions
+          - name: jboss.container.wildfly.launch.json-logging
+          - name: jboss.container.wildfly.launch.jgroups
+          - name: jboss.container.wildfly.launch.filters
+          - name: jboss.container.wildfly.launch.logger-category
+          - name: jboss.container.wildfly.launch.mp-config
+          - name: jboss.container.wildfly.launch.os.node-name
+          - name: jboss.container.wildfly.launch.tracing
+          - name: jboss.container.wildfly.launch.deployment-scanner
+          - name: jboss.container.wildfly.launch.keycloak
+          - name: jboss.container.wildfly.launch.https
+          - name: jboss.container.wildfly.launch.security-domains
+          - name: jboss.container.wildfly.launch.elytron
+          - name: jboss.container.wildfly.launch.port-offset
+          - name: jboss.container.wildfly.launch.resource-adapters
+          - name: jboss.container.wildfly.launch.messaging
+          - name: jboss.container.wildfly.galleon.fp-content.keycloak
+          - name: jboss.container.wildfly.galleon.fp-content.jolokia
+          - name: jboss.container.wildfly.galleon.fp-content.java
+          - name: jboss.container.wildfly.galleon.fp-content.mvn
+          - name: jboss.container.wildfly.galleon.fp-content.ejb-tx-recovery
+          - name: os-eap-probes
+            version: "3.0"
+          - name: os-eap70-sso
+          # We keep this one to only advertise that hawkular is no more supported.
+          - name: jboss.container.eap.hawkular
+          - name: openshift-layer
+          - name: openshift-passwd
+          - name: jboss.container.util.logging.bash
+          - name: jboss.container.eap.prometheus.config
+          - name: os-eap-txnrecovery.run
+            version: 'python3'
+
+          # At this point, all scripts must have been added to JBOSS_HOME and to custom galleon packages location
+          - name: jboss.container.wildfly.galleon.build-feature-pack
+          - name: jboss.container.wildfly.galleon.provision-server
+          - name: jboss.container.eap.final-setup
+
+# note that building in OSBS using ODCS requires a content set to be specified, these are done in the overrides
+# cekit doesn't appear to allow this to be overriden from a default
+#packages:
+#      content_sets_file: content_sets.yml
+
+artifacts:
+  - name: maven-repo
+    target: maven-repo.zip
+    md5: 4332f2181b4cd378bd3e360610020e69
+
+run:
+      user: 185
+      cmd:
+          - "/opt/eap/bin/openshift-launch.sh"
+osbs:
+      configuration:
+            container_file: container.yaml
+      repository:
+            name: containers/jboss-eap-xp2-openjdk11-builder
+            branch: jb-eap-7.3-openshift-rhel-8

eap-xp2/rel-j9-11-xp-overrides.yaml

@@ -0,0 +1,41 @@
+schema_version: 1
+
+name: "jboss-eap-7/eap-xp2-openj9-11-openshift-rhel8"
+description: "Red Hat JBoss Enterprise Application Platform XP 2.0 OpenShift container image."
+
+labels:
+      - name: "com.redhat.component"
+        value: "jboss-eap-7-xp2-openj9-11-openshift-rhel8-container"
+
+modules:
+      install:
+          - name: jboss.container.eap.galleon.build-settings
+            version: "osbs"
+          - name: os-eap-python
+            version: '3.6'
+          - name: jboss.container.java.rm-openjdk
+          - name: jboss.container.openjdk.jdk
+            version: "openj9-11"
+
+packages:
+  manager: dnf
+  content_sets_file: content_sets_rhel8.yml
+
+osbs:
+  configuration:
+    container:
+      platforms:
+        only:
+          - s390x
+          - ppc64le
+      compose:
+        pulp_repos: true
+        packages:
+          - java-11-openj9
+          - java-11-openj9-headless
+          - java-11-openj9-devel
+        signing_intent: release
+        inherit: true
+  repository:
+    name:  containers/jboss-eap-xp2-openj9-11-builder
+    branch: jb-eap-7.3-openshift-rhel-8

eap-xp2/rel-jdk11-xp-overrides.yaml

@@ -0,0 +1,17 @@
+schema_version: 1
+
+modules:
+      install:
+          - name: jboss.container.eap.galleon.build-settings
+            version: "osbs"
+          - name: os-eap-python
+            version: '3.6'
+
+packages:
+  manager: dnf
+  content_sets_file: content_sets_rhel8.yml
+
+osbs:
+      repository:
+            name:  containers/jboss-eap-xp2-openjdk11-builder
+            branch: jb-eap-7.3-openshift-rhel-8

eap-xp2/rel-jdk8-xp-overrides.yaml

@@ -0,0 +1,32 @@
+schema_version: 1
+
+name: "jboss-eap-7/eap-xp2-openjdk8-openshift-rhel7"
+from: "registry.redhat.io/ubi7/ubi:latest"
+
+labels:
+    - name: "com.redhat.component"
+      value: "jboss-eap-7-xp2-openjdk8-openshift-rhel7-container"
+
+modules:
+      install:
+          - name: jboss.container.openjdk.jdk
+            version: "8"
+          - name: jboss.container.maven.35.bash
+            version: "3.5scl"
+          - name: jboss.container.eap.galleon.build-settings
+            version: "osbs"
+          - name: os-eap-txnrecovery.run
+            version: 'python2'
+          - name: os-eap-probes
+            version: "2.0"
+
+packages:
+  manager: yum
+  content_sets_file: content_sets_rhel7.yml
+
+osbs:
+      repository:
+            name: containers/jboss-eap-xp2-openjdk8-builder
+            branch: jb-eap-7.3-openshift-rhel-7
+
+

eap-xp2/runtime-image/.gitignore

@@ -0,0 +1 @@
+target

eap-xp2/runtime-image/content_sets_rhel7.yml

@@ -0,0 +1,3 @@
+x86_64:
+- rhel-7-server-rpms
+

eap-xp2/runtime-image/content_sets_rhel8.yml

@@ -0,0 +1,11 @@
+x86_64:
+  - rhel-8-for-x86_64-baseos-rpms
+  - rhel-8-for-x86_64-appstream-rpms
+s390x:
+  - rhel-8-for-s390x-baseos-rpms
+  - rhel-8-for-s390x-appstream-rpms
+  - openj9-1-for-rhel-8-s390x-rpms
+ppc64le:
+  - rhel-8-for-ppc64le-baseos-rpms
+  - rhel-8-for-ppc64le-appstream-rpms
+  - openj9-1-for-rhel-8-ppc64le-rpms

eap-xp2/runtime-image/image.yaml

@@ -0,0 +1,74 @@
+schema_version: 1
+
+name: "jboss-eap-7/eap-xp2-openjdk11-runtime-openshift-rhel8"
+description: "Red Hat JBoss Enterprise Application Platform XP 2.0 OpenShift runtime image with OpenJDK 11"
+version: "2.0"
+from: "registry.redhat.io/ubi8/ubi:latest"
+labels:
+    - name: "com.redhat.component"
+      value: "jboss-eap-7-xp2-openjdk11-runtime-openshift-rhel8-container"
+    - name: "io.k8s.description"
+      value: "Base runtime image to run EAP XP server and application"
+    - name: "io.k8s.display-name"
+      value: "JBoss EAP XP runtime image"
+    - name: "io.openshift.expose-services"
+      value: "8080:http"
+    - name: "io.openshift.tags"
+      value: "javaee,eap,eap7"
+    - name: "maintainer"
+      value: "Red Hat"
+envs:
+    - name: "LAUNCH_JBOSS_IN_BACKGROUND"
+      value: "true"
+    - name: HTTPS_ENABLE_HTTP2
+      value: "true"
+    - name: SCRIPT_DEBUG
+      description: If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed.
+      example: "true"
+    - name: JBOSS_HOME
+      value: "/opt/eap"
+    # env var set by modules in the builder image context, duplicating them here.
+    - name: JBOSS_MODULES_SYSTEM_PKGS
+      value: "org.jboss.logmanager,jdk.nashorn.api"
+    - name: DEFAULT_ADMIN_USERNAME
+      value: "eapadmin"
+    - name: MICROPROFILE_CONFIG_DIR_ORDINAL
+      value: "500"
+    - name: SSO_FORCE_LEGACY_SECURITY
+      value: "true"
+ports:
+    - value: 8443
+    - value: 8080
+    - value: 8787
+      expose: false
+modules:
+      repositories:
+          - name: cct_module
+            git:
+                  url: https://github.com/jboss-openshift/cct_module.git
+                  ref: 0.39.0
+          - name: jboss-eap-modules
+            git:
+                  url: https://github.com/jboss-container-images/jboss-eap-modules.git
+                  ref: EAP_XP_2_CR1
+      install:
+          - name: jboss.container.openjdk.jdk
+            version: "11"
+          - name: dynamic-resources
+          - name: jboss.container.jolokia.bash
+          - name: jboss.container.util.logging.bash
+          - name: jboss.container.eap.prometheus.runtime
+          - name: os-eap-txnrecovery.run
+            version: 'python3'
+
+packages:
+      install:
+          # required by launch scripts
+          - hostname
+osbs:
+      configuration:
+            container_file: ../container.yaml
+      repository:
+            name: containers/jboss-eap-xp2-openjdk11-runtime
+            branch: jb-eap-7.3-openshift-rhel-8
+

eap-xp2/runtime-image/rel-j9-11-xp-overrides.yaml

@@ -0,0 +1,42 @@
+schema_version: 1
+
+name: "jboss-eap-7/eap-xp2-openj9-11-runtime-openshift-rhel8"
+description: "Red Hat JBoss Enterprise Application Platform XP 2.0 OpenShift runtime image with Openj9-11"
+
+labels:
+      - name: "com.redhat.component"
+        value: "jboss-eap-7-xp2-openj9-11-runtime-openshift-rhel8-container"
+modules:
+      install:
+          - name: os-eap-python
+            version: '3.6'
+          - name: jboss.container.openjdk.jdk
+            version: "openj9-11"
+
+
+
+packages:
+     content_sets_file: content_sets_rhel8.yml
+     install:
+         # required by probes (python 3)
+         - python3-requests
+
+osbs:
+  configuration:
+    container:
+      platforms:
+        only:
+          - s390x
+          - ppc64le
+      compose:
+        pulp_repos: true
+        packages:
+          - java-11-openj9
+          - java-11-openj9-headless
+          - java-11-openj9-devel
+        signing_intent: release
+        inherit: true
+
+  repository:
+    name:  containers/jboss-eap-xp2-openj9-11-runtime
+    branch: jb-eap-7.3-openshift-rhel-8