Skip to content

Commit

Permalink
Merge pull request #483 from OpenLiberty/vNext
Browse files Browse the repository at this point in the history 
Merge vNext (23.0.0.11) changes into main
  • Loading branch information
@leochr
leochr authored Nov 14, 2023
2 parents 51cb45f + 59857f2 commit c1f41e7
Show file tree
Hide file tree
Showing 103 changed files with 304 additions and 130 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ before_install:
env:
- RELEASE=../releases/23.0.0.6
- RELEASE=../releases/23.0.0.9
- RELEASE=../releases/23.0.0.10
- RELEASE=../releases/23.0.0.11
- RELEASE=../releases/latest

script:
Expand Down
8 changes: 4 additions & 4 deletions ...es/23.0.0.10/full/Dockerfile.ubi.ibmjava8 → ...es/23.0.0.11/full/Dockerfile.ubi.ibmjava8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM ibmjava:8-ubi AS getRuntime

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_SHA=7d0882ec20e67e6989c7263ad5defad472bf5247
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_SHA=1002e07f320bf5f6c3840d2fa74e3a8232760da0
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip

ARG VERBOSE=false
Expand All @@ -28,8 +28,8 @@ FROM ibmjava:8-ubi

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

ARG OPENJ9_SCC=true
ARG VERBOSE=false
Expand Down
9 changes: 5 additions & 4 deletions ...s/23.0.0.10/full/Dockerfile.ubi.openjdk11 → ...s/23.0.0.11/full/Dockerfile.ubi.openjdk11
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi AS getRuntime

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_SHA=7d0882ec20e67e6989c7263ad5defad472bf5247
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_SHA=1002e07f320bf5f6c3840d2fa74e3a8232760da0
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip

ARG VERBOSE=false
Expand All @@ -28,8 +28,8 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

ARG OPENJ9_SCC=true
ARG VERBOSE=false
Expand Down Expand Up @@ -132,6 +132,7 @@ RUN mkdir /logs \
&& mkdir /etc/wlp \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml

# Create a new SCC layer
Expand Down
9 changes: 5 additions & 4 deletions ...s/23.0.0.10/full/Dockerfile.ubi.openjdk17 → ...s/23.0.0.11/full/Dockerfile.ubi.openjdk17
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi AS getRuntime

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_SHA=7d0882ec20e67e6989c7263ad5defad472bf5247
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_SHA=1002e07f320bf5f6c3840d2fa74e3a8232760da0
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip

ARG VERBOSE=false
Expand All @@ -28,8 +28,8 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

ARG OPENJ9_SCC=true
ARG VERBOSE=false
Expand Down Expand Up @@ -132,6 +132,7 @@ RUN mkdir /logs \
&& mkdir /etc/wlp \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml

# Create a new SCC layer
Expand Down
9 changes: 5 additions & 4 deletions ...es/23.0.0.10/full/Dockerfile.ubi.openjdk8 → ...es/23.0.0.11/full/Dockerfile.ubi.openjdk8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi AS getRuntime

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_SHA=7d0882ec20e67e6989c7263ad5defad472bf5247
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_SHA=1002e07f320bf5f6c3840d2fa74e3a8232760da0
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip

ARG VERBOSE=false
Expand All @@ -28,8 +28,8 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

ARG OPENJ9_SCC=true
ARG VERBOSE=false
Expand Down Expand Up @@ -132,6 +132,7 @@ RUN mkdir /logs \
&& mkdir /etc/wlp \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml

# Create a new SCC layer
Expand Down
6 changes: 3 additions & 3 deletions ...3.0.0.10/full/Dockerfile.ubuntu.openjdk11 → ...3.0.0.11/full/Dockerfile.ubuntu.openjdk11
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-11-jre-jammy

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_SHA=7d0882ec20e67e6989c7263ad5defad472bf5247
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_SHA=1002e07f320bf5f6c3840d2fa74e3a8232760da0
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

