Merge pull request #606 from WASdev/main

Merge main into vNext

Author: leochr

.github/workflows/update_files_for_release.yml

@@ -6,14 +6,11 @@ on:
   workflow_dispatch:
     inputs:
       OLD_VERSION:
-        description: 'Enter old version'
-        # Show defaults as examples so user enters correct format.
-        default: '23.0.0.11'
+        description: 'Enter old version (what was just released)'
         required: true
         type: string
       NEW_VERSION:
-        description: 'Enter new version'
-        default: '23.0.0.12'
+        description: 'Enter new version (pre-eGA release)'
         required: true
         type: string
       BUILD_LABEL:
@@ -55,7 +52,7 @@ jobs:
 
     - name: Create Pull Request
       run: |
-        gh pr create -B vNext -H "${{ inputs.NEW_VERSION }}-release" -r mbroz2 -r leochr --title "Updates for the release of ${{ inputs.NEW_VERSION }}" --body "Created by Github Actions"
+        gh pr create -B vNext -H "${{ inputs.NEW_VERSION }}-release" -r leochr --title "Updates for the release of ${{ inputs.NEW_VERSION }}" --body "Created by Github Actions"
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

README.md

@@ -19,8 +19,8 @@
 
 ## Container images
 
-* Our recommended set uses Red Hat's Universal Base Image (UBI) as the Operating System and are re-built daily. They are available from [IBM Container Registry (ICR)](docs/icr-images.md) and [Docker Hub](https://hub.docker.com/r/ibmcom/websphere-liberty). We strongly recommend using the images in ICR. Unlike Docker Hub, pulls from ICR are not rate limited.
-* Another set, using Ubuntu as the Operating System can be found on [Docker Hub](https://hub.docker.com/_/websphere-liberty).  These are re-built automatically anytime something changes in the layers below.
+* Our recommended set uses Red Hat's Universal Base Image (UBI) as the Operating System and are rebuilt periodically. They are available from IBM Container Registry (icr.io) and are listed [here](docs/icr-images.md).
+* Another set, using Ubuntu as the Operating System can be found on [Docker Hub](https://hub.docker.com/_/websphere-liberty).
 
 ## Building an application image
 

docs/icr-images.md

@@ -3,16 +3,22 @@
 
 WebSphere Liberty container images are available from the IBM Container Registry (ICR) at `icr.io/appcafe/websphere-liberty`. Our recommendation is to use ICR instead of Docker Hub since ICR doesn't impose rate limits on image pulls. Images can be pulled from ICR without authentication. Only images with Universal Base Image (UBI) as the Operating System are available in ICR.
 
-The images for the latest Liberty release and the last two quarterly releases (versions ending in _.3_, _.6_, _.9_ and _.12_) are available and are refreshed regularly to include fixes for the operating system (OS) and Java.
+The images for the latest Liberty release and the last two quarterly releases (versions ending in _.3_, _.6_, _.9_ and _.12_) are available and are refreshed regularly (every 1-2 weeks) to include fixes for the operating system (OS) and Java.
 
-Available image tags are listed below. The tags follow this naming convention: 
+Available image tags are listed below. The tags use the following naming convention. For more information on tags, see [Container image naming conventions](https://www.ibm.com/docs/en/was-liberty/base?topic=images-liberty-container#cntr_r_images__imagename__title__1) documentation.
 ```
-<fixpack_version_optional>-<liberty_image_flavour>-<java_version>-<java_type>-ubi
+<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 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.
+
+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.
+
 Append a tag to `icr.io/appcafe/websphere-liberty` to pull a specific image. For example, 
 ```
-icr.io/appcafe/websphere-liberty:23.0.0.9-kernel-java17-openj9-ubi
+icr.io/appcafe/websphere-liberty:24.0.0.3-kernel-java17-openj9-ubi
 ```
 
 Available images can be listed using [IBM Cloud CLI](https://cloud.ibm.com/docs/cli?topic=cli-getting-started). Log in with your IBMid prior to running the following commands. Note that authentication is only required to list the images. **Images can be pulled from ICR without authentication** : 
@@ -22,58 +28,50 @@ ibmcloud cr images --restrict appcafe/websphere-liberty
 ```
 
 
-## Latest version (23.0.0.11)
+## Latest version (24.0.0.3)
 
 ```
-kernel-java8-openj9-ubi
-kernel-java8-ibmjava-ubi
-kernel-java11-openj9-ubi
+kernel-java21-openj9-ubi-minimal
 kernel-java17-openj9-ubi
+kernel-java11-openj9-ubi
+kernel-java8-ibmjava-ubi
+kernel-java8-openj9-ubi
 
+full-java21-openj9-ubi-minimal
+full-java17-openj9-ubi
+full-java11-openj9-ubi
 full-java8-openj9-ubi
 full-java8-ibmjava-ubi
-full-java11-openj9-ubi
-full-java17-openj9-ubi
-```
 
-## 23.0.0.11
-
-```
-23.0.0.11-kernel-java8-openj9-ubi
-23.0.0.11-kernel-java8-ibmjava-ubi
-23.0.0.11-kernel-java11-openj9-ubi
-23.0.0.11-kernel-java17-openj9-ubi
-
-23.0.0.11-full-java8-openj9-ubi
-23.0.0.11-full-java8-ibmjava-ubi
-23.0.0.11-full-java11-openj9-ubi
-23.0.0.11-full-java17-openj9-ubi
+latest
 ```
 
-## 23.0.0.9
+## 24.0.0.3
 
 ```
-23.0.0.9-kernel-java8-openj9-ubi
-23.0.0.9-kernel-java8-ibmjava-ubi
-23.0.0.9-kernel-java11-openj9-ubi
-23.0.0.9-kernel-java17-openj9-ubi
-
-23.0.0.9-full-java8-openj9-ubi
-23.0.0.9-full-java8-ibmjava-ubi
-23.0.0.9-full-java11-openj9-ubi
-23.0.0.9-full-java17-openj9-ubi
+24.0.0.3-kernel-java21-openj9-ubi-minimal
+24.0.0.3-kernel-java17-openj9-ubi
+24.0.0.3-kernel-java11-openj9-ubi
+24.0.0.3-kernel-java8-ibmjava-ubi
+24.0.0.3-kernel-java8-openj9-ubi
+
+24.0.0.3-full-java21-openj9-ubi-minimal
+24.0.0.3-full-java17-openj9-ubi
+24.0.0.3-full-java11-openj9-ubi
+24.0.0.3-full-java8-openj9-ubi
+24.0.0.3-full-java8-ibmjava-ubi
 ```
 
-## 23.0.0.6
+## 23.0.0.12
 
 ```
-23.0.0.6-kernel-java8-openj9-ubi
-23.0.0.6-kernel-java8-ibmjava-ubi
-23.0.0.6-kernel-java11-openj9-ubi
-23.0.0.6-kernel-java17-openj9-ubi
-
-23.0.0.6-full-java8-openj9-ubi
-23.0.0.6-full-java8-ibmjava-ubi
-23.0.0.6-full-java11-openj9-ubi
-23.0.0.6-full-java17-openj9-ubi
+23.0.0.12-kernel-java17-openj9-ubi
+23.0.0.12-kernel-java11-openj9-ubi
+23.0.0.12-kernel-java8-openj9-ubi
+23.0.0.12-kernel-java8-ibmjava-ubi
+
+23.0.0.12-full-java17-openj9-ubi
+23.0.0.12-full-java11-openj9-ubi
+23.0.0.12-full-java8-openj9-ubi
+23.0.0.12-full-java8-ibmjava-ubi
 ```

ga/23.0.0.12/kernel/helpers/build/configure.sh

@@ -21,7 +21,7 @@ else
 fi
 
 if [ "$VERBOSE" != "true" ]; then
-  exec &>/dev/null
+  exec >/dev/null
 fi
 
 set -Eeox pipefail

ga/23.0.0.12/kernel/helpers/build/infinispan-client-setup.sh

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 if [ "$VERBOSE" != "true" ]; then
-  exec &>/dev/null
+  exec >/dev/null
 fi
 
 set -Eeox pipefail

ga/23.0.0.12/kernel/helpers/build/populate_scc.sh

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 if [ "$VERBOSE" != "true" ]; then
-  exec &>/dev/null
+  exec >/dev/null
 fi
 
 set -Eeox pipefail

ga/24.0.0.3/kernel/helpers/build/configure.sh

@@ -21,7 +21,7 @@ else
 fi
 
 if [ "$VERBOSE" != "true" ]; then
-  exec &>/dev/null
+  exec >/dev/null
 fi
 
 set -Eeox pipefail

ga/24.0.0.3/kernel/helpers/build/infinispan-client-setup.sh

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 if [ "$VERBOSE" != "true" ]; then
-  exec &>/dev/null
+  exec >/dev/null
 fi
 
 set -Eeox pipefail

ga/24.0.0.3/kernel/helpers/build/populate_scc.sh

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 if [ "$VERBOSE" != "true" ]; then
-  exec &>/dev/null
+  exec >/dev/null
 fi
 
 set -Eeox pipefail

ga/latest/kernel/helpers/build/configure.sh

@@ -21,7 +21,7 @@ else
 fi
 
 if [ "$VERBOSE" != "true" ]; then
-  exec &>/dev/null
+  exec >/dev/null
 fi
 
 set -Eeox pipefail