Skip to content

Commit 17cb34a

Browse files
committed
feat: add Windows 2022 images
1 parent a9a6873 commit 17cb34a

File tree

4 files changed

+39
-3
lines changed

4 files changed

+39
-3
lines changed

Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pipeline {
1212
axes {
1313
axis {
1414
name 'AGENT_TYPE'
15-
values 'linux', 'windows-2019'
15+
values 'linux', 'windows-2019', 'windows-2022'
1616
}
1717
}
1818
stages {

README.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,14 @@ The image has several supported configurations, which can be accessed via the fo
7070
From version 4.11.2, the alpine images are tagged using the alpine OS version as well (i.e. `alpine` ==> `alpine3.16`, `alpine-jdk11` ==> `alpine3.16-jdk11`).
7171

7272
* Windows Images:
73-
* `jdk11-windowsservercore-ltsc2019`: Latest version with the newest remoting and Java 11 (based on `eclipse-temurin:11.xxx-jdk-windowsservercore-ltsc2019`)
7473
* `jdk11-nanoserver-1809`: Latest version with the newest remoting with Windows Nano Server and Java 11 (based on `eclipse-temurin:11.xxx-jdk-nanoserver-1809`)
75-
* `jdk17-windowsservercore-ltsc2019`: Latest version with the newest remoting and Java 17 (based on `eclipse-temurin:17.xxx-jdk-windowsservercore-ltsc2019`)
74+
* `jdk11-windowsservercore-ltsc2019`: Latest version with the newest remoting and Java 11 (based on `eclipse-temurin:11.xxx-jdk-windowsservercore-ltsc2019`)
7675
* `jdk17-nanoserver-1809`: Latest version with the newest remoting with Windows Nano Server and Java 17 (based on `eclipse-temurin:17.xxx-jdk-nanoserver-1809`)
76+
* `jdk17-windowsservercore-ltsc2019`: Latest version with the newest remoting and Java 17 (based on `eclipse-temurin:17.xxx-jdk-windowsservercore-ltsc2019`)
77+
* `jdk11-nanoserver-ltsc2022`: Latest version with the newest remoting with Windows Nano Server and Java 11 (based on `eclipse-temurin:11.xxx-jdk-nanoserver-ltsc2022`)
78+
* `jdk11-windowsservercore-ltsc2022`: Latest version with the newest remoting and Java 11 (based on `eclipse-temurin:11.xxx-jdk-windowsservercore-ltsc2022`)
79+
* `jdk17-nanoserver-ltsc2022`: Latest version with the newest remoting with Windows Nano Server and Java 17 (based on `eclipse-temurin:17.xxx-jdk-nanoserver-ltsc2022`)
80+
* `jdk17-windowsservercore-ltsc2022`: Latest version with the newest remoting and Java 17 (based on `eclipse-temurin:17.xxx-jdk-windowsservercore-ltsc2022`)
7781

7882
The file `docker-bake.hcl` defines all the configuration for Linux images and their associated tags.
7983

updatecli/updatecli.d/jdk11.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,22 @@ conditions:
7070
architecture: amd64
7171
image: eclipse-temurin
7272
tag: '{{source "lastVersion" }}-jdk-windowsservercore-1809'
73+
checkTemurinNanoserver2022DockerImage:
74+
kind: dockerimage
75+
name: Check if the container image "eclipse-temurin:<lastVersion>-jdk-nanoserver-ltsc2022" is available
76+
disablesourceinput: true
77+
spec:
78+
architecture: amd64
79+
image: eclipse-temurin
80+
tag: '{{source "lastVersion" }}-jdk-nanoserver-ltsc2022'
81+
checkTemurinWindowsCore2022DockerImage:
82+
kind: dockerimage
83+
name: Check if the container image "eclipse-temurin:<lastVersion>-jdk-windowsservercore-18ltsc202209" is available
84+
disablesourceinput: true
85+
spec:
86+
architecture: amd64
87+
image: eclipse-temurin
88+
tag: '{{source "lastVersion" }}-jdk-windowsservercore-ltsc2022'
7389

7490
targets:
7591
setJDK11VersionDockerBake:

updatecli/updatecli.d/jdk17.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,22 @@ conditions:
7070
architecture: amd64
7171
image: eclipse-temurin
7272
tag: '{{source "lastVersion" }}-jdk-windowsservercore-1809'
73+
checkTemurinNanoserver2022DockerImage:
74+
kind: dockerimage
75+
name: Check if the container image "eclipse-temurin:<lastVersion>-jdk-nanoserver-ltsc2022" is available
76+
disablesourceinput: true
77+
spec:
78+
architecture: amd64
79+
image: eclipse-temurin
80+
tag: '{{source "lastVersion" }}-jdk-nanoserver-ltsc2022'
81+
checkTemurinWindowsCore2022DockerImage:
82+
kind: dockerimage
83+
name: Check if the container image "eclipse-temurin:<lastVersion>-jdk-windowsservercore-ltsc2022" is available
84+
disablesourceinput: true
85+
spec:
86+
architecture: amd64
87+
image: eclipse-temurin
88+
tag: '{{source "lastVersion" }}-jdk-windowsservercore-ltsc2022'
7389

7490
targets:
7591
setJDK17VersionDockerBake:

0 commit comments

Comments
 (0)