ARG OPENJ9_SCC=true
ARG VERBOSE=false
Expand Down
6 changes: 3 additions & 3 deletions ...3.0.0.10/full/Dockerfile.ubuntu.openjdk17 → ...3.0.0.11/full/Dockerfile.ubuntu.openjdk17
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-17-jre-jammy

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_SHA=7d0882ec20e67e6989c7263ad5defad472bf5247
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_SHA=1002e07f320bf5f6c3840d2fa74e3a8232760da0
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

ARG OPENJ9_SCC=true
ARG VERBOSE=false
Expand Down
6 changes: 3 additions & 3 deletions ...23.0.0.10/full/Dockerfile.ubuntu.openjdk8 → ...23.0.0.11/full/Dockerfile.ubuntu.openjdk8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-8-jre-jammy

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_SHA=7d0882ec20e67e6989c7263ad5defad472bf5247
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_SHA=1002e07f320bf5f6c3840d2fa74e3a8232760da0
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

ARG OPENJ9_SCC=true
ARG VERBOSE=false
Expand Down
0 releases/23.0.0.10/full/NOTICES → releases/23.0.0.11/full/NOTICES
View file
File renamed without changes.
0 releases/23.0.0.10/full/fixes/.gitkeep → releases/23.0.0.11/full/fixes/.gitkeep
View file
File renamed without changes.
17 changes: 17 additions & 0 deletions ...3.0.0.10/full/helpers/build/checkpoint.sh → ...3.0.0.11/full/helpers/build/checkpoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,23 @@ do
pidplus.sh
done

if [ -e /etc/instanton.ld.so.cache ]; then
cp /etc/instanton.ld.so.cache /etc/ld.so.cache
fi

ARCH="$(uname -m)";
case "${ARCH}" in
ppc64el|ppc64le)
export JVM_ARGS="${JVM_ARGS} -XX:+JVMPortableRestoreMode"
;;
s390x)
export JVM_ARGS="${JVM_ARGS} -XX:+JVMPortableRestoreMode"
;;
*)
;;
esac;


echo "Performing checkpoint --at=$1"
/opt/ol/wlp/bin/server checkpoint defaultServer --at=$1

