Merge pull request #556 from jmtd/3591-merge-back-jlink

OPENJDK-3591 merge back jlink

Author: jmtd

.github/workflows/gendocs.yml

@@ -41,13 +41,13 @@ jobs:
           ./gendocs.sh
 
       - name: Setup Pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v5
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           path: 'docs'
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4

.github/workflows/image-workflow-template.yml

@@ -23,7 +23,7 @@ jobs:
         run:  docker pull registry.access.redhat.com/ubi9/ubi-minimal:latest
 
       - name: Install CEKit
-        uses: cekit/[email protected].5
+        uses: cekit/[email protected].7
 
       - name: Build
         run: |
@@ -45,18 +45,4 @@ jobs:
       - name: Behave Tests
         run: |
           echo /home/runner/work/_temp/openshift-bin >> $GITHUB_PATH
-          cekit -v --descriptor ${{ inputs.image }}.yaml test --image localimage behave --steps-url https://github.com/jmtd/behave-test-steps
-
-      - if: github.event_name == 'push'
-        name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - if: github.event_name == 'push'
-        name: Tag and push container image
-        run: |
-          docker tag localimage ${{ env.IMAGE_URI }}
-          docker push ${{ env.IMAGE_URI }}
+          cekit -v --descriptor ${{ inputs.image }}.yaml test behave

README.adoc

@@ -17,14 +17,14 @@ link:https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI[UBI
 link:https://access.redhat.com/documentation/en-us/openjdk/17[Red Hat provide
 Product documentation for customers]. Tables of environment variables used for
 image configuration are published to
-<https://jboss-container-images.github.io/openjdk/>. These tables are automatically
+<https://rh-openjdk.github.io/redhat-openjdk-containers/>. These tables are automatically
 updated for every tagged release, and every commit to the development branches.
 
 Older RHEL7 and RHEL8-based image sources are in the `rhel7` and `ubi8` branches respectively.
 
 ## How to build the images
 
-You need to https://cekit.readthedocs.io/en/develop/installation.html[install Cekit] to build these images.
+You need to https://docs.cekit.io/en/latest/handbook/installation/index.html[install Cekit] to build these images.
 
 These sources are prepared and tested for Cekit 4.1.1.
 

docs/README.adoc

@@ -1,10 +1,11 @@
-# Red Hat UBI OpenJDK container images
+= Red Hat UBI OpenJDK container images
+:toc: right
 
 This is auto-generated documentation for the
 link:https://www.redhat.com/en/blog/introducing-red-hat-universal-base-image[Red
 Hat Universal Base Image] (UBI) OpenJDK container images.
 
-* link:https://github.com/jboss-container-images/openjdk[container image source repository]
+* link:https://rh-openjdk.github.io/redhat-openjdk-containers/[container image source repository]
 
 Container images are available from the
 link:https://catalog.redhat.com/software/containers/explore[Red Hat Ecosystem

gendocs.sh

@@ -67,18 +67,16 @@ workdir="$(mktemp -td gendocs.XXXXXX)"
 cp ./gendocs.py "$workdir/gendocs.py"
 cp ./docs/README.adoc "$workdir/README.adoc"
 
-# documentation for development branches
-addToIndex "\n== Development branches ==\n"
-for branch in ubi8 ubi9; do
-    addToIndex "\n=== $branch ===\n"
-    handleRef "$branch" "$branch"
-done
-
-# documentation for tagged releases
-addToIndex "\n== Released images =="
-for tag in $(git tag -l 'ubi?-openjdk-containers*' | sort -r); do
-    addToIndex "\n=== $tag ===\n"
-    handleRef "$tag"
+for ubi in ubi9 ubi8; do
+    UBI=${ubi^^}
+    addToIndex "\n== $UBI\n"
+    addToIndex "\n=== development\n"
+    handleRef "$ubi"
+    for tag in $(git tag -l "${ubi}-openjdk-containers*" | sort -r); do
+        version=${tag/${ubi}-openjdk-containers-/}
+        addToIndex "\n=== $version\n"
+        handleRef "$tag"
+    done
 done
 
 asciidoctor "$workdir/README.adoc" -o docs/index.html

modules/jdk/11/module.yaml

@@ -30,6 +30,7 @@ packages:
 modules:
   install:
   - name: jboss.container.user
+  - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh

modules/jdk/17/module.yaml

@@ -29,6 +29,7 @@ packages:
 modules:
   install:
   - name: jboss.container.user
+  - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh

modules/jdk/21/module.yaml

@@ -30,6 +30,7 @@ packages:
 modules:
   install:
   - name: jboss.container.user
+  - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh

modules/jdk/8/module.yaml

@@ -29,6 +29,7 @@ packages:
 modules:
   install:
   - name: jboss.container.user
+  - name: jboss.container.openjdk
 
 execute:
 - script: configure.sh

modules/jdk/module.yaml

@@ -0,0 +1,5 @@
+schema_version: 1
+
+name: "jboss.container.openjdk"
+description: "A dummy descriptor to couple tests with jdk modules"
+version: "0"