Split jlink TP into separate image descriptor

Signed-off-by: Jonathan Dowland <[email protected]>

Author: jmtd

openjdk-21-jlink-rhel9.yaml

@@ -0,0 +1,64 @@
+# This is an Image descriptor for Cekit
+
+schema_version: 1
+
+from: "registry.access.redhat.com/ubi9/ubi-minimal"
+name: &name "openjdk-tech-preview/openjdk-21-jlink-rhel9"
+version: &version "1.23"
+description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 21"
+
+labels:
+- name: "io.k8s.description"
+  value: "Platform for building and running plain Java applications (fat-jar and flat classpath)"
+- name: "io.k8s.display-name"
+  value: "Java Applications"
+- name: "io.openshift.tags"
+  value: "builder,java"
+- name: "maintainer"
+  value: "Red Hat OpenJDK <[email protected]>"
+- name: "com.redhat.component"
+  value: "openjdk-21-jlink-tech-preview-ubi9-container"
+- name: "usage"
+  value: &docs "https://rh-openjdk.github.io/redhat-openjdk-containers/"
+- name: "com.redhat.license_terms"
+  value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
+- name: "org.opencontainers.image.documentation"
+  value: *docs
+- name: "name"
+  value: *name
+- name: "version"
+  value: *version
+
+envs:
+- name: PATH
+  value: $PATH:"/usr/local/s2i"
+- name: "JBOSS_IMAGE_NAME"
+  value: *name
+- name: "JBOSS_IMAGE_VERSION"
+  value: *version
+- name: "LANG"
+  value: "C.utf8"
+
+ports:
+- value: 8080
+- value: 8443
+
+modules:
+  repositories:
+  - path: modules
+  install:
+  - name: jboss.container.util.pkg-update
+  - name: jboss.container.openjdk.jdk
+    version: "21"
+  - name: jboss.container.maven
+    version: "3.9.21"
+  - name: jboss.container.util.tzdata
+  - name: jboss.container.java.s2i.bash
+  - name: jboss.container.util.tzdata
+  - name: jboss.container.java.jlink
+
+help:
+  add: true
+
+packages:
+  manager: microdnf

redhat/openjdk-21-jlink-rhel9.yaml

@@ -0,0 +1,33 @@
+# 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
+osbs:
+  configuration:
+    container:
+      compose:
+        pulp_repos: true
+        packages:
+        - java-21-openjdk
+        - java-21-openjdk-devel
+        - java-21-openjdk-headless
+        signing_intent: release
+  repository:
+    name: containers/openjdk
+    branch: openjdk-21-jlink-tech-preview-ubi9
+
+packages:
+  manager: microdnf
+  content_sets:
+    x86_64:
+    - rhel-9-for-x86_64-baseos-rpms
+    - rhel-9-for-x86_64-appstream-rpms
+    ppc64le:
+    - rhel-9-for-ppc64le-baseos-rpms
+    - rhel-9-for-ppc64le-appstream-rpms
+    aarch64:
+    - rhel-9-for-aarch64-baseos-rpms
+    - rhel-9-for-aarch64-appstream-rpms
+    s390x:
+    - rhel-9-for-s390x-baseos-rpms
+    - rhel-9-for-s390x-appstream-rpms

redhat/ubi9-openjdk-21.yaml

@@ -14,7 +14,7 @@ osbs:
         signing_intent: release
   repository:
     name: containers/openjdk
-    branch: openjdk-21-jlink-tech-preview-ubi9
+    branch: openjdk-21-ubi9
 
 packages:
   manager: microdnf

ubi9-openjdk-21.yaml

@@ -3,7 +3,7 @@
 schema_version: 1
 
 from: "registry.access.redhat.com/ubi9/ubi-minimal"
-name: &name "openjdk-tech-preview/openjdk-21-jlink-rhel9"
+name: &name "ubi9/openjdk-21"
 version: &version "1.23"
 description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 21"
 
@@ -17,7 +17,7 @@ labels:
 - name: "maintainer"
   value: "Red Hat OpenJDK <[email protected]>"
 - name: "com.redhat.component"
-  value: "openjdk-21-jlink-tech-preview-ubi9-container"
+  value: "openjdk-21-ubi9-container"
 - name: "usage"
   value: &docs "https://rh-openjdk.github.io/redhat-openjdk-containers/"
 - name: "com.redhat.license_terms"