Expand Down
0 ...nfiguration_snippets/hazelcast-client.xml → ...nfiguration_snippets/hazelcast-client.xml
View file
File renamed without changes.
0 ...iguration_snippets/hazelcast-embedded.xml → ...iguration_snippets/hazelcast-embedded.xml
View file
File renamed without changes.
0 ...ation_snippets/hazelcast-sessioncache.xml → ...ation_snippets/hazelcast-sessioncache.xml
View file
File renamed without changes.
0 .../configuration_snippets/http-endpoint.xml → .../configuration_snippets/http-endpoint.xml
View file
File renamed without changes.
0 ...figuration_snippets/http-ssl-endpoint.xml → ...figuration_snippets/http-ssl-endpoint.xml
View file
File renamed without changes.
0 .../configuration_snippets/iiop-endpoint.xml → .../configuration_snippets/iiop-endpoint.xml
View file
File renamed without changes.
0 ...figuration_snippets/iiop-ssl-endpoint.xml → ...figuration_snippets/iiop-ssl-endpoint.xml
View file
File renamed without changes.
0 ...ippets/infinispan-client-sessioncache.xml → ...ippets/infinispan-client-sessioncache.xml
View file
File renamed without changes.
0 ...d/configuration_snippets/jms-endpoint.xml → ...d/configuration_snippets/jms-endpoint.xml
View file
File renamed without changes.
0 ...nfiguration_snippets/jms-ssl-endpoint.xml → ...nfiguration_snippets/jms-ssl-endpoint.xml
View file
File renamed without changes.
0 ...build/configuration_snippets/keystore.xml → ...build/configuration_snippets/keystore.xml
View file
File renamed without changes.
0 ...onfiguration_snippets/mp-health-check.xml → ...onfiguration_snippets/mp-health-check.xml
View file
File renamed without changes.
0 .../configuration_snippets/mp-monitoring.xml → .../configuration_snippets/mp-monitoring.xml
View file
File renamed without changes.
0 ...d/configuration_snippets/sso-facebook.xml → ...d/configuration_snippets/sso-facebook.xml
View file
File renamed without changes.
0 ...d/configuration_snippets/sso-features.xml → ...d/configuration_snippets/sso-features.xml
View file
File renamed without changes.
0 ...ild/configuration_snippets/sso-github.xml → ...ild/configuration_snippets/sso-github.xml
View file
File renamed without changes.
0 ...ild/configuration_snippets/sso-google.xml → ...ild/configuration_snippets/sso-google.xml
View file
File renamed without changes.
0 ...d/configuration_snippets/sso-linkedin.xml → ...d/configuration_snippets/sso-linkedin.xml
View file
File renamed without changes.
0 ...ild/configuration_snippets/sso-oauth2.xml → ...ild/configuration_snippets/sso-oauth2.xml
View file
File renamed without changes.
0 ...build/configuration_snippets/sso-oidc.xml → ...build/configuration_snippets/sso-oidc.xml
View file
File renamed without changes.
0 ...ld/configuration_snippets/sso-twitter.xml → ...ld/configuration_snippets/sso-twitter.xml
View file
File renamed without changes.
0 ...pers/build/configuration_snippets/tls.xml → ...pers/build/configuration_snippets/tls.xml
View file
File renamed without changes.
0 ...d/configuration_snippets/trustDefault.xml → ...d/configuration_snippets/trustDefault.xml
View file
File renamed without changes.
0 ...ild/configuration_snippets/truststore.xml → ...ild/configuration_snippets/truststore.xml
View file
File renamed without changes.
0 ...23.0.0.10/full/helpers/build/configure.sh → ...23.0.0.11/full/helpers/build/configure.sh
View file
File renamed without changes.
0 .../helpers/build/infinispan-client-setup.sh → .../helpers/build/infinispan-client-setup.sh
View file
File renamed without changes.
0 ...s/23.0.0.10/full/helpers/build/pidplus.sh → ...s/23.0.0.11/full/helpers/build/pidplus.sh
View file
File renamed without changes.
0 ...0.0.10/full/helpers/build/populate_scc.sh → ...0.0.11/full/helpers/build/populate_scc.sh
View file
File renamed without changes.
0 ....10/full/helpers/runtime/docker-server.sh → ....11/full/helpers/runtime/docker-server.sh
View file
File renamed without changes.
0 ...10/full/helpers/runtime/restore-server.sh → ...11/full/helpers/runtime/restore-server.sh
View file
File renamed without changes.
0 releases/23.0.0.10/full/resources/.gitkeep → releases/23.0.0.11/full/resources/.gitkeep
View file
File renamed without changes.
24 changes: 12 additions & 12 deletions releases/23.0.0.10/images.txt → releases/23.0.0.11/images.txt
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
kernel-slim Dockerfile.ubuntu.openjdk8 open-liberty 23.0.0.10-kernel-slim-java8-openj9
kernel-slim Dockerfile.ubuntu.openjdk11 open-liberty 23.0.0.10-kernel-slim-java11-openj9
kernel-slim Dockerfile.ubuntu.openjdk17 open-liberty 23.0.0.10-kernel-slim-java17-openj9
kernel-slim Dockerfile.ubi.openjdk8 openliberty/open-liberty 23.0.0.10-kernel-slim-java8-openj9-ubi
kernel-slim Dockerfile.ubi.openjdk11 openliberty/open-liberty 23.0.0.10-kernel-slim-java11-openj9-ubi
kernel-slim Dockerfile.ubi.openjdk17 openliberty/open-liberty 23.0.0.10-kernel-slim-java17-openj9-ubi
full Dockerfile.ubuntu.openjdk8 open-liberty 23.0.0.10-full-java8-openj9
full Dockerfile.ubuntu.openjdk11 open-liberty 23.0.0.10-full-java11-openj9
full Dockerfile.ubuntu.openjdk17 open-liberty 23.0.0.10-full-java17-openj9
full Dockerfile.ubi.openjdk8 openliberty/open-liberty 23.0.0.10-full-java8-openj9-ubi
full Dockerfile.ubi.openjdk11 openliberty/open-liberty 23.0.0.10-full-java11-openj9-ubi
full Dockerfile.ubi.openjdk17 openliberty/open-liberty 23.0.0.10-full-java17-openj9-ubi
kernel-slim Dockerfile.ubuntu.openjdk8 open-liberty 23.0.0.11-kernel-slim-java8-openj9
kernel-slim Dockerfile.ubuntu.openjdk11 open-liberty 23.0.0.11-kernel-slim-java11-openj9
kernel-slim Dockerfile.ubuntu.openjdk17 open-liberty 23.0.0.11-kernel-slim-java17-openj9
kernel-slim Dockerfile.ubi.openjdk8 openliberty/open-liberty 23.0.0.11-kernel-slim-java8-openj9-ubi
kernel-slim Dockerfile.ubi.openjdk11 openliberty/open-liberty 23.0.0.11-kernel-slim-java11-openj9-ubi
kernel-slim Dockerfile.ubi.openjdk17 openliberty/open-liberty 23.0.0.11-kernel-slim-java17-openj9-ubi
full Dockerfile.ubuntu.openjdk8 open-liberty 23.0.0.11-full-java8-openj9
full Dockerfile.ubuntu.openjdk11 open-liberty 23.0.0.11-full-java11-openj9
full Dockerfile.ubuntu.openjdk17 open-liberty 23.0.0.11-full-java17-openj9
full Dockerfile.ubi.openjdk8 openliberty/open-liberty 23.0.0.11-full-java8-openj9-ubi
full Dockerfile.ubi.openjdk11 openliberty/open-liberty 23.0.0.11-full-java11-openj9-ubi
full Dockerfile.ubi.openjdk17 openliberty/open-liberty 23.0.0.11-full-java17-openj9-ubi
8 changes: 4 additions & 4 deletions ....0.10/kernel-slim/Dockerfile.ubi.ibmjava8 → ....0.11/kernel-slim/Dockerfile.ubi.ibmjava8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM ibmjava:8-ubi AS getRuntime

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_SHA=347b762d21caba2e2d3d117759c318c47a23721e
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_SHA=04769ecf029f5198aae6b9d6b8b708202567b501
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip

