Skip to content

Commit e52e69e

Browse files
sefrobergsefroberg
committed
Attempt to merge ubi9 branch content back to jlink-dev branch.
1 parent 8e77d86 commit e52e69e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+770
-46
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
run: docker pull registry.access.redhat.com/ubi9/ubi-minimal:latest
2424

2525
- name: Install CEKit
26-
uses: cekit/[email protected].5
26+
uses: cekit/[email protected].7
2727

2828
- name: Build
2929
run: |

‎README.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ link:https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI[UBI
1717
link:https://access.redhat.com/documentation/en-us/openjdk/17[Red Hat provide
1818
Product documentation for customers]. Tables of environment variables used for
1919
image configuration are published to
20-
<https://jboss-container-images.github.io/openjdk/>. These tables are automatically
20+
<https://rh-openjdk.github.io/redhat-openjdk-containers/>. These tables are automatically
2121
updated for every tagged release, and every commit to the development branches.
2222

2323
Older RHEL7 and RHEL8-based image sources are in the `rhel7` and `ubi8` branches respectively.
2424

2525
## How to build the images
2626

27-
You need to https://cekit.readthedocs.io/en/develop/installation.html[install Cekit] to build these images.
27+
You need to https://docs.cekit.io/en/latest/handbook/installation/index.html[install Cekit] to build these images.
2828

2929
These sources are prepared and tested for Cekit 4.1.1.
3030

‎docs/README.adoc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
# Red Hat UBI OpenJDK container images
1+
= Red Hat UBI OpenJDK container images
2+
:toc: right
23

34
This is auto-generated documentation for the
45
link:https://www.redhat.com/en/blog/introducing-red-hat-universal-base-image[Red
56
Hat Universal Base Image] (UBI) OpenJDK container images.
67

7-
* link:https://github.com/jboss-container-images/openjdk[container image source repository]
8+
* link:https://rh-openjdk.github.io/redhat-openjdk-containers/[container image source repository]
89
910
Container images are available from the
1011
link:https://catalog.redhat.com/software/containers/explore[Red Hat Ecosystem

‎gendocs.sh‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,16 @@ workdir="$(mktemp -td gendocs.XXXXXX)"
6767
cp ./gendocs.py "$workdir/gendocs.py"
6868
cp ./docs/README.adoc "$workdir/README.adoc"
6969

70-
# documentation for development branches
71-
addToIndex "\n== Development branches ==\n"
72-
for branch in ubi8 ubi9; do
73-
addToIndex "\n=== $branch ===\n"
74-
handleRef "$branch" "$branch"
75-
done
76-
77-
# documentation for tagged releases
78-
addToIndex "\n== Released images =="
79-
for tag in $(git tag -l 'ubi?-openjdk-containers*' | sort -r); do
80-
addToIndex "\n=== $tag ===\n"
81-
handleRef "$tag"
70+
for ubi in ubi9 ubi8; do
71+
UBI=${ubi^^}
72+
addToIndex "\n== $UBI\n"
73+
addToIndex "\n=== development\n"
74+
handleRef "$ubi"
75+
for tag in $(git tag -l "${ubi}-openjdk-containers*" | sort -r); do
76+
version=${tag/${ubi}-openjdk-containers-/}
77+
addToIndex "\n=== $version\n"
78+
handleRef "$tag"
79+
done
8280
done
8381

8482
asciidoctor "$workdir/README.adoc" -o docs/index.html

‎modules/jdk/11/module.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ packages:
3030
modules:
3131
install:
3232
- name: jboss.container.user
33+
- name: jboss.container.openjdk
3334

3435
execute:
3536
- script: configure.sh

‎modules/jdk/17/module.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ packages:
2929
modules:
3030
install:
3131
- name: jboss.container.user
32+
- name: jboss.container.openjdk
3233

3334
execute:
3435
- script: configure.sh

‎modules/jdk/21/module.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ packages:
3030
modules:
3131
install:
3232
- name: jboss.container.user
33+
- name: jboss.container.openjdk
3334

3435
execute:
3536
- script: configure.sh

‎modules/jdk/8/module.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ packages:
2929
modules:
3030
install:
3131
- name: jboss.container.user
32+
- name: jboss.container.openjdk
3233

