Merge pull request #42 from jfdenise/ubi9

Initial UBI9 images for EAP 8.1

Author: jmesnil

README.md

@@ -90,5 +90,5 @@ that contains the server and application is based on the EAP 8 runtime image.
 
 # Image runtime API
 
-When running an EAP 8 server inside the EAP 8 runtime or S2I builder image, you can use [these environment variables](https://github.com/jboss-container-images/openjdk/blob/develop/modules/jvm/api/module.yaml) to configure the Java VM.
+When running an EAP 8 server inside the EAP 8 runtime or S2I builder image, you can use [these environment variables](https://github.com/rh-openjdk/redhat-openjdk-containers/blob/ubi9/modules/jvm/module.yaml) to configure the Java VM.
 The EAP 8 runtime and S2I builder images are exposing a set of [environment variables](https://github.com/wildfly/wildfly-cekit-modules/blob/main/jboss/container/wildfly/run/api/module.yaml) to fine tune the server execution.

builder-image/README.md

@@ -1,10 +1,10 @@
 
 Build with podman:
 
-* JDK17: `cekit --redhat build --overrides image-jdk17-overrides.yaml podman`
+* JDK17: `cekit --redhat build podman`
 * JDK21: `cekit --redhat build --overrides image-jdk21-overrides.yaml podman`
 
 Build with OSBS:
 
-* JDK17: `cekit --redhat build --overrides image-jdk17-overrides.yaml --overrides rh-jdk17-overrides.yaml osbs`
+* JDK17: `cekit --redhat build --overrides rh-jdk17-overrides.yaml osbs`
 * JDK21: `cekit --redhat build --overrides image-jdk21-overrides.yaml --overrides rh-jdk21-overrides.yaml osbs`

builder-image/content_sets_rhel8.yml

@@ -1,43 +1,21 @@
 schema_version: 1
 
-name: &imgName "jboss-eap-8/eap8-openjdk21-builder-openshift-rhel9"
-# This OSBS Base Image is designed and engineered to be the base layer for
-# Red Hat products. This base image is only supported for approved Red Hat
-# products. This image is maintained by Red Hat and updated regularly.
-from: registry.redhat.io/rhel9-osbs/osbs-ubi9-minimal
+name: &imgName "jboss-eap-8-tech-preview/eap81-openjdk21-builder-openshift-rhel9"
 labels:
     - name: "org.jboss.product"
-      value: "eap8-openjdk21-builder"
+      value: "eap81-openjdk21-builder"
     - name: "com.redhat.component"
-      value: "jboss-eap8-openjdk21-builder-openshift-container"
+      value: "jboss-eap81-openjdk21-builder-openshift-container"
     - name: name
       value: *imgName
 
 envs:
-    - name: LOGGING_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: IMAGE_NAME
       value: *imgName
 
 modules:
-      repositories:
-          - name: openjdk
-            git:
-              url: https://github.com/rh-openjdk/redhat-openjdk-containers
-              ref: ubi9-wildfly-container-33.0
-          - name: wildfly-cekit-modules
-            git:
-              url: https://github.com/wildfly/wildfly-cekit-modules
-              ref: 0.29.alpha1.ubi9.1
       install:
-          - name: jboss.container.user
-            version: "2.0+jboss1"
           - name: jboss.container.openjdk.jdk
             version: "21"
-          - name: jboss.container.wildfly.dynamic-resources
-            version: "2.0"
           - name: jboss.container.maven
             version: "3.8.21"
-          - name: jboss.container.wildfly.run
-            version: "2.0"

builder-image/image-jdk17-overrides.yaml

@@ -1,23 +1,23 @@
 schema_version: 1
 
-name: &imgName "jboss-eap-8/eap8-openjdk11-builder-openshift-rhel8"
-description: "Red Hat JBoss Enterprise Application Platform 8 OpenShift S2I Builder image."
-version: &imgVersion "1.0.1.GA"
-from: "registry.access.redhat.com/ubi8/ubi-minimal"
+name: &imgName "jboss-eap-8-tech-preview/eap81-openjdk17-builder-openshift-rhel9"
+description: "Red Hat JBoss Enterprise Application Platform 8.1 OpenShift S2I Builder image."
+version: &imgVersion "1.0.0.Beta"
+from: "registry.access.redhat.com/ubi9/ubi-minimal"
 # Warning, we must use cekit min version 4.3.0 in order for the labels to be set at the end of the build and override JDK modules ones.
 labels:
     - name: name
       value: *imgName
     - name: "org.jboss.product"
-      value: "eap8-openjdk11-builder"
+      value: "eap81-openjdk17-builder"
     - name: "org.jboss.product.version"
       value: *imgVersion
     - name: "com.redhat.component"
-      value: "jboss-eap8-openjdk11-builder-openshift-container"
+      value: "jboss-eap81-openjdk17-builder-openshift-container"
     - name: io.k8s.description
-      value: "Platform for building and running Jakarta EE applications on JBoss EAP 8"
+      value: "Platform for building and running Jakarta EE applications on JBoss EAP 8.1"
     - name: io.k8s.display-name
-      value: "JBoss EAP 8 S2I builder"
+      value: "JBoss EAP 8.1 S2I builder"
     - name: io.openshift.expose-services
       value: "8080:http"
     - name: io.openshift.tags
@@ -31,6 +31,9 @@ labels:
     - name: "com.redhat.deployments-dir"
       value: "/opt/server/standalone/deployments"
 envs:
+    - name: LOGGING_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: IMAGE_NAME
       value: *imgName
     - name: IMAGE_VERSION
@@ -52,21 +55,26 @@ modules:
       repositories:
           - name: openjdk
             git:
-              url: https://github.com/jboss-container-images/openjdk
-              ref: wildfly-container-29.0
+              url: https://github.com/rh-openjdk/redhat-openjdk-containers
+              ref: ubi9-wildfly-container-33.0
           - name: wildfly-cekit-modules
             git:
               url: https://github.com/wildfly/wildfly-cekit-modules
-              ref: 0.29.alpha1.3
+              ref: 0.33.0
           - name: eap-modules
             path: ../modules
       install:
+          - name: jboss.container.user
+            version: "2.0+jboss1"
           - name: jboss.container.openjdk.jdk
-            version: "11"
+            version: "17"
           - name: jboss.container.maven
-            version: "8.6.3.6.11"
+            version: "3.8.17"
           - name: jboss.container.wildfly.dynamic-resources
+            version: "2.0"
           - name: jboss.container.maven.s2i
+          - name: jboss.container.wildfly.run
+            version: "2.0"
           - name: jboss.container.wildfly.s2i.legacy
           - name: jboss.container.eap.s2i-eap.bash
           - name: jboss.container.eap.cleanup

builder-image/image-jdk21-overrides.yaml

@@ -1,7 +1,7 @@
 schema_version: 1
 
 packages:
-  content_sets_file: content_sets_rhel8.yml
+  content_sets_file: content_sets_rhel9.yml
 
 osbs:
   configuration:
@@ -16,5 +16,5 @@ osbs:
         pulp_repos: true
         signing_intent: release
   repository:
-    name: containers/jboss-eap8-openjdk17-builder-openshift 
-    branch: jb-eap-8.0-rhel-8
+    name: containers/jboss-eap81-openjdk17-builder-openshift 
+    branch: jb-eap-8.1-rhel-9

builder-image/image.yaml

@@ -11,9 +11,10 @@ osbs:
           - x86_64
           - s390x
           - ppc64le
+          - aarch64
       compose:
         pulp_repos: true
         signing_intent: release
   repository:
-    name: containers/jboss-eap8-openjdk21-builder-openshift
-    branch: jb-eap-8.0-rhel-9
+    name: containers/jboss-eap81-openjdk21-builder-openshift
+    branch: jb-eap-8.1-rhel-9

builder-image/rh-jdk11-overrides.yaml

@@ -1,12 +1,13 @@
 @jboss-eap-8
+@jboss-eap-8-tech-preview
 Feature: EAP basic tests
 
   Scenario: Check that the legacy default config provisioned using galleon plugin works fine
    Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app-default-config with env and True using eap8-dev
    | variable                 | value           |
    | S2I_SERVER_DIR | server |
    ### PLACEHOLDER FOR CLOUD CUSTOM TESTING ###
-   Then container log should contain Running jboss-eap-8/
+   Then container log should contain Running jboss-eap-8-tech-preview/
    Then exactly 2 times container log should contain WFLYSRV0025:
 
   Scenario:  Test ENV_FILES just to validate that there is no side effect
@@ -25,7 +26,7 @@ Feature: EAP basic tests
    Given s2i build https://github.com/jboss-container-images/jboss-eap-8-openshift-image from test/test-app with env and True using eap8-dev
    | variable                 | value           |
    ### PLACEHOLDER FOR CLOUD CUSTOM TESTING ###
-   Then container log should contain Running jboss-eap-8/
+   Then container log should contain Running jboss-eap-8-tech-preview/
    Then exactly 2 times container log should contain WFLYSRV0025:
 
   Scenario:  Test basic deployment