ARG VERBOSE=false
Expand All @@ -28,8 +28,8 @@ FROM ibmjava:8-ubi

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

ARG OPENJ9_SCC=true
ARG VERBOSE=false
Expand Down
9 changes: 5 additions & 4 deletions ...0.10/kernel-slim/Dockerfile.ubi.openjdk11 → ...0.11/kernel-slim/Dockerfile.ubi.openjdk11
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi AS getRuntime

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_SHA=347b762d21caba2e2d3d117759c318c47a23721e
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_SHA=04769ecf029f5198aae6b9d6b8b708202567b501
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip

ARG VERBOSE=false
Expand All @@ -28,8 +28,8 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

ARG OPENJ9_SCC=true
ARG VERBOSE=false
Expand Down Expand Up @@ -130,6 +130,7 @@ RUN mkdir /logs \
&& mkdir /etc/wlp \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml

# Create a new SCC layer
Expand Down
9 changes: 5 additions & 4 deletions ...0.10/kernel-slim/Dockerfile.ubi.openjdk17 → ...0.11/kernel-slim/Dockerfile.ubi.openjdk17
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi AS getRuntime

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_SHA=347b762d21caba2e2d3d117759c318c47a23721e
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_SHA=04769ecf029f5198aae6b9d6b8b708202567b501
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip

