fix: pin windowsservercore-ltsc2019 to April 2024 release

jenkinsci · Jun 23, 2024 · a309788 · a309788
1 parent d1bfd81
commit a309788
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -141,6 +141,15 @@ function "toolsversion" {
     : version)
 }
 
+# Return the Windows version digest to use for windowsservercore ltsc2019 image
+# TODO: workaround, to be removed when https://github.com/microsoft/Windows-Containers/issues/493 is resolved
+function "windowsversiondigest" {
+  params = [version]
+  result = (equal("ltsc2019", version)
+    ? "@sha256:6fdf140282a2f809dae9b13fe441635867f0a27c33a438771673b8da8f3348a4"
+    : "")
+}
+
 target "alpine" {
   matrix = {
     jdk = jdks_to_build
@@ -208,6 +217,8 @@ target "nanoserver" {
     JAVA_HOME = "C:/openjdk-${jdk}"
     JAVA_VERSION   = "${replace(javaversion(jdk), "_", "+")}"
     TOOLS_WINDOWS_VERSION = "${toolsversion(windows_version)}"
+    # TODO: workaround, to be removed when https://github.com/microsoft/Windows-Containers/issues/493 is resolved
+    WINDOWS_VERSION_DIGEST = windowsversiondigest(windows_version)
     WINDOWS_VERSION_TAG = windows_version
   }
   tags = [
@@ -233,6 +244,8 @@ target "windowsservercore" {
     JAVA_HOME = "C:/openjdk-${jdk}"
     JAVA_VERSION   = "${replace(javaversion(jdk), "_", "+")}"
     TOOLS_WINDOWS_VERSION = "${toolsversion(windows_version)}"
+    # TODO: workaround, to be removed when https://github.com/microsoft/Windows-Containers/issues/493 is resolved
+    WINDOWS_VERSION_DIGEST = windowsversiondigest(windows_version)
     WINDOWS_VERSION_TAG = windows_version
   }
   tags = [

diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile
@@ -24,7 +24,9 @@
 
 ARG WINDOWS_VERSION_TAG
 ARG TOOLS_WINDOWS_VERSION
-FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION_TAG}" AS jdk-core
+# TODO: workaround, to be removed when https://github.com/microsoft/Windows-Containers/issues/493 is resolved
+ARG WINDOWS_VERSION_DIGEST # Empty by default
+FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION_TAG}${WINDOWS_VERSION_DIGEST}" AS jdk-core
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

diff --git a/windows/windowsservercore/Dockerfile b/windows/windowsservercore/Dockerfile
@@ -24,7 +24,9 @@
 
 ARG WINDOWS_VERSION_TAG
 ARG TOOLS_WINDOWS_VERSION
-FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION_TAG}" AS jdk-core
+# TODO: workaround, to be removed when https://github.com/microsoft/Windows-Containers/issues/493 is resolved
+ARG WINDOWS_VERSION_DIGEST # Empty by default
+FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION_TAG}${WINDOWS_VERSION_DIGEST}" AS jdk-core
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
@@ -38,7 +40,7 @@ RUN New-Item -ItemType Directory -Path C:\temp | Out-Null ; `
     $proc.WaitForExit() ; `
     Remove-Item -Path C:\temp -Recurse | Out-Null
 
-FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION_TAG}"
+FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION_TAG}${WINDOWS_VERSION_DIGEST}"
 
 ARG JAVA_HOME
 ENV JAVA_HOME=${JAVA_HOME}