From 1d4880c7faaf333d0012aed2ac2328c5d74838b8 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Wed, 9 Aug 2023 13:13:16 -0700 Subject: [PATCH 1/4] Updates for the release of 23.0.0.8 --- .travis.yml | 2 +- ga/23.0.0.7/full/resources/.gitkeep | 0 ga/23.0.0.7/images.txt | 18 ---------------- .../kernel/helpers/build/checkpoint.sh | 13 ------------ ga/23.0.0.7/kernel/resources/.gitkeep | 0 ga/{23.0.0.7 => 23.0.0.8}/README.md | 0 .../full/Dockerfile.ubi.ibmjava8 | 4 ++-- .../full/Dockerfile.ubi.openjdk11 | 4 ++-- .../full/Dockerfile.ubi.openjdk17 | 4 ++-- .../full/Dockerfile.ubi.openjdk8 | 4 ++-- .../full/Dockerfile.ubuntu.ibmjava8 | 2 +- .../full/Dockerfile.ubuntu.openjdk11 | 2 +- .../full/Dockerfile.ubuntu.openjdk17 | 2 +- ga/{23.0.0.7 => 23.0.0.8}/full/README.md | 0 ga/{23.0.0.7 => 23.0.0.8}/full/server.xml | 0 ga/23.0.0.8/images.txt | 18 ++++++++++++++++ .../kernel/Dockerfile.ubi.ibmjava8 | 6 +++--- .../kernel/Dockerfile.ubi.openjdk11 | 6 +++--- .../kernel/Dockerfile.ubi.openjdk17 | 6 +++--- .../kernel/Dockerfile.ubi.openjdk8 | 6 +++--- .../kernel/Dockerfile.ubuntu.ibmjava8 | 4 ++-- .../kernel/Dockerfile.ubuntu.openjdk11 | 4 ++-- .../kernel/Dockerfile.ubuntu.openjdk17 | 4 ++-- ga/{23.0.0.7 => 23.0.0.8}/kernel/NOTICES | 0 ga/{23.0.0.7 => 23.0.0.8}/kernel/README.md | 0 .../kernel/fixes/.gitkeep | 0 .../kernel/helpers/build/checkpoint.sh | 21 +++++++++++++++++++ .../hazelcast-client.xml | 0 .../hazelcast-embedded.xml | 0 .../hazelcast-sessioncache-config.xml | 0 .../hazelcast-sessioncache.xml | 0 .../configuration_snippets/http-endpoint.xml | 0 .../http-ssl-endpoint.xml | 0 .../configuration_snippets/iiop-endpoint.xml | 0 .../iiop-ssl-endpoint.xml | 0 .../infinispan-client-sessioncache-config.xml | 0 .../infinispan-client-sessioncache.xml | 0 .../configuration_snippets/jms-endpoint.xml | 0 .../jms-ssl-endpoint.xml | 0 .../build/configuration_snippets/keystore.xml | 0 .../mp-health-check.xml | 0 .../configuration_snippets/mp-monitoring.xml | 0 .../configuration_snippets/oidc-config.xml | 0 .../build/configuration_snippets/oidc.xml | 0 .../sessioncache-features.xml | 0 .../configuration_snippets/sso-facebook.xml | 0 .../configuration_snippets/sso-features.xml | 0 .../configuration_snippets/sso-github.xml | 0 .../configuration_snippets/sso-google.xml | 0 .../configuration_snippets/sso-linkedin.xml | 0 .../configuration_snippets/sso-oauth2.xml | 0 .../build/configuration_snippets/sso-oidc.xml | 0 .../configuration_snippets/sso-twitter.xml | 0 .../build/configuration_snippets/tls.xml | 0 .../configuration_snippets/trustDefault.xml | 0 .../configuration_snippets/truststore.xml | 0 .../kernel/helpers/build/configure.sh | 0 .../kernel/helpers/build/features.sh | 0 .../helpers/build/infinispan-client-setup.sh | 0 .../build/internal/features-installed.sh | 0 .../kernel/helpers/build/pidplus.sh | 0 .../kernel/helpers/build/populate_scc.sh | 0 .../kernel/helpers/runtime/docker-server.sh | 0 .../kernel/helpers/runtime/restore-server.sh | 0 .../oidcProvider/Dockerfile | 0 .../oidcProvider/Dockerfile.java11 | 0 .../oidcProvider/README.md | 0 .../oidcProvider/server.xml | 0 ga/latest/kernel/Dockerfile.ubi.ibmjava8 | 6 +++--- ga/latest/kernel/Dockerfile.ubi.openjdk11 | 6 +++--- ga/latest/kernel/Dockerfile.ubi.openjdk17 | 6 +++--- ga/latest/kernel/Dockerfile.ubi.openjdk8 | 6 +++--- ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 | 4 ++-- ga/latest/kernel/Dockerfile.ubuntu.openjdk11 | 4 ++-- ga/latest/kernel/Dockerfile.ubuntu.openjdk17 | 4 ++-- 75 files changed, 87 insertions(+), 79 deletions(-) delete mode 100644 ga/23.0.0.7/full/resources/.gitkeep delete mode 100644 ga/23.0.0.7/images.txt delete mode 100755 ga/23.0.0.7/kernel/helpers/build/checkpoint.sh delete mode 100644 ga/23.0.0.7/kernel/resources/.gitkeep rename ga/{23.0.0.7 => 23.0.0.8}/README.md (100%) rename ga/{23.0.0.7 => 23.0.0.8}/full/Dockerfile.ubi.ibmjava8 (91%) rename ga/{23.0.0.7 => 23.0.0.8}/full/Dockerfile.ubi.openjdk11 (91%) rename ga/{23.0.0.7 => 23.0.0.8}/full/Dockerfile.ubi.openjdk17 (91%) rename ga/{23.0.0.7 => 23.0.0.8}/full/Dockerfile.ubi.openjdk8 (91%) rename ga/{23.0.0.7 => 23.0.0.8}/full/Dockerfile.ubuntu.ibmjava8 (96%) rename ga/{23.0.0.7 => 23.0.0.8}/full/Dockerfile.ubuntu.openjdk11 (96%) rename ga/{23.0.0.7 => 23.0.0.8}/full/Dockerfile.ubuntu.openjdk17 (96%) rename ga/{23.0.0.7 => 23.0.0.8}/full/README.md (100%) rename ga/{23.0.0.7 => 23.0.0.8}/full/server.xml (100%) create mode 100644 ga/23.0.0.8/images.txt rename ga/{23.0.0.7 => 23.0.0.8}/kernel/Dockerfile.ubi.ibmjava8 (98%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/Dockerfile.ubi.openjdk11 (98%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/Dockerfile.ubi.openjdk17 (98%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/Dockerfile.ubi.openjdk8 (98%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/Dockerfile.ubuntu.ibmjava8 (98%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/Dockerfile.ubuntu.openjdk11 (98%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/Dockerfile.ubuntu.openjdk17 (98%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/NOTICES (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/README.md (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/fixes/.gitkeep (100%) create mode 100755 ga/23.0.0.8/kernel/helpers/build/checkpoint.sh rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/hazelcast-client.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/http-endpoint.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/jms-endpoint.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/keystore.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/mp-health-check.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/mp-monitoring.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/oidc-config.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/oidc.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/sessioncache-features.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/sso-facebook.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/sso-features.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/sso-github.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/sso-google.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/sso-linkedin.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/sso-oauth2.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/sso-oidc.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/sso-twitter.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/tls.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/trustDefault.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configuration_snippets/truststore.xml (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/configure.sh (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/features.sh (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/infinispan-client-setup.sh (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/internal/features-installed.sh (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/pidplus.sh (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/build/populate_scc.sh (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/runtime/docker-server.sh (100%) rename ga/{23.0.0.7 => 23.0.0.8}/kernel/helpers/runtime/restore-server.sh (100%) rename ga/{23.0.0.7 => 23.0.0.8}/oidcProvider/Dockerfile (100%) rename ga/{23.0.0.7 => 23.0.0.8}/oidcProvider/Dockerfile.java11 (100%) rename ga/{23.0.0.7 => 23.0.0.8}/oidcProvider/README.md (100%) rename ga/{23.0.0.7 => 23.0.0.8}/oidcProvider/server.xml (100%) diff --git a/.travis.yml b/.travis.yml index d68cc6677..82054bf16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: env: - RELEASE=../ga/23.0.0.3 - RELEASE=../ga/23.0.0.6 - - RELEASE=../ga/23.0.0.7 + - RELEASE=../ga/23.0.0.8 - RELEASE=../ga/latest script: diff --git a/ga/23.0.0.7/full/resources/.gitkeep b/ga/23.0.0.7/full/resources/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/ga/23.0.0.7/images.txt b/ga/23.0.0.7/images.txt deleted file mode 100644 index fd926b33e..000000000 --- a/ga/23.0.0.7/images.txt +++ /dev/null @@ -1,18 +0,0 @@ -websphere-liberty:23.0.0.7-kernel ../ga/23.0.0.7/kernel ../ga/23.0.0.7/kernel/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:23.0.0.7-kernel-java11-openj9 ../ga/23.0.0.7/kernel ../ga/23.0.0.7/kernel/Dockerfile.ubuntu.openjdk11 -websphere-liberty:23.0.0.7-kernel-java17-openj9 ../ga/23.0.0.7/kernel ../ga/23.0.0.7/kernel/Dockerfile.ubuntu.openjdk17 -websphere-liberty:23.0.0.7-kernel-java8-ibmjava-ubi ../ga/23.0.0.7/kernel ../ga/23.0.0.7/kernel/Dockerfile.ubi.ibmjava8 -websphere-liberty:23.0.0.7-kernel-java8-openj9-ubi ../ga/23.0.0.7/kernel ../ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk8 -websphere-liberty:23.0.0.7-kernel-java11-openj9-ubi ../ga/23.0.0.7/kernel ../ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk11 -websphere-liberty:23.0.0.7-kernel-java17-openj9-ubi ../ga/23.0.0.7/kernel ../ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk17 -websphere-liberty:23.0.0.7-full ../ga/23.0.0.7/full ../ga/23.0.0.7/full/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:23.0.0.7-full-java11-openj9 ../ga/23.0.0.7/full ../ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk11 -websphere-liberty:23.0.0.7-full-java17-openj9 ../ga/23.0.0.7/full ../ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk17 -websphere-liberty:23.0.0.7-full-java8-ibmjava-ubi ../ga/23.0.0.7/full ../ga/23.0.0.7/full/Dockerfile.ubi.ibmjava8 -websphere-liberty:23.0.0.7-full-java8-openj9-ubi ../ga/23.0.0.7/full ../ga/23.0.0.7/full/Dockerfile.ubi.openjdk8 -websphere-liberty:23.0.0.7-full-java11-openj9-ubi ../ga/23.0.0.7/full ../ga/23.0.0.7/full/Dockerfile.ubi.openjdk11 -websphere-liberty:23.0.0.7-full-java17-openj9-ubi ../ga/23.0.0.7/full ../ga/23.0.0.7/full/Dockerfile.ubi.openjdk17 -websphere-liberty:beta ../beta -websphere-liberty:test-stock-quote test-stock-quote -websphere-liberty:test-stock-trader test-stock-trader -websphere-liberty:test-pet-clinic test-pet-clinic diff --git a/ga/23.0.0.7/kernel/helpers/build/checkpoint.sh b/ga/23.0.0.7/kernel/helpers/build/checkpoint.sh deleted file mode 100755 index dba7820ff..000000000 --- a/ga/23.0.0.7/kernel/helpers/build/checkpoint.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -# hack to bump up the pid by 100 -for i in {1..100} -do - pidplus.sh -done - -echo "Performing checkpoint --at=$1" -/opt/ibm/wlp/bin/server checkpoint defaultServer --at=$1 - -rc=$? -exit $rc diff --git a/ga/23.0.0.7/kernel/resources/.gitkeep b/ga/23.0.0.7/kernel/resources/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/ga/23.0.0.7/README.md b/ga/23.0.0.8/README.md similarity index 100% rename from ga/23.0.0.7/README.md rename to ga/23.0.0.8/README.md diff --git a/ga/23.0.0.7/full/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.8/full/Dockerfile.ubi.ibmjava8 similarity index 91% rename from ga/23.0.0.7/full/Dockerfile.ubi.ibmjava8 rename to ga/23.0.0.8/full/Dockerfile.ubi.ibmjava8 index e2fac8612..8323de579 100644 --- a/ga/23.0.0.7/full/Dockerfile.ubi.ibmjava8 +++ b/ga/23.0.0.8/full/Dockerfile.ubi.ibmjava8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.7-kernel-java8-ibmjava-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java8-ibmjava-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.7-kernel-java8-ibmjava-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java8-ibmjava-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.7/full/Dockerfile.ubi.openjdk11 b/ga/23.0.0.8/full/Dockerfile.ubi.openjdk11 similarity index 91% rename from ga/23.0.0.7/full/Dockerfile.ubi.openjdk11 rename to ga/23.0.0.8/full/Dockerfile.ubi.openjdk11 index 5e01f9c49..8669e3adf 100644 --- a/ga/23.0.0.7/full/Dockerfile.ubi.openjdk11 +++ b/ga/23.0.0.8/full/Dockerfile.ubi.openjdk11 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.7-kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java11-openj9-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.7-kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java11-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.7/full/Dockerfile.ubi.openjdk17 b/ga/23.0.0.8/full/Dockerfile.ubi.openjdk17 similarity index 91% rename from ga/23.0.0.7/full/Dockerfile.ubi.openjdk17 rename to ga/23.0.0.8/full/Dockerfile.ubi.openjdk17 index 96a3d85a2..e38227406 100644 --- a/ga/23.0.0.7/full/Dockerfile.ubi.openjdk17 +++ b/ga/23.0.0.8/full/Dockerfile.ubi.openjdk17 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.7-kernel-java17-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java17-openj9-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.7-kernel-java17-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java17-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.7/full/Dockerfile.ubi.openjdk8 b/ga/23.0.0.8/full/Dockerfile.ubi.openjdk8 similarity index 91% rename from ga/23.0.0.7/full/Dockerfile.ubi.openjdk8 rename to ga/23.0.0.8/full/Dockerfile.ubi.openjdk8 index b1601394c..0081f5719 100644 --- a/ga/23.0.0.7/full/Dockerfile.ubi.openjdk8 +++ b/ga/23.0.0.8/full/Dockerfile.ubi.openjdk8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.7-kernel-java8-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java8-openj9-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.7-kernel-java8-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java8-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.7/full/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.8/full/Dockerfile.ubuntu.ibmjava8 similarity index 96% rename from ga/23.0.0.7/full/Dockerfile.ubuntu.ibmjava8 rename to ga/23.0.0.8/full/Dockerfile.ubuntu.ibmjava8 index 735e362e9..c301dfec2 100644 --- a/ga/23.0.0.7/full/Dockerfile.ubuntu.ibmjava8 +++ b/ga/23.0.0.8/full/Dockerfile.ubuntu.ibmjava8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:23.0.0.7-kernel-java8-ibmjava +FROM websphere-liberty:kernel-java8-ibmjava ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk11 similarity index 96% rename from ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk11 rename to ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk11 index 814a5f02d..305136390 100644 --- a/ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk11 +++ b/ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk11 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:23.0.0.7-kernel-java11-openj9 +FROM websphere-liberty:kernel-java11-openj9 ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk17 similarity index 96% rename from ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk17 rename to ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk17 index 436a388f2..58d75c5a0 100644 --- a/ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk17 +++ b/ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk17 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:23.0.0.7-kernel-java17-openj9 +FROM websphere-liberty:kernel-java17-openj9 ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.7/full/README.md b/ga/23.0.0.8/full/README.md similarity index 100% rename from ga/23.0.0.7/full/README.md rename to ga/23.0.0.8/full/README.md diff --git a/ga/23.0.0.7/full/server.xml b/ga/23.0.0.8/full/server.xml similarity index 100% rename from ga/23.0.0.7/full/server.xml rename to ga/23.0.0.8/full/server.xml diff --git a/ga/23.0.0.8/images.txt b/ga/23.0.0.8/images.txt new file mode 100644 index 000000000..14821150e --- /dev/null +++ b/ga/23.0.0.8/images.txt @@ -0,0 +1,18 @@ +websphere-liberty:23.0.0.8-kernel ../ga/23.0.0.8/kernel ../ga/23.0.0.8/kernel/Dockerfile.ubuntu.ibmjava8 +websphere-liberty:23.0.0.8-kernel-java11-openj9 ../ga/23.0.0.8/kernel ../ga/23.0.0.8/kernel/Dockerfile.ubuntu.openjdk11 +websphere-liberty:23.0.0.8-kernel-java17-openj9 ../ga/23.0.0.8/kernel ../ga/23.0.0.8/kernel/Dockerfile.ubuntu.openjdk17 +websphere-liberty:23.0.0.8-kernel-java8-ibmjava-ubi ../ga/23.0.0.8/kernel ../ga/23.0.0.8/kernel/Dockerfile.ubi.ibmjava8 +websphere-liberty:23.0.0.8-kernel-java8-openj9-ubi ../ga/23.0.0.8/kernel ../ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk8 +websphere-liberty:23.0.0.8-kernel-java11-openj9-ubi ../ga/23.0.0.8/kernel ../ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk11 +websphere-liberty:23.0.0.8-kernel-java17-openj9-ubi ../ga/23.0.0.8/kernel ../ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk17 +websphere-liberty:23.0.0.8-full ../ga/23.0.0.8/full ../ga/23.0.0.8/full/Dockerfile.ubuntu.ibmjava8 +websphere-liberty:23.0.0.8-full-java11-openj9 ../ga/23.0.0.8/full ../ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk11 +websphere-liberty:23.0.0.8-full-java17-openj9 ../ga/23.0.0.8/full ../ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk17 +websphere-liberty:23.0.0.8-full-java8-ibmjava-ubi ../ga/23.0.0.8/full ../ga/23.0.0.8/full/Dockerfile.ubi.ibmjava8 +websphere-liberty:23.0.0.8-full-java8-openj9-ubi ../ga/23.0.0.8/full ../ga/23.0.0.8/full/Dockerfile.ubi.openjdk8 +websphere-liberty:23.0.0.8-full-java11-openj9-ubi ../ga/23.0.0.8/full ../ga/23.0.0.8/full/Dockerfile.ubi.openjdk11 +websphere-liberty:23.0.0.8-full-java17-openj9-ubi ../ga/23.0.0.8/full ../ga/23.0.0.8/full/Dockerfile.ubi.openjdk17 +websphere-liberty:beta ../beta +websphere-liberty:test-stock-quote test-stock-quote +websphere-liberty:test-stock-trader test-stock-trader +websphere-liberty:test-pet-clinic test-pet-clinic diff --git a/ga/23.0.0.7/kernel/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.8/kernel/Dockerfile.ubi.ibmjava8 similarity index 98% rename from ga/23.0.0.7/kernel/Dockerfile.ubi.ibmjava8 rename to ga/23.0.0.8/kernel/Dockerfile.ubi.ibmjava8 index 0218db758..c4c582a7c 100644 --- a/ga/23.0.0.7/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/23.0.0.8/kernel/Dockerfile.ubi.ibmjava8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_VERSION=23.0.0.8 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.7 -ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 +ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk11 b/ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk11 similarity index 98% rename from ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk11 rename to ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk11 index b5882d924..8a40ddee7 100644 --- a/ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk11 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_VERSION=23.0.0.8 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.7 -ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 +ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk17 b/ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk17 similarity index 98% rename from ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk17 rename to ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk17 index 569932d85..ccf8ee982 100644 --- a/ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk17 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_VERSION=23.0.0.8 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.7 -ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 +ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk8 b/ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk8 similarity index 98% rename from ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk8 rename to ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk8 index 90927869d..2a725f691 100644 --- a/ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/23.0.0.8/kernel/Dockerfile.ubi.openjdk8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_VERSION=23.0.0.8 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.7 -ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 +ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.7/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.8/kernel/Dockerfile.ubuntu.ibmjava8 similarity index 98% rename from ga/23.0.0.7/kernel/Dockerfile.ubuntu.ibmjava8 rename to ga/23.0.0.8/kernel/Dockerfile.ubuntu.ibmjava8 index 0342ad8bb..eb12964a2 100644 --- a/ga/23.0.0.7/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/23.0.0.8/kernel/Dockerfile.ubuntu.ibmjava8 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.7 -ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 +ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.7/kernel/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.8/kernel/Dockerfile.ubuntu.openjdk11 similarity index 98% rename from ga/23.0.0.7/kernel/Dockerfile.ubuntu.openjdk11 rename to ga/23.0.0.8/kernel/Dockerfile.ubuntu.openjdk11 index 727d9ad06..765ce5591 100644 --- a/ga/23.0.0.7/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/23.0.0.8/kernel/Dockerfile.ubuntu.openjdk11 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.7 -ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 +ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.7/kernel/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.8/kernel/Dockerfile.ubuntu.openjdk17 similarity index 98% rename from ga/23.0.0.7/kernel/Dockerfile.ubuntu.openjdk17 rename to ga/23.0.0.8/kernel/Dockerfile.ubuntu.openjdk17 index 6bd2eeba2..3247b5a20 100644 --- a/ga/23.0.0.7/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/23.0.0.8/kernel/Dockerfile.ubuntu.openjdk17 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.7 -ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 +ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.7/kernel/NOTICES b/ga/23.0.0.8/kernel/NOTICES similarity index 100% rename from ga/23.0.0.7/kernel/NOTICES rename to ga/23.0.0.8/kernel/NOTICES diff --git a/ga/23.0.0.7/kernel/README.md b/ga/23.0.0.8/kernel/README.md similarity index 100% rename from ga/23.0.0.7/kernel/README.md rename to ga/23.0.0.8/kernel/README.md diff --git a/ga/23.0.0.7/kernel/fixes/.gitkeep b/ga/23.0.0.8/kernel/fixes/.gitkeep similarity index 100% rename from ga/23.0.0.7/kernel/fixes/.gitkeep rename to ga/23.0.0.8/kernel/fixes/.gitkeep diff --git a/ga/23.0.0.8/kernel/helpers/build/checkpoint.sh b/ga/23.0.0.8/kernel/helpers/build/checkpoint.sh new file mode 100755 index 000000000..7c8f6d189 --- /dev/null +++ b/ga/23.0.0.8/kernel/helpers/build/checkpoint.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +# hack to bump up the pid by 100 +for i in {1..100} +do + pidplus.sh +done + +echo "Performing checkpoint --at=$1" +/opt/ibm/wlp/bin/server checkpoint defaultServer --at=$1 + +# Find all directories in logs/ and output/ that the current user has read/write/execute permissions for +# and give the same permissions to the group. +find -L /logs /output -type d -readable -writable -executable -exec chmod g+rwx {} \; + +# Find all files in logs/ and output/ that the current user has read/write permissions for +# and give the same permissions to the group. +find -L /logs /output -type f -readable -writable -exec chmod g+rw {} \; + +rc=$? +exit $rc diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-client.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-client.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-client.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-client.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/http-endpoint.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/http-endpoint.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/http-endpoint.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/http-endpoint.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/jms-endpoint.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/jms-endpoint.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/jms-endpoint.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/jms-endpoint.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/keystore.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/keystore.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/keystore.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/keystore.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/mp-health-check.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/mp-health-check.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/mp-health-check.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/mp-health-check.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/mp-monitoring.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/mp-monitoring.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/mp-monitoring.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/mp-monitoring.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/oidc-config.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/oidc-config.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/oidc-config.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/oidc-config.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/oidc.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/oidc.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/oidc.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/oidc.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sessioncache-features.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sessioncache-features.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sessioncache-features.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sessioncache-features.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-facebook.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-facebook.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-facebook.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-facebook.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-features.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-features.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-features.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-features.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-github.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-github.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-github.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-github.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-google.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-google.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-google.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-google.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-linkedin.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-linkedin.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-linkedin.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-linkedin.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-oauth2.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-oauth2.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-oauth2.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-oauth2.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-oidc.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-oidc.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-oidc.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-oidc.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-twitter.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-twitter.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-twitter.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/sso-twitter.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/tls.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/tls.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/tls.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/tls.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/trustDefault.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/trustDefault.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/trustDefault.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/trustDefault.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/truststore.xml b/ga/23.0.0.8/kernel/helpers/build/configuration_snippets/truststore.xml similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configuration_snippets/truststore.xml rename to ga/23.0.0.8/kernel/helpers/build/configuration_snippets/truststore.xml diff --git a/ga/23.0.0.7/kernel/helpers/build/configure.sh b/ga/23.0.0.8/kernel/helpers/build/configure.sh similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/configure.sh rename to ga/23.0.0.8/kernel/helpers/build/configure.sh diff --git a/ga/23.0.0.7/kernel/helpers/build/features.sh b/ga/23.0.0.8/kernel/helpers/build/features.sh similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/features.sh rename to ga/23.0.0.8/kernel/helpers/build/features.sh diff --git a/ga/23.0.0.7/kernel/helpers/build/infinispan-client-setup.sh b/ga/23.0.0.8/kernel/helpers/build/infinispan-client-setup.sh similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/infinispan-client-setup.sh rename to ga/23.0.0.8/kernel/helpers/build/infinispan-client-setup.sh diff --git a/ga/23.0.0.7/kernel/helpers/build/internal/features-installed.sh b/ga/23.0.0.8/kernel/helpers/build/internal/features-installed.sh similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/internal/features-installed.sh rename to ga/23.0.0.8/kernel/helpers/build/internal/features-installed.sh diff --git a/ga/23.0.0.7/kernel/helpers/build/pidplus.sh b/ga/23.0.0.8/kernel/helpers/build/pidplus.sh similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/pidplus.sh rename to ga/23.0.0.8/kernel/helpers/build/pidplus.sh diff --git a/ga/23.0.0.7/kernel/helpers/build/populate_scc.sh b/ga/23.0.0.8/kernel/helpers/build/populate_scc.sh similarity index 100% rename from ga/23.0.0.7/kernel/helpers/build/populate_scc.sh rename to ga/23.0.0.8/kernel/helpers/build/populate_scc.sh diff --git a/ga/23.0.0.7/kernel/helpers/runtime/docker-server.sh b/ga/23.0.0.8/kernel/helpers/runtime/docker-server.sh similarity index 100% rename from ga/23.0.0.7/kernel/helpers/runtime/docker-server.sh rename to ga/23.0.0.8/kernel/helpers/runtime/docker-server.sh diff --git a/ga/23.0.0.7/kernel/helpers/runtime/restore-server.sh b/ga/23.0.0.8/kernel/helpers/runtime/restore-server.sh similarity index 100% rename from ga/23.0.0.7/kernel/helpers/runtime/restore-server.sh rename to ga/23.0.0.8/kernel/helpers/runtime/restore-server.sh diff --git a/ga/23.0.0.7/oidcProvider/Dockerfile b/ga/23.0.0.8/oidcProvider/Dockerfile similarity index 100% rename from ga/23.0.0.7/oidcProvider/Dockerfile rename to ga/23.0.0.8/oidcProvider/Dockerfile diff --git a/ga/23.0.0.7/oidcProvider/Dockerfile.java11 b/ga/23.0.0.8/oidcProvider/Dockerfile.java11 similarity index 100% rename from ga/23.0.0.7/oidcProvider/Dockerfile.java11 rename to ga/23.0.0.8/oidcProvider/Dockerfile.java11 diff --git a/ga/23.0.0.7/oidcProvider/README.md b/ga/23.0.0.8/oidcProvider/README.md similarity index 100% rename from ga/23.0.0.7/oidcProvider/README.md rename to ga/23.0.0.8/oidcProvider/README.md diff --git a/ga/23.0.0.7/oidcProvider/server.xml b/ga/23.0.0.8/oidcProvider/server.xml similarity index 100% rename from ga/23.0.0.7/oidcProvider/server.xml rename to ga/23.0.0.8/oidcProvider/server.xml diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 index 0218db758..c4c582a7c 100644 --- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_VERSION=23.0.0.8 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.7 -ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 +ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11 index b5882d924..8a40ddee7 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_VERSION=23.0.0.8 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.7 -ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 +ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17 index 569932d85..ccf8ee982 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_VERSION=23.0.0.8 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.7 -ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 +ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8 index 90927869d..2a725f691 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_VERSION=23.0.0.8 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.7 -ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 +ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 index 0342ad8bb..eb12964a2 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.7 -ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 +ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 index 727d9ad06..765ce5591 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.7 -ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 +ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 index 6bd2eeba2..3247b5a20 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.7 -ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 +ARG LIBERTY_VERSION=23.0.0.8 +ARG LIBERTY_BUILD_LABEL=cl230820230807-0401 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ From 949e8304cc998f46c130d734498c99d63701498b Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Wed, 9 Aug 2023 16:21:35 -0700 Subject: [PATCH 2/4] Correct PARENT_IMAGE name --- ga/23.0.0.8/full/Dockerfile.ubi.ibmjava8 | 4 ++-- ga/23.0.0.8/full/Dockerfile.ubi.openjdk11 | 2 +- ga/23.0.0.8/full/Dockerfile.ubi.openjdk17 | 4 ++-- ga/23.0.0.8/full/Dockerfile.ubi.openjdk8 | 4 ++-- ga/23.0.0.8/full/Dockerfile.ubuntu.ibmjava8 | 2 +- ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk11 | 2 +- ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk17 | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ga/23.0.0.8/full/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.8/full/Dockerfile.ubi.ibmjava8 index 8323de579..b413d39c2 100644 --- a/ga/23.0.0.8/full/Dockerfile.ubi.ibmjava8 +++ b/ga/23.0.0.8/full/Dockerfile.ubi.ibmjava8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java8-ibmjava-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.8-kernel-java8-ibmjava-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java8-ibmjava-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.8-kernel-java8-ibmjava-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.8/full/Dockerfile.ubi.openjdk11 b/ga/23.0.0.8/full/Dockerfile.ubi.openjdk11 index 8669e3adf..d6418cbd6 100644 --- a/ga/23.0.0.8/full/Dockerfile.ubi.openjdk11 +++ b/ga/23.0.0.8/full/Dockerfile.ubi.openjdk11 @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.8-kernel-java11-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.8/full/Dockerfile.ubi.openjdk17 b/ga/23.0.0.8/full/Dockerfile.ubi.openjdk17 index e38227406..a190b20f8 100644 --- a/ga/23.0.0.8/full/Dockerfile.ubi.openjdk17 +++ b/ga/23.0.0.8/full/Dockerfile.ubi.openjdk17 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java17-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.8-kernel-java17-openj9-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java17-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.8-kernel-java17-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.8/full/Dockerfile.ubi.openjdk8 b/ga/23.0.0.8/full/Dockerfile.ubi.openjdk8 index 0081f5719..921103188 100644 --- a/ga/23.0.0.8/full/Dockerfile.ubi.openjdk8 +++ b/ga/23.0.0.8/full/Dockerfile.ubi.openjdk8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java8-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.8-kernel-java8-openj9-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java8-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.8-kernel-java8-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.8/full/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.8/full/Dockerfile.ubuntu.ibmjava8 index c301dfec2..1ff695561 100644 --- a/ga/23.0.0.8/full/Dockerfile.ubuntu.ibmjava8 +++ b/ga/23.0.0.8/full/Dockerfile.ubuntu.ibmjava8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:kernel-java8-ibmjava +FROM websphere-liberty:23.0.0.8-kernel-java8-ibmjava ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk11 index 305136390..11cfdc57b 100644 --- a/ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk11 +++ b/ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk11 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:kernel-java11-openj9 +FROM websphere-liberty:23.0.0.8-kernel-java11-openj9 ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk17 index 58d75c5a0..16872360c 100644 --- a/ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk17 +++ b/ga/23.0.0.8/full/Dockerfile.ubuntu.openjdk17 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:kernel-java17-openj9 +FROM websphere-liberty:23.0.0.8-kernel-java17-openj9 ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" From 5e9f00ae8b80ea5b633b0b637b97823cbaa88222 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Wed, 9 Aug 2023 16:24:16 -0700 Subject: [PATCH 3/4] Resources is required directory --- ga/23.0.0.8/full/resources/.gitkeep | 0 ga/23.0.0.8/kernel/resources/.gitkeep | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 ga/23.0.0.8/full/resources/.gitkeep create mode 100644 ga/23.0.0.8/kernel/resources/.gitkeep diff --git a/ga/23.0.0.8/full/resources/.gitkeep b/ga/23.0.0.8/full/resources/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/ga/23.0.0.8/kernel/resources/.gitkeep b/ga/23.0.0.8/kernel/resources/.gitkeep new file mode 100644 index 000000000..e69de29bb From 5059c6468f95a4c44765d89ed092c6babf6c0f83 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Thu, 10 Aug 2023 07:34:30 -0500 Subject: [PATCH 4/4] Properly capture the RC from the checkpoint command Without this fix the wrong RC was caputured from the chmod/chown commands run after the server script. --- ga/23.0.0.8/kernel/helpers/build/checkpoint.sh | 16 +++++++++------- ga/latest/kernel/helpers/build/checkpoint.sh | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/ga/23.0.0.8/kernel/helpers/build/checkpoint.sh b/ga/23.0.0.8/kernel/helpers/build/checkpoint.sh index 7c8f6d189..8a677ea58 100755 --- a/ga/23.0.0.8/kernel/helpers/build/checkpoint.sh +++ b/ga/23.0.0.8/kernel/helpers/build/checkpoint.sh @@ -9,13 +9,15 @@ done echo "Performing checkpoint --at=$1" /opt/ibm/wlp/bin/server checkpoint defaultServer --at=$1 -# Find all directories in logs/ and output/ that the current user has read/write/execute permissions for -# and give the same permissions to the group. -find -L /logs /output -type d -readable -writable -executable -exec chmod g+rwx {} \; +rc=$? +if [ $rc -eq 0 ]; then + # Find all directories in logs/ and output/ that the current user has read/write/execute permissions for + # and give the same permissions to the group. + find -L /logs /output -type d -readable -writable -executable -exec chmod g+rwx {} \; -# Find all files in logs/ and output/ that the current user has read/write permissions for -# and give the same permissions to the group. -find -L /logs /output -type f -readable -writable -exec chmod g+rw {} \; + # Find all files in logs/ and output/ that the current user has read/write permissions for + # and give the same permissions to the group. + find -L /logs /output -type f -readable -writable -exec chmod g+rw {} \; +fi -rc=$? exit $rc diff --git a/ga/latest/kernel/helpers/build/checkpoint.sh b/ga/latest/kernel/helpers/build/checkpoint.sh index 7c8f6d189..8a677ea58 100755 --- a/ga/latest/kernel/helpers/build/checkpoint.sh +++ b/ga/latest/kernel/helpers/build/checkpoint.sh @@ -9,13 +9,15 @@ done echo "Performing checkpoint --at=$1" /opt/ibm/wlp/bin/server checkpoint defaultServer --at=$1 -# Find all directories in logs/ and output/ that the current user has read/write/execute permissions for -# and give the same permissions to the group. -find -L /logs /output -type d -readable -writable -executable -exec chmod g+rwx {} \; +rc=$? +if [ $rc -eq 0 ]; then + # Find all directories in logs/ and output/ that the current user has read/write/execute permissions for + # and give the same permissions to the group. + find -L /logs /output -type d -readable -writable -executable -exec chmod g+rwx {} \; -# Find all files in logs/ and output/ that the current user has read/write permissions for -# and give the same permissions to the group. -find -L /logs /output -type f -readable -writable -exec chmod g+rw {} \; + # Find all files in logs/ and output/ that the current user has read/write permissions for + # and give the same permissions to the group. + find -L /logs /output -type f -readable -writable -exec chmod g+rw {} \; +fi -rc=$? exit $rc