From c434f835a1cbd50104bbb4b6b6ef5165cfb575a4 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Tue, 17 Oct 2023 16:11:43 -0700 Subject: [PATCH 01/10] Updates for the release of 23.0.0.11 --- .travis.yml | 2 +- ga/23.0.0.10/full/resources/.gitkeep | 0 ga/23.0.0.10/images.txt | 18 ------------------ ga/23.0.0.10/kernel/resources/.gitkeep | 0 ga/{23.0.0.10 => 23.0.0.11}/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.10 => 23.0.0.11}/full/README.md | 0 ga/{23.0.0.10 => 23.0.0.11}/full/server.xml | 0 ga/23.0.0.11/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.10 => 23.0.0.11}/kernel/NOTICES | 0 ga/{23.0.0.10 => 23.0.0.11}/kernel/README.md | 0 .../kernel/fixes/.gitkeep | 0 .../kernel/helpers/build/checkpoint.sh | 0 .../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 .../configuration_snippets/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 ++-- 74 files changed, 66 insertions(+), 66 deletions(-) delete mode 100644 ga/23.0.0.10/full/resources/.gitkeep delete mode 100644 ga/23.0.0.10/images.txt delete mode 100644 ga/23.0.0.10/kernel/resources/.gitkeep rename ga/{23.0.0.10 => 23.0.0.11}/README.md (100%) rename ga/{23.0.0.10 => 23.0.0.11}/full/Dockerfile.ubi.ibmjava8 (93%) rename ga/{23.0.0.10 => 23.0.0.11}/full/Dockerfile.ubi.openjdk11 (93%) rename ga/{23.0.0.10 => 23.0.0.11}/full/Dockerfile.ubi.openjdk17 (93%) rename ga/{23.0.0.10 => 23.0.0.11}/full/Dockerfile.ubi.openjdk8 (93%) rename ga/{23.0.0.10 => 23.0.0.11}/full/Dockerfile.ubuntu.ibmjava8 (96%) rename ga/{23.0.0.10 => 23.0.0.11}/full/Dockerfile.ubuntu.openjdk11 (96%) rename ga/{23.0.0.10 => 23.0.0.11}/full/Dockerfile.ubuntu.openjdk17 (96%) rename ga/{23.0.0.10 => 23.0.0.11}/full/README.md (100%) rename ga/{23.0.0.10 => 23.0.0.11}/full/server.xml (100%) create mode 100644 ga/23.0.0.11/images.txt rename ga/{23.0.0.10 => 23.0.0.11}/kernel/Dockerfile.ubi.ibmjava8 (98%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/Dockerfile.ubi.openjdk11 (98%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/Dockerfile.ubi.openjdk17 (98%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/Dockerfile.ubi.openjdk8 (98%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/Dockerfile.ubuntu.ibmjava8 (98%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/Dockerfile.ubuntu.openjdk11 (98%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/Dockerfile.ubuntu.openjdk17 (98%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/NOTICES (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/README.md (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/fixes/.gitkeep (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/checkpoint.sh (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/hazelcast-client.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/http-endpoint.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/jms-endpoint.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/keystore.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/mp-health-check.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/mp-monitoring.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/oidc-config.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/oidc.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/sessioncache-features.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/sso-facebook.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/sso-features.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/sso-github.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/sso-google.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/sso-linkedin.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/sso-oauth2.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/sso-oidc.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/sso-twitter.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/tls.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/trustDefault.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configuration_snippets/truststore.xml (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/configure.sh (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/features.sh (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/infinispan-client-setup.sh (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/internal/features-installed.sh (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/pidplus.sh (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/build/populate_scc.sh (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/runtime/docker-server.sh (100%) rename ga/{23.0.0.10 => 23.0.0.11}/kernel/helpers/runtime/restore-server.sh (100%) rename ga/{23.0.0.10 => 23.0.0.11}/oidcProvider/Dockerfile (100%) rename ga/{23.0.0.10 => 23.0.0.11}/oidcProvider/Dockerfile.java11 (100%) rename ga/{23.0.0.10 => 23.0.0.11}/oidcProvider/README.md (100%) rename ga/{23.0.0.10 => 23.0.0.11}/oidcProvider/server.xml (100%) diff --git a/.travis.yml b/.travis.yml index 811e17ba..0255093e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: env: - RELEASE=../ga/23.0.0.6 - RELEASE=../ga/23.0.0.9 - - RELEASE=../ga/23.0.0.10 + - RELEASE=../ga/23.0.0.11 - RELEASE=../ga/latest script: diff --git a/ga/23.0.0.10/full/resources/.gitkeep b/ga/23.0.0.10/full/resources/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/ga/23.0.0.10/images.txt b/ga/23.0.0.10/images.txt deleted file mode 100644 index 2e28009d..00000000 --- a/ga/23.0.0.10/images.txt +++ /dev/null @@ -1,18 +0,0 @@ -websphere-liberty:23.0.0.10-kernel ../ga/23.0.0.10/kernel ../ga/23.0.0.10/kernel/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:23.0.0.10-kernel-java11-openj9 ../ga/23.0.0.10/kernel ../ga/23.0.0.10/kernel/Dockerfile.ubuntu.openjdk11 -websphere-liberty:23.0.0.10-kernel-java17-openj9 ../ga/23.0.0.10/kernel ../ga/23.0.0.10/kernel/Dockerfile.ubuntu.openjdk17 -websphere-liberty:23.0.0.10-kernel-java8-ibmjava-ubi ../ga/23.0.0.10/kernel ../ga/23.0.0.10/kernel/Dockerfile.ubi.ibmjava8 -websphere-liberty:23.0.0.10-kernel-java8-openj9-ubi ../ga/23.0.0.10/kernel ../ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk8 -websphere-liberty:23.0.0.10-kernel-java11-openj9-ubi ../ga/23.0.0.10/kernel ../ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk11 -websphere-liberty:23.0.0.10-kernel-java17-openj9-ubi ../ga/23.0.0.10/kernel ../ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk17 -websphere-liberty:23.0.0.10-full ../ga/23.0.0.10/full ../ga/23.0.0.10/full/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:23.0.0.10-full-java11-openj9 ../ga/23.0.0.10/full ../ga/23.0.0.10/full/Dockerfile.ubuntu.openjdk11 -websphere-liberty:23.0.0.10-full-java17-openj9 ../ga/23.0.0.10/full ../ga/23.0.0.10/full/Dockerfile.ubuntu.openjdk17 -websphere-liberty:23.0.0.10-full-java8-ibmjava-ubi ../ga/23.0.0.10/full ../ga/23.0.0.10/full/Dockerfile.ubi.ibmjava8 -websphere-liberty:23.0.0.10-full-java8-openj9-ubi ../ga/23.0.0.10/full ../ga/23.0.0.10/full/Dockerfile.ubi.openjdk8 -websphere-liberty:23.0.0.10-full-java11-openj9-ubi ../ga/23.0.0.10/full ../ga/23.0.0.10/full/Dockerfile.ubi.openjdk11 -websphere-liberty:23.0.0.10-full-java17-openj9-ubi ../ga/23.0.0.10/full ../ga/23.0.0.10/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.10/kernel/resources/.gitkeep b/ga/23.0.0.10/kernel/resources/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/ga/23.0.0.10/README.md b/ga/23.0.0.11/README.md similarity index 100% rename from ga/23.0.0.10/README.md rename to ga/23.0.0.11/README.md diff --git a/ga/23.0.0.10/full/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.11/full/Dockerfile.ubi.ibmjava8 similarity index 93% rename from ga/23.0.0.10/full/Dockerfile.ubi.ibmjava8 rename to ga/23.0.0.11/full/Dockerfile.ubi.ibmjava8 index 39aa0bd2..d2815729 100644 --- a/ga/23.0.0.10/full/Dockerfile.ubi.ibmjava8 +++ b/ga/23.0.0.11/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.10-kernel-java8-ibmjava-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-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.10-kernel-java8-ibmjava-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java8-ibmjava-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.10/full/Dockerfile.ubi.openjdk11 b/ga/23.0.0.11/full/Dockerfile.ubi.openjdk11 similarity index 93% rename from ga/23.0.0.10/full/Dockerfile.ubi.openjdk11 rename to ga/23.0.0.11/full/Dockerfile.ubi.openjdk11 index 051c23fa..f0c03ec9 100644 --- a/ga/23.0.0.10/full/Dockerfile.ubi.openjdk11 +++ b/ga/23.0.0.11/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.10-kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-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.10-kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java11-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.10/full/Dockerfile.ubi.openjdk17 b/ga/23.0.0.11/full/Dockerfile.ubi.openjdk17 similarity index 93% rename from ga/23.0.0.10/full/Dockerfile.ubi.openjdk17 rename to ga/23.0.0.11/full/Dockerfile.ubi.openjdk17 index 7d043010..57c18c39 100644 --- a/ga/23.0.0.10/full/Dockerfile.ubi.openjdk17 +++ b/ga/23.0.0.11/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.10-kernel-java17-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-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.10-kernel-java17-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java17-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.10/full/Dockerfile.ubi.openjdk8 b/ga/23.0.0.11/full/Dockerfile.ubi.openjdk8 similarity index 93% rename from ga/23.0.0.10/full/Dockerfile.ubi.openjdk8 rename to ga/23.0.0.11/full/Dockerfile.ubi.openjdk8 index cd1bc26d..9605016b 100644 --- a/ga/23.0.0.10/full/Dockerfile.ubi.openjdk8 +++ b/ga/23.0.0.11/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.10-kernel-java8-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-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.10-kernel-java8-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java8-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.10/full/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.11/full/Dockerfile.ubuntu.ibmjava8 similarity index 96% rename from ga/23.0.0.10/full/Dockerfile.ubuntu.ibmjava8 rename to ga/23.0.0.11/full/Dockerfile.ubuntu.ibmjava8 index 55c8e4ec..eeba0c94 100644 --- a/ga/23.0.0.10/full/Dockerfile.ubuntu.ibmjava8 +++ b/ga/23.0.0.11/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.10-kernel-java8-ibmjava +FROM websphere-liberty:23.0.0.11-kernel-java8-ibmjava ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.10/full/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk11 similarity index 96% rename from ga/23.0.0.10/full/Dockerfile.ubuntu.openjdk11 rename to ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk11 index e5c264d6..5e08b1ef 100644 --- a/ga/23.0.0.10/full/Dockerfile.ubuntu.openjdk11 +++ b/ga/23.0.0.11/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.10-kernel-java11-openj9 +FROM websphere-liberty:23.0.0.11-kernel-java11-openj9 ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.10/full/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk17 similarity index 96% rename from ga/23.0.0.10/full/Dockerfile.ubuntu.openjdk17 rename to ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk17 index 4b30de00..1ab06384 100644 --- a/ga/23.0.0.10/full/Dockerfile.ubuntu.openjdk17 +++ b/ga/23.0.0.11/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.10-kernel-java17-openj9 +FROM websphere-liberty:23.0.0.11-kernel-java17-openj9 ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.10/full/README.md b/ga/23.0.0.11/full/README.md similarity index 100% rename from ga/23.0.0.10/full/README.md rename to ga/23.0.0.11/full/README.md diff --git a/ga/23.0.0.10/full/server.xml b/ga/23.0.0.11/full/server.xml similarity index 100% rename from ga/23.0.0.10/full/server.xml rename to ga/23.0.0.11/full/server.xml diff --git a/ga/23.0.0.11/images.txt b/ga/23.0.0.11/images.txt new file mode 100644 index 00000000..1cad09aa --- /dev/null +++ b/ga/23.0.0.11/images.txt @@ -0,0 +1,18 @@ +websphere-liberty:23.0.0.11-kernel ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 +websphere-liberty:23.0.0.11-kernel-java11-openj9 ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 +websphere-liberty:23.0.0.11-kernel-java17-openj9 ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 +websphere-liberty:23.0.0.11-kernel-java8-ibmjava-ubi ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubi.ibmjava8 +websphere-liberty:23.0.0.11-kernel-java8-openj9-ubi ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 +websphere-liberty:23.0.0.11-kernel-java11-openj9-ubi ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 +websphere-liberty:23.0.0.11-kernel-java17-openj9-ubi ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 +websphere-liberty:23.0.0.11-full ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubuntu.ibmjava8 +websphere-liberty:23.0.0.11-full-java11-openj9 ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk11 +websphere-liberty:23.0.0.11-full-java17-openj9 ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk17 +websphere-liberty:23.0.0.11-full-java8-ibmjava-ubi ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubi.ibmjava8 +websphere-liberty:23.0.0.11-full-java8-openj9-ubi ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubi.openjdk8 +websphere-liberty:23.0.0.11-full-java11-openj9-ubi ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubi.openjdk11 +websphere-liberty:23.0.0.11-full-java17-openj9-ubi ../ga/23.0.0.11/full ../ga/23.0.0.11/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.10/kernel/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.11/kernel/Dockerfile.ubi.ibmjava8 similarity index 98% rename from ga/23.0.0.10/kernel/Dockerfile.ubi.ibmjava8 rename to ga/23.0.0.11/kernel/Dockerfile.ubi.ibmjava8 index f060d976..a1ff55a8 100644 --- a/ga/23.0.0.10/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubi.ibmjava8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.10 +ARG LIBERTY_VERSION=23.0.0.11 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.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 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.10/kernel/Dockerfile.ubi.openjdk11 b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 similarity index 98% rename from ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk11 rename to ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 index 49875cd2..a82697b5 100644 --- a/ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.10 +ARG LIBERTY_VERSION=23.0.0.11 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.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 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.10/kernel/Dockerfile.ubi.openjdk17 b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 similarity index 98% rename from ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk17 rename to ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 index 6faf0284..93e427dc 100644 --- a/ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.10 +ARG LIBERTY_VERSION=23.0.0.11 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.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 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.10/kernel/Dockerfile.ubi.openjdk8 b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 similarity index 98% rename from ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk8 rename to ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 index f27221e1..60013803 100644 --- a/ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.10 +ARG LIBERTY_VERSION=23.0.0.11 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.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 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.10/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 similarity index 98% rename from ga/23.0.0.10/kernel/Dockerfile.ubuntu.ibmjava8 rename to ga/23.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 index 10cf13b2..70c0aacf 100644 --- a/ga/23.0.0.10/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 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.10/kernel/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 similarity index 98% rename from ga/23.0.0.10/kernel/Dockerfile.ubuntu.openjdk11 rename to ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 index fc1a14eb..aebcfe99 100644 --- a/ga/23.0.0.10/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 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.10/kernel/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 similarity index 98% rename from ga/23.0.0.10/kernel/Dockerfile.ubuntu.openjdk17 rename to ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 index ec5fa0f0..d467956f 100644 --- a/ga/23.0.0.10/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 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.10/kernel/NOTICES b/ga/23.0.0.11/kernel/NOTICES similarity index 100% rename from ga/23.0.0.10/kernel/NOTICES rename to ga/23.0.0.11/kernel/NOTICES diff --git a/ga/23.0.0.10/kernel/README.md b/ga/23.0.0.11/kernel/README.md similarity index 100% rename from ga/23.0.0.10/kernel/README.md rename to ga/23.0.0.11/kernel/README.md diff --git a/ga/23.0.0.10/kernel/fixes/.gitkeep b/ga/23.0.0.11/kernel/fixes/.gitkeep similarity index 100% rename from ga/23.0.0.10/kernel/fixes/.gitkeep rename to ga/23.0.0.11/kernel/fixes/.gitkeep diff --git a/ga/23.0.0.10/kernel/helpers/build/checkpoint.sh b/ga/23.0.0.11/kernel/helpers/build/checkpoint.sh similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/checkpoint.sh rename to ga/23.0.0.11/kernel/helpers/build/checkpoint.sh diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-client.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-client.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-client.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-client.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/http-endpoint.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/http-endpoint.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/http-endpoint.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/http-endpoint.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/jms-endpoint.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/jms-endpoint.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/jms-endpoint.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/jms-endpoint.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/keystore.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/keystore.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/keystore.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/keystore.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/mp-health-check.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/mp-health-check.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/mp-health-check.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/mp-health-check.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/mp-monitoring.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/mp-monitoring.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/mp-monitoring.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/mp-monitoring.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/oidc-config.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/oidc-config.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/oidc-config.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/oidc-config.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/oidc.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/oidc.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/oidc.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/oidc.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sessioncache-features.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sessioncache-features.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sessioncache-features.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sessioncache-features.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-facebook.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-facebook.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-facebook.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-facebook.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-features.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-features.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-features.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-features.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-github.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-github.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-github.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-github.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-google.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-google.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-google.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-google.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-linkedin.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-linkedin.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-linkedin.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-linkedin.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-oauth2.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-oauth2.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-oauth2.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-oauth2.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-oidc.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-oidc.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-oidc.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-oidc.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-twitter.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-twitter.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-twitter.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-twitter.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/tls.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/tls.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/tls.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/tls.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/trustDefault.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/trustDefault.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/trustDefault.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/trustDefault.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/truststore.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/truststore.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/truststore.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/truststore.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configure.sh b/ga/23.0.0.11/kernel/helpers/build/configure.sh similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configure.sh rename to ga/23.0.0.11/kernel/helpers/build/configure.sh diff --git a/ga/23.0.0.10/kernel/helpers/build/features.sh b/ga/23.0.0.11/kernel/helpers/build/features.sh similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/features.sh rename to ga/23.0.0.11/kernel/helpers/build/features.sh diff --git a/ga/23.0.0.10/kernel/helpers/build/infinispan-client-setup.sh b/ga/23.0.0.11/kernel/helpers/build/infinispan-client-setup.sh similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/infinispan-client-setup.sh rename to ga/23.0.0.11/kernel/helpers/build/infinispan-client-setup.sh diff --git a/ga/23.0.0.10/kernel/helpers/build/internal/features-installed.sh b/ga/23.0.0.11/kernel/helpers/build/internal/features-installed.sh similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/internal/features-installed.sh rename to ga/23.0.0.11/kernel/helpers/build/internal/features-installed.sh diff --git a/ga/23.0.0.10/kernel/helpers/build/pidplus.sh b/ga/23.0.0.11/kernel/helpers/build/pidplus.sh similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/pidplus.sh rename to ga/23.0.0.11/kernel/helpers/build/pidplus.sh diff --git a/ga/23.0.0.10/kernel/helpers/build/populate_scc.sh b/ga/23.0.0.11/kernel/helpers/build/populate_scc.sh similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/populate_scc.sh rename to ga/23.0.0.11/kernel/helpers/build/populate_scc.sh diff --git a/ga/23.0.0.10/kernel/helpers/runtime/docker-server.sh b/ga/23.0.0.11/kernel/helpers/runtime/docker-server.sh similarity index 100% rename from ga/23.0.0.10/kernel/helpers/runtime/docker-server.sh rename to ga/23.0.0.11/kernel/helpers/runtime/docker-server.sh diff --git a/ga/23.0.0.10/kernel/helpers/runtime/restore-server.sh b/ga/23.0.0.11/kernel/helpers/runtime/restore-server.sh similarity index 100% rename from ga/23.0.0.10/kernel/helpers/runtime/restore-server.sh rename to ga/23.0.0.11/kernel/helpers/runtime/restore-server.sh diff --git a/ga/23.0.0.10/oidcProvider/Dockerfile b/ga/23.0.0.11/oidcProvider/Dockerfile similarity index 100% rename from ga/23.0.0.10/oidcProvider/Dockerfile rename to ga/23.0.0.11/oidcProvider/Dockerfile diff --git a/ga/23.0.0.10/oidcProvider/Dockerfile.java11 b/ga/23.0.0.11/oidcProvider/Dockerfile.java11 similarity index 100% rename from ga/23.0.0.10/oidcProvider/Dockerfile.java11 rename to ga/23.0.0.11/oidcProvider/Dockerfile.java11 diff --git a/ga/23.0.0.10/oidcProvider/README.md b/ga/23.0.0.11/oidcProvider/README.md similarity index 100% rename from ga/23.0.0.10/oidcProvider/README.md rename to ga/23.0.0.11/oidcProvider/README.md diff --git a/ga/23.0.0.10/oidcProvider/server.xml b/ga/23.0.0.11/oidcProvider/server.xml similarity index 100% rename from ga/23.0.0.10/oidcProvider/server.xml rename to ga/23.0.0.11/oidcProvider/server.xml diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 index f060d976..a1ff55a8 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.10 +ARG LIBERTY_VERSION=23.0.0.11 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.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 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 49875cd2..a82697b5 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.10 +ARG LIBERTY_VERSION=23.0.0.11 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.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 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 6faf0284..93e427dc 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.10 +ARG LIBERTY_VERSION=23.0.0.11 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.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 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 f27221e1..60013803 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.10 +ARG LIBERTY_VERSION=23.0.0.11 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.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 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 10cf13b2..70c0aacf 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.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 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 fc1a14eb..aebcfe99 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.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 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 ec5fa0f0..d467956f 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.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ From 970cec432fba4f1a516696261ef61038a2ac2b2a Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Tue, 17 Oct 2023 16:12:53 -0700 Subject: [PATCH 02/10] Add required resources directory in 23.0.0.11 --- ga/23.0.0.11/full/resources/.gitkeep | 0 ga/23.0.0.11/kernel/resources/.gitkeep | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 ga/23.0.0.11/full/resources/.gitkeep create mode 100644 ga/23.0.0.11/kernel/resources/.gitkeep diff --git a/ga/23.0.0.11/full/resources/.gitkeep b/ga/23.0.0.11/full/resources/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/ga/23.0.0.11/kernel/resources/.gitkeep b/ga/23.0.0.11/kernel/resources/.gitkeep new file mode 100644 index 00000000..e69de29b From 27dac8bda605855f699c0e3c414aa6a3fa619245 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Fri, 27 Oct 2023 12:19:31 -0500 Subject: [PATCH 03/10] update.sh script invoked by main branch workflow needs to be in vNext --- update.sh | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 update.sh diff --git a/update.sh b/update.sh new file mode 100644 index 00000000..faf12f36 --- /dev/null +++ b/update.sh @@ -0,0 +1,67 @@ +#!/bin/bash + +echo "Hello from the update.sh script!" +echo $(date) + +# Set variables to the positional parameters +OLD_VERSION=$1 +NEW_VERSION=$2 +BUILD_LABEL=$3 + +# See if NEW_VERSION and OLD_VERSION fit expected pattern. +if [[ $OLD_VERSION =~ 2[3-9]\.0\.0\.[0-9]+ && $NEW_VERSION =~ 2[3-9]\.0\.0\.[0-9]+ ]]; +then + echo "$OLD_VERSION and $NEW_VERSION matches expected version format." +else + echo "Either $OLD_VERSION or $NEW_VERSION does not fit expected version format." + exit 1; +fi + +# Get last digit of old version +OLD_SHORT_VERSION=${OLD_VERSION:7} + +echo "OLD_VERSION = $OLD_VERSION" +echo "NEW_VERSION = $NEW_VERSION" +echo "BUILD_LABEL = $BUILD_LABEL" +echo "OLD_SHORT_VERSION = $OLD_SHORT_VERSION" + +echo "Copying latest files to $NEW_VERSION" +cp -r ./ga/latest ./ga/$NEW_VERSION + +# Perform the substitutions in both latest and $NEW_VERSION directories. +for file in $(find ./ga/latest ./ga/$NEW_VERSION -name Dockerfile.*); do + echo "Processing $file"; + + sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/" $file; + sed -i'.bak' -e "s/ARG LIBERTY_BUILD_LABEL=.*/ARG LIBERTY_BUILD_LABEL=$BUILD_LABEL/g" $file; + + # Do these substitutions only in $NEW_VERSION, not latest. + if [[ "$file" == "./ga/$NEW_VERSION/"* ]]; + then + sed -i'.bak' -e "s/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:kernel/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:$NEW_VERSION-kernel/g" $file; + sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file; + fi + + # Clean up temp files + rm $file.bak + +done + +cp ./ga/$OLD_VERSION/images.txt ./ga/$NEW_VERSION/images.txt; +sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/g" ./ga/$NEW_VERSION/images.txt; +rm ./ga/$NEW_VERSION/images.txt.bak; + +if [[ $(( $OLD_SHORT_VERSION % 3 )) -eq 0 ]] + then + : + else + rm -rf ./ga/$OLD_VERSION + fi + +# Finally, comment out "ga/*/*/resources/*" in .gitignore so +# newly created $NEW_VERSION/full/resources and $NEW_VERSION/kernel/resources +# directories can be committed and pushed. +sed -i'.bak' -e "s/ga\/\*\/\*\/resources\/\*/#ga\/\*\/\*\/resources\/\*/g" .gitignore +rm ./.gitignore.bak + +echo "Done performing file updates."; From 5e150419956db0d40e08877cfb88b2de06a32769 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Mon, 30 Oct 2023 12:03:17 -0500 Subject: [PATCH 04/10] Update Travis config file --- update.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/update.sh b/update.sh index faf12f36..d28fc336 100644 --- a/update.sh +++ b/update.sh @@ -47,6 +47,11 @@ for file in $(find ./ga/latest ./ga/$NEW_VERSION -name Dockerfile.*); do done +# Update the .travis.yml file. +sed -i'.bak' -e "s/RELEASE=\.\.\/releases\/$OLD_VERSION/RELEASE=\.\.\/releases\/$NEW_VERSION/" ./.travis.yml; +rm ./.travis.yml.bak; + +# Update the images.txt file cp ./ga/$OLD_VERSION/images.txt ./ga/$NEW_VERSION/images.txt; sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/g" ./ga/$NEW_VERSION/images.txt; rm ./ga/$NEW_VERSION/images.txt.bak; From 2623a69bc09038076e5cc594ec73cb48243ea0f5 Mon Sep 17 00:00:00 2001 From: Kirby Chin Date: Tue, 31 Oct 2023 11:55:16 -0400 Subject: [PATCH 05/10] Output stderr in features.sh (#559) --- ga/23.0.0.11/kernel/helpers/build/features.sh | 2 +- ga/23.0.0.6/kernel/helpers/build/features.sh | 2 +- ga/23.0.0.9/kernel/helpers/build/features.sh | 2 +- ga/latest/kernel/helpers/build/features.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ga/23.0.0.11/kernel/helpers/build/features.sh b/ga/23.0.0.11/kernel/helpers/build/features.sh index 4e665489..f6ac6152 100755 --- a/ga/23.0.0.11/kernel/helpers/build/features.sh +++ b/ga/23.0.0.11/kernel/helpers/build/features.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.6/kernel/helpers/build/features.sh b/ga/23.0.0.6/kernel/helpers/build/features.sh index 4e665489..f6ac6152 100755 --- a/ga/23.0.0.6/kernel/helpers/build/features.sh +++ b/ga/23.0.0.6/kernel/helpers/build/features.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.9/kernel/helpers/build/features.sh b/ga/23.0.0.9/kernel/helpers/build/features.sh index 4e665489..f6ac6152 100755 --- a/ga/23.0.0.9/kernel/helpers/build/features.sh +++ b/ga/23.0.0.9/kernel/helpers/build/features.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/features.sh b/ga/latest/kernel/helpers/build/features.sh index 4e665489..f6ac6152 100755 --- a/ga/latest/kernel/helpers/build/features.sh +++ b/ga/latest/kernel/helpers/build/features.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 From 69f80478b793e8610c312982f7b335c512a54bd6 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Tue, 31 Oct 2023 10:54:23 -0500 Subject: [PATCH 06/10] Script rename and in subdir --- update.sh => internal/create-new-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename update.sh => internal/create-new-release.sh (97%) diff --git a/update.sh b/internal/create-new-release.sh similarity index 97% rename from update.sh rename to internal/create-new-release.sh index d28fc336..07dd2d71 100644 --- a/update.sh +++ b/internal/create-new-release.sh @@ -1,6 +1,6 @@ #!/bin/bash -echo "Hello from the update.sh script!" +echo "Hello from the create-new-release.sh script!" echo $(date) # Set variables to the positional parameters From 76c553665701b0c1752d98f126b4c540f9698de3 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Tue, 31 Oct 2023 12:08:11 -0500 Subject: [PATCH 07/10] Restore location structure of script --- internal/create-new-release.sh => create-new-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename internal/create-new-release.sh => create-new-release.sh (95%) diff --git a/internal/create-new-release.sh b/create-new-release.sh similarity index 95% rename from internal/create-new-release.sh rename to create-new-release.sh index 07dd2d71..a422c911 100644 --- a/internal/create-new-release.sh +++ b/create-new-release.sh @@ -48,7 +48,7 @@ for file in $(find ./ga/latest ./ga/$NEW_VERSION -name Dockerfile.*); do done # Update the .travis.yml file. -sed -i'.bak' -e "s/RELEASE=\.\.\/releases\/$OLD_VERSION/RELEASE=\.\.\/releases\/$NEW_VERSION/" ./.travis.yml; +sed -i'.bak' -e "s/RELEASE=\.\.\/ga\/$OLD_VERSION/RELEASE=\.\.\/ga\/$NEW_VERSION/" ./.travis.yml; rm ./.travis.yml.bak; # Update the images.txt file From c839f7de10fa18bb1c8e148b92442c863c863f1d Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 2 Nov 2023 12:04:54 -0500 Subject: [PATCH 08/10] Update placeholder build label with cl231120231030-1102 --- ga/23.0.0.11/kernel/Dockerfile.ubi.ibmjava8 | 2 +- ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 | 2 +- ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 | 2 +- ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 | 2 +- ga/23.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 | 2 +- ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 | 2 +- ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 | 2 +- ga/latest/kernel/Dockerfile.ubi.ibmjava8 | 2 +- ga/latest/kernel/Dockerfile.ubi.openjdk11 | 2 +- ga/latest/kernel/Dockerfile.ubi.openjdk17 | 2 +- ga/latest/kernel/Dockerfile.ubi.openjdk8 | 2 +- ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 | 2 +- ga/latest/kernel/Dockerfile.ubuntu.openjdk11 | 2 +- ga/latest/kernel/Dockerfile.ubuntu.openjdk17 | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ga/23.0.0.11/kernel/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.11/kernel/Dockerfile.ubi.ibmjava8 index a1ff55a8..e39211eb 100644 --- a/ga/23.0.0.11/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubi.ibmjava8 @@ -46,7 +46,7 @@ ARG VERBOSE=false ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 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.11/kernel/Dockerfile.ubi.openjdk11 b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 index a82697b5..52f1da44 100644 --- a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 @@ -46,7 +46,7 @@ ARG VERBOSE=false ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 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.11/kernel/Dockerfile.ubi.openjdk17 b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 index 93e427dc..24a074ec 100644 --- a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 @@ -46,7 +46,7 @@ ARG VERBOSE=false ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 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.11/kernel/Dockerfile.ubi.openjdk8 b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 index 60013803..d0770516 100644 --- a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 @@ -46,7 +46,7 @@ ARG VERBOSE=false ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 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.11/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 index 70c0aacf..34918551 100644 --- a/ga/23.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 @@ -20,7 +20,7 @@ ARG VERBOSE=false ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 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.11/kernel/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 index aebcfe99..6c3894c9 100644 --- a/ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 @@ -20,7 +20,7 @@ ARG VERBOSE=false ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 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.11/kernel/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 index d467956f..7df996aa 100644 --- a/ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 @@ -20,7 +20,7 @@ ARG VERBOSE=false ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 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.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 index a1ff55a8..e39211eb 100644 --- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 @@ -46,7 +46,7 @@ ARG VERBOSE=false ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 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 a82697b5..52f1da44 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11 @@ -46,7 +46,7 @@ ARG VERBOSE=false ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 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 93e427dc..24a074ec 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17 @@ -46,7 +46,7 @@ ARG VERBOSE=false ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 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 60013803..d0770516 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8 @@ -46,7 +46,7 @@ ARG VERBOSE=false ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 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 70c0aacf..34918551 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 @@ -20,7 +20,7 @@ ARG VERBOSE=false ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 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 aebcfe99..6c3894c9 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 @@ -20,7 +20,7 @@ ARG VERBOSE=false ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 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 d467956f..7df996aa 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 @@ -20,7 +20,7 @@ ARG VERBOSE=false ARG OPENJ9_SCC=true ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ From 4882bc7e22c49b22a8eeba6196b0f6e0b3cfa952 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Thu, 2 Nov 2023 15:59:07 -0500 Subject: [PATCH 09/10] Add -XX:+JVMPortableRestoreMode for P and Z --- ga/latest/kernel/helpers/build/checkpoint.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ga/latest/kernel/helpers/build/checkpoint.sh b/ga/latest/kernel/helpers/build/checkpoint.sh index 58d5293b..9afa3bae 100755 --- a/ga/latest/kernel/helpers/build/checkpoint.sh +++ b/ga/latest/kernel/helpers/build/checkpoint.sh @@ -6,6 +6,19 @@ do pidplus.sh done +ARCH="$(uname -m)"; +case "${ARCH}" in + ppc64el|ppc64le) + export JVM_ARGS="${JVM_ARGS} -XX:+JVMPortableRestoreMode" + ;; + s390x) + export JVM_ARGS="${JVM_ARGS} -XX:+JVMPortableRestoreMode" + ;; + *) + ;; +esac; + + echo "Performing checkpoint --at=$1" /opt/ibm/wlp/bin/server checkpoint defaultServer --at=$1 From 592ede817cfb2925e73ee09de876bfd1c132f823 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Fri, 3 Nov 2023 09:53:09 -0500 Subject: [PATCH 10/10] Apply fixes to 23.0.0.11 directory and java 8/11 Includes the fixes for: Use instanton.ld.so.cache for checkpointing java Add -XX:+JVMPortableRestoreMode for P and Z --- ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 | 1 + ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 | 1 + ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 | 1 + ga/23.0.0.11/kernel/helpers/build/checkpoint.sh | 17 +++++++++++++++++ ga/latest/kernel/Dockerfile.ubi.openjdk11 | 1 + ga/latest/kernel/Dockerfile.ubi.openjdk17 | 1 + ga/latest/kernel/Dockerfile.ubi.openjdk8 | 1 + ga/latest/kernel/helpers/build/checkpoint.sh | 4 ++++ 8 files changed, 27 insertions(+) diff --git a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 index 52f1da44..3d265ef3 100644 --- a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 @@ -154,6 +154,7 @@ RUN mkdir /logs \ && chmod -R g+rw /logs \ && chown -R 1001:0 /etc/wlp \ && chmod -R g+rw /etc/wlp \ + && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \ && chown -R 1001:0 /home/default \ && chmod -R g+rw /home/default diff --git a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 index 24a074ec..5a0a60a7 100644 --- a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 @@ -154,6 +154,7 @@ RUN mkdir /logs \ && chmod -R g+rw /logs \ && chown -R 1001:0 /etc/wlp \ && chmod -R g+rw /etc/wlp \ + && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \ && chown -R 1001:0 /home/default \ && chmod -R g+rw /home/default diff --git a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 index d0770516..1b017724 100644 --- a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 @@ -154,6 +154,7 @@ RUN mkdir /logs \ && chmod -R g+rw /logs \ && chown -R 1001:0 /etc/wlp \ && chmod -R g+rw /etc/wlp \ + && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \ && chown -R 1001:0 /home/default \ && chmod -R g+rw /home/default diff --git a/ga/23.0.0.11/kernel/helpers/build/checkpoint.sh b/ga/23.0.0.11/kernel/helpers/build/checkpoint.sh index 58d5293b..2b2fa90b 100755 --- a/ga/23.0.0.11/kernel/helpers/build/checkpoint.sh +++ b/ga/23.0.0.11/kernel/helpers/build/checkpoint.sh @@ -6,6 +6,23 @@ do pidplus.sh done +if [ -e /etc/instanton.ld.so.cache ]; then + cp /etc/instanton.ld.so.cache /etc/ld.so.cache +fi + +ARCH="$(uname -m)"; +case "${ARCH}" in + ppc64el|ppc64le) + export JVM_ARGS="${JVM_ARGS} -XX:+JVMPortableRestoreMode" + ;; + s390x) + export JVM_ARGS="${JVM_ARGS} -XX:+JVMPortableRestoreMode" + ;; + *) + ;; +esac; + + echo "Performing checkpoint --at=$1" /opt/ibm/wlp/bin/server checkpoint defaultServer --at=$1 diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11 index 52f1da44..3d265ef3 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11 @@ -154,6 +154,7 @@ RUN mkdir /logs \ && chmod -R g+rw /logs \ && chown -R 1001:0 /etc/wlp \ && chmod -R g+rw /etc/wlp \ + && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \ && chown -R 1001:0 /home/default \ && chmod -R g+rw /home/default diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17 index 24a074ec..5a0a60a7 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17 @@ -154,6 +154,7 @@ RUN mkdir /logs \ && chmod -R g+rw /logs \ && chown -R 1001:0 /etc/wlp \ && chmod -R g+rw /etc/wlp \ + && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \ && chown -R 1001:0 /home/default \ && chmod -R g+rw /home/default diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8 index d0770516..1b017724 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8 @@ -154,6 +154,7 @@ RUN mkdir /logs \ && chmod -R g+rw /logs \ && chown -R 1001:0 /etc/wlp \ && chmod -R g+rw /etc/wlp \ + && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \ && chown -R 1001:0 /home/default \ && chmod -R g+rw /home/default diff --git a/ga/latest/kernel/helpers/build/checkpoint.sh b/ga/latest/kernel/helpers/build/checkpoint.sh index 9afa3bae..2b2fa90b 100755 --- a/ga/latest/kernel/helpers/build/checkpoint.sh +++ b/ga/latest/kernel/helpers/build/checkpoint.sh @@ -6,6 +6,10 @@ do pidplus.sh done +if [ -e /etc/instanton.ld.so.cache ]; then + cp /etc/instanton.ld.so.cache /etc/ld.so.cache +fi + ARCH="$(uname -m)"; case "${ARCH}" in ppc64el|ppc64le)