Pin JDK docker images (#15328)

Author: trask

.github/renovate.json5

@@ -289,7 +289,7 @@
       enabled: false,
     },
     {
-      // intentionally using Java 11 in some examples
+      // intentionally testing against specific major Java versions
       matchPackageNames: [
         'eclipse-temurin',
       ],
@@ -378,6 +378,17 @@
       depNameTemplate: 'java',
       extractVersionTemplate: '^(?<version>\\d+)',
     },
+    {
+      customType: 'regex',
+      datasourceTemplate: 'docker',
+      managerFilePatterns: [
+        '**/build.gradle.kts',
+      ],
+      matchStrings: [
+        '"(?<depName>eclipse-temurin):(?<currentValue>[^"@]+)@(?<currentDigest>sha256:[0-9a-f]+)"',
+        '"(?<depName>ibm-semeru-runtimes):(?<currentValue>[^"@]+)@(?<currentDigest>sha256:[0-9a-f]+)"',
+      ],
+    },
     {
       customType: 'regex',
       datasourceTemplate: 'pypi',

smoke-tests/images/servlet/build.gradle.kts

@@ -19,7 +19,7 @@ data class ImageTarget(
 val extraTag = findProperty("extraTag")
   ?: java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd.HHmmSS").format(java.time.LocalDateTime.now())
 
-val latestJava = "25" // renovate: datasource=java-version
+val latestJava = "25" // renovate(java-version)
 
 // Each line under appserver describes one matrix of (version x vm x jdk), dockerfile key overrides
 // Dockerfile name, args key passes raw arguments to docker build
@@ -157,21 +157,47 @@ fun configureImage(
   val image = "ghcr.io/$repo/smoke-test-servlet-$server:$version-jdk$jdk$vmSuffix$platformSuffix-$extraTag"
 
   val jdkImage = if (vm == "hotspot") {
-    if (jdk == "24") {
+    if (jdk == "26-ea") {
       // "The only tags which will continue to receive updates beyond July 2022 will be Early Access
       // builds (which are sourced from jdk.java.net), as those are not published/supported by any
       // of the above projects."
       // (see https://hub.docker.com/_/openjdk)
       "openjdk:$jdk"
+    } else if (isWindows) {
+      when (jdk) {
+        "8" -> "eclipse-temurin:8u472-b08-jdk-windowsservercore-ltsc2022@sha256:46d804b1c8a658fd84b8f3b3f39a1739b0f0ffccf41a682cea4847982de3bd08"
+        "11" -> "eclipse-temurin:11.0.29_7-jdk-windowsservercore-ltsc2022@sha256:3b16568beff29ff623e7d72018cd6b08f4003964a342a907ad410a0b953f40e6"
+        "17" -> "eclipse-temurin:17.0.16_8-jdk-windowsservercore-ltsc2022@sha256:a7dc8df0d1367405bf195cda6a12489b17c99691c2448ea97b9418915e24ca7e"
+        "20" -> "eclipse-temurin:20.0.2_9-jdk-windowsservercore-ltsc2022@sha256:a36eee54cc400505a19157a0fb3000eebed7aba34efa2faa11aa80d9365a2e1e"
+        "21" -> "eclipse-temurin:21.0.9_10-jdk-windowsservercore-ltsc2022@sha256:45a3d356d018942a497b877633f19db401828ecb2a1de3cda635b98d08bfbaeb"
+        "25" -> "eclipse-temurin:25.0.1_8-jdk-windowsservercore-ltsc2022@sha256:556d727eb539fd9c6242e75d17e1a2bf59456ea8a37478cfbd6406ca6db0d2d1"
+        else -> throw GradleException("Unexpected jdk version for Windows: $jdk")
+      }
     } else {
-      "eclipse-temurin:$jdk"
+      when (jdk) {
+        "8" -> "eclipse-temurin:8u472-b08-jdk@sha256:b4e05de303ea02659ee17044d6b68caadfc462f1530f3a461482afee23379cdd"
+        "11" -> "eclipse-temurin:11.0.29_7-jdk@sha256:189ce1c8831fa5bdd801127dad99f68a17615f81f4aa839b1a4aae693261929a"
+        "17" -> "eclipse-temurin:17.0.16_8-jdk@sha256:06ee07a59dc7011f643baaa45889ecd15a0b9176490943b0e4379630e832ac2d"
+        "20" -> "eclipse-temurin:20.0.2_9-jdk@sha256:a8010918241007417c8c0ce7d203cf110f8c945b56da01a13eb55af7eb3d3175"
+        "21" -> "eclipse-temurin:21.0.9_10-jdk@sha256:81ad1240d91eeafe1ab4154e9ed2310b67cb966caad1d235232ae10abcb1fae2"
+        "25" -> "eclipse-temurin:25.0.1_8-jdk@sha256:adc4533ea69967c783ac2327dac7ff548fcf6401a7e595e723b414c0a7920eb2"
+        else -> throw GradleException("Unexpected jdk version for Linux: $jdk")
+      }
     }
   } else if (vm == "openj9") {
     if (isWindows) {
       // ibm-semeru-runtimes doesn't publish windows images
       throw GradleException("Unexpected vm: $vm")
     } else {
-      "ibm-semeru-runtimes:open-$jdk-jdk"
+      when (jdk) {
+        "8" -> "ibm-semeru-runtimes:open-8u472-b08-jdk@sha256:63bb8aad02000edbc5f90222a018862f546a0ac21ec01d6b31af6202083297e8"
+        "11" -> "ibm-semeru-runtimes:open-11.0.29_7-jdk@sha256:a0910e6646e71de764f56ea19238719cb150ffabb46c0f9d3323e4cb697d59dc"
+        "17" -> "ibm-semeru-runtimes:open-17-jdk@sha256:ad9a76a79afef5f01b49d3a7487e017305cb76f7421cd88e9424ee1c96fe8c09"
+        "20" -> "ibm-semeru-runtimes:open-20.0.2_9-jdk@sha256:e950be308506f63b61a196b55dc53059317dc32e0c25c5d863bfb4ef6911922a"
+        "21" -> "ibm-semeru-runtimes:open-21.0.9_10-jdk@sha256:bd69dbe68315b72ebfa0d708511176c3317dd0c500dc462e7041570983f14c49"
+        "25" -> "ibm-semeru-runtimes:open-25-jdk@sha256:58f8efd0e2b137c19e192a3d1a36e9efe070d6f59784bc4a84f551e6c148b35c"
+        else -> throw GradleException("Unexpected jdk version for openj9: $jdk")
+      }
     }
   } else {
     throw GradleException("Unexpected vm: $vm")

smoke-tests/images/servlet/src/jetty.windows.dockerfile

@@ -7,7 +7,7 @@ ARG sourceVersion
 ADD https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/${sourceVersion}/jetty-home-${sourceVersion}.zip /server.zip
 RUN ["powershell", "-Command", "expand-archive -Path /server.zip -DestinationPath /server"]
 
-FROM ${jdkImage}-windowsservercore-ltsc2022
+FROM ${jdkImage}
 ARG sourceVersion
 
 # Make /server the base directory to simplify all further paths

smoke-tests/images/servlet/src/liberty.windows.dockerfile

@@ -8,7 +8,7 @@ ARG release
 ADD https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/release/${release}/openliberty-${version}.zip /server.zip
 RUN ["powershell", "-Command", "expand-archive -Path /server.zip -DestinationPath /server"]
 
-FROM ${jdkImage}-windowsservercore-ltsc2022
+FROM ${jdkImage}
 
 # Make /server the base directory to simplify all further paths
 COPY --from=builder /server/wlp /server

smoke-tests/images/servlet/src/payara.windows.dockerfile

@@ -9,7 +9,7 @@ RUN ["powershell", "-Command", "expand-archive -Path /server.zip -DestinationPat
 RUN ["powershell", "-Command", "Get-ChildItem -Path /server/ -filter payara* | Rename-Item -NewName payara"]
 RUN ["powershell", "-Command", "remove-item -Path /server/payara/glassfish/modules/phonehome-bootstrap.jar"]
 
-FROM ${jdkImage}-windowsservercore-ltsc2022
+FROM ${jdkImage}
 
 # Make /server the base directory to simplify all further paths
 COPY --from=builder /server/payara /server

smoke-tests/images/servlet/src/tomcat.windows.dockerfile

@@ -8,7 +8,7 @@ ARG version
 ADD https://archive.apache.org/dist/tomcat/tomcat-${majorVersion}/v${version}/bin/apache-tomcat-${version}-windows-x64.zip /server.zip
 RUN ["powershell", "-Command", "expand-archive -Path /server.zip -DestinationPath /server"]
 
-FROM ${jdkImage}-windowsservercore-ltsc2022
+FROM ${jdkImage}
 ARG version
 
 # Make /server the base directory to simplify all further paths

smoke-tests/images/servlet/src/tomee.windows.dockerfile

@@ -7,7 +7,7 @@ ARG version
 ADD https://archive.apache.org/dist/tomee/tomee-${version}/apache-tomee-${version}-webprofile.zip /server.zip
 RUN ["powershell", "-Command", "expand-archive -Path /server.zip -DestinationPath /server"]
 
-FROM ${jdkImage}-windowsservercore-ltsc2022
+FROM ${jdkImage}
 ARG version
 
 # Make /server the base directory to simplify all further paths

smoke-tests/images/servlet/src/wildfly.windows.dockerfile

@@ -8,7 +8,7 @@ ARG baseDownloadUrl
 ADD ${baseDownloadUrl}.zip /server.zip
 RUN ["powershell", "-Command", "expand-archive -Path /server.zip -DestinationPath /server"]
 
-FROM ${jdkImage}-windowsservercore-ltsc2022
+FROM ${jdkImage}
 ARG version
 
 # Make /server the base directory to simplify all further paths