diff --git a/ga/latest/full/Dockerfile.ubi9-minimal.ibmjava8 b/ga/latest/full/Dockerfile.ubi10-minimal.ibmjava8 similarity index 97% rename from ga/latest/full/Dockerfile.ubi9-minimal.ibmjava8 rename to ga/latest/full/Dockerfile.ubi10-minimal.ibmjava8 index e66222d9f..6e27013e2 100644 --- a/ga/latest/full/Dockerfile.ubi9-minimal.ibmjava8 +++ b/ga/latest/full/Dockerfile.ubi10-minimal.ibmjava8 @@ -1,4 +1,4 @@ -# (C) Copyright IBM Corporation 2025. +# (C) Copyright IBM Corporation 2025, 2026. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ga/latest/full/Dockerfile.ubi9-minimal.openjdk11 b/ga/latest/full/Dockerfile.ubi10-minimal.openjdk11 similarity index 97% rename from ga/latest/full/Dockerfile.ubi9-minimal.openjdk11 rename to ga/latest/full/Dockerfile.ubi10-minimal.openjdk11 index 480ac5c12..e2291a6fd 100644 --- a/ga/latest/full/Dockerfile.ubi9-minimal.openjdk11 +++ b/ga/latest/full/Dockerfile.ubi10-minimal.openjdk11 @@ -1,4 +1,4 @@ -# (C) Copyright IBM Corporation 2023. +# (C) Copyright IBM Corporation 2023, 2026. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ga/latest/full/Dockerfile.ubi9-minimal.openjdk17 b/ga/latest/full/Dockerfile.ubi10-minimal.openjdk17 similarity index 97% rename from ga/latest/full/Dockerfile.ubi9-minimal.openjdk17 rename to ga/latest/full/Dockerfile.ubi10-minimal.openjdk17 index fc02408ba..48ca741f4 100644 --- a/ga/latest/full/Dockerfile.ubi9-minimal.openjdk17 +++ b/ga/latest/full/Dockerfile.ubi10-minimal.openjdk17 @@ -1,4 +1,4 @@ -# (C) Copyright IBM Corporation 2025. +# (C) Copyright IBM Corporation 2025, 2026. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ga/latest/full/Dockerfile.ubi9-minimal.openjdk21 b/ga/latest/full/Dockerfile.ubi10-minimal.openjdk21 similarity index 97% rename from ga/latest/full/Dockerfile.ubi9-minimal.openjdk21 rename to ga/latest/full/Dockerfile.ubi10-minimal.openjdk21 index ae172a1b4..fcc45e04e 100644 --- a/ga/latest/full/Dockerfile.ubi9-minimal.openjdk21 +++ b/ga/latest/full/Dockerfile.ubi10-minimal.openjdk21 @@ -1,4 +1,4 @@ -# (C) Copyright IBM Corporation 2023. +# (C) Copyright IBM Corporation 2023, 2026. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ga/latest/full/Dockerfile.ubi9-minimal.openjdk25 b/ga/latest/full/Dockerfile.ubi10-minimal.openjdk25 similarity index 97% rename from ga/latest/full/Dockerfile.ubi9-minimal.openjdk25 rename to ga/latest/full/Dockerfile.ubi10-minimal.openjdk25 index 941678b02..9909d945d 100644 --- a/ga/latest/full/Dockerfile.ubi9-minimal.openjdk25 +++ b/ga/latest/full/Dockerfile.ubi10-minimal.openjdk25 @@ -1,4 +1,4 @@ -# (C) Copyright IBM Corporation 2025. +# (C) Copyright IBM Corporation 2025, 2026. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ga/latest/full/Dockerfile.ubi9-minimal.openjdk8 b/ga/latest/full/Dockerfile.ubi10-minimal.openjdk8 similarity index 97% rename from ga/latest/full/Dockerfile.ubi9-minimal.openjdk8 rename to ga/latest/full/Dockerfile.ubi10-minimal.openjdk8 index 47fa0f406..ba7d2ccae 100644 --- a/ga/latest/full/Dockerfile.ubi9-minimal.openjdk8 +++ b/ga/latest/full/Dockerfile.ubi10-minimal.openjdk8 @@ -1,4 +1,4 @@ -# (C) Copyright IBM Corporation 2023. +# (C) Copyright IBM Corporation 2023, 2026. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi10-minimal.ibmjava8 similarity index 93% rename from ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8 rename to ga/latest/kernel/Dockerfile.ubi10-minimal.ibmjava8 index f90238289..c52a1dc4b 100644 --- a/ga/latest/kernel/Dockerfile.ubi9-minimal.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubi10-minimal.ibmjava8 @@ -1,4 +1,4 @@ -# (C) Copyright IBM Corporation 2025. +# (C) Copyright IBM Corporation 2025, 2026. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ # This relies on a base image which needs to be built seperately -# curl https://raw.githubusercontent.com/ibmruntimes/ci.docker/main/ibmjava/8/jre/ubi-min/Dockerfile -o java/Dockerfile.ubi9.minimal +# curl https://raw.githubusercontent.com/ibmruntimes/ci.docker/main/ibmjava/8/jre/ubi-min/Dockerfile -o java/Dockerfile.ubi10.minimal # The above file needs editing before it is built: -# This changes to a UBI9 base, and corrects the microdnf command to work on UBI9. -# $> sed -i -e 's/ubi8/ubi9/' -e 's/microdnf install/microdnf -y install/' -e 's/microdnf update/microdnf update -y/' Dockerfile.ubi9-minimal.ibmjava8 -# $> rm ./java/Dockerfile.ubi9.minimal.bak -# Then build and tag as 'ibmjava:9-ubi' -# $> docker build -t ibmjava:9-ubi -f ./java/Dockerfile.ubi9.minimal java +# This changes to a UBI10 base, and corrects the microdnf command to work on UBI10. +# $> sed -i -e 's/ubi8/ubi10/' -e 's/microdnf install/microdnf -y install/' -e 's/microdnf update/microdnf update -y/' Dockerfile.ubi10-minimal.ibmjava8 +# $> rm ./java/Dockerfile.ubi10.minimal.bak +# Then build and tag as 'ibmjava:10-ubi' +# $> docker build -t ibmjava:9-ubi -f ./java/Dockerfile.ubi10.minimal java -FROM ibmjava:9-ubi AS getRuntime +FROM ibmjava:10-ubi AS getRuntime USER root @@ -52,7 +52,7 @@ RUN microdnf -y install shadow-utils unzip wget findutils openssl \ && chmod -R g+rw /opt/ibm/wlp \ && cp -a /opt/ibm/wlp/lafiles/. /licenses/ -FROM ibmjava:9-ubi +FROM ibmjava:10-ubi USER root diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11 b/ga/latest/kernel/Dockerfile.ubi10-minimal.openjdk11 similarity index 97% rename from ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11 rename to ga/latest/kernel/Dockerfile.ubi10-minimal.openjdk11 index 07dcaaa4f..d15bc823b 100644 --- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubi10-minimal.openjdk11 @@ -1,4 +1,4 @@ -# (C) Copyright IBM Corporation 2023. +# (C) Copyright IBM Corporation 2023, 2026. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jre-ubi9-minimal AS getRuntime +FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jre-ubi10-minimal AS getRuntime USER root @@ -40,7 +40,7 @@ RUN microdnf -y install shadow-utils unzip wget findutils openssl \ && chmod -R g+rw /opt/ibm/wlp \ && cp -a /opt/ibm/wlp/lafiles/. /licenses/ -FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jre-ubi9-minimal +FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jre-ubi10-minimal USER root diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17 b/ga/latest/kernel/Dockerfile.ubi10-minimal.openjdk17 similarity index 97% rename from ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17 rename to ga/latest/kernel/Dockerfile.ubi10-minimal.openjdk17 index 6e793aa3e..415f87faa 100644 --- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubi10-minimal.openjdk17 @@ -1,4 +1,4 @@ -# (C) Copyright IBM Corporation 2025. +# (C) Copyright IBM Corporation 2025, 2026. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jre-ubi9-minimal AS getRuntime +FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jre-ubi10-minimal AS getRuntime USER root @@ -40,7 +40,7 @@ RUN microdnf -y install shadow-utils unzip wget findutils openssl \ && chmod -R g+rw /opt/ibm/wlp \ && cp -a /opt/ibm/wlp/lafiles/. /licenses/ -FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jre-ubi9-minimal +FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jre-ubi10-minimal USER root diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 b/ga/latest/kernel/Dockerfile.ubi10-minimal.openjdk21 similarity index 97% rename from ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 rename to ga/latest/kernel/Dockerfile.ubi10-minimal.openjdk21 index eef1e52a6..19c4183dc 100644 --- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk21 +++ b/ga/latest/kernel/Dockerfile.ubi10-minimal.openjdk21 @@ -1,4 +1,4 @@ -# (C) Copyright IBM Corporation 2023. +# (C) Copyright IBM Corporation 2023, 2026. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM icr.io/appcafe/ibm-semeru-runtimes:open-21-jre-ubi9-minimal AS getRuntime +FROM icr.io/appcafe/ibm-semeru-runtimes:open-21-jre-ubi10-minimal AS getRuntime USER root @@ -40,7 +40,7 @@ RUN microdnf -y install shadow-utils unzip wget findutils openssl \ && chmod -R g+rw /opt/ibm/wlp \ && cp -a /opt/ibm/wlp/lafiles/. /licenses/ -FROM icr.io/appcafe/ibm-semeru-runtimes:open-21-jre-ubi9-minimal +FROM icr.io/appcafe/ibm-semeru-runtimes:open-21-jre-ubi10-minimal USER root diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8 b/ga/latest/kernel/Dockerfile.ubi10-minimal.openjdk25 similarity index 97% rename from ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8 rename to ga/latest/kernel/Dockerfile.ubi10-minimal.openjdk25 index 6710cd0f5..0a81ef110 100644 --- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk8 +++ b/ga/latest/kernel/Dockerfile.ubi10-minimal.openjdk25 @@ -1,4 +1,4 @@ -# (C) Copyright IBM Corporation 2023. +# (C) Copyright IBM Corporation 2025, 2026. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jre-ubi9-minimal AS getRuntime +FROM icr.io/appcafe/ibm-semeru-runtimes:open-25-jre-ubi10-minimal AS getRuntime USER root @@ -40,7 +40,7 @@ RUN microdnf -y install shadow-utils unzip wget findutils openssl \ && chmod -R g+rw /opt/ibm/wlp \ && cp -a /opt/ibm/wlp/lafiles/. /licenses/ -FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jre-ubi9-minimal +FROM icr.io/appcafe/ibm-semeru-runtimes:open-25-jre-ubi10-minimal USER root diff --git a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk25 b/ga/latest/kernel/Dockerfile.ubi10-minimal.openjdk8 similarity index 97% rename from ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk25 rename to ga/latest/kernel/Dockerfile.ubi10-minimal.openjdk8 index a59b1f35e..1feff1836 100644 --- a/ga/latest/kernel/Dockerfile.ubi9-minimal.openjdk25 +++ b/ga/latest/kernel/Dockerfile.ubi10-minimal.openjdk8 @@ -1,4 +1,4 @@ -# (C) Copyright IBM Corporation 2025. +# (C) Copyright IBM Corporation 2023, 2026. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM icr.io/appcafe/ibm-semeru-runtimes:open-25-jre-ubi9-minimal AS getRuntime +FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jre-ubi10-minimal AS getRuntime USER root @@ -40,7 +40,7 @@ RUN microdnf -y install shadow-utils unzip wget findutils openssl \ && chmod -R g+rw /opt/ibm/wlp \ && cp -a /opt/ibm/wlp/lafiles/. /licenses/ -FROM icr.io/appcafe/ibm-semeru-runtimes:open-25-jre-ubi9-minimal +FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jre-ubi10-minimal USER root