Merge pull request #415 from jmtd/ubi8-jdk21

[OPENJDK-2411] JDK21 images for UBI8

.github/workflows/ubi8-openjdk-21-runtime.yml

@@ -0,0 +1,10 @@
+name: UBI8 OpenJDK 21 Runtime S2I Image CI
+on: [push, pull_request]
+env:
+  LANG: en_US.UTF-8
+  IMAGE: ubi8-openjdk-21-runtime
+jobs:
+  call-openjdkci:
+    uses: ./.github/workflows/image-workflow-template.yml
+    with:
+      image: ubi8-openjdk-21-runtime

.github/workflows/ubi8-openjdk-21.yml

@@ -0,0 +1,10 @@
+name: UBI8 OpenJDK 21 S2I Image CI
+on: [push, pull_request]
+env:
+  LANG: en_US.UTF-8
+  IMAGE: ubi8-openjdk-21
+jobs:
+  call-openjdkci:
+    uses: ./.github/workflows/image-workflow-template.yml
+    with:
+      image: ubi8-openjdk-21

modules/jdk/11/configure.sh

@@ -5,7 +5,7 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R jboss:root $SCRIPT_DIR
+chown -R $USER:root $SCRIPT_DIR
 chmod -R ug+rwX $SCRIPT_DIR
 chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
 

modules/jdk/17/configure.sh

@@ -5,7 +5,7 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R jboss:root $SCRIPT_DIR
+chown -R $USER:root $SCRIPT_DIR
 chmod -R ug+rwX $SCRIPT_DIR
 chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
 

modules/jdk/21/artifacts/opt/jboss/container/openjdk/jdk/jvm-options

@@ -0,0 +1,10 @@
+
+#!/bin/sh
+# ==============================================================================
+# JDK specific customizations
+#
+# ==============================================================================
+
+function jvm_specific_diagnostics() {
+    echo "-Xlog:gc::utctime -XX:NativeMemoryTracking=summary"
+}

modules/jdk/21/configure.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+# Configure module
+set -e
+
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+chown -R $USER:root $SCRIPT_DIR
+chmod -R ug+rwX $SCRIPT_DIR
+chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
+
+pushd ${ARTIFACTS_DIR}
+cp -pr * /
+popd
+
+# Set this JDK as the alternative in use
+_arch="$(uname -i)"
+alternatives --set java java-21-openjdk.${_arch}
+alternatives --set javac java-21-openjdk.${_arch}
+alternatives --set java_sdk_openjdk java-21-openjdk.${_arch}
+alternatives --set jre_openjdk java-21-openjdk.${_arch}
+
+# Update securerandom.source for quicker starts (must be done after removing jdk 8, or it will hit the wrong files)
+JAVA_SECURITY_FILE=/usr/lib/jvm/java/conf/security/java.security
+SECURERANDOM=securerandom.source
+if grep -q "^$SECURERANDOM=.*" $JAVA_SECURITY_FILE; then
+    sed -i "s|^$SECURERANDOM=.*|$SECURERANDOM=file:/dev/urandom|" $JAVA_SECURITY_FILE
+else
+    echo $SECURERANDOM=file:/dev/urandom >> $JAVA_SECURITY_FILE
+fi

modules/jdk/21/module.yaml

@@ -0,0 +1,34 @@
+schema_version: 1
+
+name: "jboss.container.openjdk.jdk"
+description: "Installs the JDK for OpenJDK 21."
+version: &jdkver "21"
+
+labels:
+- name: "org.jboss.product"
+  value: "openjdk"
+- name: "org.jboss.product.version"
+  value: *jdkver
+- name: "org.jboss.product.openjdk.version"
+  value: *jdkver
+
+envs:
+- name: "JAVA_HOME"
+  value: "/usr/lib/jvm/java-21"
+- name: "JAVA_VENDOR"
+  value: "openjdk"
+- name: "JAVA_VERSION"
+  value: *jdkver
+- name: JBOSS_CONTAINER_OPENJDK_JDK_MODULE
+  value: /opt/jboss/container/openjdk/jdk
+
+packages:
+  install:
+  - java-21-openjdk-devel
+
+modules:
+  install:
+  - name: jboss.container.user
+
+execute:
+- script: configure.sh

modules/jdk/8/configure.sh

@@ -5,7 +5,7 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R jboss:root $SCRIPT_DIR
+chown -R $USER:root $SCRIPT_DIR
 chmod -R ug+rwX $SCRIPT_DIR
 chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
 

modules/jre/11/configure.sh

@@ -7,7 +7,7 @@ echo $SCRIPT_DIR
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 echo $ARTIFACTS_DIR
 