ARG VERBOSE=false
Expand All @@ -28,8 +28,8 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

ARG OPENJ9_SCC=true
ARG VERBOSE=false
Expand Down Expand Up @@ -130,6 +130,7 @@ RUN mkdir /logs \
&& mkdir /etc/wlp \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml

# Create a new SCC layer
Expand Down
9 changes: 5 additions & 4 deletions ....0.10/kernel-slim/Dockerfile.ubi.openjdk8 → ....0.11/kernel-slim/Dockerfile.ubi.openjdk8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi AS getRuntime

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_SHA=347b762d21caba2e2d3d117759c318c47a23721e
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_SHA=04769ecf029f5198aae6b9d6b8b708202567b501
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip

ARG VERBOSE=false
Expand All @@ -28,8 +28,8 @@ FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

ARG OPENJ9_SCC=true
ARG VERBOSE=false
Expand Down Expand Up @@ -130,6 +130,7 @@ RUN mkdir /logs \
&& mkdir /etc/wlp \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml

# Create a new SCC layer
Expand Down
6 changes: 3 additions & 3 deletions ...0/kernel-slim/Dockerfile.ubuntu.openjdk11 → ...1/kernel-slim/Dockerfile.ubuntu.openjdk11
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-11-jre-jammy

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_SHA=347b762d21caba2e2d3d117759c318c47a23721e
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_SHA=04769ecf029f5198aae6b9d6b8b708202567b501
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

ARG OPENJ9_SCC=true
ARG VERBOSE=false
Expand Down
6 changes: 3 additions & 3 deletions ...0/kernel-slim/Dockerfile.ubuntu.openjdk17 → ...1/kernel-slim/Dockerfile.ubuntu.openjdk17
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-17-jre-jammy

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_SHA=347b762d21caba2e2d3d117759c318c47a23721e
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_SHA=04769ecf029f5198aae6b9d6b8b708202567b501
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

ARG OPENJ9_SCC=true
ARG VERBOSE=false
Expand Down
6 changes: 3 additions & 3 deletions ...10/kernel-slim/Dockerfile.ubuntu.openjdk8 → ...11/kernel-slim/Dockerfile.ubuntu.openjdk8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ FROM ibm-semeru-runtimes:open-8-jre-jammy

USER root

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_SHA=347b762d21caba2e2d3d117759c318c47a23721e
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_SHA=04769ecf029f5198aae6b9d6b8b708202567b501
ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-kernel/$LIBERTY_VERSION/openliberty-kernel-$LIBERTY_VERSION.zip
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

ARG OPENJ9_SCC=true
ARG VERBOSE=false
Expand Down
0 releases/23.0.0.10/kernel-slim/NOTICES → releases/23.0.0.11/kernel-slim/NOTICES
View file
File renamed without changes.
0 ...ases/23.0.0.10/kernel-slim/fixes/.gitkeep → ...ases/23.0.0.11/kernel-slim/fixes/.gitkeep
View file
File renamed without changes.
17 changes: 17 additions & 0 deletions ...0/kernel-slim/helpers/build/checkpoint.sh → ...1/kernel-slim/helpers/build/checkpoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,23 @@ do
pidplus.sh
done

if [ -e /etc/instanton.ld.so.cache ]; then
cp /etc/instanton.ld.so.cache /etc/ld.so.cache
fi

ARCH="$(uname -m)";
case "${ARCH}" in
ppc64el|ppc64le)
export JVM_ARGS="${JVM_ARGS} -XX:+JVMPortableRestoreMode"
;;
s390x)
export JVM_ARGS="${JVM_ARGS} -XX:+JVMPortableRestoreMode"
;;
*)
;;
esac;


echo "Performing checkpoint --at=$1"
/opt/ol/wlp/bin/server checkpoint defaultServer --at=$1

