Revert "hotfix(Windows Server Core LTSC2019) pin 2019 images to April…

… version" (#833)
jenkinsci · Jul 10, 2024 · 7b32976 · 7b32976
1 parent baa4a6a
commit 7b32976
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/build-windows.yaml b/build-windows.yaml
@@ -9,7 +9,6 @@ services:
         JAVA_VERSION: 11.0.23+9
         VERSION: ${REMOTING_VERSION}
         WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG}
-        WINDOWS_VERSION_DIGEST: ${WINDOWS_VERSION_DIGEST}
         TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION}
       tags:
         - "${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}-jdk11-${WINDOWS_FLAVOR}-${WINDOWS_VERSION_TAG}"
@@ -23,7 +22,6 @@ services:
         JAVA_VERSION: 17.0.11+9
         VERSION: ${REMOTING_VERSION}
         WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG}
-        WINDOWS_VERSION_DIGEST: ${WINDOWS_VERSION_DIGEST}
         TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION}
       tags:
         - "${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}-jdk17-${WINDOWS_FLAVOR}-${WINDOWS_VERSION_TAG}"
@@ -39,7 +37,6 @@ services:
         JAVA_VERSION: 21.0.3+9
         VERSION: ${REMOTING_VERSION}
         WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG}
-        WINDOWS_VERSION_DIGEST: ${WINDOWS_VERSION_DIGEST}
         TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION}
       tags:
         - "${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}-jdk21-${WINDOWS_FLAVOR}-${WINDOWS_VERSION_TAG}"
diff --git a/build.ps1 b/build.ps1
@@ -90,10 +90,8 @@ $env:WINDOWS_FLAVOR = $items[0]
 $env:WINDOWS_VERSION_TAG = $items[1]
 $env:TOOLS_WINDOWS_VERSION = $items[1]
 if ($items[1] -eq 'ltsc2019') {
-    # There are no mcr.microsoft.com/powershell:*-ltsc2019 docker images unfortunately, only "1809" ones
+    # There are no eclipse-temurin:*-ltsc2019 or mcr.microsoft.com/powershell:*-ltsc2019 docker images unfortunately, only "1809" ones
     $env:TOOLS_WINDOWS_VERSION = '1809'
-    # Workaround for 2019 only until https://github.com/microsoft/Windows-Containers/issues/493 is solved
-    $env:WINDOWS_VERSION_DIGEST = '@sha256:6fdf140282a2f809dae9b13fe441635867f0a27c33a438771673b8da8f3348a4'
 }
 
 $ProgressPreference = 'SilentlyContinue' # Disable Progress bar for faster downloads

diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile
@@ -24,8 +24,7 @@
 
 ARG WINDOWS_VERSION_TAG=ltsc2019
 ARG TOOLS_WINDOWS_VERSION=1809
-ARG WINDOWS_VERSION_DIGEST # Empty by default
-FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION_TAG}${WINDOWS_VERSION_DIGEST}" AS jdk-core
+FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION_TAG}" AS jdk-core
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

diff --git a/windows/windowsservercore/Dockerfile b/windows/windowsservercore/Dockerfile
@@ -23,9 +23,8 @@
 #  THE SOFTWARE.
 
 ARG WINDOWS_VERSION_TAG=ltsc2019
-ARG WINDOWS_VERSION_DIGEST # Empty by default
-ARG TOOLS_WINDOWS_VERSION # Empty (only used on nanoserver)
-FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION_TAG}${WINDOWS_VERSION_DIGEST}" AS jdk-core
+ARG TOOLS_WINDOWS_VERSION=1809
+FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION_TAG}" AS jdk-core
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
@@ -40,7 +39,7 @@ RUN New-Item -ItemType Directory -Path C:\temp | Out-Null ; `
     Remove-Item -Path C:\temp -Recurse | Out-Null
 
 ## Agent image target
-FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION_TAG}${WINDOWS_VERSION_DIGEST}" AS agent
+FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION_TAG}" AS agent
 
 ARG JAVA_HOME="C:\openjdk-17"
 ENV JAVA_HOME=${JAVA_HOME}