diff --git a/.travis.yml b/.travis.yml index 811e17bac..0255093eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: env: - RELEASE=../ga/23.0.0.6 - RELEASE=../ga/23.0.0.9 - - RELEASE=../ga/23.0.0.10 + - RELEASE=../ga/23.0.0.11 - RELEASE=../ga/latest script: diff --git a/create-new-release.sh b/create-new-release.sh new file mode 100644 index 000000000..a422c9117 --- /dev/null +++ b/create-new-release.sh @@ -0,0 +1,72 @@ +#!/bin/bash + +echo "Hello from the create-new-release.sh script!" +echo $(date) + +# Set variables to the positional parameters +OLD_VERSION=$1 +NEW_VERSION=$2 +BUILD_LABEL=$3 + +# See if NEW_VERSION and OLD_VERSION fit expected pattern. +if [[ $OLD_VERSION =~ 2[3-9]\.0\.0\.[0-9]+ && $NEW_VERSION =~ 2[3-9]\.0\.0\.[0-9]+ ]]; +then + echo "$OLD_VERSION and $NEW_VERSION matches expected version format." +else + echo "Either $OLD_VERSION or $NEW_VERSION does not fit expected version format." + exit 1; +fi + +# Get last digit of old version +OLD_SHORT_VERSION=${OLD_VERSION:7} + +echo "OLD_VERSION = $OLD_VERSION" +echo "NEW_VERSION = $NEW_VERSION" +echo "BUILD_LABEL = $BUILD_LABEL" +echo "OLD_SHORT_VERSION = $OLD_SHORT_VERSION" + +echo "Copying latest files to $NEW_VERSION" +cp -r ./ga/latest ./ga/$NEW_VERSION + +# Perform the substitutions in both latest and $NEW_VERSION directories. +for file in $(find ./ga/latest ./ga/$NEW_VERSION -name Dockerfile.*); do + echo "Processing $file"; + + sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/" $file; + sed -i'.bak' -e "s/ARG LIBERTY_BUILD_LABEL=.*/ARG LIBERTY_BUILD_LABEL=$BUILD_LABEL/g" $file; + + # Do these substitutions only in $NEW_VERSION, not latest. + if [[ "$file" == "./ga/$NEW_VERSION/"* ]]; + then + sed -i'.bak' -e "s/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:kernel/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:$NEW_VERSION-kernel/g" $file; + sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file; + fi + + # Clean up temp files + rm $file.bak + +done + +# Update the .travis.yml file. +sed -i'.bak' -e "s/RELEASE=\.\.\/ga\/$OLD_VERSION/RELEASE=\.\.\/ga\/$NEW_VERSION/" ./.travis.yml; +rm ./.travis.yml.bak; + +# Update the images.txt file +cp ./ga/$OLD_VERSION/images.txt ./ga/$NEW_VERSION/images.txt; +sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/g" ./ga/$NEW_VERSION/images.txt; +rm ./ga/$NEW_VERSION/images.txt.bak; + +if [[ $(( $OLD_SHORT_VERSION % 3 )) -eq 0 ]] + then + : + else + rm -rf ./ga/$OLD_VERSION + fi + +# Finally, comment out "ga/*/*/resources/*" in .gitignore so +# newly created $NEW_VERSION/full/resources and $NEW_VERSION/kernel/resources +# directories can be committed and pushed. +sed -i'.bak' -e "s/ga\/\*\/\*\/resources\/\*/#ga\/\*\/\*\/resources\/\*/g" .gitignore +rm ./.gitignore.bak + +echo "Done performing file updates."; diff --git a/ga/23.0.0.10/images.txt b/ga/23.0.0.10/images.txt deleted file mode 100644 index 2e28009de..000000000 --- a/ga/23.0.0.10/images.txt +++ /dev/null @@ -1,18 +0,0 @@ -websphere-liberty:23.0.0.10-kernel ../ga/23.0.0.10/kernel ../ga/23.0.0.10/kernel/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:23.0.0.10-kernel-java11-openj9 ../ga/23.0.0.10/kernel ../ga/23.0.0.10/kernel/Dockerfile.ubuntu.openjdk11 -websphere-liberty:23.0.0.10-kernel-java17-openj9 ../ga/23.0.0.10/kernel ../ga/23.0.0.10/kernel/Dockerfile.ubuntu.openjdk17 -websphere-liberty:23.0.0.10-kernel-java8-ibmjava-ubi ../ga/23.0.0.10/kernel ../ga/23.0.0.10/kernel/Dockerfile.ubi.ibmjava8 -websphere-liberty:23.0.0.10-kernel-java8-openj9-ubi ../ga/23.0.0.10/kernel ../ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk8 -websphere-liberty:23.0.0.10-kernel-java11-openj9-ubi ../ga/23.0.0.10/kernel ../ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk11 -websphere-liberty:23.0.0.10-kernel-java17-openj9-ubi ../ga/23.0.0.10/kernel ../ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk17 -websphere-liberty:23.0.0.10-full ../ga/23.0.0.10/full ../ga/23.0.0.10/full/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:23.0.0.10-full-java11-openj9 ../ga/23.0.0.10/full ../ga/23.0.0.10/full/Dockerfile.ubuntu.openjdk11 -websphere-liberty:23.0.0.10-full-java17-openj9 ../ga/23.0.0.10/full ../ga/23.0.0.10/full/Dockerfile.ubuntu.openjdk17 -websphere-liberty:23.0.0.10-full-java8-ibmjava-ubi ../ga/23.0.0.10/full ../ga/23.0.0.10/full/Dockerfile.ubi.ibmjava8 -websphere-liberty:23.0.0.10-full-java8-openj9-ubi ../ga/23.0.0.10/full ../ga/23.0.0.10/full/Dockerfile.ubi.openjdk8 -websphere-liberty:23.0.0.10-full-java11-openj9-ubi ../ga/23.0.0.10/full ../ga/23.0.0.10/full/Dockerfile.ubi.openjdk11 -websphere-liberty:23.0.0.10-full-java17-openj9-ubi ../ga/23.0.0.10/full ../ga/23.0.0.10/full/Dockerfile.ubi.openjdk17 -websphere-liberty:beta ../beta -websphere-liberty:test-stock-quote test-stock-quote -websphere-liberty:test-stock-trader test-stock-trader -websphere-liberty:test-pet-clinic test-pet-clinic diff --git a/ga/23.0.0.10/README.md b/ga/23.0.0.11/README.md similarity index 100% rename from ga/23.0.0.10/README.md rename to ga/23.0.0.11/README.md diff --git a/ga/23.0.0.10/full/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.11/full/Dockerfile.ubi.ibmjava8 similarity index 93% rename from ga/23.0.0.10/full/Dockerfile.ubi.ibmjava8 rename to ga/23.0.0.11/full/Dockerfile.ubi.ibmjava8 index 39aa0bd2e..d28157291 100644 --- a/ga/23.0.0.10/full/Dockerfile.ubi.ibmjava8 +++ b/ga/23.0.0.11/full/Dockerfile.ubi.ibmjava8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.10-kernel-java8-ibmjava-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java8-ibmjava-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.10-kernel-java8-ibmjava-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java8-ibmjava-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.10/full/Dockerfile.ubi.openjdk11 b/ga/23.0.0.11/full/Dockerfile.ubi.openjdk11 similarity index 93% rename from ga/23.0.0.10/full/Dockerfile.ubi.openjdk11 rename to ga/23.0.0.11/full/Dockerfile.ubi.openjdk11 index 051c23fa4..f0c03ec91 100644 --- a/ga/23.0.0.10/full/Dockerfile.ubi.openjdk11 +++ b/ga/23.0.0.11/full/Dockerfile.ubi.openjdk11 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.10-kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java11-openj9-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.10-kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java11-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.10/full/Dockerfile.ubi.openjdk17 b/ga/23.0.0.11/full/Dockerfile.ubi.openjdk17 similarity index 93% rename from ga/23.0.0.10/full/Dockerfile.ubi.openjdk17 rename to ga/23.0.0.11/full/Dockerfile.ubi.openjdk17 index 7d0430101..57c18c399 100644 --- a/ga/23.0.0.10/full/Dockerfile.ubi.openjdk17 +++ b/ga/23.0.0.11/full/Dockerfile.ubi.openjdk17 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.10-kernel-java17-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java17-openj9-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.10-kernel-java17-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java17-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.10/full/Dockerfile.ubi.openjdk8 b/ga/23.0.0.11/full/Dockerfile.ubi.openjdk8 similarity index 93% rename from ga/23.0.0.10/full/Dockerfile.ubi.openjdk8 rename to ga/23.0.0.11/full/Dockerfile.ubi.openjdk8 index cd1bc26db..9605016bf 100644 --- a/ga/23.0.0.10/full/Dockerfile.ubi.openjdk8 +++ b/ga/23.0.0.11/full/Dockerfile.ubi.openjdk8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.10-kernel-java8-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java8-openj9-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.10-kernel-java8-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java8-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.10/full/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.11/full/Dockerfile.ubuntu.ibmjava8 similarity index 96% rename from ga/23.0.0.10/full/Dockerfile.ubuntu.ibmjava8 rename to ga/23.0.0.11/full/Dockerfile.ubuntu.ibmjava8 index 55c8e4ecd..eeba0c94d 100644 --- a/ga/23.0.0.10/full/Dockerfile.ubuntu.ibmjava8 +++ b/ga/23.0.0.11/full/Dockerfile.ubuntu.ibmjava8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:23.0.0.10-kernel-java8-ibmjava +FROM websphere-liberty:23.0.0.11-kernel-java8-ibmjava ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.10/full/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk11 similarity index 96% rename from ga/23.0.0.10/full/Dockerfile.ubuntu.openjdk11 rename to ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk11 index e5c264d69..5e08b1efc 100644 --- a/ga/23.0.0.10/full/Dockerfile.ubuntu.openjdk11 +++ b/ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk11 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:23.0.0.10-kernel-java11-openj9 +FROM websphere-liberty:23.0.0.11-kernel-java11-openj9 ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.10/full/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk17 similarity index 96% rename from ga/23.0.0.10/full/Dockerfile.ubuntu.openjdk17 rename to ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk17 index 4b30de001..1ab063843 100644 --- a/ga/23.0.0.10/full/Dockerfile.ubuntu.openjdk17 +++ b/ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk17 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:23.0.0.10-kernel-java17-openj9 +FROM websphere-liberty:23.0.0.11-kernel-java17-openj9 ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.10/full/README.md b/ga/23.0.0.11/full/README.md similarity index 100% rename from ga/23.0.0.10/full/README.md rename to ga/23.0.0.11/full/README.md diff --git a/ga/23.0.0.10/full/resources/.gitkeep b/ga/23.0.0.11/full/resources/.gitkeep similarity index 100% rename from ga/23.0.0.10/full/resources/.gitkeep rename to ga/23.0.0.11/full/resources/.gitkeep diff --git a/ga/23.0.0.10/full/server.xml b/ga/23.0.0.11/full/server.xml similarity index 100% rename from ga/23.0.0.10/full/server.xml rename to ga/23.0.0.11/full/server.xml diff --git a/ga/23.0.0.11/images.txt b/ga/23.0.0.11/images.txt new file mode 100644 index 000000000..1cad09aab --- /dev/null +++ b/ga/23.0.0.11/images.txt @@ -0,0 +1,18 @@ +websphere-liberty:23.0.0.11-kernel ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 +websphere-liberty:23.0.0.11-kernel-java11-openj9 ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 +websphere-liberty:23.0.0.11-kernel-java17-openj9 ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 +websphere-liberty:23.0.0.11-kernel-java8-ibmjava-ubi ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubi.ibmjava8 +websphere-liberty:23.0.0.11-kernel-java8-openj9-ubi ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 +websphere-liberty:23.0.0.11-kernel-java11-openj9-ubi ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 +websphere-liberty:23.0.0.11-kernel-java17-openj9-ubi ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 +websphere-liberty:23.0.0.11-full ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubuntu.ibmjava8 +websphere-liberty:23.0.0.11-full-java11-openj9 ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk11 +websphere-liberty:23.0.0.11-full-java17-openj9 ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk17 +websphere-liberty:23.0.0.11-full-java8-ibmjava-ubi ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubi.ibmjava8 +websphere-liberty:23.0.0.11-full-java8-openj9-ubi ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubi.openjdk8 +websphere-liberty:23.0.0.11-full-java11-openj9-ubi ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubi.openjdk11 +websphere-liberty:23.0.0.11-full-java17-openj9-ubi ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubi.openjdk17 +websphere-liberty:beta ../beta +websphere-liberty:test-stock-quote test-stock-quote +websphere-liberty:test-stock-trader test-stock-trader +websphere-liberty:test-pet-clinic test-pet-clinic diff --git a/ga/23.0.0.10/kernel/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.11/kernel/Dockerfile.ubi.ibmjava8 similarity index 98% rename from ga/23.0.0.10/kernel/Dockerfile.ubi.ibmjava8 rename to ga/23.0.0.11/kernel/Dockerfile.ubi.ibmjava8 index f060d976c..e39211eba 100644 --- a/ga/23.0.0.10/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubi.ibmjava8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.10 +ARG LIBERTY_VERSION=23.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk11 b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 similarity index 97% rename from ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk11 rename to ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 index 49875cd28..3d265ef38 100644 --- a/ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.10 +ARG LIBERTY_VERSION=23.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ @@ -154,6 +154,7 @@ RUN mkdir /logs \ && chmod -R g+rw /logs \ && chown -R 1001:0 /etc/wlp \ && chmod -R g+rw /etc/wlp \ + && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \ && chown -R 1001:0 /home/default \ && chmod -R g+rw /home/default diff --git a/ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk17 b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 similarity index 97% rename from ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk17 rename to ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 index 6faf0284f..5a0a60a73 100644 --- a/ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.10 +ARG LIBERTY_VERSION=23.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ @@ -154,6 +154,7 @@ RUN mkdir /logs \ && chmod -R g+rw /logs \ && chown -R 1001:0 /etc/wlp \ && chmod -R g+rw /etc/wlp \ + && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \ && chown -R 1001:0 /home/default \ && chmod -R g+rw /home/default diff --git a/ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk8 b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 similarity index 97% rename from ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk8 rename to ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 index f27221e15..1b017724c 100644 --- a/ga/23.0.0.10/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.10 +ARG LIBERTY_VERSION=23.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ @@ -154,6 +154,7 @@ RUN mkdir /logs \ && chmod -R g+rw /logs \ && chown -R 1001:0 /etc/wlp \ && chmod -R g+rw /etc/wlp \ + && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \ && chown -R 1001:0 /home/default \ && chmod -R g+rw /home/default diff --git a/ga/23.0.0.10/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 similarity index 98% rename from ga/23.0.0.10/kernel/Dockerfile.ubuntu.ibmjava8 rename to ga/23.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 index 10cf13b21..349185511 100644 --- a/ga/23.0.0.10/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.10/kernel/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 similarity index 98% rename from ga/23.0.0.10/kernel/Dockerfile.ubuntu.openjdk11 rename to ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 index fc1a14eb6..6c3894c95 100644 --- a/ga/23.0.0.10/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.10/kernel/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 similarity index 98% rename from ga/23.0.0.10/kernel/Dockerfile.ubuntu.openjdk17 rename to ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 index ec5fa0f0e..7df996aa5 100644 --- a/ga/23.0.0.10/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.10/kernel/NOTICES b/ga/23.0.0.11/kernel/NOTICES similarity index 100% rename from ga/23.0.0.10/kernel/NOTICES rename to ga/23.0.0.11/kernel/NOTICES diff --git a/ga/23.0.0.10/kernel/README.md b/ga/23.0.0.11/kernel/README.md similarity index 100% rename from ga/23.0.0.10/kernel/README.md rename to ga/23.0.0.11/kernel/README.md diff --git a/ga/23.0.0.10/kernel/fixes/.gitkeep b/ga/23.0.0.11/kernel/fixes/.gitkeep similarity index 100% rename from ga/23.0.0.10/kernel/fixes/.gitkeep rename to ga/23.0.0.11/kernel/fixes/.gitkeep diff --git a/ga/23.0.0.10/kernel/helpers/build/checkpoint.sh b/ga/23.0.0.11/kernel/helpers/build/checkpoint.sh similarity index 66% rename from ga/23.0.0.10/kernel/helpers/build/checkpoint.sh rename to ga/23.0.0.11/kernel/helpers/build/checkpoint.sh index 58d5293b5..2b2fa90b3 100755 --- a/ga/23.0.0.10/kernel/helpers/build/checkpoint.sh +++ b/ga/23.0.0.11/kernel/helpers/build/checkpoint.sh @@ -6,6 +6,23 @@ do pidplus.sh done +if [ -e /etc/instanton.ld.so.cache ]; then + cp /etc/instanton.ld.so.cache /etc/ld.so.cache +fi + +ARCH="$(uname -m)"; +case "${ARCH}" in + ppc64el|ppc64le) + export JVM_ARGS="${JVM_ARGS} -XX:+JVMPortableRestoreMode" + ;; + s390x) + export JVM_ARGS="${JVM_ARGS} -XX:+JVMPortableRestoreMode" + ;; + *) + ;; +esac; + + echo "Performing checkpoint --at=$1" /opt/ibm/wlp/bin/server checkpoint defaultServer --at=$1 diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-client.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-client.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-client.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-client.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/http-endpoint.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/http-endpoint.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/http-endpoint.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/http-endpoint.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/jms-endpoint.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/jms-endpoint.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/jms-endpoint.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/jms-endpoint.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/keystore.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/keystore.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/keystore.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/keystore.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/mp-health-check.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/mp-health-check.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/mp-health-check.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/mp-health-check.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/mp-monitoring.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/mp-monitoring.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/mp-monitoring.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/mp-monitoring.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/oidc-config.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/oidc-config.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/oidc-config.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/oidc-config.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/oidc.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/oidc.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/oidc.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/oidc.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sessioncache-features.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sessioncache-features.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sessioncache-features.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sessioncache-features.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-facebook.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-facebook.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-facebook.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-facebook.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-features.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-features.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-features.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-features.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-github.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-github.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-github.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-github.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-google.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-google.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-google.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-google.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-linkedin.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-linkedin.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-linkedin.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-linkedin.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-oauth2.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-oauth2.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-oauth2.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-oauth2.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-oidc.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-oidc.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-oidc.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-oidc.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-twitter.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-twitter.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/sso-twitter.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-twitter.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/tls.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/tls.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/tls.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/tls.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/trustDefault.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/trustDefault.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/trustDefault.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/trustDefault.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configuration_snippets/truststore.xml b/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/truststore.xml similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configuration_snippets/truststore.xml rename to ga/23.0.0.11/kernel/helpers/build/configuration_snippets/truststore.xml diff --git a/ga/23.0.0.10/kernel/helpers/build/configure.sh b/ga/23.0.0.11/kernel/helpers/build/configure.sh similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/configure.sh rename to ga/23.0.0.11/kernel/helpers/build/configure.sh diff --git a/ga/23.0.0.10/kernel/helpers/build/features.sh b/ga/23.0.0.11/kernel/helpers/build/features.sh similarity index 98% rename from ga/23.0.0.10/kernel/helpers/build/features.sh rename to ga/23.0.0.11/kernel/helpers/build/features.sh index 4e6654898..f6ac61528 100755 --- a/ga/23.0.0.10/kernel/helpers/build/features.sh +++ b/ga/23.0.0.11/kernel/helpers/build/features.sh @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. if [ "$VERBOSE" != "true" ]; then - exec &>/dev/null + exec >/dev/null fi set -Eeox pipefail diff --git a/ga/23.0.0.10/kernel/helpers/build/infinispan-client-setup.sh b/ga/23.0.0.11/kernel/helpers/build/infinispan-client-setup.sh similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/infinispan-client-setup.sh rename to ga/23.0.0.11/kernel/helpers/build/infinispan-client-setup.sh diff --git a/ga/23.0.0.10/kernel/helpers/build/internal/features-installed.sh b/ga/23.0.0.11/kernel/helpers/build/internal/features-installed.sh similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/internal/features-installed.sh rename to ga/23.0.0.11/kernel/helpers/build/internal/features-installed.sh diff --git a/ga/23.0.0.10/kernel/helpers/build/pidplus.sh b/ga/23.0.0.11/kernel/helpers/build/pidplus.sh similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/pidplus.sh rename to ga/23.0.0.11/kernel/helpers/build/pidplus.sh diff --git a/ga/23.0.0.10/kernel/helpers/build/populate_scc.sh b/ga/23.0.0.11/kernel/helpers/build/populate_scc.sh similarity index 100% rename from ga/23.0.0.10/kernel/helpers/build/populate_scc.sh rename to ga/23.0.0.11/kernel/helpers/build/populate_scc.sh diff --git a/ga/23.0.0.10/kernel/helpers/runtime/docker-server.sh b/ga/23.0.0.11/kernel/helpers/runtime/docker-server.sh similarity index 100% rename from ga/23.0.0.10/kernel/helpers/runtime/docker-server.sh rename to ga/23.0.0.11/kernel/helpers/runtime/docker-server.sh diff --git a/ga/23.0.0.10/kernel/helpers/runtime/restore-server.sh b/ga/23.0.0.11/kernel/helpers/runtime/restore-server.sh similarity index 100% rename from ga/23.0.0.10/kernel/helpers/runtime/restore-server.sh rename to ga/23.0.0.11/kernel/helpers/runtime/restore-server.sh diff --git a/ga/23.0.0.10/kernel/resources/.gitkeep b/ga/23.0.0.11/kernel/resources/.gitkeep similarity index 100% rename from ga/23.0.0.10/kernel/resources/.gitkeep rename to ga/23.0.0.11/kernel/resources/.gitkeep diff --git a/ga/23.0.0.10/oidcProvider/Dockerfile b/ga/23.0.0.11/oidcProvider/Dockerfile similarity index 100% rename from ga/23.0.0.10/oidcProvider/Dockerfile rename to ga/23.0.0.11/oidcProvider/Dockerfile diff --git a/ga/23.0.0.10/oidcProvider/Dockerfile.java11 b/ga/23.0.0.11/oidcProvider/Dockerfile.java11 similarity index 100% rename from ga/23.0.0.10/oidcProvider/Dockerfile.java11 rename to ga/23.0.0.11/oidcProvider/Dockerfile.java11 diff --git a/ga/23.0.0.10/oidcProvider/README.md b/ga/23.0.0.11/oidcProvider/README.md similarity index 100% rename from ga/23.0.0.10/oidcProvider/README.md rename to ga/23.0.0.11/oidcProvider/README.md diff --git a/ga/23.0.0.10/oidcProvider/server.xml b/ga/23.0.0.11/oidcProvider/server.xml similarity index 100% rename from ga/23.0.0.10/oidcProvider/server.xml rename to ga/23.0.0.11/oidcProvider/server.xml diff --git a/ga/23.0.0.6/kernel/helpers/build/features.sh b/ga/23.0.0.6/kernel/helpers/build/features.sh index 4e6654898..f6ac61528 100755 --- a/ga/23.0.0.6/kernel/helpers/build/features.sh +++ b/ga/23.0.0.6/kernel/helpers/build/features.sh @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. if [ "$VERBOSE" != "true" ]; then - exec &>/dev/null + exec >/dev/null fi set -Eeox pipefail diff --git a/ga/23.0.0.9/kernel/helpers/build/features.sh b/ga/23.0.0.9/kernel/helpers/build/features.sh index 4e6654898..f6ac61528 100755 --- a/ga/23.0.0.9/kernel/helpers/build/features.sh +++ b/ga/23.0.0.9/kernel/helpers/build/features.sh @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. if [ "$VERBOSE" != "true" ]; then - exec &>/dev/null + exec >/dev/null fi set -Eeox pipefail diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 index f060d976c..e39211eba 100644 --- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.10 +ARG LIBERTY_VERSION=23.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11 index 49875cd28..3d265ef38 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.10 +ARG LIBERTY_VERSION=23.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ @@ -154,6 +154,7 @@ RUN mkdir /logs \ && chmod -R g+rw /logs \ && chown -R 1001:0 /etc/wlp \ && chmod -R g+rw /etc/wlp \ + && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \ && chown -R 1001:0 /home/default \ && chmod -R g+rw /home/default diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17 index 6faf0284f..5a0a60a73 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.10 +ARG LIBERTY_VERSION=23.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ @@ -154,6 +154,7 @@ RUN mkdir /logs \ && chmod -R g+rw /logs \ && chown -R 1001:0 /etc/wlp \ && chmod -R g+rw /etc/wlp \ + && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \ && chown -R 1001:0 /home/default \ && chmod -R g+rw /home/default diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8 index f27221e15..1b017724c 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.10 +ARG LIBERTY_VERSION=23.0.0.11 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ @@ -154,6 +154,7 @@ RUN mkdir /logs \ && chmod -R g+rw /logs \ && chown -R 1001:0 /etc/wlp \ && chmod -R g+rw /etc/wlp \ + && if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \ && chown -R 1001:0 /home/default \ && chmod -R g+rw /home/default diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 index 10cf13b21..349185511 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 index fc1a14eb6..6c3894c95 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 index ec5fa0f0e..7df996aa5 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.10 -ARG LIBERTY_BUILD_LABEL=cl231020231002-1201 +ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_BUILD_LABEL=cl231120231030-1102 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/helpers/build/checkpoint.sh b/ga/latest/kernel/helpers/build/checkpoint.sh index 58d5293b5..2b2fa90b3 100755 --- a/ga/latest/kernel/helpers/build/checkpoint.sh +++ b/ga/latest/kernel/helpers/build/checkpoint.sh @@ -6,6 +6,23 @@ do pidplus.sh done +if [ -e /etc/instanton.ld.so.cache ]; then + cp /etc/instanton.ld.so.cache /etc/ld.so.cache +fi + +ARCH="$(uname -m)"; +case "${ARCH}" in + ppc64el|ppc64le) + export JVM_ARGS="${JVM_ARGS} -XX:+JVMPortableRestoreMode" + ;; + s390x) + export JVM_ARGS="${JVM_ARGS} -XX:+JVMPortableRestoreMode" + ;; + *) + ;; +esac; + + echo "Performing checkpoint --at=$1" /opt/ibm/wlp/bin/server checkpoint defaultServer --at=$1 diff --git a/ga/latest/kernel/helpers/build/features.sh b/ga/latest/kernel/helpers/build/features.sh index 4e6654898..f6ac61528 100755 --- a/ga/latest/kernel/helpers/build/features.sh +++ b/ga/latest/kernel/helpers/build/features.sh @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. if [ "$VERBOSE" != "true" ]; then - exec &>/dev/null + exec >/dev/null fi set -Eeox pipefail