Skip to content

Commit 25c0fa6

Browse files
authored
chore: remove unused TOOLS_WINDOWS_VERSION (#2169)
1 parent fef7398 commit 25c0fa6

File tree

3 files changed

+0
-9
lines changed

3 files changed

+0
-9
lines changed

build-windows.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff 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}

make.ps1

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff 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

windows/windowsservercore/hotspot/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
ARG JAVA_VERSION=17.0.17_10
55
ARG WINDOWS_VERSION=ltsc2019
6-
ARG TOOLS_WINDOWS_VERSION=1809
76

87
FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION}" AS jre-build
98

0 commit comments

Comments
 (0)