Expand Down
0 ...nfiguration_snippets/hazelcast-client.xml → ...nfiguration_snippets/hazelcast-client.xml
View file
File renamed without changes.
0 ...iguration_snippets/hazelcast-embedded.xml → ...iguration_snippets/hazelcast-embedded.xml
View file
File renamed without changes.
0 ...ation_snippets/hazelcast-sessioncache.xml → ...ation_snippets/hazelcast-sessioncache.xml
View file
File renamed without changes.
0 ...ippets/infinispan-client-sessioncache.xml → ...ippets/infinispan-client-sessioncache.xml
View file
File renamed without changes.
0 ...build/configuration_snippets/keystore.xml → ...build/configuration_snippets/keystore.xml
View file
File renamed without changes.
0 ...ration_snippets/sessioncache-features.xml → ...ration_snippets/sessioncache-features.xml
View file
File renamed without changes.
0 ...d/configuration_snippets/sso-facebook.xml → ...d/configuration_snippets/sso-facebook.xml
View file
File renamed without changes.
0 ...d/configuration_snippets/sso-features.xml → ...d/configuration_snippets/sso-features.xml
View file
File renamed without changes.
0 ...ild/configuration_snippets/sso-github.xml → ...ild/configuration_snippets/sso-github.xml
View file
File renamed without changes.
0 ...ild/configuration_snippets/sso-google.xml → ...ild/configuration_snippets/sso-google.xml
View file
File renamed without changes.
0 ...d/configuration_snippets/sso-linkedin.xml → ...d/configuration_snippets/sso-linkedin.xml
View file
File renamed without changes.
0 ...ild/configuration_snippets/sso-oauth2.xml → ...ild/configuration_snippets/sso-oauth2.xml
View file
File renamed without changes.
0 ...build/configuration_snippets/sso-oidc.xml → ...build/configuration_snippets/sso-oidc.xml
View file
File renamed without changes.
0 ...ld/configuration_snippets/sso-twitter.xml → ...ld/configuration_snippets/sso-twitter.xml
View file
File renamed without changes.
0 ...pers/build/configuration_snippets/tls.xml → ...pers/build/configuration_snippets/tls.xml
View file
File renamed without changes.
0 ...d/configuration_snippets/trustDefault.xml → ...d/configuration_snippets/trustDefault.xml
View file
File renamed without changes.
0 ...ild/configuration_snippets/truststore.xml → ...ild/configuration_snippets/truststore.xml
View file
File renamed without changes.
0 ...10/kernel-slim/helpers/build/configure.sh → ...11/kernel-slim/helpers/build/configure.sh
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ....10/kernel-slim/helpers/build/features.sh → ....11/kernel-slim/helpers/build/features.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

if [ "$VERBOSE" != "true" ]; then
exec &>/dev/null
exec >/dev/null
fi

set -Eeox pipefail
Expand Down
0 .../helpers/build/infinispan-client-setup.sh → .../helpers/build/infinispan-client-setup.sh
View file
File renamed without changes.
0 ...0.10/kernel-slim/helpers/build/pidplus.sh → ...0.11/kernel-slim/helpers/build/pidplus.sh
View file
File renamed without changes.
0 ...kernel-slim/helpers/build/populate_scc.sh → ...kernel-slim/helpers/build/populate_scc.sh
View file
File renamed without changes.
0 ...nel-slim/helpers/runtime/docker-server.sh → ...nel-slim/helpers/runtime/docker-server.sh
View file
File renamed without changes.
0 ...el-slim/helpers/runtime/restore-server.sh → ...el-slim/helpers/runtime/restore-server.sh
View file
File renamed without changes.
0 .../23.0.0.10/kernel-slim/resources/.gitkeep → .../23.0.0.11/kernel-slim/resources/.gitkeep
View file
File renamed without changes.
Loading

0 comments on commit c1f41e7

Please sign in to comment.