Skip to content

Commit af31207

Browse files
leochrleochr
authored
Merge pull request #723 from WASdev/main
Merge main into vNext
2 parents 3959ddc + 158f7aa commit af31207

4 files changed

Lines changed: 45 additions & 10 deletions

File tree

‎.secrets.baseline‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@
646646
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
647647
"is_secret": false,
648648
"is_verified": false,
649-
"line_number": 73,
649+
"line_number": 74,
650650
"type": "Hex High Entropy String",
651651
"verified_result": null
652652
}
@@ -696,7 +696,7 @@
696696
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
697697
"is_secret": false,
698698
"is_verified": false,
699-
"line_number": 72,
699+
"line_number": 73,
700700
"type": "Hex High Entropy String",
701701
"verified_result": null
702702
}

‎docs/icr-images.md‎

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ Available image tags are listed below. The tags use the following naming convent
1010
<optional fix pack version-><liberty image type>-<java version>-<java type>-<base image type>
1111
```
1212

13-
Liberty images based on Universal Base Image (UBI) 9 minimal include the JRE of IBM Semeru Runtime 21, 17, 11 or 8 or IBM Java 8. This combination offers a compact and effective Java runtime.
13+
Liberty images based on Universal Base Image (UBI) 9 Minimal end with `-ubi-minimal` and include the JRE of IBM Semeru Runtime 25, 21, 17, 11 or 8 or IBM Java 8. We recommend using this combination as it offers a compact and effective Java runtime. Liberty images with Java 21 and higher are only available on UBI Minimal.
1414

15-
Liberty images with Java 17, 11 and 8, the `openj9` type and based on UBI 8 standard include IBM Semeru Runtime for the respective Java version with the JDK. Java 8 images with the `ibmjava` type and based on UBI 8 standard include IBM Java 8 JRE.
15+
Liberty images based on UBI 8 Standard end with `-ubi` and include Java 17, 11 or 8. The `openj9` type includes IBM Semeru Runtime for the respective Java version with the JDK. Java 8 images with the `ibmjava` type and based on UBI 8 standard include IBM Java 8 JRE.
1616

17-
The `latest` tag simplifies pulling the full latest Open Liberty release with the latest Java JRE. It is an alias for the full-java21-openj9-ubi-minimal tag. If you do not specify a tag value, `latest` is used by default.
17+
The `latest` tag simplifies pulling the full latest Open Liberty release with the latest Java JRE. It is an alias for the `full-java25-openj9-ubi-minimal` tag. If you do not specify a tag value, `latest` is used by default.
1818

1919
Append a tag to `icr.io/appcafe/websphere-liberty` to pull a specific image. For example,
2020
```
@@ -30,9 +30,10 @@ ibmcloud cr images --restrict appcafe/websphere-liberty
3030

3131
## Latest version
3232

33-
The following tags include the most recent WebSphere Liberty version: `25.0.0.9`
33+
The following tags include the most recent WebSphere Liberty version: `25.0.0.10`
3434

3535
```
36+
kernel-java25-openj9-ubi-minimal
3637
kernel-java21-openj9-ubi-minimal
3738
kernel-java17-openj9-ubi-minimal
3839
kernel-java11-openj9-ubi-minimal
@@ -44,6 +45,7 @@ kernel-java11-openj9-ubi
4445
kernel-java8-openj9-ubi
4546
kernel-java8-ibmjava-ubi
4647
48+
full-java25-openj9-ubi-minimal
4749
full-java21-openj9-ubi-minimal
4850
full-java17-openj9-ubi-minimal
4951
full-java11-openj9-ubi-minimal
@@ -58,6 +60,37 @@ full-java8-ibmjava-ubi
5860
latest
5961
```
6062

63+
64+
## 25.0.0.10
65+
66+
```
67+
25.0.0.10-kernel-java25-openj9-ubi-minimal
68+
25.0.0.10-kernel-java21-openj9-ubi-minimal
69+
25.0.0.10-kernel-java17-openj9-ubi-minimal
70+
25.0.0.10-kernel-java11-openj9-ubi-minimal
71+
25.0.0.10-kernel-java8-openj9-ubi-minimal
72+
25.0.0.10-kernel-java8-ibmjava-ubi-minimal
73+
74+
25.0.0.10-kernel-java17-openj9-ubi
75+
25.0.0.10-kernel-java11-openj9-ubi
76+
25.0.0.10-kernel-java8-openj9-ubi
77+
25.0.0.10-kernel-java8-ibmjava-ubi
78+
79+
25.0.0.10-full-java25-openj9-ubi-minimal
80+
25.0.0.10-full-java21-openj9-ubi-minimal
81+
25.0.0.10-full-java17-openj9-ubi-minimal
82+
25.0.0.10-full-java11-openj9-ubi-minimal
83+
25.0.0.10-full-java8-openj9-ubi-minimal
84+
25.0.0.10-full-java8-ibmjava-ubi-minimal
85+
86+
25.0.0.10-full-java17-openj9-ubi
87+
25.0.0.10-full-java11-openj9-ubi
88+
25.0.0.10-full-java8-openj9-ubi
89+
25.0.0.10-full-java8-ibmjava-ubi
90+
```
91+
92+
93+
6194
## 25.0.0.9
6295

6396
```

‎ga/25.0.0.9/kernel/Dockerfile.ubi.openjdk8‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
3737
&& sha1sum -c /tmp/wlp.zip.sha1 \
3838
&& chmod -R g+x /usr/bin \
3939
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
40+
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/ \
41+
&& find /tmp/wlpFixes -type f -name "*.jar" -print0 | sort -z | xargs -0 -n 1 -r -I {} java -jar {} --installLocation /opt/ibm/wlp \
4042
&& chown -R 1001:0 /opt/ibm/wlp \
41-
&& chmod -R g+rw /opt/ibm/wlp \
42-
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/
43+
&& chmod -R g+rw /opt/ibm/wlp
4344

4445
FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi
4546

‎ga/25.0.0.9/kernel/Dockerfile.ubi9-minimal.openjdk8‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ RUN microdnf -y install shadow-utils unzip wget findutils openssl \
3636
&& sha1sum -c /tmp/wlp.zip.sha1 \
3737
&& chmod -R g+x /usr/bin \
3838
&& unzip -q /tmp/wlp.zip -d /opt/ibm \
39+
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/ \
40+
&& find /tmp/wlpFixes -type f -name "*.jar" -print0 | sort -z | xargs -0 -n 1 -r -I {} java -jar {} --installLocation /opt/ibm/wlp \
3941
&& chown -R 1001:0 /opt/ibm/wlp \
40-
&& chmod -R g+rw /opt/ibm/wlp \
41-
&& cp -a /opt/ibm/wlp/lafiles/. /licenses/
42+
&& chmod -R g+rw /opt/ibm/wlp
4243

4344
FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jre-ubi9-minimal
4445

0 commit comments

Comments
 (0)