WASdev · leochr · Jun 17, 2025 · Apr 11, 2025 · Apr 22, 2025 · Apr 23, 2025
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,63 @@
+# Contributing to WebSphere Liberty Container Images
+
+There are multiple ways to contribute: report bugs, request features, fix bugs, contribute code, improve documentation, etc. You must follow the established process and guidelines. We welcome your contributions!
+
+- [Raising issues](#Raising-Issues)
+- [Legal](#Legal)
+- [Coding Standards](#Coding-Standards)
+
+## Raising Issues
+
+Please raise any bug reports or feature requests on the [WebSphere Liberty Container Images project repository's GitHub issue tracker](https://github.com/WASdev/ci.docker/issues). Search the list to see if your issue has already been raised.
+
+A good bug report is one that makes it easy for everyone to understand what you were trying to do and what went wrong. Please provide as much context as possible so we can try to recreate the issue.
+
+## Legal
+
+We use the same approach - the Developer's Certificate of Origin 1.1 (DCO) - that the Linux® Kernel community uses to manage code contributions.
+
+For us to accept pull requests, you must declare that you wrote the code or, at least, have the right to contribute it to the repo under the open source license of the project in the repo. It's that easy.
+
+1. Read the following terms from [DCO](https://elinux.org/Developer_Certificate_Of_Origin) :
+
+  ```
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
+  ```
+
+2. If you can certify that it is true, sign off your `git commit` with a message like this:
+  ```
+  Signed-off-by: John Doe <john.doe@example.com>
+  ```
+  You must use your real name (no pseudonyms or anonymous contributions, sorry).
+
+  Instead of typing that in every git commit message, your Git tools might let you automatically add the details for you. If you configure them to do that, when you issue the `git commit` command, just add the `-s` option.
+
+If you are an IBMer, please contact us directly, as the contribution process is slightly different.
+
+## Coding Standards
+
+Please ensure you follow the coding standards used throughout the existing code base.
diff --git a/README.md b/README.md
@@ -328,7 +328,7 @@ For the list of known issues related to images, see the [Known Issues](https://g
 
 # Issues and Contributions
 
-For issues relating specifically to the Dockerfiles and scripts, please use the [GitHub issue tracker](https://github.com/WASdev/ci.docker/issues). For more general issue relating to IBM WebSphere Application Server Liberty you can [get help](https://developer.ibm.com/wasdev/help/) through the WASdev community or, if you have production licenses for WebSphere Application Server, via the usual support channels. We welcome contributions following [our guidelines](https://github.com/WASdev/wasdev.github.io/blob/master/CONTRIBUTING.md).
+For issues relating specifically to the Dockerfiles and scripts, please use the [GitHub issue tracker](https://github.com/WASdev/ci.docker/issues). For more general issue relating to IBM WebSphere Application Server Liberty you can [get help](https://developer.ibm.com/wasdev/help/) through the WASdev community or, if you have production licenses for WebSphere Application Server, via the usual support channels. We welcome contributions following [our guidelines](https://github.com/WASdev/ci.docker/blob/main/CONTRIBUTING.md).
 
 # License
 

diff --git a/SECURITY.md b/SECURITY.md
@@ -9,7 +9,7 @@ If set to true, then the default certificates from the JVM are used in addition
 
 ### Providing custom certificates (`20.0.0.3+`)
 
-It is possible to provide custom PEM certifacates by mounting the files into the container. Files that will be imported are `tls.key`, `tls.crt` and `ca.crt`.
+It is possible to provide custom PEM certificates by mounting the files into the container. Files that will be imported are `tls.key`, `tls.crt` and `ca.crt`.
 
 The location can be specified by `TLS_DIR` environment variable. Default location
 for certificates is `/etc/x509/certs/`.

diff --git a/docs/icr-images.md b/docs/icr-images.md
@@ -10,9 +10,9 @@ Available image tags are listed below. The tags use the following naming convent
 <optional fix pack version-><liberty image type>-<java version>-<java type>-<base image type>
 ```
 
-Liberty images with Java 21 are based on UBI 9 minimal and include IBM Semeru Runtimes for Java 21 JRE. This combination offers a compact and effective Java runtime that is suited for applications that need Java 21.
+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.
 
-Liberty images with Java 8, 11 and 17 and with the `openj9` type are based on UBI 8 standard and include IBM Semeru Runtime for the respective Java version with the JDK. Images with the `ibmjava` type are based on UBI 8 standard and include IBM Java 8 JRE.
+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.
 
 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.
 
@@ -30,16 +30,26 @@ ibmcloud cr images --restrict appcafe/websphere-liberty
 
 ## Latest version
 
-The following tags include the most recent WebSphere Liberty version: `25.0.0.3` 
+The following tags include the most recent WebSphere Liberty version: `25.0.0.5` 
 
 ```
 kernel-java21-openj9-ubi-minimal
+kernel-java17-openj9-ubi-minimal
+kernel-java11-openj9-ubi-minimal
+kernel-java8-openj9-ubi-minimal
+kernel-java8-ibmjava-ubi-minimal
+
 kernel-java17-openj9-ubi
 kernel-java11-openj9-ubi
-kernel-java8-ibmjava-ubi
 kernel-java8-openj9-ubi
+kernel-java8-ibmjava-ubi
 
 full-java21-openj9-ubi-minimal
+full-java17-openj9-ubi-minimal
+full-java11-openj9-ubi-minimal
+full-java8-openj9-ubi-minimal
+full-java8-ibmjava-ubi-minimal
+
 full-java17-openj9-ubi
 full-java11-openj9-ubi
 full-java8-openj9-ubi
@@ -48,6 +58,32 @@ full-java8-ibmjava-ubi
 latest
 ```
 
+## 25.0.0.5
+
+```
+25.0.0.5-kernel-java21-openj9-ubi-minimal
+25.0.0.5-kernel-java17-openj9-ubi-minimal
+25.0.0.5-kernel-java11-openj9-ubi-minimal
+25.0.0.5-kernel-java8-openj9-ubi-minimal
+25.0.0.5-kernel-java8-ibmjava-ubi-minimal
+
+25.0.0.5-kernel-java17-openj9-ubi
+25.0.0.5-kernel-java11-openj9-ubi
+25.0.0.5-kernel-java8-openj9-ubi
+25.0.0.5-kernel-java8-ibmjava-ubi
+
+25.0.0.5-full-java21-openj9-ubi-minimal
+25.0.0.5-full-java17-openj9-ubi-minimal
+25.0.0.5-full-java11-openj9-ubi-minimal
+25.0.0.5-full-java8-openj9-ubi-minimal
+25.0.0.5-full-java8-ibmjava-ubi-minimal
+
+25.0.0.5-full-java17-openj9-ubi
+25.0.0.5-full-java11-openj9-ubi
+25.0.0.5-full-java8-openj9-ubi
+25.0.0.5-full-java8-ibmjava-ubi
+```
+
 ## 25.0.0.3
 
 ```

diff --git a/ga/25.0.0.3/kernel/helpers/build/infinispan-client-setup.sh b/ga/25.0.0.3/kernel/helpers/build/infinispan-client-setup.sh
@@ -16,13 +16,20 @@
 
 set -Eeox pipefail
 
-yum update -y
-yum install -y maven
+pkgcmd=yum
+if ! command $pkgcmd
+then
+  pkgcmd=microdnf
+fi
+
+$pkgcmd update -y
+$pkgcmd install -y maven
 mkdir -p /opt/ibm/wlp/usr/shared/resources/infinispan
 echo '<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">  <modelVersion>4.0.0</modelVersion>   <groupId>io.openliberty</groupId>  <artifactId>openliberty-infinispan-client</artifactId>  <version>1.0</version>  <!-- https://mvnrepository.com/artifact/org.infinispan/infinispan-jcache-remote -->  <dependencies>    <dependency>      <groupId>org.infinispan</groupId>      <artifactId>infinispan-jcache-remote</artifactId>      <version>10.1.3.Final</version>    </dependency>  </dependencies></project>' > /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml
 mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml versions:use-latest-releases -DallowMajorUpdates=false
 mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml dependency:copy-dependencies -DoutputDirectory=/opt/ibm/wlp/usr/shared/resources/infinispan
-yum remove -y maven
+# This fails with dependency errors using microdnf on ubi-minimal, but it is okay to let it fail
+yum remove -y maven || true
 rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml
 rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/jboss-transaction-api*.jar
 rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/reactive-streams-*.jar