3334
execute:
3435
- script: configure.sh

‎modules/jdk/module.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
schema_version: 1
2+
3+
name: "jboss.container.openjdk"
4+
description: "A dummy descriptor to couple tests with jdk modules"
5+
version: "0"

‎modules/jdk/tests/features/openjdk.feature‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
Feature: Miscellaneous OpenJDK-related unit tests
2+
3+
@ubi9/openjdk-11
4+
@ubi9/openjdk-11-runtime
5+
Scenario: Check that only OpenJDK 11 is installed
6+
When container is started with args
7+
| arg | value |
8+
| command | rpm -qa |
9+
Then available container log should not contain java-1.8.0
10+
Then available container log should not contain java-17
11+
Then available container log should not contain java-21
12+
13+
@ubi9/openjdk-17
14+
@ubi9/openjdk-17-runtime
15+
Scenario: Check that only OpenJDK 17 is installed
16+
When container is started with args
17+
| arg | value |
18+
| command | rpm -qa |
19+
Then available container log should not contain java-1.8.0
20+
Then available container log should not contain java-11
21+
Then available container log should not contain java-21
22+
23+
@ubi9/openjdk-21
24+
@ubi9/openjdk-21-runtime
25+
Scenario: Check that only OpenJDK 21 is installed
26+
When container is started with args
27+
| arg | value |
28+
| command | rpm -qa |
29+
Then available container log should not contain java-1.8.0
30+
Then available container log should not contain java-11
31+
Then available container log should not contain java-17
32+
33+
@ubi9
34+
Scenario: Ensure JAVA_HOME is defined and contains Java
35+
When container is started with args
36+
| arg | value |
37+
| command | bash -c "$JAVA_HOME/bin/java -version" |
38+
Then available container log should contain OpenJDK Runtime Environment
39+
40+
@ubi9
41+
Scenario: Check that certain non-UBI packages are not installed
42+
When container is started with args
43+
| arg | value |
44+
| command | rpm -qa |
45+
Then available container log should not contain grub
46+
Then available container log should not contain os-prober
47+
Then available container log should not contain rpm-plugin-systemd-inhibit
48+
49+
@ubi9/openjdk-11
50+
@ubi9/openjdk-11-runtime
51+
Scenario: Check that directories from other JDKs are not present (JDK11)
52+
When container is started with args
53+
| arg | value |
54+
| command | ls -1 /usr/lib/jvm |
55+
Then available container log should not contain java-1.8.0
56+
Then available container log should not contain java-17
57+
Then available container log should not contain java-21
58+
59+
@ubi9/openjdk-17
60+
@ubi9/openjdk-17-runtime
61+
Scenario: Check that directories from other JDKs are not present (JDK17)
62+
When container is started with args
63+
| arg | value |
64+
| command | ls -1 /usr/lib/jvm |
65+
Then available container log should not contain java-1.8.0
66+
Then available container log should not contain java-11
67+
Then available container log should not contain java-21
68+
69+
@ubi9/openjdk-21
70+
@ubi9/openjdk-21-runtime
71+
Scenario: Check that directories from other JDKs are not present (JDK21)
72+
When container is started with args
73+
| arg | value |
74+
| command | ls -1 /usr/lib/jvm |
75+
Then available container log should not contain java-1.8.0
76+
Then available container log should not contain java-11
77+
Then available container log should not contain java-17
78+
79+
@ubi9
80+
Scenario: Ensure LANG is defined and contains UTF-8
81+
When container is started with args
82+
| arg | value |
83+
| command | bash -c "$JAVA_HOME/bin/java -XshowSettings:properties -version" |
84+
Then available container log should contain file.encoding = UTF-8
85+
86+
@ubi9
87+
Scenario: Ensure tar is installed (OPENJDK-1165)
88+
When container is started with args
89+
| arg | value |
90+
| command | tar |
91+
Then available container log should not contain command not found
92+
93+
@ubi9
94+
Scenario: Ensure tzdata RPM is properly installed (OPENJDK-2519)
95+
When container is started with args
96+
| arg | value |
97+
| command | rpm -V tzdata |
98+
Then available container log should not contain missing

0 commit comments

Comments
 (0)