From 5fb4dbb2b85f551b3f1775728843e36069327d4a Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Thu, 7 Dec 2023 15:45:01 -0500 Subject: [PATCH 1/8] List the images for 23.0.0.12 --- docs/icr-images.md | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/docs/icr-images.md b/docs/icr-images.md index fa82eabb..aa4f62dc 100644 --- a/docs/icr-images.md +++ b/docs/icr-images.md @@ -12,7 +12,7 @@ Available image tags are listed below. The tags follow this naming convention: 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:23.0.0.12-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,7 +22,7 @@ ibmcloud cr images --restrict appcafe/websphere-liberty ``` -## Latest version (23.0.0.11) +## Latest version (23.0.0.12) ``` kernel-java8-openj9-ubi @@ -36,18 +36,18 @@ full-java11-openj9-ubi full-java17-openj9-ubi ``` -## 23.0.0.11 +## 23.0.0.12 ``` -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 +23.0.0.12-kernel-java8-openj9-ubi +23.0.0.12-kernel-java8-ibmjava-ubi +23.0.0.12-kernel-java11-openj9-ubi +23.0.0.12-kernel-java17-openj9-ubi + +23.0.0.12-full-java8-openj9-ubi +23.0.0.12-full-java8-ibmjava-ubi +23.0.0.12-full-java11-openj9-ubi +23.0.0.12-full-java17-openj9-ubi ``` ## 23.0.0.9 @@ -63,17 +63,3 @@ full-java17-openj9-ubi 23.0.0.9-full-java11-openj9-ubi 23.0.0.9-full-java17-openj9-ubi ``` - -## 23.0.0.6 - -``` -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 -``` From 6cfb00f29d032aa2ac0cde668c116a4823c154cd Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Tue, 30 Jan 2024 19:54:37 -0500 Subject: [PATCH 2/8] List 24.0.0.1 images including Java 21 + misc doc updates (#583) Signed-off-by: Leo Christy Jesuraj --- README.md | 4 ++-- docs/icr-images.md | 58 +++++++++++++++++++++++++++++++++------------- 2 files changed, 44 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index d66285a5..9f16dd76 100644 --- a/README.md +++ b/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 diff --git a/docs/icr-images.md b/docs/icr-images.md index aa4f62dc..4e1a1dc9 100644 --- a/docs/icr-images.md +++ b/docs/icr-images.md @@ -5,11 +5,17 @@ WebSphere Liberty container images are available from the IBM Container Registry 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. -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. ``` -----ubi +--- ``` +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.12-kernel-java17-openj9-ubi @@ -22,44 +28,64 @@ ibmcloud cr images --restrict appcafe/websphere-liberty ``` -## Latest version (23.0.0.12) +## Latest version (24.0.0.1) ``` -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 + +latest +``` + +## 24.0.0.1 + +``` +24.0.0.1-kernel-java21-openj9-ubi-minimal +24.0.0.1-kernel-java17-openj9-ubi +24.0.0.1-kernel-java11-openj9-ubi +24.0.0.1-kernel-java8-ibmjava-ubi +24.0.0.1-kernel-java8-openj9-ubi + +24.0.0.1-full-java21-openj9-ubi-minimal +24.0.0.1-full-java17-openj9-ubi +24.0.0.1-full-java11-openj9-ubi +24.0.0.1-full-java8-openj9-ubi +24.0.0.1-full-java8-ibmjava-ubi ``` ## 23.0.0.12 ``` +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-kernel-java11-openj9-ubi -23.0.0.12-kernel-java17-openj9-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 -23.0.0.12-full-java11-openj9-ubi -23.0.0.12-full-java17-openj9-ubi ``` ## 23.0.0.9 ``` +23.0.0.9-kernel-java17-openj9-ubi +23.0.0.9-kernel-java11-openj9-ubi 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-java17-openj9-ubi +23.0.0.9-full-java11-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 ``` From f46542f5268d68861799e1834d2f60a4c77f68a2 Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Mon, 12 Feb 2024 10:18:15 -0500 Subject: [PATCH 3/8] Update icr-images.md (#587) --- docs/icr-images.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/icr-images.md b/docs/icr-images.md index 4e1a1dc9..f50f1a1a 100644 --- a/docs/icr-images.md +++ b/docs/icr-images.md @@ -3,7 +3,7 @@ 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 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. ``` From 1d50506efd66b987ebdd478e92c95e2f5b357f1c Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Wed, 28 Feb 2024 13:26:39 -0500 Subject: [PATCH 4/8] List images for 24.0.0.2 (#592) --- docs/icr-images.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/icr-images.md b/docs/icr-images.md index f50f1a1a..bb11a97a 100644 --- a/docs/icr-images.md +++ b/docs/icr-images.md @@ -28,7 +28,7 @@ ibmcloud cr images --restrict appcafe/websphere-liberty ``` -## Latest version (24.0.0.1) +## Latest version (24.0.0.2) ``` kernel-java21-openj9-ubi-minimal @@ -46,20 +46,20 @@ full-java8-ibmjava-ubi latest ``` -## 24.0.0.1 +## 24.0.0.2 ``` -24.0.0.1-kernel-java21-openj9-ubi-minimal -24.0.0.1-kernel-java17-openj9-ubi -24.0.0.1-kernel-java11-openj9-ubi -24.0.0.1-kernel-java8-ibmjava-ubi -24.0.0.1-kernel-java8-openj9-ubi - -24.0.0.1-full-java21-openj9-ubi-minimal -24.0.0.1-full-java17-openj9-ubi -24.0.0.1-full-java11-openj9-ubi -24.0.0.1-full-java8-openj9-ubi -24.0.0.1-full-java8-ibmjava-ubi +24.0.0.2-kernel-java21-openj9-ubi-minimal +24.0.0.2-kernel-java17-openj9-ubi +24.0.0.2-kernel-java11-openj9-ubi +24.0.0.2-kernel-java8-ibmjava-ubi +24.0.0.2-kernel-java8-openj9-ubi + +24.0.0.2-full-java21-openj9-ubi-minimal +24.0.0.2-full-java17-openj9-ubi +24.0.0.2-full-java11-openj9-ubi +24.0.0.2-full-java8-openj9-ubi +24.0.0.2-full-java8-ibmjava-ubi ``` ## 23.0.0.12 From 735b7b31e2ef4adab7ad3e99f0668f7ea73abede Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Fri, 1 Mar 2024 11:28:12 -0600 Subject: [PATCH 5/8] Default placeholder for versions fields can be confusing --- .github/workflows/update_files_for_release.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/update_files_for_release.yml b/.github/workflows/update_files_for_release.yml index bb6e4aa3..f90e2ba5 100644 --- a/.github/workflows/update_files_for_release.yml +++ b/.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: From 4c3bb55166f156999b56ce17839bdbfc8fa61903 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Fri, 1 Mar 2024 11:39:16 -0600 Subject: [PATCH 6/8] Remove Michal as reviewer --- .github/workflows/update_files_for_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_files_for_release.yml b/.github/workflows/update_files_for_release.yml index f90e2ba5..7e89b84b 100644 --- a/.github/workflows/update_files_for_release.yml +++ b/.github/workflows/update_files_for_release.yml @@ -52,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 }} From 80af99b0a76b70eb8daec44a377cac0af788b2f6 Mon Sep 17 00:00:00 2001 From: Leo Christy Jesuraj Date: Wed, 27 Mar 2024 11:47:46 -0400 Subject: [PATCH 7/8] List 24.0.0.3 images (#604) --- docs/icr-images.md | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/docs/icr-images.md b/docs/icr-images.md index bb11a97a..d0b933ec 100644 --- a/docs/icr-images.md +++ b/docs/icr-images.md @@ -18,7 +18,7 @@ The `latest` tag simplifies pulling the full latest Open Liberty release with th Append a tag to `icr.io/appcafe/websphere-liberty` to pull a specific image. For example, ``` -icr.io/appcafe/websphere-liberty:23.0.0.12-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** : @@ -28,7 +28,7 @@ ibmcloud cr images --restrict appcafe/websphere-liberty ``` -## Latest version (24.0.0.2) +## Latest version (24.0.0.3) ``` kernel-java21-openj9-ubi-minimal @@ -46,20 +46,20 @@ full-java8-ibmjava-ubi latest ``` -## 24.0.0.2 +## 24.0.0.3 ``` -24.0.0.2-kernel-java21-openj9-ubi-minimal -24.0.0.2-kernel-java17-openj9-ubi -24.0.0.2-kernel-java11-openj9-ubi -24.0.0.2-kernel-java8-ibmjava-ubi -24.0.0.2-kernel-java8-openj9-ubi - -24.0.0.2-full-java21-openj9-ubi-minimal -24.0.0.2-full-java17-openj9-ubi -24.0.0.2-full-java11-openj9-ubi -24.0.0.2-full-java8-openj9-ubi -24.0.0.2-full-java8-ibmjava-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.12 @@ -75,17 +75,3 @@ latest 23.0.0.12-full-java8-openj9-ubi 23.0.0.12-full-java8-ibmjava-ubi ``` - -## 23.0.0.9 - -``` -23.0.0.9-kernel-java17-openj9-ubi -23.0.0.9-kernel-java11-openj9-ubi -23.0.0.9-kernel-java8-openj9-ubi -23.0.0.9-kernel-java8-ibmjava-ubi - -23.0.0.9-full-java17-openj9-ubi -23.0.0.9-full-java11-openj9-ubi -23.0.0.9-full-java8-openj9-ubi -23.0.0.9-full-java8-ibmjava-ubi -``` From 8907ba85a609bdfe5c56dcb0a6501be41c8d96dc Mon Sep 17 00:00:00 2001 From: Kirby Chin <37311900+kabicin@users.noreply.github.com> Date: Tue, 9 Apr 2024 12:52:31 -0400 Subject: [PATCH 8/8] Output errors to stderr by default when VERBOSE=true (#605) --- ga/23.0.0.12/kernel/helpers/build/configure.sh | 2 +- ga/23.0.0.12/kernel/helpers/build/infinispan-client-setup.sh | 2 +- ga/23.0.0.12/kernel/helpers/build/populate_scc.sh | 2 +- ga/24.0.0.3/kernel/helpers/build/configure.sh | 2 +- ga/24.0.0.3/kernel/helpers/build/infinispan-client-setup.sh | 2 +- ga/24.0.0.3/kernel/helpers/build/populate_scc.sh | 2 +- ga/latest/kernel/helpers/build/configure.sh | 2 +- ga/latest/kernel/helpers/build/infinispan-client-setup.sh | 2 +- ga/latest/kernel/helpers/build/populate_scc.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ga/23.0.0.12/kernel/helpers/build/configure.sh b/ga/23.0.0.12/kernel/helpers/build/configure.sh index 7a9f03b1..5efde7e9 100755 --- a/ga/23.0.0.12/kernel/helpers/build/configure.sh +++ b/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 diff --git a/ga/23.0.0.12/kernel/helpers/build/infinispan-client-setup.sh b/ga/23.0.0.12/kernel/helpers/build/infinispan-client-setup.sh index cf54d05d..37dcda2b 100755 --- a/ga/23.0.0.12/kernel/helpers/build/infinispan-client-setup.sh +++ b/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 diff --git a/ga/23.0.0.12/kernel/helpers/build/populate_scc.sh b/ga/23.0.0.12/kernel/helpers/build/populate_scc.sh index ea255eef..1234400c 100755 --- a/ga/23.0.0.12/kernel/helpers/build/populate_scc.sh +++ b/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 diff --git a/ga/24.0.0.3/kernel/helpers/build/configure.sh b/ga/24.0.0.3/kernel/helpers/build/configure.sh index 7a9f03b1..5efde7e9 100755 --- a/ga/24.0.0.3/kernel/helpers/build/configure.sh +++ b/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 diff --git a/ga/24.0.0.3/kernel/helpers/build/infinispan-client-setup.sh b/ga/24.0.0.3/kernel/helpers/build/infinispan-client-setup.sh index cf54d05d..37dcda2b 100755 --- a/ga/24.0.0.3/kernel/helpers/build/infinispan-client-setup.sh +++ b/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 diff --git a/ga/24.0.0.3/kernel/helpers/build/populate_scc.sh b/ga/24.0.0.3/kernel/helpers/build/populate_scc.sh index 19e4974c..143f5c2b 100755 --- a/ga/24.0.0.3/kernel/helpers/build/populate_scc.sh +++ b/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 diff --git a/ga/latest/kernel/helpers/build/configure.sh b/ga/latest/kernel/helpers/build/configure.sh index 7a9f03b1..5efde7e9 100755 --- a/ga/latest/kernel/helpers/build/configure.sh +++ b/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 diff --git a/ga/latest/kernel/helpers/build/infinispan-client-setup.sh b/ga/latest/kernel/helpers/build/infinispan-client-setup.sh index cf54d05d..37dcda2b 100755 --- a/ga/latest/kernel/helpers/build/infinispan-client-setup.sh +++ b/ga/latest/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 diff --git a/ga/latest/kernel/helpers/build/populate_scc.sh b/ga/latest/kernel/helpers/build/populate_scc.sh index 19e4974c..143f5c2b 100755 --- a/ga/latest/kernel/helpers/build/populate_scc.sh +++ b/ga/latest/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