From 88edc0ed79c23e5c5a86687d9164c4f2426e2628 Mon Sep 17 00:00:00 2001 From: Michal Broz Date: Wed, 5 Jul 2023 22:53:20 -0500 Subject: [PATCH 01/11] revert the FROM statement back to ibmjava:8-ubi --- ga/23.0.0.3/kernel/Dockerfile.ubi.ibmjava8 | 2 +- ga/23.0.0.6/kernel/Dockerfile.ubi.ibmjava8 | 4 ++-- ga/latest/kernel/Dockerfile.ubi.ibmjava8 | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ga/23.0.0.3/kernel/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.3/kernel/Dockerfile.ubi.ibmjava8 index bb605e028..b7015c750 100644 --- a/ga/23.0.0.3/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/23.0.0.3/kernel/Dockerfile.ubi.ibmjava8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM icr.io/appcafe/ibmjava:8-sdk-ubi8 +FROM ibmjava:8-ubi USER root diff --git a/ga/23.0.0.6/kernel/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.6/kernel/Dockerfile.ubi.ibmjava8 index b5830d066..74d122601 100644 --- a/ga/23.0.0.6/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/23.0.0.6/kernel/Dockerfile.ubi.ibmjava8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM icr.io/appcafe/ibmjava:8-sdk-ubi8 AS getRuntime +FROM ibmjava:8-ubi AS getRuntime USER root @@ -38,7 +38,7 @@ RUN yum -y install unzip wget openssl \ && chmod -R g+rw /opt/ibm/wlp \ && cp -a /opt/ibm/wlp/lafiles/. /licenses/ -FROM icr.io/appcafe/ibmjava:8-sdk-ubi8 +FROM ibmjava:8-ubi USER root diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 index b5830d066..74d122601 100644 --- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM icr.io/appcafe/ibmjava:8-sdk-ubi8 AS getRuntime +FROM ibmjava:8-ubi AS getRuntime USER root @@ -38,7 +38,7 @@ RUN yum -y install unzip wget openssl \ && chmod -R g+rw /opt/ibm/wlp \ && cp -a /opt/ibm/wlp/lafiles/. /licenses/ -FROM icr.io/appcafe/ibmjava:8-sdk-ubi8 +FROM ibmjava:8-ubi USER root From 5b05819614b038318d7360dc4509ec68a5336fa9 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Tue, 11 Jul 2023 11:05:05 -0700 Subject: [PATCH 02/11] Updates for the release of 23.0.0.7 --- ga/23.0.0.7/README.md | 6 + ga/23.0.0.7/full/Dockerfile.ubi.ibmjava8 | 53 +++++ ga/23.0.0.7/full/Dockerfile.ubi.openjdk11 | 53 +++++ ga/23.0.0.7/full/Dockerfile.ubi.openjdk17 | 53 +++++ ga/23.0.0.7/full/Dockerfile.ubi.openjdk8 | 53 +++++ ga/23.0.0.7/full/Dockerfile.ubuntu.ibmjava8 | 49 ++++ ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk11 | 51 ++++ ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk17 | 51 ++++ ga/23.0.0.7/full/README.md | 7 + ga/23.0.0.7/full/server.xml | 36 +++ ga/23.0.0.7/images.txt | 18 ++ ga/23.0.0.7/kernel/Dockerfile.ubi.ibmjava8 | 175 ++++++++++++++ ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk11 | 175 ++++++++++++++ ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk17 | 175 ++++++++++++++ ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk8 | 175 ++++++++++++++ ga/23.0.0.7/kernel/Dockerfile.ubuntu.ibmjava8 | 175 ++++++++++++++ .../kernel/Dockerfile.ubuntu.openjdk11 | 171 ++++++++++++++ .../kernel/Dockerfile.ubuntu.openjdk17 | 171 ++++++++++++++ ga/23.0.0.7/kernel/NOTICES | 72 ++++++ ga/23.0.0.7/kernel/README.md | 9 + ga/23.0.0.7/kernel/fixes/.gitkeep | 2 + .../kernel/helpers/build/checkpoint.sh | 13 ++ .../hazelcast-client.xml | 16 ++ .../hazelcast-embedded.xml | 19 ++ .../hazelcast-sessioncache-config.xml | 8 + .../hazelcast-sessioncache.xml | 11 + .../configuration_snippets/http-endpoint.xml | 5 + .../http-ssl-endpoint.xml | 6 + .../configuration_snippets/iiop-endpoint.xml | 5 + .../iiop-ssl-endpoint.xml | 8 + .../infinispan-client-sessioncache-config.xml | 16 ++ .../infinispan-client-sessioncache.xml | 19 ++ .../configuration_snippets/jms-endpoint.xml | 5 + .../jms-ssl-endpoint.xml | 5 + .../build/configuration_snippets/keystore.xml | 3 + .../mp-health-check.xml | 6 + .../configuration_snippets/mp-monitoring.xml | 9 + .../configuration_snippets/oidc-config.xml | 8 + .../build/configuration_snippets/oidc.xml | 6 + .../sessioncache-features.xml | 5 + .../configuration_snippets/sso-facebook.xml | 19 ++ .../configuration_snippets/sso-features.xml | 7 + .../configuration_snippets/sso-github.xml | 24 ++ .../configuration_snippets/sso-google.xml | 19 ++ .../configuration_snippets/sso-linkedin.xml | 19 ++ .../configuration_snippets/sso-oauth2.xml | 51 ++++ .../build/configuration_snippets/sso-oidc.xml | 38 +++ .../configuration_snippets/sso-twitter.xml | 17 ++ .../build/configuration_snippets/tls.xml | 5 + .../configuration_snippets/trustDefault.xml | 4 + .../configuration_snippets/truststore.xml | 5 + ga/23.0.0.7/kernel/helpers/build/configure.sh | 219 ++++++++++++++++++ ga/23.0.0.7/kernel/helpers/build/features.sh | 48 ++++ .../helpers/build/infinispan-client-setup.sh | 35 +++ .../build/internal/features-installed.sh | 9 + ga/23.0.0.7/kernel/helpers/build/pidplus.sh | 6 + .../kernel/helpers/build/populate_scc.sh | 138 +++++++++++ .../kernel/helpers/runtime/docker-server.sh | 159 +++++++++++++ .../kernel/helpers/runtime/restore-server.sh | 6 + ga/23.0.0.7/oidcProvider/Dockerfile | 32 +++ ga/23.0.0.7/oidcProvider/Dockerfile.java11 | 32 +++ ga/23.0.0.7/oidcProvider/README.md | 7 + ga/23.0.0.7/oidcProvider/server.xml | 143 ++++++++++++ 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 | 6 +- ga/latest/kernel/Dockerfile.ubuntu.openjdk11 | 6 +- ga/latest/kernel/Dockerfile.ubuntu.openjdk17 | 6 +- 70 files changed, 2966 insertions(+), 21 deletions(-) create mode 100644 ga/23.0.0.7/README.md create mode 100644 ga/23.0.0.7/full/Dockerfile.ubi.ibmjava8 create mode 100644 ga/23.0.0.7/full/Dockerfile.ubi.openjdk11 create mode 100644 ga/23.0.0.7/full/Dockerfile.ubi.openjdk17 create mode 100644 ga/23.0.0.7/full/Dockerfile.ubi.openjdk8 create mode 100644 ga/23.0.0.7/full/Dockerfile.ubuntu.ibmjava8 create mode 100644 ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk11 create mode 100644 ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk17 create mode 100644 ga/23.0.0.7/full/README.md create mode 100644 ga/23.0.0.7/full/server.xml create mode 100644 ga/23.0.0.7/images.txt create mode 100644 ga/23.0.0.7/kernel/Dockerfile.ubi.ibmjava8 create mode 100644 ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk11 create mode 100644 ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk17 create mode 100644 ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk8 create mode 100644 ga/23.0.0.7/kernel/Dockerfile.ubuntu.ibmjava8 create mode 100644 ga/23.0.0.7/kernel/Dockerfile.ubuntu.openjdk11 create mode 100644 ga/23.0.0.7/kernel/Dockerfile.ubuntu.openjdk17 create mode 100644 ga/23.0.0.7/kernel/NOTICES create mode 100644 ga/23.0.0.7/kernel/README.md create mode 100644 ga/23.0.0.7/kernel/fixes/.gitkeep create mode 100755 ga/23.0.0.7/kernel/helpers/build/checkpoint.sh create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-client.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/http-endpoint.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/jms-endpoint.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/keystore.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/mp-health-check.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/mp-monitoring.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/oidc-config.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/oidc.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sessioncache-features.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-facebook.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-features.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-github.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-google.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-linkedin.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-oauth2.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-oidc.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-twitter.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/tls.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/trustDefault.xml create mode 100644 ga/23.0.0.7/kernel/helpers/build/configuration_snippets/truststore.xml create mode 100755 ga/23.0.0.7/kernel/helpers/build/configure.sh create mode 100755 ga/23.0.0.7/kernel/helpers/build/features.sh create mode 100755 ga/23.0.0.7/kernel/helpers/build/infinispan-client-setup.sh create mode 100755 ga/23.0.0.7/kernel/helpers/build/internal/features-installed.sh create mode 100755 ga/23.0.0.7/kernel/helpers/build/pidplus.sh create mode 100755 ga/23.0.0.7/kernel/helpers/build/populate_scc.sh create mode 100755 ga/23.0.0.7/kernel/helpers/runtime/docker-server.sh create mode 100755 ga/23.0.0.7/kernel/helpers/runtime/restore-server.sh create mode 100644 ga/23.0.0.7/oidcProvider/Dockerfile create mode 100644 ga/23.0.0.7/oidcProvider/Dockerfile.java11 create mode 100644 ga/23.0.0.7/oidcProvider/README.md create mode 100644 ga/23.0.0.7/oidcProvider/server.xml diff --git a/ga/23.0.0.7/README.md b/ga/23.0.0.7/README.md new file mode 100644 index 000000000..e0d4b8c1a --- /dev/null +++ b/ga/23.0.0.7/README.md @@ -0,0 +1,6 @@ +# WebSphere Application Server Developer Edition Liberty image + +Under this directory you can find build scripts for WebSphere Application Server Liberty container images: + +* [WebSphere Application Server Developer Edition Liberty, Kernel](kernel) +* [WebSphere Application Server Developer Edition Liberty, Full](full) diff --git a/ga/23.0.0.7/full/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.7/full/Dockerfile.ubi.ibmjava8 new file mode 100644 index 000000000..2a2aef089 --- /dev/null +++ b/ga/23.0.0.7/full/Dockerfile.ubi.ibmjava8 @@ -0,0 +1,53 @@ +# (C) Copyright IBM Corporation 2023. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# 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 +FROM $PARENT_IMAGE AS installBundle + +USER root + +ARG VERBOSE=false +ARG REPOSITORIES_PROPERTIES="" + +# If there is a local copy of the repository use that instead +COPY resources/ /tmp/ + +# Install the base bundle +RUN set -eux; \ + if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \ + mkdir /opt/ibm/wlp/etc/; \ + echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \ + installUtility install --acceptLicense baseBundle; \ + rm /opt/ibm/wlp/etc/repositories.properties; \ + elif [ -f /tmp/wlpRepo.zip ]; then \ + installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \ + else \ + installUtility install --acceptLicense baseBundle; \ + fi; \ + 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 +FROM $PARENT_IMAGE +ARG VERBOSE=false + +# Copy the runtime +COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp + +COPY --chown=1001:0 server.xml /config/ + +# Create a new SCC layer +RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ + && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ + && find /opt/ibm/wlp/output ! -path "*.classCache*" ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx diff --git a/ga/23.0.0.7/full/Dockerfile.ubi.openjdk11 b/ga/23.0.0.7/full/Dockerfile.ubi.openjdk11 new file mode 100644 index 000000000..79f2900b0 --- /dev/null +++ b/ga/23.0.0.7/full/Dockerfile.ubi.openjdk11 @@ -0,0 +1,53 @@ +# (C) Copyright IBM Corporation 2023. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java11-openj9-ubi +FROM $PARENT_IMAGE AS installBundle + +USER root + +ARG VERBOSE=false +ARG REPOSITORIES_PROPERTIES="" + +# If there is a local copy of the repository use that instead +COPY resources/ /tmp/ + +# Install the base bundle +RUN set -eux; \ + if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \ + mkdir /opt/ibm/wlp/etc/; \ + echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \ + installUtility install --acceptLicense baseBundle; \ + rm /opt/ibm/wlp/etc/repositories.properties; \ + elif [ -f /tmp/wlpRepo.zip ]; then \ + installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \ + else \ + installUtility install --acceptLicense baseBundle; \ + fi; \ + 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 +FROM $PARENT_IMAGE +ARG VERBOSE=false + +# Copy the runtime +COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp + +COPY --chown=1001:0 server.xml /config/ + +# Create a new SCC layer +RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ + && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ + && find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx diff --git a/ga/23.0.0.7/full/Dockerfile.ubi.openjdk17 b/ga/23.0.0.7/full/Dockerfile.ubi.openjdk17 new file mode 100644 index 000000000..dc91e1978 --- /dev/null +++ b/ga/23.0.0.7/full/Dockerfile.ubi.openjdk17 @@ -0,0 +1,53 @@ +# (C) Copyright IBM Corporation 2023. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# 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 +FROM $PARENT_IMAGE AS installBundle + +USER root + +ARG VERBOSE=false +ARG REPOSITORIES_PROPERTIES="" + +# If there is a local copy of the repository use that instead +COPY resources/ /tmp/ + +# Install the base bundle +RUN set -eux; \ + if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \ + mkdir /opt/ibm/wlp/etc/; \ + echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \ + installUtility install --acceptLicense baseBundle; \ + rm /opt/ibm/wlp/etc/repositories.properties; \ + elif [ -f /tmp/wlpRepo.zip ]; then \ + installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \ + else \ + installUtility install --acceptLicense baseBundle; \ + fi; \ + 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 +FROM $PARENT_IMAGE +ARG VERBOSE=false + +# Copy the runtime +COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp + +COPY --chown=1001:0 server.xml /config/ + +# Create a new SCC layer +RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ + && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ + && find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx diff --git a/ga/23.0.0.7/full/Dockerfile.ubi.openjdk8 b/ga/23.0.0.7/full/Dockerfile.ubi.openjdk8 new file mode 100644 index 000000000..1d700de48 --- /dev/null +++ b/ga/23.0.0.7/full/Dockerfile.ubi.openjdk8 @@ -0,0 +1,53 @@ +# (C) Copyright IBM Corporation 2023. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# 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 +FROM $PARENT_IMAGE AS installBundle + +USER root + +ARG VERBOSE=false +ARG REPOSITORIES_PROPERTIES="" + +# If there is a local copy of the repository use that instead +COPY resources/ /tmp/ + +# Install the base bundle +RUN set -eux; \ + if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \ + mkdir /opt/ibm/wlp/etc/; \ + echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \ + installUtility install --acceptLicense baseBundle; \ + rm /opt/ibm/wlp/etc/repositories.properties; \ + elif [ -f /tmp/wlpRepo.zip ]; then \ + installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \ + else \ + installUtility install --acceptLicense baseBundle; \ + fi; \ + 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 +FROM $PARENT_IMAGE +ARG VERBOSE=false + +# Copy the runtime +COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp + +COPY --chown=1001:0 server.xml /config/ + +# Create a new SCC layer +RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ + && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ + && find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx diff --git a/ga/23.0.0.7/full/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.7/full/Dockerfile.ubuntu.ibmjava8 new file mode 100644 index 000000000..395a6922a --- /dev/null +++ b/ga/23.0.0.7/full/Dockerfile.ubuntu.ibmjava8 @@ -0,0 +1,49 @@ +# (C) Copyright IBM Corporation 2023. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM websphere-liberty:kernel AS installBundle +ARG VERBOSE=false +ARG REPOSITORIES_PROPERTIES="" + +# If there is a local copy of the repository use that instead +COPY resources/ /tmp/ + +# Install the base bundle +RUN set -eux; \ + if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \ + mkdir /opt/ibm/wlp/etc/; \ + echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \ + installUtility install --acceptLicense baseBundle; \ + rm /opt/ibm/wlp/etc/repositories.properties; \ + elif [ -f /tmp/wlpRepo.zip ]; then \ + installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \ + else \ + installUtility install --acceptLicense baseBundle; \ + fi; \ + rm -rf /output/workarea /output/logs; \ + find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; + +FROM websphere-liberty:kernel +ARG VERBOSE=false + +# Copy the runtime +COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp + +COPY --chown=1001:0 server.xml /config/ + +# Create a new SCC layer +RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ + && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ + && find /opt/ibm/wlp/output ! -path "*.classCache*" ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx + diff --git a/ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk11 new file mode 100644 index 000000000..02fd841cd --- /dev/null +++ b/ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk11 @@ -0,0 +1,51 @@ +# (C) Copyright IBM Corporation 2023. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM websphere-liberty:kernel-java11-openj9 AS installBundle + +USER root + +ARG VERBOSE=false +ARG REPOSITORIES_PROPERTIES="" + +# If there is a local copy of the repository use that instead +COPY resources/ /tmp/ + +# Install the base bundle +RUN set -eux; \ + if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \ + mkdir /opt/ibm/wlp/etc/; \ + echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \ + installUtility install --acceptLicense baseBundle; \ + rm /opt/ibm/wlp/etc/repositories.properties; \ + elif [ -f /tmp/wlpRepo.zip ]; then \ + installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \ + else \ + installUtility install --acceptLicense baseBundle; \ + fi; \ + rm -rf /output/workarea /output/logs; \ + find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; + +FROM websphere-liberty:kernel-java11-openj9 +ARG VERBOSE=false + +# Copy the runtime +COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp + +COPY --chown=1001:0 server.xml /config/ + +# Create a new SCC layer +RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ + && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ + && find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx diff --git a/ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk17 new file mode 100644 index 000000000..1241066c1 --- /dev/null +++ b/ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk17 @@ -0,0 +1,51 @@ +# (C) Copyright IBM Corporation 2023. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM websphere-liberty:kernel-java17-openj9 AS installBundle + +USER root + +ARG VERBOSE=false +ARG REPOSITORIES_PROPERTIES="" + +# If there is a local copy of the repository use that instead +COPY resources/ /tmp/ + +# Install the base bundle +RUN set -eux; \ + if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \ + mkdir /opt/ibm/wlp/etc/; \ + echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \ + installUtility install --acceptLicense baseBundle; \ + rm /opt/ibm/wlp/etc/repositories.properties; \ + elif [ -f /tmp/wlpRepo.zip ]; then \ + installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \ + else \ + installUtility install --acceptLicense baseBundle; \ + fi; \ + rm -rf /output/workarea /output/logs; \ + find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; + +FROM websphere-liberty:kernel-java17-openj9 +ARG VERBOSE=false + +# Copy the runtime +COPY --from=installBundle /opt/ibm/wlp /opt/ibm/wlp + +COPY --chown=1001:0 server.xml /config/ + +# Create a new SCC layer +RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ + && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ + && find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx diff --git a/ga/23.0.0.7/full/README.md b/ga/23.0.0.7/full/README.md new file mode 100644 index 000000000..4292ed4c6 --- /dev/null +++ b/ga/23.0.0.7/full/README.md @@ -0,0 +1,7 @@ +# WebSphere Application Server Developer Edition Liberty image + +The [Dockerfile.ubuntu.ibmjava8](Dockerfile.ubuntu.ibmjava8) in this directory is used to build the `websphere-liberty:full` image on [Docker Hub](https://registry.hub.docker.com/_/websphere-liberty/). The image contains IBM WebSphere Liberty with an extensive set of features for convenience. + +# Usage + +Instructions for using the image can be found on [Docker Hub](https://registry.hub.docker.com/_/websphere-liberty/). It is possible to build the image yourself by cloning this repository, changing to the `ga//full` directory and then issuing the command to build container image. For example, with Docker execute `docker build .`. diff --git a/ga/23.0.0.7/full/server.xml b/ga/23.0.0.7/full/server.xml new file mode 100644 index 000000000..9d0b33f75 --- /dev/null +++ b/ga/23.0.0.7/full/server.xml @@ -0,0 +1,36 @@ + + + + + + javaee-8.0 + microProfile-3.0 + + + + + + + + + + + + + + + + + + + diff --git a/ga/23.0.0.7/images.txt b/ga/23.0.0.7/images.txt new file mode 100644 index 000000000..fd926b33e --- /dev/null +++ b/ga/23.0.0.7/images.txt @@ -0,0 +1,18 @@ +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/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.7/kernel/Dockerfile.ubi.ibmjava8 new file mode 100644 index 000000000..9d5ac1c1e --- /dev/null +++ b/ga/23.0.0.7/kernel/Dockerfile.ubi.ibmjava8 @@ -0,0 +1,175 @@ +# (C) Copyright IBM Corporation 2023. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM ibmjava:8-ubi AS getRuntime + +USER root + +ARG VERBOSE=false + +# Install WebSphere Liberty +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_URL +ARG DOWNLOAD_OPTIONS="" + +# If there is a local copy of the image use that instead +COPY resources/ /tmp/ + +RUN yum -y install unzip wget openssl \ + && yum clean all \ + && mkdir -p /licenses \ + && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ + && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ + && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ + && chmod -R g+x /usr/bin \ + && unzip -q /tmp/wlp.zip -d /opt/ibm \ + && chown -R 1001:0 /opt/ibm/wlp \ + && chmod -R g+rw /opt/ibm/wlp \ + && cp -a /opt/ibm/wlp/lafiles/. /licenses/ + +FROM ibmjava:8-ubi + +USER root + +ARG VERBOSE=false +ARG OPENJ9_SCC=true + +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 + +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ + org.opencontainers.image.title="IBM WebSphere Liberty" \ + vendor="IBM" \ + name="IBM WebSphere Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for WebSphere Liberty with IBM's Java and Red Hat's UBI 8" \ + description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + +# Install dumb-init +RUN set -eux; \ + ARCH="$(uname -m)"; \ + case "${ARCH}" in \ + aarch64|arm64) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_aarch64'; \ + DUMB_INIT_SHA256=b7d648f97154a99c539b63c55979cd29f005f88430fb383007fe3458340b795e; \ + ;; \ + amd64|x86_64) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64'; \ + DUMB_INIT_SHA256=e874b55f3279ca41415d290c512a7ba9d08f98041b28ae7c2acb19a545f1c4df; \ + ;; \ + ppc64el|ppc64le) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_ppc64le'; \ + DUMB_INIT_SHA256=3d15e80e29f0f4fa1fc686b00613a2220bc37e83a35283d4b4cca1fbd0a5609f; \ + ;; \ + s390x) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_s390x'; \ + DUMB_INIT_SHA256=47e4601b152fc6dcb1891e66c30ecc62a2939fd7ffd1515a7c30f281cfec53b7; \ + ;;\ + *) \ + echo "Unsupported arch: ${ARCH}"; \ + exit 1; \ + ;; \ + esac; \ + curl -LfsSo /usr/bin/dumb-init ${DUMB_INIT_URL}; \ + echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ + chmod +x /usr/bin/dumb-init; + +# Add default user 1001 and create wlp with right user/permissions before copying +RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ + && mkdir -p /opt/ibm/wlp \ + && chown -R 1001:0 /opt/ibm/wlp \ + && chmod -R g+rw /opt/ibm/wlp + +# Copy the runtime and licenses +COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp +COPY --from=getRuntime /licenses /licenses + +RUN yum -y install openssl \ + && yum clean all +# Set Path Shortcuts +ENV LOG_DIR=/logs \ + WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ + OPENJ9_SCC=$OPENJ9_SCC + +# Configure WebSphere Liberty +RUN /opt/ibm/wlp/bin/server create \ + && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea \ + && rm -rf /opt/ibm/wlp/usr/servers/defaultServer/server.env + +COPY NOTICES /opt/ibm/NOTICES +COPY helpers/ /opt/ibm/helpers/ +COPY fixes/ /opt/ibm/fixes/ + +# Create symlinks && set permissions for non-root user +RUN mkdir /logs \ + && mkdir /etc/wlp \ + && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ + && mkdir -p /home/default \ + && mkdir /output \ + && chmod -t /output \ + && rm -rf /output \ + && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ + && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ + && ln -s /opt/ibm /liberty \ + && ln -s /opt/ibm/fixes /fixes \ + && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ + && mkdir -p /config/configDropins/defaults \ + && mkdir -p /config/configDropins/overrides \ + && chown -R 1001:0 /config \ + && chmod -R g+rw /config \ + && chown -R 1001:0 /opt/ibm/helpers \ + && chmod -R g+rwx /opt/ibm/helpers \ + && chown -R 1001:0 /opt/ibm/fixes \ + && chmod -R g+rwx /opt/ibm/fixes \ + && chown -R 1001:0 /opt/ibm/wlp/usr \ + && chmod -R g+rw /opt/ibm/wlp/usr \ + && chown -R 1001:0 /opt/ibm/wlp/output \ + && chmod -R g+rw /opt/ibm/wlp/output \ + && chown -R 1001:0 /logs \ + && chmod -R g+rw /logs \ + && chown -R 1001:0 /etc/wlp \ + && chmod -R g+rw /etc/wlp \ + && chown -R 1001:0 /home/default \ + && chmod -R g+rw /home/default + +# Create a new SCC layer +RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ + && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ + && chown -R 1001:0 /opt/ibm/wlp/output \ + && chmod -R g+rwx /opt/ibm/wlp/output + +# These settings are needed so that we can run as a different user than 1001 after server warmup +ENV RANDFILE=/tmp/.rnd \ + IBM_JAVA_OPTIONS="-Xshareclasses:name=liberty,readonly,nonfatal,cacheDir=/output/.classCache/ -Dosgi.checkConfiguration=false ${IBM_JAVA_OPTIONS}" + +USER 1001 + +EXPOSE 9080 9443 + +ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] +CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk11 b/ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk11 new file mode 100644 index 000000000..cbd5df5ec --- /dev/null +++ b/ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk11 @@ -0,0 +1,175 @@ +# (C) Copyright IBM Corporation 2023. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi AS getRuntime + +USER root + +ARG VERBOSE=false + +# Install WebSphere Liberty +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_URL +ARG DOWNLOAD_OPTIONS="" + +# If there is a local copy of the image use that instead +COPY resources/ /tmp/ + +RUN yum -y install shadow-utils unzip wget findutils openssl \ + && yum clean all \ + && mkdir -p /licenses \ + && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ + && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ + && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ + && chmod -R g+x /usr/bin \ + && unzip -q /tmp/wlp.zip -d /opt/ibm \ + && chown -R 1001:0 /opt/ibm/wlp \ + && chmod -R g+rw /opt/ibm/wlp \ + && cp -a /opt/ibm/wlp/lafiles/. /licenses/ + +FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi + +USER root + +ARG VERBOSE=false +ARG OPENJ9_SCC=true + +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 + +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ + org.opencontainers.image.title="IBM WebSphere Liberty" \ + vendor="IBM" \ + name="IBM WebSphere Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ + description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + +# Install dumb-init +RUN set -eux; \ + ARCH="$(uname -m)"; \ + case "${ARCH}" in \ + aarch64|arm64) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_aarch64'; \ + DUMB_INIT_SHA256=b7d648f97154a99c539b63c55979cd29f005f88430fb383007fe3458340b795e; \ + ;; \ + amd64|x86_64) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64'; \ + DUMB_INIT_SHA256=e874b55f3279ca41415d290c512a7ba9d08f98041b28ae7c2acb19a545f1c4df; \ + ;; \ + ppc64el|ppc64le) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_ppc64le'; \ + DUMB_INIT_SHA256=3d15e80e29f0f4fa1fc686b00613a2220bc37e83a35283d4b4cca1fbd0a5609f; \ + ;; \ + s390x) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_s390x'; \ + DUMB_INIT_SHA256=47e4601b152fc6dcb1891e66c30ecc62a2939fd7ffd1515a7c30f281cfec53b7; \ + ;;\ + *) \ + echo "Unsupported arch: ${ARCH}"; \ + exit 1; \ + ;; \ + esac; \ + curl -LfsSo /usr/bin/dumb-init ${DUMB_INIT_URL}; \ + echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ + chmod +x /usr/bin/dumb-init; + +# Add default user 1001 and create wlp with right user/permissions before copying +RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ + && mkdir -p /opt/ibm/wlp \ + && chown -R 1001:0 /opt/ibm/wlp \ + && chmod -R g+rw /opt/ibm/wlp + +# Copy the runtime and licenses +COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp +COPY --from=getRuntime /licenses /licenses + +RUN yum -y install openssl \ + && yum clean all +# Set Path Shortcuts +ENV LOG_DIR=/logs \ + WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ + OPENJ9_SCC=$OPENJ9_SCC + +# Configure WebSphere Liberty +RUN /opt/ibm/wlp/bin/server create \ + && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea \ + && rm -rf /opt/ibm/wlp/usr/servers/defaultServer/server.env + +COPY NOTICES /opt/ibm/NOTICES +COPY helpers/ /opt/ibm/helpers/ +COPY fixes/ /opt/ibm/fixes/ + +# Create symlinks && set permissions for non-root user +RUN mkdir /logs \ + && mkdir /etc/wlp \ + && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ + && mkdir -p /home/default \ + && mkdir /output \ + && chmod -t /output \ + && rm -rf /output \ + && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ + && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ + && ln -s /opt/ibm /liberty \ + && ln -s /opt/ibm/fixes /fixes \ + && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ + && mkdir -p /config/configDropins/defaults \ + && mkdir -p /config/configDropins/overrides \ + && chown -R 1001:0 /config \ + && chmod -R g+rw /config \ + && chown -R 1001:0 /opt/ibm/helpers \ + && chmod -R g+rwx /opt/ibm/helpers \ + && chown -R 1001:0 /opt/ibm/fixes \ + && chmod -R g+rwx /opt/ibm/fixes \ + && chown -R 1001:0 /opt/ibm/wlp/usr \ + && chmod -R g+rw /opt/ibm/wlp/usr \ + && chown -R 1001:0 /opt/ibm/wlp/output \ + && chmod -R g+rw /opt/ibm/wlp/output \ + && chown -R 1001:0 /logs \ + && chmod -R g+rw /logs \ + && chown -R 1001:0 /etc/wlp \ + && chmod -R g+rw /etc/wlp \ + && chown -R 1001:0 /home/default \ + && chmod -R g+rw /home/default + +# Create a new SCC layer +RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ + && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ + && chown -R 1001:0 /opt/ibm/wlp/output \ + && chmod -R g+rwx /opt/ibm/wlp/output + +# These settings are needed so that we can run as a different user than 1001 after server warmup +ENV RANDFILE=/tmp/.rnd \ + OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false" + +USER 1001 + +EXPOSE 9080 9443 + +ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] +CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk17 b/ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk17 new file mode 100644 index 000000000..bdf26a8a1 --- /dev/null +++ b/ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk17 @@ -0,0 +1,175 @@ +# (C) Copyright IBM Corporation 2023. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi AS getRuntime + +USER root + +ARG VERBOSE=false + +# Install WebSphere Liberty +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_URL +ARG DOWNLOAD_OPTIONS="" + +# If there is a local copy of the image use that instead +COPY resources/ /tmp/ + +RUN yum -y install shadow-utils unzip wget findutils openssl \ + && yum clean all \ + && mkdir -p /licenses \ + && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ + && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ + && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ + && chmod -R g+x /usr/bin \ + && unzip -q /tmp/wlp.zip -d /opt/ibm \ + && chown -R 1001:0 /opt/ibm/wlp \ + && chmod -R g+rw /opt/ibm/wlp \ + && cp -a /opt/ibm/wlp/lafiles/. /licenses/ + +FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi + +USER root + +ARG VERBOSE=false +ARG OPENJ9_SCC=true + +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 + +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ + org.opencontainers.image.title="IBM WebSphere Liberty" \ + vendor="IBM" \ + name="IBM WebSphere Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ + description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + +# Install dumb-init +RUN set -eux; \ + ARCH="$(uname -m)"; \ + case "${ARCH}" in \ + aarch64|arm64) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_aarch64'; \ + DUMB_INIT_SHA256=b7d648f97154a99c539b63c55979cd29f005f88430fb383007fe3458340b795e; \ + ;; \ + amd64|x86_64) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64'; \ + DUMB_INIT_SHA256=e874b55f3279ca41415d290c512a7ba9d08f98041b28ae7c2acb19a545f1c4df; \ + ;; \ + ppc64el|ppc64le) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_ppc64le'; \ + DUMB_INIT_SHA256=3d15e80e29f0f4fa1fc686b00613a2220bc37e83a35283d4b4cca1fbd0a5609f; \ + ;; \ + s390x) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_s390x'; \ + DUMB_INIT_SHA256=47e4601b152fc6dcb1891e66c30ecc62a2939fd7ffd1515a7c30f281cfec53b7; \ + ;;\ + *) \ + echo "Unsupported arch: ${ARCH}"; \ + exit 1; \ + ;; \ + esac; \ + curl -LfsSo /usr/bin/dumb-init ${DUMB_INIT_URL}; \ + echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ + chmod +x /usr/bin/dumb-init; + +# Add default user 1001 and create wlp with right user/permissions before copying +RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ + && mkdir -p /opt/ibm/wlp \ + && chown -R 1001:0 /opt/ibm/wlp \ + && chmod -R g+rw /opt/ibm/wlp + +# Copy the runtime and licenses +COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp +COPY --from=getRuntime /licenses /licenses + +RUN yum -y install openssl \ + && yum clean all +# Set Path Shortcuts +ENV LOG_DIR=/logs \ + WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ + OPENJ9_SCC=$OPENJ9_SCC + +# Configure WebSphere Liberty +RUN /opt/ibm/wlp/bin/server create \ + && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea \ + && rm -rf /opt/ibm/wlp/usr/servers/defaultServer/server.env + +COPY NOTICES /opt/ibm/NOTICES +COPY helpers/ /opt/ibm/helpers/ +COPY fixes/ /opt/ibm/fixes/ + +# Create symlinks && set permissions for non-root user +RUN mkdir /logs \ + && mkdir /etc/wlp \ + && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ + && mkdir -p /home/default \ + && mkdir /output \ + && chmod -t /output \ + && rm -rf /output \ + && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ + && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ + && ln -s /opt/ibm /liberty \ + && ln -s /opt/ibm/fixes /fixes \ + && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ + && mkdir -p /config/configDropins/defaults \ + && mkdir -p /config/configDropins/overrides \ + && chown -R 1001:0 /config \ + && chmod -R g+rw /config \ + && chown -R 1001:0 /opt/ibm/helpers \ + && chmod -R g+rwx /opt/ibm/helpers \ + && chown -R 1001:0 /opt/ibm/fixes \ + && chmod -R g+rwx /opt/ibm/fixes \ + && chown -R 1001:0 /opt/ibm/wlp/usr \ + && chmod -R g+rw /opt/ibm/wlp/usr \ + && chown -R 1001:0 /opt/ibm/wlp/output \ + && chmod -R g+rw /opt/ibm/wlp/output \ + && chown -R 1001:0 /logs \ + && chmod -R g+rw /logs \ + && chown -R 1001:0 /etc/wlp \ + && chmod -R g+rw /etc/wlp \ + && chown -R 1001:0 /home/default \ + && chmod -R g+rw /home/default + +# Create a new SCC layer +RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ + && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ + && chown -R 1001:0 /opt/ibm/wlp/output \ + && chmod -R g+rwx /opt/ibm/wlp/output + +# These settings are needed so that we can run as a different user than 1001 after server warmup +ENV RANDFILE=/tmp/.rnd \ + OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false" + +USER 1001 + +EXPOSE 9080 9443 + +ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] +CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk8 b/ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk8 new file mode 100644 index 000000000..2484c6586 --- /dev/null +++ b/ga/23.0.0.7/kernel/Dockerfile.ubi.openjdk8 @@ -0,0 +1,175 @@ +# (C) Copyright IBM Corporation 2023. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi AS getRuntime + +USER root + +ARG VERBOSE=false + +# Install WebSphere Liberty +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_URL +ARG DOWNLOAD_OPTIONS="" + +# If there is a local copy of the image use that instead +COPY resources/ /tmp/ + +RUN yum -y install shadow-utils unzip wget findutils openssl \ + && yum clean all \ + && mkdir -p /licenses \ + && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ + && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ + && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ + && chmod -R g+x /usr/bin \ + && unzip -q /tmp/wlp.zip -d /opt/ibm \ + && chown -R 1001:0 /opt/ibm/wlp \ + && chmod -R g+rw /opt/ibm/wlp \ + && cp -a /opt/ibm/wlp/lafiles/. /licenses/ + +FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi + +USER root + +ARG VERBOSE=false +ARG OPENJ9_SCC=true + +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 + +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ + org.opencontainers.image.title="IBM WebSphere Liberty" \ + vendor="IBM" \ + name="IBM WebSphere Liberty" \ + version="$LIBERTY_VERSION" \ + summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ + description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + +# Install dumb-init +RUN set -eux; \ + ARCH="$(uname -m)"; \ + case "${ARCH}" in \ + aarch64|arm64) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_aarch64'; \ + DUMB_INIT_SHA256=b7d648f97154a99c539b63c55979cd29f005f88430fb383007fe3458340b795e; \ + ;; \ + amd64|x86_64) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64'; \ + DUMB_INIT_SHA256=e874b55f3279ca41415d290c512a7ba9d08f98041b28ae7c2acb19a545f1c4df; \ + ;; \ + ppc64el|ppc64le) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_ppc64le'; \ + DUMB_INIT_SHA256=3d15e80e29f0f4fa1fc686b00613a2220bc37e83a35283d4b4cca1fbd0a5609f; \ + ;; \ + s390x) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_s390x'; \ + DUMB_INIT_SHA256=47e4601b152fc6dcb1891e66c30ecc62a2939fd7ffd1515a7c30f281cfec53b7; \ + ;;\ + *) \ + echo "Unsupported arch: ${ARCH}"; \ + exit 1; \ + ;; \ + esac; \ + curl -LfsSo /usr/bin/dumb-init ${DUMB_INIT_URL}; \ + echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ + chmod +x /usr/bin/dumb-init; + +# Add default user 1001 and create wlp with right user/permissions before copying +RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ + && mkdir -p /opt/ibm/wlp \ + && chown -R 1001:0 /opt/ibm/wlp \ + && chmod -R g+rw /opt/ibm/wlp + +# Copy the runtime and licenses +COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp +COPY --from=getRuntime /licenses /licenses + +RUN yum -y install openssl \ + && yum clean all +# Set Path Shortcuts +ENV LOG_DIR=/logs \ + WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ + OPENJ9_SCC=$OPENJ9_SCC + +# Configure WebSphere Liberty +RUN /opt/ibm/wlp/bin/server create \ + && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea \ + && rm -rf /opt/ibm/wlp/usr/servers/defaultServer/server.env + +COPY NOTICES /opt/ibm/NOTICES +COPY helpers/ /opt/ibm/helpers/ +COPY fixes/ /opt/ibm/fixes/ + +# Create symlinks && set permissions for non-root user +RUN mkdir /logs \ + && mkdir /etc/wlp \ + && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ + && mkdir -p /home/default \ + && mkdir /output \ + && chmod -t /output \ + && rm -rf /output \ + && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ + && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ + && ln -s /opt/ibm /liberty \ + && ln -s /opt/ibm/fixes /fixes \ + && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ + && mkdir -p /config/configDropins/defaults \ + && mkdir -p /config/configDropins/overrides \ + && chown -R 1001:0 /config \ + && chmod -R g+rw /config \ + && chown -R 1001:0 /opt/ibm/helpers \ + && chmod -R g+rwx /opt/ibm/helpers \ + && chown -R 1001:0 /opt/ibm/fixes \ + && chmod -R g+rwx /opt/ibm/fixes \ + && chown -R 1001:0 /opt/ibm/wlp/usr \ + && chmod -R g+rw /opt/ibm/wlp/usr \ + && chown -R 1001:0 /opt/ibm/wlp/output \ + && chmod -R g+rw /opt/ibm/wlp/output \ + && chown -R 1001:0 /logs \ + && chmod -R g+rw /logs \ + && chown -R 1001:0 /etc/wlp \ + && chmod -R g+rw /etc/wlp \ + && chown -R 1001:0 /home/default \ + && chmod -R g+rw /home/default + +# Create a new SCC layer +RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ + && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ + && chown -R 1001:0 /opt/ibm/wlp/output \ + && chmod -R g+rwx /opt/ibm/wlp/output + +# These settings are needed so that we can run as a different user than 1001 after server warmup +ENV RANDFILE=/tmp/.rnd \ + OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false" + +USER 1001 + +EXPOSE 9080 9443 + +ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] +CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.7/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.7/kernel/Dockerfile.ubuntu.ibmjava8 new file mode 100644 index 000000000..796d40ac0 --- /dev/null +++ b/ga/23.0.0.7/kernel/Dockerfile.ubuntu.ibmjava8 @@ -0,0 +1,175 @@ +# (C) Copyright IBM Corporation 2023. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM ibmjava:8-jre AS getRuntime + +USER root + +ARG VERBOSE=false + +# Install WebSphere Liberty +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_URL +ARG DOWNLOAD_OPTIONS="" + +# If there is a local copy of the image use that instead +COPY resources/ /tmp/ + +RUN apt-get update \ + && apt-get install -y --no-install-recommends unzip wget openssl \ + && rm -rf /var/lib/apt/lists/* \ + && mkdir -p /licenses/ \ + && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ + && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ + && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ + && unzip -q /tmp/wlp.zip -d /opt/ibm \ + && chown -R 1001:0 /opt/ibm/wlp \ + && chmod -R g+rw /opt/ibm/wlp \ + && cp -a /opt/ibm/wlp/lafiles/. /licenses/ + +FROM ibmjava:8-jre + +USER root + +ARG VERBOSE=false +ARG OPENJ9_SCC=true + +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 + +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ + org.opencontainers.image.title="IBM WebSphere Liberty" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + +# Install dumb-init +RUN set -eux; \ + apt-get update; \ + apt-get install -y curl; \ + ARCH="$(dpkg --print-architecture)"; \ + case "${ARCH}" in \ + aarch64|arm64) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_aarch64'; \ + DUMB_INIT_SHA256=b7d648f97154a99c539b63c55979cd29f005f88430fb383007fe3458340b795e; \ + ;; \ + amd64|x86_64) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64'; \ + DUMB_INIT_SHA256=e874b55f3279ca41415d290c512a7ba9d08f98041b28ae7c2acb19a545f1c4df; \ + ;; \ + ppc64el|ppc64le) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_ppc64le'; \ + DUMB_INIT_SHA256=3d15e80e29f0f4fa1fc686b00613a2220bc37e83a35283d4b4cca1fbd0a5609f; \ + ;; \ + s390x) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_s390x'; \ + DUMB_INIT_SHA256=47e4601b152fc6dcb1891e66c30ecc62a2939fd7ffd1515a7c30f281cfec53b7; \ + ;;\ + *) \ + echo "Unsupported arch: ${ARCH}"; \ + exit 1; \ + ;; \ + esac; \ + curl -LfsSo /usr/bin/dumb-init ${DUMB_INIT_URL}; \ + echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ + chmod +x /usr/bin/dumb-init; \ + apt-get purge --auto-remove -y wget; \ + rm -rf /var/lib/apt/lists/*; + +# Add default user 1001 and create wlp with right user/permissions before copying +RUN useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ + && mkdir -p /opt/ibm/wlp \ + && chown -R 1001:0 /opt/ibm/wlp \ + && chmod -R g+rw /opt/ibm/wlp + +# Copy the runtime and licenses +COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp +COPY --from=getRuntime /licenses /licenses + +RUN apt-get install -y --no-install-recommends openssl \ + && rm -rf /var/lib/apt/lists/* + +# Set Path Shortcuts +ENV LOG_DIR=/logs \ + WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ + OPENJ9_SCC=$OPENJ9_SCC + +# Configure WebSphere Liberty +RUN /opt/ibm/wlp/bin/server create \ + && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea \ + && rm -rf /opt/ibm/wlp/usr/servers/defaultServer/server.env + +COPY NOTICES /opt/ibm/NOTICES +COPY helpers/ /opt/ibm/helpers/ +COPY fixes/ /opt/ibm/fixes/ + +# Create symlinks && set permissions for non-root user +RUN mkdir /logs \ + && mkdir /etc/wlp \ + && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ + && mkdir -p /home/default \ + && mkdir /output \ + && chmod -t /output \ + && rm -rf /output \ + && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ + && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ + && ln -s /opt/ibm /liberty \ + && ln -s /opt/ibm/fixes /fixes \ + && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ + && mkdir -p /config/configDropins/defaults \ + && mkdir -p /config/configDropins/overrides \ + && chown -R 1001:0 /config \ + && chmod -R g+rw /config \ + && chown -R 1001:0 /opt/ibm/helpers \ + && chmod -R g+rwx /opt/ibm/helpers \ + && chown -R 1001:0 /opt/ibm/fixes \ + && chmod -R g+rwx /opt/ibm/fixes \ + && chown -R 1001:0 /opt/ibm/wlp/usr \ + && chmod -R g+rw /opt/ibm/wlp/usr \ + && chown -R 1001:0 /opt/ibm/wlp/output \ + && chmod -R g+rw /opt/ibm/wlp/output \ + && chown -R 1001:0 /logs \ + && chmod -R g+rw /logs \ + && chown -R 1001:0 /etc/wlp \ + && chmod -R g+rw /etc/wlp \ + && chown -R 1001:0 /home/default \ + && chmod -R g+rw /home/default + +# Create a new SCC layer +RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ + && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ + && chown -R 1001:0 /opt/ibm/wlp/output \ + && chmod -R g+rwx /opt/ibm/wlp/output + +# These settings are needed so that we can run as a different user than 1001 after server warmup +ENV RANDFILE=/tmp/.rnd \ + IBM_JAVA_OPTIONS="-Xshareclasses:name=liberty,readonly,nonfatal,cacheDir=/output/.classCache/ -Dosgi.checkConfiguration=false ${IBM_JAVA_OPTIONS}" + +USER 1001 + +EXPOSE 9080 9443 + +ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] +CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.7/kernel/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.7/kernel/Dockerfile.ubuntu.openjdk11 new file mode 100644 index 000000000..808d8dac3 --- /dev/null +++ b/ga/23.0.0.7/kernel/Dockerfile.ubuntu.openjdk11 @@ -0,0 +1,171 @@ +# (C) Copyright IBM Corporation 2023. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM ibm-semeru-runtimes:open-11-jre-focal AS getRuntime + +USER root + +ARG VERBOSE=false + +# Install WebSphere Liberty +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_URL +ARG DOWNLOAD_OPTIONS="" + +# If there is a local copy of the image use that instead +COPY resources/ /tmp/ + +RUN apt-get update \ + && apt-get install -y --no-install-recommends unzip wget openssl \ + && rm -rf /var/lib/apt/lists/* \ + && mkdir -p /licenses/ \ + && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ + && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ + && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ + && unzip -q /tmp/wlp.zip -d /opt/ibm \ + && chown -R 1001:0 /opt/ibm/wlp \ + && chmod -R g+rw /opt/ibm/wlp \ + && cp -a /opt/ibm/wlp/lafiles/. /licenses/ + +FROM ibm-semeru-runtimes:open-11-jre-focal + +USER root + +ARG VERBOSE=false +ARG OPENJ9_SCC=true + +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 + +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ + org.opencontainers.image.title="IBM WebSphere Liberty" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + +# Install dumb-init +RUN set -eux; \ + ARCH="$(dpkg --print-architecture)"; \ + case "${ARCH}" in \ + aarch64|arm64) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_aarch64'; \ + DUMB_INIT_SHA256=b7d648f97154a99c539b63c55979cd29f005f88430fb383007fe3458340b795e; \ + ;; \ + amd64|x86_64) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64'; \ + DUMB_INIT_SHA256=e874b55f3279ca41415d290c512a7ba9d08f98041b28ae7c2acb19a545f1c4df; \ + ;; \ + ppc64el|ppc64le) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_ppc64le'; \ + DUMB_INIT_SHA256=3d15e80e29f0f4fa1fc686b00613a2220bc37e83a35283d4b4cca1fbd0a5609f; \ + ;; \ + s390x) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_s390x'; \ + DUMB_INIT_SHA256=47e4601b152fc6dcb1891e66c30ecc62a2939fd7ffd1515a7c30f281cfec53b7; \ + ;;\ + *) \ + echo "Unsupported arch: ${ARCH}"; \ + exit 1; \ + ;; \ + esac; \ + curl -LfsSo /usr/bin/dumb-init ${DUMB_INIT_URL}; \ + echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ + chmod +x /usr/bin/dumb-init; + +# Add default user 1001 and create wlp with right user/permissions before copying +RUN useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ + && mkdir -p /opt/ibm/wlp \ + && chown -R 1001:0 /opt/ibm/wlp \ + && chmod -R g+rw /opt/ibm/wlp + +# Copy the runtime and licenses +COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp +COPY --from=getRuntime /licenses /licenses + +RUN apt-get install -y --no-install-recommends openssl \ + && rm -rf /var/lib/apt/lists/* + +# Set Path Shortcuts +ENV LOG_DIR=/logs \ + WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ + OPENJ9_SCC=$OPENJ9_SCC + +# Configure WebSphere Liberty +RUN /opt/ibm/wlp/bin/server create \ + && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea \ + && rm -rf /opt/ibm/wlp/usr/servers/defaultServer/server.env + +COPY NOTICES /opt/ibm/NOTICES +COPY helpers/ /opt/ibm/helpers/ +COPY fixes/ /opt/ibm/fixes/ + +# Create symlinks && set permissions for non-root user +RUN mkdir /logs \ + && mkdir /etc/wlp \ + && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ + && mkdir -p /home/default \ + && mkdir /output \ + && chmod -t /output \ + && rm -rf /output \ + && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ + && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ + && ln -s /opt/ibm /liberty \ + && ln -s /opt/ibm/fixes /fixes \ + && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ + && mkdir -p /config/configDropins/defaults \ + && mkdir -p /config/configDropins/overrides \ + && chown -R 1001:0 /config \ + && chmod -R g+rw /config \ + && chown -R 1001:0 /opt/ibm/helpers \ + && chmod -R g+rwx /opt/ibm/helpers \ + && chown -R 1001:0 /opt/ibm/fixes \ + && chmod -R g+rwx /opt/ibm/fixes \ + && chown -R 1001:0 /opt/ibm/wlp/usr \ + && chmod -R g+rw /opt/ibm/wlp/usr \ + && chown -R 1001:0 /opt/ibm/wlp/output \ + && chmod -R g+rw /opt/ibm/wlp/output \ + && chown -R 1001:0 /logs \ + && chmod -R g+rw /logs \ + && chown -R 1001:0 /etc/wlp \ + && chmod -R g+rw /etc/wlp \ + && chown -R 1001:0 /home/default \ + && chmod -R g+rw /home/default + +# Create a new SCC layer +RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ + && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ + && chown -R 1001:0 /opt/ibm/wlp/output \ + && chmod -R g+rwx /opt/ibm/wlp/output + +# These settings are needed so that we can run as a different user than 1001 after server warmup +ENV RANDFILE=/tmp/.rnd \ + OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false" + +USER 1001 + +EXPOSE 9080 9443 + +ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] +CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.7/kernel/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.7/kernel/Dockerfile.ubuntu.openjdk17 new file mode 100644 index 000000000..f0bc89464 --- /dev/null +++ b/ga/23.0.0.7/kernel/Dockerfile.ubuntu.openjdk17 @@ -0,0 +1,171 @@ +# (C) Copyright IBM Corporation 2023. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM ibm-semeru-runtimes:open-17-jre-focal AS getRuntime + +USER root + +ARG VERBOSE=false + +# Install WebSphere Liberty +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_URL +ARG DOWNLOAD_OPTIONS="" + +# If there is a local copy of the image use that instead +COPY resources/ /tmp/ + +RUN apt-get update \ + && apt-get install -y --no-install-recommends unzip wget openssl \ + && rm -rf /var/lib/apt/lists/* \ + && mkdir -p /licenses/ \ + && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ + && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ + && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ + && unzip -q /tmp/wlp.zip -d /opt/ibm \ + && chown -R 1001:0 /opt/ibm/wlp \ + && chmod -R g+rw /opt/ibm/wlp \ + && cp -a /opt/ibm/wlp/lafiles/. /licenses/ + +FROM ibm-semeru-runtimes:open-17-jre-focal + +USER root + +ARG VERBOSE=false +ARG OPENJ9_SCC=true + +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 + +LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ + org.opencontainers.image.vendor="IBM" \ + org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ + org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ + org.opencontainers.image.version="$LIBERTY_VERSION" \ + org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ + org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ + org.opencontainers.image.title="IBM WebSphere Liberty" + +ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build + +# Add labels for consumption by IBM Product Insights +LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ + "ProductName"="WebSphere Application Server Liberty" \ + "ProductVersion"="$LIBERTY_VERSION" \ + "BuildLabel"="$LIBERTY_BUILD_LABEL" + +# Install dumb-init +RUN set -eux; \ + ARCH="$(dpkg --print-architecture)"; \ + case "${ARCH}" in \ + aarch64|arm64) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_aarch64'; \ + DUMB_INIT_SHA256=b7d648f97154a99c539b63c55979cd29f005f88430fb383007fe3458340b795e; \ + ;; \ + amd64|x86_64) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64'; \ + DUMB_INIT_SHA256=e874b55f3279ca41415d290c512a7ba9d08f98041b28ae7c2acb19a545f1c4df; \ + ;; \ + ppc64el|ppc64le) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_ppc64le'; \ + DUMB_INIT_SHA256=3d15e80e29f0f4fa1fc686b00613a2220bc37e83a35283d4b4cca1fbd0a5609f; \ + ;; \ + s390x) \ + DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_s390x'; \ + DUMB_INIT_SHA256=47e4601b152fc6dcb1891e66c30ecc62a2939fd7ffd1515a7c30f281cfec53b7; \ + ;;\ + *) \ + echo "Unsupported arch: ${ARCH}"; \ + exit 1; \ + ;; \ + esac; \ + curl -LfsSo /usr/bin/dumb-init ${DUMB_INIT_URL}; \ + echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ + chmod +x /usr/bin/dumb-init; + +# Add default user 1001 and create wlp with right user/permissions before copying +RUN useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ + && mkdir -p /opt/ibm/wlp \ + && chown -R 1001:0 /opt/ibm/wlp \ + && chmod -R g+rw /opt/ibm/wlp + +# Copy the runtime and licenses +COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp +COPY --from=getRuntime /licenses /licenses + +RUN apt-get install -y --no-install-recommends openssl \ + && rm -rf /var/lib/apt/lists/* + +# Set Path Shortcuts +ENV LOG_DIR=/logs \ + WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ + OPENJ9_SCC=$OPENJ9_SCC + +# Configure WebSphere Liberty +RUN /opt/ibm/wlp/bin/server create \ + && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea \ + && rm -rf /opt/ibm/wlp/usr/servers/defaultServer/server.env + +COPY NOTICES /opt/ibm/NOTICES +COPY helpers/ /opt/ibm/helpers/ +COPY fixes/ /opt/ibm/fixes/ + +# Create symlinks && set permissions for non-root user +RUN mkdir /logs \ + && mkdir /etc/wlp \ + && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ + && mkdir -p /home/default \ + && mkdir /output \ + && chmod -t /output \ + && rm -rf /output \ + && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ + && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ + && ln -s /opt/ibm /liberty \ + && ln -s /opt/ibm/fixes /fixes \ + && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ + && mkdir -p /config/configDropins/defaults \ + && mkdir -p /config/configDropins/overrides \ + && chown -R 1001:0 /config \ + && chmod -R g+rw /config \ + && chown -R 1001:0 /opt/ibm/helpers \ + && chmod -R g+rwx /opt/ibm/helpers \ + && chown -R 1001:0 /opt/ibm/fixes \ + && chmod -R g+rwx /opt/ibm/fixes \ + && chown -R 1001:0 /opt/ibm/wlp/usr \ + && chmod -R g+rw /opt/ibm/wlp/usr \ + && chown -R 1001:0 /opt/ibm/wlp/output \ + && chmod -R g+rw /opt/ibm/wlp/output \ + && chown -R 1001:0 /logs \ + && chmod -R g+rw /logs \ + && chown -R 1001:0 /etc/wlp \ + && chmod -R g+rw /etc/wlp \ + && chown -R 1001:0 /home/default \ + && chmod -R g+rw /home/default + +# Create a new SCC layer +RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ + && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ + && chown -R 1001:0 /opt/ibm/wlp/output \ + && chmod -R g+rwx /opt/ibm/wlp/output + +# These settings are needed so that we can run as a different user than 1001 after server warmup +ENV RANDFILE=/tmp/.rnd \ + OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false" + +USER 1001 + +EXPOSE 9080 9443 + +ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] +CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.7/kernel/NOTICES b/ga/23.0.0.7/kernel/NOTICES new file mode 100644 index 000000000..474e8d98e --- /dev/null +++ b/ga/23.0.0.7/kernel/NOTICES @@ -0,0 +1,72 @@ +NOTICES AND INFORMATION + +IBM WebSphere Application Server Liberty @LIBERTY_VERSION@ + +The IBM license agreement and any applicable information on the web +download page for IBM products refers Licensee to this file for details +concerning notices applicable to code included in the products listed +above ("the Program"). + +Notwithstanding the terms and conditions of any other agreement Licensee +may have with IBM or any of its related or affiliated entities +(collectively "IBM"), the third party code identified below is subject +to the terms and conditions of the IBM license agreement for the Program +and not the license terms that may be contained in the notices below. +The notices are provided for informational purposes. + +Please note: This Notices file may identify information that is not used +by, or that was not shipped with, the Program as Licensee installed it. + +IMPORTANT: IBM does not represent or warrant that the information in this +NOTICES file is accurate. Third party websites are independent of IBM and +IBM does not represent or warrant that the information on any third party +website referenced in this NOTICES file is accurate. IBM disclaims any +and all liability for errors and omissions or for any damages accruing +from the use of this NOTICES file or its contents, including without +limitation URLs or references to any third party websites. + +TABLE OF CONTENTS + +THIS IBM NOTICES FILE CONSISTS OF THE FOLLOWING SECTIONS: +MIT + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +MIT LICENSE + +The Program includes some or all of the following that IBM obtained +under the MIT License: + +DUMB_INIT Copyright (c) 2015 Yelp, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +END OF MIT LICENSE NOTICES AND INFORMATION +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +END OF NOTICES AND INFORMATION +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + + +END OF NOTICES AND INFORMATION FOR +IBM WebSphere Application Server Liberty @LIBERTY_VERSION@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + + diff --git a/ga/23.0.0.7/kernel/README.md b/ga/23.0.0.7/kernel/README.md new file mode 100644 index 000000000..32ce7911c --- /dev/null +++ b/ga/23.0.0.7/kernel/README.md @@ -0,0 +1,9 @@ +# WebSphere Application Server Developer Edition Liberty kernel image + +The [Dockerfile.ubuntu.ibmjava8](Dockerfile.ubuntu.ibmjava8) in this directory is used to build the `websphere-liberty:kernel` image on [Docker Hub](https://registry.hub.docker.com/_/websphere-liberty/). The image contains IBM WebSphere Application Server Developer Edition Liberty Kernel and an IBM Java Runtime Environment. + +# Usage + +Instructions for using the image can be found on [Docker Hub](https://registry.hub.docker.com/_/websphere-liberty/). It is possible to build the image yourself by cloning this repository, changing to the `ga//kernel` directory and then issuing the command to build container image. For example, with Docker execute `docker build .`. + +**Note:** Refer to [Optional Enterprise Functionality](https://github.com/WASdev/ci.docker#optional-enterprise-functionality) to ensure certain features are enabled such as monitoring or SSL. diff --git a/ga/23.0.0.7/kernel/fixes/.gitkeep b/ga/23.0.0.7/kernel/fixes/.gitkeep new file mode 100644 index 000000000..a282fd264 --- /dev/null +++ b/ga/23.0.0.7/kernel/fixes/.gitkeep @@ -0,0 +1,2 @@ +Place holder file to keep the fixes directory +in git even if there aren't any current ifixes. diff --git a/ga/23.0.0.7/kernel/helpers/build/checkpoint.sh b/ga/23.0.0.7/kernel/helpers/build/checkpoint.sh new file mode 100755 index 000000000..dba7820ff --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/checkpoint.sh @@ -0,0 +1,13 @@ +#!/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/helpers/build/configuration_snippets/hazelcast-client.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-client.xml new file mode 100644 index 000000000..61dddfce0 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-client.xml @@ -0,0 +1,16 @@ + + + + true + + + true + + + + + + diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml new file mode 100644 index 000000000..4dd8f8063 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml @@ -0,0 +1,19 @@ + + + + true + + + + + + + + + + + + diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml new file mode 100644 index 000000000..ce9fa0d76 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml new file mode 100644 index 000000000..db8dc6a47 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml @@ -0,0 +1,11 @@ + + + sessionCache-1.0 + + + + + + + + \ No newline at end of file diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/http-endpoint.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/http-endpoint.xml new file mode 100644 index 000000000..5f6c60552 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/http-endpoint.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml new file mode 100644 index 000000000..2a2388a3c --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml new file mode 100644 index 000000000..a5b7d8a0c --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml new file mode 100644 index 000000000..f8fea3c88 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml new file mode 100644 index 000000000..d835cb4e9 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml new file mode 100644 index 000000000..e2ec72d2c --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml @@ -0,0 +1,19 @@ + + + sessionCache-1.0 + + + + + + + + + + + + + + + + diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/jms-endpoint.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/jms-endpoint.xml new file mode 100644 index 000000000..a99b07165 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/jms-endpoint.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml new file mode 100644 index 000000000..d32a77ce7 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/keystore.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/keystore.xml new file mode 100644 index 000000000..d4872b5ce --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/keystore.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/mp-health-check.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/mp-health-check.xml new file mode 100644 index 000000000..874559d63 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/mp-health-check.xml @@ -0,0 +1,6 @@ + + + + mpHealth-1.0 + + \ No newline at end of file diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/mp-monitoring.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/mp-monitoring.xml new file mode 100644 index 000000000..4f5b0ce08 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/mp-monitoring.xml @@ -0,0 +1,9 @@ + + + + mpMetrics-1.1 + monitor-1.0 + + + + diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/oidc-config.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/oidc-config.xml new file mode 100644 index 000000000..976afbe4b --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/oidc-config.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/oidc.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/oidc.xml new file mode 100644 index 000000000..f044723be --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/oidc.xml @@ -0,0 +1,6 @@ + + + + openidConnectClient-1.0 + + diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sessioncache-features.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sessioncache-features.xml new file mode 100644 index 000000000..f7b5a4685 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sessioncache-features.xml @@ -0,0 +1,5 @@ + + + sessionCache-1.0 + + \ No newline at end of file diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-facebook.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-facebook.xml new file mode 100644 index 000000000..0c2d8aa42 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-facebook.xml @@ -0,0 +1,19 @@ + + + + + + + + + \ No newline at end of file diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-features.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-features.xml new file mode 100644 index 000000000..a26c00a58 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-features.xml @@ -0,0 +1,7 @@ + + + + appSecurity-2.0 + socialLogin-1.0 + + \ No newline at end of file diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-github.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-github.xml new file mode 100644 index 000000000..1e96a50aa --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-github.xml @@ -0,0 +1,24 @@ + + + + + + + + + + \ No newline at end of file diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-google.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-google.xml new file mode 100644 index 000000000..50b40143f --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-google.xml @@ -0,0 +1,19 @@ + + + + + + + + + \ No newline at end of file diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-linkedin.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-linkedin.xml new file mode 100644 index 000000000..f608d5cbb --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-linkedin.xml @@ -0,0 +1,19 @@ + + + + + + + + + \ No newline at end of file diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-oauth2.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-oauth2.xml new file mode 100644 index 000000000..783ce2d95 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-oauth2.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-oidc.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-oidc.xml new file mode 100644 index 000000000..530465305 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-oidc.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-twitter.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-twitter.xml new file mode 100644 index 000000000..aedffbb50 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/sso-twitter.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/tls.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/tls.xml new file mode 100644 index 000000000..9d6838900 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/tls.xml @@ -0,0 +1,5 @@ + + + transportSecurity-1.0 + + \ No newline at end of file diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/trustDefault.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/trustDefault.xml new file mode 100644 index 000000000..396987fad --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/trustDefault.xml @@ -0,0 +1,4 @@ + + + + diff --git a/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/truststore.xml b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/truststore.xml new file mode 100644 index 000000000..3a32393d3 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configuration_snippets/truststore.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/ga/23.0.0.7/kernel/helpers/build/configure.sh b/ga/23.0.0.7/kernel/helpers/build/configure.sh new file mode 100755 index 000000000..b2480a5cd --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/configure.sh @@ -0,0 +1,219 @@ +#!/bin/bash +# (C) Copyright IBM Corporation 2020, 2023. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Determine if featureUtility ran in an earlier build step +if /opt/ibm/helpers/build/internal/features-installed.sh; then + FEATURES_INSTALLED=true +else + FEATURES_INSTALLED=false +fi + +if [ "$VERBOSE" != "true" ]; then + exec &>/dev/null +fi + +set -Eeox pipefail + +function main() { + ##Define variables for XML snippets source and target paths + WLP_INSTALL_DIR=/opt/ibm/wlp + SHARED_CONFIG_DIR=${WLP_INSTALL_DIR}/usr/shared/config + SHARED_RESOURCE_DIR=${WLP_INSTALL_DIR}/usr/shared/resources + + SNIPPETS_SOURCE=/opt/ibm/helpers/build/configuration_snippets + SNIPPETS_TARGET=/config/configDropins/overrides + SNIPPETS_TARGET_DEFAULTS=/config/configDropins/defaults + mkdir -p ${SNIPPETS_TARGET} + mkdir -p ${SNIPPETS_TARGET_DEFAULTS} + + # Check for each Liberty value-add functionality + if [ "$FEATURES_INSTALLED" == "false" ]; then + # HTTP Endpoint + if [ "$HTTP_ENDPOINT" == "true" ]; then + if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]; then + cp $SNIPPETS_SOURCE/http-ssl-endpoint.xml $SNIPPETS_TARGET/http-ssl-endpoint.xml + else + cp $SNIPPETS_SOURCE/http-endpoint.xml $SNIPPETS_TARGET/http-endpoint.xml + fi + fi + + # MicroProfile Health + if [ "$MP_HEALTH_CHECK" == "true" ]; then + cp $SNIPPETS_SOURCE/mp-health-check.xml $SNIPPETS_TARGET/mp-health-check.xml + fi + + # MicroProfile Monitoring + if [ "$MP_MONITORING" == "true" ]; then + cp $SNIPPETS_SOURCE/mp-monitoring.xml $SNIPPETS_TARGET/mp-monitoring.xml + fi + + # IIOP Endpoint + if [ "$IIOP_ENDPOINT" == "true" ]; then + if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]; then + cp $SNIPPETS_SOURCE/iiop-ssl-endpoint.xml $SNIPPETS_TARGET/iiop-ssl-endpoint.xml + else + cp $SNIPPETS_SOURCE/iiop-endpoint.xml $SNIPPETS_TARGET/iiop-endpoint.xml + fi + fi + + # JMS Endpoint + if [ "$JMS_ENDPOINT" == "true" ]; then + if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]; then + cp $SNIPPETS_SOURCE/jms-ssl-endpoint.xml $SNIPPETS_TARGET/jms-ssl-endpoint.xml + else + cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml + fi + fi + + # OpenIdConnect Client + if [ "$OIDC" == "true" ] || [ "$OIDC_CONFIG" == "true" ]; then + cp $SNIPPETS_SOURCE/oidc.xml $SNIPPETS_TARGET/oidc.xml + fi + if [ "$OIDC_CONFIG" == "true" ]; then + cp $SNIPPETS_SOURCE/oidc-config.xml $SNIPPETS_TARGET/oidc-config.xml + fi + + # Infinispan Session Caching (Full) + if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then + cp ${SNIPPETS_SOURCE}/infinispan-client-sessioncache.xml ${SNIPPETS_TARGET}/infinispan-client-sessioncache.xml + chmod g+rw $SNIPPETS_TARGET/infinispan-client-sessioncache.xml + fi + + # Hazelcast Session Caching (Full) + if [ "${HZ_SESSION_CACHE}" == "client" ] || [ "${HZ_SESSION_CACHE}" == "embedded" ]; then + cp ${SNIPPETS_SOURCE}/hazelcast-sessioncache.xml ${SNIPPETS_TARGET}/hazelcast-sessioncache.xml + mkdir -p ${SHARED_CONFIG_DIR}/hazelcast + cp ${SNIPPETS_SOURCE}/hazelcast-${HZ_SESSION_CACHE}.xml ${SHARED_CONFIG_DIR}/hazelcast/hazelcast.xml + fi + + # SSO + if [[ -n "$SEC_SSO_PROVIDERS" ]]; then + cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS + fi + + # Key Store + if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]; then + cp $SNIPPETS_SOURCE/tls.xml $SNIPPETS_TARGET/tls.xml + fi + else + # Otherwise, load XML for addons that have features already installed + # Infinispan Session Caching + if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then + cp ${SNIPPETS_SOURCE}/infinispan-client-sessioncache-config.xml ${SNIPPETS_TARGET}/infinispan-client-sessioncache-config.xml + chmod g+rw $SNIPPETS_TARGET/infinispan-client-sessioncache-config.xml + fi + + # Hazelcast Session Caching + if [ "${HZ_SESSION_CACHE}" == "client" ] || [ "${HZ_SESSION_CACHE}" == "embedded" ]; then + cp ${SNIPPETS_SOURCE}/hazelcast-sessioncache-config.xml ${SNIPPETS_TARGET}/hazelcast-sessioncache-config.xml + mkdir -p ${SHARED_CONFIG_DIR}/hazelcast + cp ${SNIPPETS_SOURCE}/hazelcast-${HZ_SESSION_CACHE}.xml ${SHARED_CONFIG_DIR}/hazelcast/hazelcast.xml + fi + fi + + # Key Store + keystorePath="$SNIPPETS_TARGET_DEFAULTS/keystore.xml" + if [ "$SSL" != "false" ] && [ "$TLS" != "false" ]; then + if [ ! -e $keystorePath ]; then + # Generate the keystore.xml + export KEYSTOREPWD=$(openssl rand -base64 32) + sed "s|REPLACE|$KEYSTOREPWD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml + chmod g+w $SNIPPETS_TARGET_DEFAULTS/keystore.xml + fi + fi + + # SSO + if [[ -n "$SEC_SSO_PROVIDERS" ]]; then + parseProviders $SEC_SSO_PROVIDERS + fi + + if [ "$SKIP_FEATURE_INSTALL" != "true" ] && [ "$FEATURES_INSTALLED" == "false" ]; then + # Install needed features + if [ "$FEATURE_REPO_URL" ]; then + curl -k --fail $FEATURE_REPO_URL > /tmp/repo.zip + installUtility install --acceptLicense defaultServer --from=/tmp/repo.zip || rc=$?; if [ $rc -ne 22 ]; then exit $rc; fi + rm -rf /tmp/repo.zip + else + installUtility install --acceptLicense defaultServer || rc=$?; if [ $rc -ne 22 ]; then exit $rc; fi + fi + fi + + # Apply interim fixes found in /opt/ibm/fixes + # Fixes recommended by IBM, such as to resolve security vulnerabilities, are also included in /opt/ibm/fixes + # Note: This step should be done once needed features are enabled and installed using installUtility. + + # Do not create a SCC + if [ -n "${IBM_JAVA_OPTIONS}" ]; then + IBM_JAVA_OPTIONS="${IBM_JAVA_OPTIONS} -Xshareclasses:none" + fi + + if [ -n "${OPENJ9_JAVA_OPTIONS}" ]; then + OPENJ9_JAVA_OPTIONS="${OPENJ9_JAVA_OPTIONS} -Xshareclasses:none" + fi + + find /opt/ibm/fixes -type f -name "*.jar" -print0 | sort -z | xargs -0 -n 1 -r -I {} java -jar {} --installLocation $WLP_INSTALL_DIR + #Make sure that group write permissions are set correctly after installing new features + find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw + + # Create a new SCC layer + if [ "$OPENJ9_SCC" == "true" ]; then + cmd="populate_scc.sh -i 1" + if [ "$TRIM_SCC" == "false" ]; then + cmd+=" -d" + fi + if [ ! "$SCC_SIZE" = "" ]; then + cmd+=" -s $SCC_SIZE" + fi + eval $cmd + fi +} + +## parse provider list to generate files into configDropins +function parseProviders() { + while [ $# -gt 0 ]; do + case "$1" in + oidc:*) + parseCommaList oidc "${1#*:}" + ;; + oauth2:*) + parseCommaList oauth2 "${1#*:}" + ;; + *) + if [[ $(ls $SNIPPETS_SOURCE | grep "$1") ]]; then + cp $SNIPPETS_SOURCE/sso-${1}.xml $SNIPPETS_TARGET_DEFAULTS + fi + ;; + esac + shift + done +} + +## process the comma delimitted oauth2/oidc source lists +function parseCommaList() { + local type="$1" + local list=$(echo "$2" | tr , " ") + + for current in ${list}; do + if [[ "${type}" = "oidc" ]]; then + # replace oidc identifiers with custom name + sed -e 's/=\"oidc/=\"'${current}'/g' -e 's/_OIDC_/_'${current^^}'_/g' $SNIPPETS_SOURCE/sso-oidc.xml > $SNIPPETS_TARGET_DEFAULTS/sso-${current}.xml + else + # replace oauth2 identifiers with custom name + sed -e 's/=\"oauth2/=\"'${current}'/g' -e 's/_OAUTH2_/_'${current^^}'_/g' $SNIPPETS_SOURCE/sso-oauth2.xml > $SNIPPETS_TARGET_DEFAULTS/sso-${current}.xml + fi + done +} + +main "$@" diff --git a/ga/23.0.0.7/kernel/helpers/build/features.sh b/ga/23.0.0.7/kernel/helpers/build/features.sh new file mode 100755 index 000000000..4e6654898 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/features.sh @@ -0,0 +1,48 @@ +#!/bin/bash +# (C) Copyright IBM Corporation 2023. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +if [ "$VERBOSE" != "true" ]; then + exec &>/dev/null +fi + +set -Eeox pipefail + +##Define variables for XML snippets source and target paths +SNIPPETS_SOURCE=/opt/ibm/helpers/build/configuration_snippets +SNIPPETS_TARGET=/config/configDropins/overrides +SNIPPETS_TARGET_DEFAULTS=/config/configDropins/defaults +mkdir -p ${SNIPPETS_TARGET} +mkdir -p ${SNIPPETS_TARGET_DEFAULTS} + +# Session Caching +if [ -n "$INFINISPAN_SERVICE_NAME" ] || [ "${HZ_SESSION_CACHE}" == "client" ] || [ "${HZ_SESSION_CACHE}" == "embedded" ]; then + cp ${SNIPPETS_SOURCE}/sessioncache-features.xml ${SNIPPETS_TARGET}/sessioncache-features.xml + chmod g+rw $SNIPPETS_TARGET/sessioncache-features.xml +fi + +# SSO +if [[ -n "$SEC_SSO_PROVIDERS" ]]; then + cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS +fi + +# Key Store +if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]; then + cp $SNIPPETS_SOURCE/tls.xml $SNIPPETS_TARGET/tls.xml +fi + +# Install necessary features using featureUtility +featureUtility installServerFeatures --acceptLicense defaultServer --noCache +find /opt/ibm/wlp/lib /opt/ibm/wlp/bin ! -perm -g=rw -print0 | xargs -0 -r chmod g+rw + +echo "features.sh script has been run" > /logs/features.log diff --git a/ga/23.0.0.7/kernel/helpers/build/infinispan-client-setup.sh b/ga/23.0.0.7/kernel/helpers/build/infinispan-client-setup.sh new file mode 100755 index 000000000..cf54d05df --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/infinispan-client-setup.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# (C) Copyright IBM Corporation 2020. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +if [ "$VERBOSE" != "true" ]; then + exec &>/dev/null +fi + +set -Eeox pipefail + +yum update -y +yum install -y maven +mkdir -p /opt/ibm/wlp/usr/shared/resources/infinispan +echo ' 4.0.0 io.openliberty openliberty-infinispan-client 1.0 org.infinispan infinispan-jcache-remote 10.1.3.Final ' > /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml +mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml versions:use-latest-releases -DallowMajorUpdates=false +mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml dependency:copy-dependencies -DoutputDirectory=/opt/ibm/wlp/usr/shared/resources/infinispan +yum remove -y maven +rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml +rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/jboss-transaction-api*.jar +rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/reactive-streams-*.jar +rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/rxjava-*.jar +rm -rf ~/.m2 +chown -R 1001:0 /opt/ibm/wlp/usr/shared/resources/infinispan +chmod -R g+rw /opt/ibm/wlp/usr/shared/resources/infinispan + diff --git a/ga/23.0.0.7/kernel/helpers/build/internal/features-installed.sh b/ga/23.0.0.7/kernel/helpers/build/internal/features-installed.sh new file mode 100755 index 000000000..c32ac59f4 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/internal/features-installed.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +if [ -f "/logs/features.log" ]; then + rm /logs/features.log + exit 0 +fi + +>&2 echo "WARNING: This is not an optimal build configuration. Although features in server.xml will continue to be installed correctly, the 'RUN features.sh' command should be added to the Dockerfile prior to configure.sh. See https://ibm.biz/wl-app-image-template for a sample application image template." +exit 1 diff --git a/ga/23.0.0.7/kernel/helpers/build/pidplus.sh b/ga/23.0.0.7/kernel/helpers/build/pidplus.sh new file mode 100755 index 000000000..ad8007957 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/pidplus.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# hack to bump up the pid +echo "nothing" > /dev/null + + diff --git a/ga/23.0.0.7/kernel/helpers/build/populate_scc.sh b/ga/23.0.0.7/kernel/helpers/build/populate_scc.sh new file mode 100755 index 000000000..8f65ec392 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/build/populate_scc.sh @@ -0,0 +1,138 @@ +#!/bin/bash +# (C) Copyright IBM Corporation 2020. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +if [ "$VERBOSE" != "true" ]; then + exec &>/dev/null +fi + +set -Eeox pipefail + +# 32-bit JVMs don't supported multi-layered SCCs. +[ -e "$JAVA_HOME/lib/i386" -o -e "$JAVA_HOME/lib/ppc" -o -e "$JAVA_HOME/lib/s390" ] && exit 0 + +SCC_SIZE="80m" # Default size of the SCC layer. +ITERATIONS=2 # Number of iterations to run to populate it. +TRIM_SCC=yes # Trim the SCC to eliminate any wasted space. + +# If this directory exists and has at least ug=rwx permissions, assume the base image includes an SCC called 'openj9_system_scc' and build on it. +# If not, build on our own SCC. +if [[ -d "/opt/java/.scc" ]] && [[ `stat -L -c "%a" "/opt/java/.scc" | cut -c 1,2` == "77" ]] +then + SCC="-Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc" +else + SCC="-Xshareclasses:name=liberty,cacheDir=/output/.classCache" +fi + +# For JDK8, as of OpenJ9 0.20.0 the criteria for determining the max heap size (-Xmx) has changed +# and the JVM has freedom to choose larger max heap sizes. +# Currently in compressedrefs mode there is a dependency between heap size and position and the AOT code stored in the +# SCC, such that if the max heap size/position changes too drastically the AOT code in the SCC becomes invalid and will +# not be loaded. Also, new AOT code will not be generated. +# In order to reduce the chances of this happening we use the -XX:+OriginalJDK8HeapSizeCompatibilityMode +# option to revert to the old criteria, which results in AOT code that is more compatible, on average, with typical heap sizes/positions. +# The option has no effect on later JDKs. +export OPENJ9_JAVA_OPTIONS="-XX:+OriginalJDK8HeapSizeCompatibilityMode $SCC" +export IBM_JAVA_OPTIONS="$OPENJ9_JAVA_OPTIONS" +CREATE_LAYER="$OPENJ9_JAVA_OPTIONS,createLayer,groupAccess" +DESTROY_LAYER="$OPENJ9_JAVA_OPTIONS,destroy" +PRINT_LAYER_STATS="$OPENJ9_JAVA_OPTIONS,printTopLayerStats" + +while getopts ":i:s:tdh" OPT +do + case "$OPT" in + i) + ITERATIONS="$OPTARG" + ;; + s) + [ "${OPTARG: -1}" == "m" ] || ( echo "Missing m suffix." && exit 1 ) + SCC_SIZE="$OPTARG" + ;; + t) + TRIM_SCC=yes + ;; + d) + TRIM_SCC=no + ;; + h) + echo \ +"Usage: $0 [-i iterations] [-s size] [-t] [-d] + -i Number of iterations to run to populate the SCC. (Default: $ITERATIONS) + -s Size of the SCC in megabytes (m suffix required). (Default: $SCC_SIZE) + -t Trim the SCC to eliminate most of the free space, if any. + -d Don't trim the SCC. + + Trimming enabled=$TRIM_SCC" + exit 1 + ;; + \?) + echo "Unrecognized option: $OPTARG" 1>&2 + exit 1 + ;; + :) + echo "Missing argument for option: $OPTARG" 1>&2 + exit 1 + ;; + esac +done + +OLD_UMASK=`umask` +umask 002 # 002 is required to provide group rw permission to the cache when `-Xshareclasses:groupAccess` options is used + +# Explicity create a class cache layer for this image layer here rather than allowing +# `server start` to do it, which will lead to problems because multiple JVMs will be started. +java $CREATE_LAYER -Xscmx$SCC_SIZE -version + +if [ $TRIM_SCC == yes ] +then + echo "Calculating SCC layer upper bound, starting with initial size $SCC_SIZE." + # Populate the newly created class cache layer. + /opt/ibm/wlp/bin/server start && /opt/ibm/wlp/bin/server stop + # Find out how full it is. + FULL=`( java $PRINT_LAYER_STATS || true ) 2>&1 | awk '/^Cache is [0-9.]*% .*full/ {print substr($3, 1, length($3)-1)}'` + echo "SCC layer is $FULL% full. Destroying layer." + # Destroy the layer once we know roughly how much space we need. + java $DESTROY_LAYER || true + # Remove the m suffix. + SCC_SIZE="${SCC_SIZE:0:-1}" + # Calculate the new size based on how full the layer was (rounded to nearest m). + SCC_SIZE=`awk "BEGIN {print int($SCC_SIZE * $FULL / 100.0 + 0.5)}"` + # Make sure size is >0. + [ $SCC_SIZE -eq 0 ] && SCC_SIZE=1 + # Add the m suffix back. + SCC_SIZE="${SCC_SIZE}m" + echo "Re-creating layer with size $SCC_SIZE." + # Recreate the layer with the new size. + java $CREATE_LAYER -Xscmx$SCC_SIZE -version +fi + +# Populate the newly created class cache layer. +# Server start/stop to populate the /output/workarea and make subsequent server starts faster. +for ((i=0; i<$ITERATIONS; i++)) +do + /opt/ibm/wlp/bin/server start && /opt/ibm/wlp/bin/server stop +done + +# restore umask +umask ${OLD_UMASK} + +rm -rf /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /output/workarea + +if [[ -d "/output/resources" ]] +then + chmod -R g+rwx /output/resources +fi + +# Tell the user how full the final layer is. +FULL=`( java $PRINT_LAYER_STATS || true ) 2>&1 | awk '/^Cache is [0-9.]*% .*full/ {print substr($3, 1, length($3)-1)}'` +echo "SCC layer is $FULL% full." diff --git a/ga/23.0.0.7/kernel/helpers/runtime/docker-server.sh b/ga/23.0.0.7/kernel/helpers/runtime/docker-server.sh new file mode 100755 index 000000000..77f7b4260 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/runtime/docker-server.sh @@ -0,0 +1,159 @@ +#!/bin/bash +# (C) Copyright IBM Corporation 2020. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +function importKeyCert() { + local CERT_FOLDER="${TLS_DIR:-/etc/x509/certs}" + local CRT_FILE="tls.crt" + local KEY_FILE="tls.key" + local CA_FILE="ca.crt" + local PASSWORD=$(openssl rand -base64 32 2>/dev/null) + local TRUSTSTORE_PASSWORD=$(openssl rand -base64 32 2>/dev/null) + local TMP_CERT=ca-bundle-temp.crt + local -r CRT_DELIMITER="/-----BEGIN CERTIFICATE-----/" + local KUBE_SA_FOLDER="/var/run/secrets/kubernetes.io/serviceaccount" + local KEYSTORE_FILE="/output/resources/security/key.p12" + local TRUSTSTORE_FILE="/output/resources/security/trust.p12" + + # Import the private key and certificate into new keytore + if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then + echo "Found mounted TLS certificates, generating keystore" + mkdir -p /output/resources/security + if [ -f "${CERT_FOLDER}/${CA_FILE}" ]; then + openssl pkcs12 -export \ + -name "defaultKeyStore" \ + -inkey "${CERT_FOLDER}/${KEY_FILE}" \ + -in "${CERT_FOLDER}/${CRT_FILE}" \ + -certfile "${CERT_FOLDER}/${CA_FILE}" \ + -out "${KEYSTORE_FILE}" \ + -password pass:"${PASSWORD}" >&/dev/null + else + openssl pkcs12 -export \ + -name "defaultKeyStore" \ + -inkey "${CERT_FOLDER}/${KEY_FILE}" \ + -in "${CERT_FOLDER}/${CRT_FILE}" \ + -out "${KEYSTORE_FILE}" \ + -password pass:"${PASSWORD}" >&/dev/null + fi + + # Since we are creating new keystore, always write new password to a file + sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml + + # Add mounted CA to the truststore + if [ -f "${CERT_FOLDER}/${CA_FILE}" ]; then + echo "Found mounted TLS CA certificate, adding to truststore" + keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FOLDER}/${CA_FILE}" \ + -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-ca" >&/dev/null + fi + fi + + # Add kubernetes CA certificates to the truststore + # CA bundles need to be split and added as individual certificates + if [ "$SEC_IMPORT_K8S_CERTS" = "true" ] && [ -d "${KUBE_SA_FOLDER}" ]; then + mkdir /tmp/certs + pushd /tmp/certs >&/dev/null + cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT} + csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}' + for CERT_FILE in crt-*; do + keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FILE}" \ + -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-sa-${CERT_FILE}" >&/dev/null + done + popd >&/dev/null + rm -rf /tmp/certs + fi + + # Add the keystore password to server configuration + if [ ! -e $keystorePath ]; then + sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml + fi + if [ -e $TRUSTSTORE_FILE ]; then + sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml + elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then + cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml + fi +} + +case "${LICENSE,,}" in + "accept" ) # Suppress license message in logs + grep -s -F "com.ibm.ws.logging.hideMessage" /config/bootstrap.properties \ + && sed -i 's/^\(com.ibm.ws.logging.hideMessage=.*$\)/\1,CWWKE0100I/' /config/bootstrap.properties \ + || echo "com.ibm.ws.logging.hideMessage=CWWKE0100I" >> /config/bootstrap.properties + ;; + "view" ) # Display license file + cat /opt/ibm/wlp/lafiles/LI_${LANG:-en} + exit 1 + ;; + "" ) # Continue, displaying license message in logs + true + ;; + *) # License not accepted + echo -e "Set environment variable LICENSE=accept to indicate acceptance of license terms and conditions.\n\nLicense agreements and information can be viewed by running this image with the environment variable LICENSE=view. You can also set the LANG environment variable to view the license in a different language." + exit 1 + ;; +esac + +SNIPPETS_SOURCE=/opt/ibm/helpers/build/configuration_snippets +SNIPPETS_TARGET_DEFAULTS=/config/configDropins/defaults +SNIPPETS_TARGET_OVERRIDES=/config/configDropins/overrides + +keystorePath="$SNIPPETS_TARGET_DEFAULTS/keystore.xml" + +importKeyCert + +# Infinispan Session Caching +if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then + echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}" + INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g') + echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}" + + if [[ -z "$INFINISPAN_HOST" ]]; then + eval INFINISPAN_HOST=\$${INFINISPAN_SERVICE_NAME}_SERVICE_HOST + export INFINISPAN_HOST + fi + echo "INFINISPAN_HOST: ${INFINISPAN_HOST}" + + if [[ -z "$INFINISPAN_PORT" ]]; then + eval INFINISPAN_PORT=\$${INFINISPAN_SERVICE_NAME}_SERVICE_PORT + export INFINISPAN_PORT + fi + echo "INFINISPAN_PORT: ${INFINISPAN_PORT:=11222}" + + if [[ -z "$INFINISPAN_USER" ]]; then + export INFINISPAN_USER=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 username | sed 's/username://' | sed 's/[[:space:]]*//g' | sed 's/^-//') + fi + echo "INFINISPAN_USER: ${INFINISPAN_USER:=developer}" + + if [[ -z "$INFINISPAN_PASS" ]]; then + export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g') + fi + echo "INFINISPAN_PASS: ${INFINISPAN_PASS}" +fi + + +# Pass on to the real server run +if [ -d "/output/workarea/checkpoint/image" ]; then + # A checkpoint image found; exec dumb-init for signal handling. + # Use of dumb-init for PID 1 is required for signal handling because + # the restored server process cannot be PID 1. + exec dumb-init --rewrite 15:2 -- /opt/ibm/helpers/runtime/restore-server.sh "$@" +elif [[ ! -z "$WLP_CHECKPOINT" ]]; then + # Unset WLP_CHECKPOINT so it is not set in the final image after checkpoint. + TMP_CHECKPOINT=$WLP_CHECKPOINT + unset WLP_CHECKPOINT + # A checkpoint action has been requested; run the checkpoint.sh script. + checkpoint.sh "$TMP_CHECKPOINT" +else + # The default is to just exec the supplied CMD + exec "$@" +fi diff --git a/ga/23.0.0.7/kernel/helpers/runtime/restore-server.sh b/ga/23.0.0.7/kernel/helpers/runtime/restore-server.sh new file mode 100755 index 000000000..cdcd84894 --- /dev/null +++ b/ga/23.0.0.7/kernel/helpers/runtime/restore-server.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# For restore use a copy of criu that does not have sys_ptrace +export CRIU_RESTORE_PATH=/opt/criu/criu +exec "$@" + diff --git a/ga/23.0.0.7/oidcProvider/Dockerfile b/ga/23.0.0.7/oidcProvider/Dockerfile new file mode 100644 index 000000000..5d13b61fb --- /dev/null +++ b/ga/23.0.0.7/oidcProvider/Dockerfile @@ -0,0 +1,32 @@ +# (C) Copyright IBM Corporation 2019. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM websphere-liberty:kernel + +ARG REPOSITORIES_PROPERTIES="" + +RUN if [ ! -z $REPOSITORIES_PROPERTIES ]; then mkdir /opt/ibm/wlp/etc/ \ + && echo $REPOSITORIES_PROPERTIES > /opt/ibm/wlp/etc/repositories.properties; fi \ + && installUtility install --acceptLicense \ + appSecurity-2.0 ldapRegistry-3.0 \ + localConnector-1.0 \ + samlWeb-2.0 \ + openidConnectServer-1.0 \ + socialLogin-1.0 \ + openidConnectClient-1.0 \ + && if [ ! -z $REPOSITORIES_PROPERTIES ]; then rm /opt/ibm/wlp/etc/repositories.properties; fi \ + && rm -rf /output/workarea /output/logs \ + && chmod -R g+rwx /opt/ibm/wlp/output/* + +COPY --chown=1001:0 server.xml /config/ diff --git a/ga/23.0.0.7/oidcProvider/Dockerfile.java11 b/ga/23.0.0.7/oidcProvider/Dockerfile.java11 new file mode 100644 index 000000000..20a2f5320 --- /dev/null +++ b/ga/23.0.0.7/oidcProvider/Dockerfile.java11 @@ -0,0 +1,32 @@ +# (C) Copyright IBM Corporation 2019. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM websphere-liberty:kernel-java11 + +ARG REPOSITORIES_PROPERTIES="" + +RUN if [ ! -z $REPOSITORIES_PROPERTIES ]; then mkdir /opt/ibm/wlp/etc/ \ + && echo $REPOSITORIES_PROPERTIES > /opt/ibm/wlp/etc/repositories.properties; fi \ + && installUtility install --acceptLicense \ + appSecurity-2.0 ldapRegistry-3.0 \ + localConnector-1.0 \ + samlWeb-2.0 \ + openidConnectServer-1.0 \ + socialLogin-1.0 \ + openidConnectClient-1.0 \ + && if [ ! -z $REPOSITORIES_PROPERTIES ]; then rm /opt/ibm/wlp/etc/repositories.properties; fi \ + && rm -rf /output/workarea /output/logs \ + && chmod -R g+rwx /opt/ibm/wlp/output/* + +COPY --chown=1001:0 server.xml /config/ diff --git a/ga/23.0.0.7/oidcProvider/README.md b/ga/23.0.0.7/oidcProvider/README.md new file mode 100644 index 000000000..52d2c87f5 --- /dev/null +++ b/ga/23.0.0.7/oidcProvider/README.md @@ -0,0 +1,7 @@ +# WebSphere Application Server Developer Edition Liberty image + +The [Dockerfile](Dockerfile) in this directory is used to build the `websphere-liberty:oidcProvider` image on [Docker Hub](https://registry.hub.docker.com/_/websphere-liberty/). + +# Usage + +TODO diff --git a/ga/23.0.0.7/oidcProvider/server.xml b/ga/23.0.0.7/oidcProvider/server.xml new file mode 100644 index 000000000..5b94ec95b --- /dev/null +++ b/ga/23.0.0.7/oidcProvider/server.xml @@ -0,0 +1,143 @@ + + + + + openidConnectServer-1.0 + ldapRegistry-3.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + regexp:https://${env.OIDCP_INGRESS_HOST_REGEX}:3!d!d!d!d/oidcclient/redirect/rp + https://${env.OIDCP_INGRESS_HOST}/oidcclient/redirect/rp + + + + ${env.OIDCP_CUSTOM_CLIENT_REDIRECT} + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 index 74d122601..9d5ac1c1e 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.6 +ARG LIBERTY_VERSION=23.0.0.7 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.6 -ARG LIBERTY_BUILD_LABEL=cl230620230612-1100 +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 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 9a1edc530..cbd5df5ec 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.6 +ARG LIBERTY_VERSION=23.0.0.7 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.6 -ARG LIBERTY_BUILD_LABEL=cl230620230612-1100 +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 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 2afe4dcd4..bdf26a8a1 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.6 +ARG LIBERTY_VERSION=23.0.0.7 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.6 -ARG LIBERTY_BUILD_LABEL=cl230620230612-1100 +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 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 bd4740e22..2484c6586 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.6 +ARG LIBERTY_VERSION=23.0.0.7 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.6 -ARG LIBERTY_BUILD_LABEL=cl230620230612-1100 +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 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 0b58a7f43..796d40ac0 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.6 +ARG LIBERTY_VERSION=23.0.0.7 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.6 -ARG LIBERTY_BUILD_LABEL=cl230620230612-1100 +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 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 4978eb1fa..808d8dac3 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.6 +ARG LIBERTY_VERSION=23.0.0.7 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.6 -ARG LIBERTY_BUILD_LABEL=cl230620230612-1100 +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 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 7fe7d2e8c..f0bc89464 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.6 +ARG LIBERTY_VERSION=23.0.0.7 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.6 -ARG LIBERTY_BUILD_LABEL=cl230620230612-1100 +ARG LIBERTY_VERSION=23.0.0.7 +ARG LIBERTY_BUILD_LABEL=cl230720230710-1201 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ From 5895a5eac7902901bf26dcecb6cf2284e8c483ab Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Wed, 12 Jul 2023 14:35:11 -0700 Subject: [PATCH 03/11] Image names need correction --- ga/23.0.0.7/full/Dockerfile.ubi.ibmjava8 | 4 ++-- ga/23.0.0.7/full/Dockerfile.ubi.openjdk11 | 4 ++-- ga/23.0.0.7/full/Dockerfile.ubi.openjdk17 | 4 ++-- ga/23.0.0.7/full/Dockerfile.ubi.openjdk8 | 4 ++-- ga/23.0.0.7/full/Dockerfile.ubuntu.ibmjava8 | 4 ++-- ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk11 | 4 ++-- ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk17 | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ga/23.0.0.7/full/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.7/full/Dockerfile.ubi.ibmjava8 index 2a2aef089..7459b92eb 100644 --- a/ga/23.0.0.7/full/Dockerfile.ubi.ibmjava8 +++ b/ga/23.0.0.7/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.7-kernel-java8-ibmjava-ubi FROM $PARENT_IMAGE AS installBundle USER root @@ -38,7 +38,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.7-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.7/full/Dockerfile.ubi.openjdk11 index 79f2900b0..7ea47011f 100644 --- a/ga/23.0.0.7/full/Dockerfile.ubi.openjdk11 +++ b/ga/23.0.0.7/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:kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.7-kernel-java11-openj9-ubi FROM $PARENT_IMAGE AS installBundle USER root @@ -38,7 +38,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.7-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.7/full/Dockerfile.ubi.openjdk17 index dc91e1978..d7911fdba 100644 --- a/ga/23.0.0.7/full/Dockerfile.ubi.openjdk17 +++ b/ga/23.0.0.7/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.7-kernel-java17-openj9-ubi FROM $PARENT_IMAGE AS installBundle USER root @@ -38,7 +38,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.7-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.7/full/Dockerfile.ubi.openjdk8 index 1d700de48..420ecdb24 100644 --- a/ga/23.0.0.7/full/Dockerfile.ubi.openjdk8 +++ b/ga/23.0.0.7/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.7-kernel-java8-openj9-ubi FROM $PARENT_IMAGE AS installBundle USER root @@ -38,7 +38,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.7-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.7/full/Dockerfile.ubuntu.ibmjava8 index 395a6922a..a200f948e 100644 --- a/ga/23.0.0.7/full/Dockerfile.ubuntu.ibmjava8 +++ b/ga/23.0.0.7/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 AS installBundle +FROM websphere-liberty:23.0.0.7-kernel-java8-ibmjava AS installBundle ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" @@ -34,7 +34,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -FROM websphere-liberty:kernel +FROM websphere-liberty:23.0.0.7-kernel-java8-ibmjava ARG VERBOSE=false # Copy the runtime diff --git a/ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk11 index 02fd841cd..6695e83f2 100644 --- a/ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk11 +++ b/ga/23.0.0.7/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 AS installBundle +FROM websphere-liberty:23.0.0.7-kernel-java11-openj9 AS installBundle USER root @@ -37,7 +37,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -FROM websphere-liberty:kernel-java11-openj9 +FROM websphere-liberty:23.0.0.7-kernel-java11-openj9 ARG VERBOSE=false # Copy the runtime diff --git a/ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk17 index 1241066c1..4b5e98a02 100644 --- a/ga/23.0.0.7/full/Dockerfile.ubuntu.openjdk17 +++ b/ga/23.0.0.7/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 AS installBundle +FROM websphere-liberty:23.0.0.7-kernel-java17-openj9 AS installBundle USER root @@ -37,7 +37,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -FROM websphere-liberty:kernel-java17-openj9 +FROM websphere-liberty:23.0.0.7-kernel-java17-openj9 ARG VERBOSE=false # Copy the runtime From 1aa1358114537a5e03dfc60a29ff01e37e38c291 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Mon, 17 Jul 2023 11:06:15 -0700 Subject: [PATCH 04/11] Update Travis YML file for record keeping --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7983df682..d68cc6677 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,9 @@ services: before_install: - sudo apt-get update env: - - RELEASE=../ga/22.0.0.12 - RELEASE=../ga/23.0.0.3 - - RELEASE=../ga/23.0.0.5 + - RELEASE=../ga/23.0.0.6 + - RELEASE=../ga/23.0.0.7 - RELEASE=../ga/latest script: From 38f93d7037b406a9bd53d4e1ca1b75fc0e6f3a1b Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Tue, 18 Jul 2023 06:42:51 -0700 Subject: [PATCH 05/11] Required resources directory --- ga/23.0.0.7/full/resources/.gitkeep | 0 ga/23.0.0.7/kernel/resources/.gitkeep | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 ga/23.0.0.7/full/resources/.gitkeep create mode 100644 ga/23.0.0.7/kernel/resources/.gitkeep diff --git a/ga/23.0.0.7/full/resources/.gitkeep b/ga/23.0.0.7/full/resources/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/ga/23.0.0.7/kernel/resources/.gitkeep b/ga/23.0.0.7/kernel/resources/.gitkeep new file mode 100644 index 000000000..e69de29bb From 56a65f4923b8dcb484166debc65bfd73d7cdb0b4 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Wed, 9 Aug 2023 08:30:03 -0500 Subject: [PATCH 06/11] Fix up permissions when a different user restores During checkpoint the current user creates resources and directories for which the restore user needs permission to read and write. This change fixes up the permissions to allow a different from the checkpoint user to restore the process. --- ga/latest/kernel/helpers/build/checkpoint.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ga/latest/kernel/helpers/build/checkpoint.sh b/ga/latest/kernel/helpers/build/checkpoint.sh index dba7820ff..7c8f6d189 100755 --- a/ga/latest/kernel/helpers/build/checkpoint.sh +++ b/ga/latest/kernel/helpers/build/checkpoint.sh @@ -9,5 +9,13 @@ 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 From 1d4880c7faaf333d0012aed2ac2328c5d74838b8 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Wed, 9 Aug 2023 13:13:16 -0700 Subject: [PATCH 07/11] 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 08/11] 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 09/11] 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 10/11] 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 From cf8d45f23a9d85ff53bb2b60f1a24b6ebde8cc2f Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Mon, 21 Aug 2023 21:23:18 -0500 Subject: [PATCH 11/11] PARENT_IMAGE needs version qualifier in name --- ga/23.0.0.8/full/Dockerfile.ubi.openjdk11 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ga/23.0.0.8/full/Dockerfile.ubi.openjdk11 b/ga/23.0.0.8/full/Dockerfile.ubi.openjdk11 index d6418cbd6..109ccb8eb 100644 --- a/ga/23.0.0.8/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:kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.8-kernel-java11-openj9-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false