File tree Expand file tree Collapse file tree 3 files changed +0
-9
lines changed
windows/windowsservercore/hotspot Expand file tree Collapse file tree 3 files changed +0
-9
lines changed Original file line number Diff line number Diff line change @@ -11,7 +11,6 @@ services:
1111 WAR_SHA : ${WAR_SHA}
1212 JENKINS_VERSION : ${JENKINS_VERSION}
1313 WAR_URL : ${WAR_URL}
14- TOOLS_WINDOWS_VERSION : ${TOOLS_WINDOWS_VERSION}
1514 WINDOWS_VERSION : ${WINDOWS_VERSION}
1615 tags :
1716 - ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${JENKINS_VERSION}-jdk17-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
@@ -27,7 +26,6 @@ services:
2726 WAR_SHA : ${WAR_SHA}
2827 JENKINS_VERSION : ${JENKINS_VERSION}
2928 WAR_URL : ${WAR_URL}
30- TOOLS_WINDOWS_VERSION : ${TOOLS_WINDOWS_VERSION}
3129 WINDOWS_VERSION : ${WINDOWS_VERSION}
3230 tags :
3331 - ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${JENKINS_VERSION}-jdk21-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
@@ -45,7 +43,6 @@ services:
4543 WAR_SHA : ${WAR_SHA}
4644 JENKINS_VERSION : ${JENKINS_VERSION}
4745 WAR_URL : ${WAR_URL}
48- TOOLS_WINDOWS_VERSION : ${TOOLS_WINDOWS_VERSION}
4946 WINDOWS_VERSION : ${WINDOWS_VERSION}
5047 tags :
5148 - ${DOCKERHUB_ORGANISATION}/${DOCKERHUB_REPO}:${JENKINS_VERSION}-jdk25-hotspot-${WINDOWS_FLAVOR}-${WINDOWS_VERSION}
Original file line number Diff line number Diff line change @@ -51,11 +51,6 @@ if([String]::IsNullOrWhiteSpace($env:WAR_URL)) {
5151$items = $ImageType.Split (' -' )
5252$env: WINDOWS_FLAVOR = $items [0 ]
5353$env: WINDOWS_VERSION = $items [1 ]
54- $env: TOOLS_WINDOWS_VERSION = $items [1 ]
55- if ($items [1 ] -eq ' ltsc2019' ) {
56- # There are no eclipse-temurin:*-ltsc2019 or mcr.microsoft.com/powershell:*-ltsc2019 docker images unfortunately, only "1809" ones
57- $env: TOOLS_WINDOWS_VERSION = ' 1809'
58- }
5954
6055# Retrieve the sha256 corresponding to the war file
6156$warShaURL = ' {0}.sha256' -f $env: WAR_URL
Original file line number Diff line number Diff line change 33
44ARG JAVA_VERSION=17.0.17_10
55ARG WINDOWS_VERSION=ltsc2019
6- ARG TOOLS_WINDOWS_VERSION=1809
76
87FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION}" AS jre-build
98
You can’t perform that action at this time.
0 commit comments