-chown -R jboss:root $SCRIPT_DIR
+chown -R $USER:root $SCRIPT_DIR
 chmod -R ug+rwX $SCRIPT_DIR
 chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jre/*
 

modules/jre/17/configure.sh

@@ -7,7 +7,7 @@ echo $SCRIPT_DIR
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 echo $ARTIFACTS_DIR
 
-chown -R jboss:root $SCRIPT_DIR
+chown -R $USER:root $SCRIPT_DIR
 chmod -R ug+rwX $SCRIPT_DIR
 chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jre/*
 

modules/jre/21/artifacts/opt/jboss/container/openjdk/jre/jvm-options

@@ -0,0 +1,10 @@
+
+#!/bin/sh
+# ==============================================================================
+# JDK specific customizations
+#
+# ==============================================================================
+
+function jvm_specific_diagnostics() {
+    echo "-Xlog:gc::utctime -XX:NativeMemoryTracking=summary"
+}

modules/jre/21/configure.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+# Configure module
+set -e
+
+SCRIPT_DIR=$(dirname $0)
+echo $SCRIPT_DIR
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+echo $ARTIFACTS_DIR
+
+chown -R $USER:root $SCRIPT_DIR
+chmod -R ug+rwX $SCRIPT_DIR
+chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jre/*
+
+pushd ${ARTIFACTS_DIR}
+cp -pr * /
+popd
+
+# Set this JDK as the alternative in use
+_arch="$(uname -i)"
+alternatives --set java java-21-openjdk.${_arch}

modules/jre/21/module.yaml

@@ -0,0 +1,34 @@
+schema_version: 1
+
+name: "jboss.container.openjdk.jre"
+description: "Installs only the JRE headless for OpenJDK 21."
+version: &jdkver "21"
+
+labels:
+- name: "org.jboss.product"
+  value: "openjdk"
+- name: "org.jboss.product.version"
+  value: *jdkver
+- name: "org.jboss.product.openjdk.version"
+  value: *jdkver
+
+envs:
+- name: "JAVA_HOME"
+  value: "/usr/lib/jvm/jre"
+- name: "JAVA_VENDOR"
+  value: "openjdk"
+- name: "JAVA_VERSION"
+  value: *jdkver
+- name: JBOSS_CONTAINER_OPENJDK_JRE_MODULE
+  value: /opt/jboss/container/openjdk/jre
+
+packages:
+  install:
+  - java-21-openjdk-headless
+
+modules:
+  install:
+  - name: jboss.container.user
+
+execute:
+- script: configure.sh

modules/jre/8/configure.sh

@@ -5,7 +5,7 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R jboss:root $SCRIPT_DIR
+chown -R $USER:root $SCRIPT_DIR
 chmod -R ug+rwX $SCRIPT_DIR
 chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jre/*
 

modules/jvm/bash/backward_compatibility.sh

@@ -6,4 +6,4 @@ set -e
 mkdir -p /opt/run-java
 ln -s /opt/jboss/container/java/jvm/* /opt/run-java
 
-chown -R jboss:root /opt/run-java
+chown -R $USER:root /opt/run-java

modules/jvm/bash/configure.sh

@@ -5,7 +5,7 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R jboss:root $SCRIPT_DIR
+chown -R $USER:root $SCRIPT_DIR
 chmod -R ug+rwX $SCRIPT_DIR
 chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/java/jvm/*
 

modules/jvm/bash/module.yaml

@@ -15,5 +15,6 @@ execute:
 
 modules:
   install:
+  - name: jboss.container.user
   - name: jboss.container.java.jvm.api
   - name: jboss.container.java.proxy.bash

modules/maven/default/configure.sh

@@ -6,7 +6,7 @@ SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
 # configure artifact permissions
-chown -R jboss:root $ARTIFACTS_DIR
+chown -R $USER:root $ARTIFACTS_DIR
 chmod -R ug+rwX $ARTIFACTS_DIR
 chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/maven/default/maven.sh
 
@@ -19,11 +19,11 @@ MAVEN_VERSION_SQUASHED=${MAVEN_VERSION/./}
 
 # pull in specific maven version to serve as default
 ln -s /opt/jboss/container/maven/${MAVEN_VERSION_SQUASHED}/* /opt/jboss/container/maven/default
-chown -h jboss:root /opt/jboss/container/maven/default/*
+chown -h $USER:root /opt/jboss/container/maven/default/*
 
 # install default settings.xml file in user home
 mkdir -p $HOME/.m2
 ln -s /opt/jboss/container/maven/default/jboss-settings.xml $HOME/.m2/settings.xml
 
-chown -R jboss:root $HOME/.m2
+chown -R $USER:root $HOME/.m2
 chmod -R ug+rwX $HOME/.m2

modules/maven/default/module.yaml

@@ -16,6 +16,7 @@ execute:
 
 modules:
   install:
+  - name: jboss.container.user
   - name: jboss.container.maven.api
   - name: jboss.container.java.jvm.bash
   - name: jboss.container.maven

modules/maven/s2i/configure.sh

@@ -5,7 +5,7 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R jboss:root $SCRIPT_DIR
+chown -R $USER:root $SCRIPT_DIR
 chmod -R ug+rwX $SCRIPT_DIR
 chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/maven/s2i/*
 chmod ug+x ${ARTIFACTS_DIR}/usr/local/s2i/*

modules/maven/s2i/module.yaml

@@ -32,6 +32,7 @@ execute:
 
 modules:
   install:
+  - name: jboss.container.user
   - name: jboss.container.s2i.core.api
   - name: jboss.container.s2i.core.bash
   - name: jboss.container.maven.default

modules/proxy/bash/backward_compatibility.sh

@@ -6,4 +6,4 @@ set -e
 mkdir -p /opt/run-java
 ln -s /opt/jboss/container/java/proxy/* /opt/run-java
 
-chown -R jboss:root /opt/run-java
+chown -R $USER:root /opt/run-java

modules/proxy/bash/configure.sh

@@ -5,7 +5,7 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R jboss:root $SCRIPT_DIR
+chown -R $USER:root $SCRIPT_DIR
 chmod -R ug+rwX $SCRIPT_DIR
 chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/java/proxy*
 

modules/proxy/bash/module.yaml

@@ -16,4 +16,5 @@ execute:
 
 modules:
   install:
-  - name: jboss.container.proxy.api
+  - name: jboss.container.user
+  - name: jboss.container.proxy.api

modules/run/configure.sh

@@ -5,7 +5,7 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R jboss:root $SCRIPT_DIR
+chown -R $USER:root $SCRIPT_DIR
 chmod -R ug+rwX $SCRIPT_DIR
 chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/java/run/*
 
@@ -15,7 +15,7 @@ popd
 
 mkdir -p /deployments/data \
  && chmod -R "ug+rwX" /deployments/data \
- && chown -R jboss:root /deployments/data
+ && chown -R $USER:root /deployments/data
 
 # OPENJDK-100: turn off negative DNS caching
 if [ -w ${JAVA_HOME}/jre/lib/security/java.security ]; then

modules/run/module.yaml

@@ -57,5 +57,6 @@ execute:
 
 modules:
   install:
+  - name: jboss.container.user
   - name: jboss.container.java.jvm.bash
   - name: jboss.container.util.logging.bash

modules/s2i/bash/configure.sh

@@ -5,7 +5,7 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R jboss:root $SCRIPT_DIR
+chown -R $USER:root $SCRIPT_DIR
 chmod -R ug+rwX $SCRIPT_DIR
 chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/java/s2i/*
 chmod ug+x ${ARTIFACTS_DIR}/usr/local/s2i/*

modules/s2i/bash/module.yaml

@@ -20,6 +20,7 @@ execute:
 
 modules:
   install:
+  - name: jboss.container.user
   - name: jboss.container.maven.s2i
   - name: jboss.container.java.run
   - name: jboss.container.util.logging.bash

modules/s2i/core/api/module.yaml

@@ -119,3 +119,7 @@ envs:
 run:
   cmd:
   - "/usr/local/s2i/run"
+
+modules:
+  install:
+    - name: jboss.container.user

modules/s2i/core/bash/configure.sh

@@ -5,7 +5,7 @@ set -e
 SCRIPT_DIR=$(dirname $0)
 ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
-chown -R jboss:root $SCRIPT_DIR
+chown -R $USER:root $SCRIPT_DIR
 chmod -R ug+rwX $SCRIPT_DIR
 chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/s2i/core/*
 
@@ -15,8 +15,8 @@ popd
 
 mkdir -p /usr/local/s2i \
  && chmod 775 /usr/local/s2i \
- && chown -R jboss:root /usr/local/s2i
+ && chown -R $USER:root /usr/local/s2i
 
 mkdir -p /deployments \
  && chmod -R "ug+rwX" /deployments \
- && chown -R jboss:root /deployments
+ && chown -R $USER:root /deployments

modules/user/configure.sh

@@ -5,7 +5,7 @@ set -e
 # We use the ID 185 for the group as well as for the user.
 # This ID is registered static ID for the JBoss EAP product
 # on RHEL which makes it safe to use.
-groupadd -r jboss -g 185 && useradd -u 185 -r -g root -G jboss -m -d /home/jboss -s /sbin/nologin -c "JBoss user" jboss
+groupadd -r $USER -g $UID && useradd -u $UID -r -g root -G $USER -m -d $HOME -s /sbin/nologin -c "$GECOS" $USER
 
 # OPENJDK-533, OPENJDK-556: correct permissions for OpenShift etc
-chmod 0770 /home/jboss
+chmod 0770 $HOME