Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update openjdk #18285

Merged
merged 1 commit into from
Jan 22, 2025
Merged

Update openjdk #18285

merged 1 commit into from
Jan 22, 2025

Conversation

tianon
Copy link
Member

@tianon tianon commented Jan 22, 2025

Changes:

@tianon tianon requested a review from a team as a code owner January 22, 2025 01:11

This comment has been minimized.

Changes:

- docker-library/openjdk@cd21f0d: Merge pull request docker-library/openjdk#545 from infosiftr/moar-nanoserver
- docker-library/openjdk@534646f: Add more Nano Server variants
- docker-library/openjdk@bf64d21: Merge pull request docker-library/openjdk#544 from infosiftr/ltsc2025
- docker-library/openjdk@865aad9: Add Windows Server 2025 variant
Copy link

Diff for 60bdda5:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 4a9a000..efe4529 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -18,6 +18,20 @@ GitCommit: 9c0cbed17ab6b22457c51976e3c13b0dadec7dc2
 Directory: 24/jdk/windows/nanoserver-1809
 Constraints: nanoserver-1809, windowsservercore-1809
 
+Tags: 24-ea-31-jdk-nanoserver-ltsc2022, 24-ea-31-nanoserver-ltsc2022, 24-ea-jdk-nanoserver-ltsc2022, 24-ea-nanoserver-ltsc2022, 24-jdk-nanoserver-ltsc2022, 24-nanoserver-ltsc2022
+SharedTags: 24-ea-31-jdk-nanoserver, 24-ea-31-nanoserver, 24-ea-jdk-nanoserver, 24-ea-nanoserver, 24-jdk-nanoserver, 24-nanoserver
+Architectures: windows-amd64
+GitCommit: 534646f0941d909897d91eddc7f8c7c7cc53a652
+Directory: 24/jdk/windows/nanoserver-ltsc2022
+Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
+
+Tags: 24-ea-31-jdk-nanoserver-ltsc2025, 24-ea-31-nanoserver-ltsc2025, 24-ea-jdk-nanoserver-ltsc2025, 24-ea-nanoserver-ltsc2025, 24-jdk-nanoserver-ltsc2025, 24-nanoserver-ltsc2025
+SharedTags: 24-ea-31-jdk-nanoserver, 24-ea-31-nanoserver, 24-ea-jdk-nanoserver, 24-ea-nanoserver, 24-jdk-nanoserver, 24-nanoserver
+Architectures: windows-amd64
+GitCommit: 534646f0941d909897d91eddc7f8c7c7cc53a652
+Directory: 24/jdk/windows/nanoserver-ltsc2025
+Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025
+
 Tags: 24-ea-31-jdk-oraclelinux8, 24-ea-31-oraclelinux8, 24-ea-jdk-oraclelinux8, 24-ea-oraclelinux8, 24-jdk-oraclelinux8, 24-oraclelinux8
 Architectures: amd64, arm64v8
 GitCommit: 9c0cbed17ab6b22457c51976e3c13b0dadec7dc2
@@ -53,6 +67,13 @@ GitCommit: 9c0cbed17ab6b22457c51976e3c13b0dadec7dc2
 Directory: 24/jdk/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
+Tags: 24-ea-31-jdk-windowsservercore-ltsc2025, 24-ea-31-windowsservercore-ltsc2025, 24-ea-jdk-windowsservercore-ltsc2025, 24-ea-windowsservercore-ltsc2025, 24-jdk-windowsservercore-ltsc2025, 24-windowsservercore-ltsc2025
+SharedTags: 24-ea-31-jdk-windowsservercore, 24-ea-31-windowsservercore, 24-ea-jdk-windowsservercore, 24-ea-windowsservercore, 24-jdk-windowsservercore, 24-windowsservercore, 24-ea-31-jdk, 24-ea-31, 24-ea-jdk, 24-ea, 24-jdk, 24
+Architectures: windows-amd64
+GitCommit: 865aad9bc52991b6e92179eb06e6e49a50004f16
+Directory: 24/jdk/windows/windowsservercore-ltsc2025
+Constraints: windowsservercore-ltsc2025
+
 Tags: 25-ea-6-jdk-bookworm, 25-ea-6-bookworm, 25-ea-jdk-bookworm, 25-ea-bookworm, 25-jdk-bookworm, 25-bookworm
 Architectures: amd64, arm64v8
 GitCommit: 6795b600616b3c7f6ef9ea2934605d05f1bba516
@@ -70,6 +91,20 @@ GitCommit: 6795b600616b3c7f6ef9ea2934605d05f1bba516
 Directory: 25/jdk/windows/nanoserver-1809
 Constraints: nanoserver-1809, windowsservercore-1809
 
+Tags: 25-ea-6-jdk-nanoserver-ltsc2022, 25-ea-6-nanoserver-ltsc2022, 25-ea-jdk-nanoserver-ltsc2022, 25-ea-nanoserver-ltsc2022, 25-jdk-nanoserver-ltsc2022, 25-nanoserver-ltsc2022
+SharedTags: 25-ea-6-jdk-nanoserver, 25-ea-6-nanoserver, 25-ea-jdk-nanoserver, 25-ea-nanoserver, 25-jdk-nanoserver, 25-nanoserver
+Architectures: windows-amd64
+GitCommit: 534646f0941d909897d91eddc7f8c7c7cc53a652
+Directory: 25/jdk/windows/nanoserver-ltsc2022
+Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
+
+Tags: 25-ea-6-jdk-nanoserver-ltsc2025, 25-ea-6-nanoserver-ltsc2025, 25-ea-jdk-nanoserver-ltsc2025, 25-ea-nanoserver-ltsc2025, 25-jdk-nanoserver-ltsc2025, 25-nanoserver-ltsc2025
+SharedTags: 25-ea-6-jdk-nanoserver, 25-ea-6-nanoserver, 25-ea-jdk-nanoserver, 25-ea-nanoserver, 25-jdk-nanoserver, 25-nanoserver
+Architectures: windows-amd64
+GitCommit: 534646f0941d909897d91eddc7f8c7c7cc53a652
+Directory: 25/jdk/windows/nanoserver-ltsc2025
+Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025
+
 Tags: 25-ea-6-jdk-oraclelinux8, 25-ea-6-oraclelinux8, 25-ea-jdk-oraclelinux8, 25-ea-oraclelinux8, 25-jdk-oraclelinux8, 25-oraclelinux8
 Architectures: amd64, arm64v8
 GitCommit: 6795b600616b3c7f6ef9ea2934605d05f1bba516
@@ -104,3 +139,10 @@ Architectures: windows-amd64
 GitCommit: 6795b600616b3c7f6ef9ea2934605d05f1bba516
 Directory: 25/jdk/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
+
+Tags: 25-ea-6-jdk-windowsservercore-ltsc2025, 25-ea-6-windowsservercore-ltsc2025, 25-ea-jdk-windowsservercore-ltsc2025, 25-ea-windowsservercore-ltsc2025, 25-jdk-windowsservercore-ltsc2025, 25-windowsservercore-ltsc2025
+SharedTags: 25-ea-6-jdk-windowsservercore, 25-ea-6-windowsservercore, 25-ea-jdk-windowsservercore, 25-ea-windowsservercore, 25-jdk-windowsservercore, 25-windowsservercore, 25-ea-6-jdk, 25-ea-6, 25-ea-jdk, 25-ea, 25-jdk, 25
+Architectures: windows-amd64
+GitCommit: 865aad9bc52991b6e92179eb06e6e49a50004f16
+Directory: 25/jdk/windows/windowsservercore-ltsc2025
+Constraints: windowsservercore-ltsc2025
diff --git a/_bashbrew-list b/_bashbrew-list
index 8263f92..1749856 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -10,6 +10,8 @@ openjdk:24-ea-31-jdk-bookworm
 openjdk:24-ea-31-jdk-bullseye
 openjdk:24-ea-31-jdk-nanoserver
 openjdk:24-ea-31-jdk-nanoserver-1809
+openjdk:24-ea-31-jdk-nanoserver-ltsc2022
+openjdk:24-ea-31-jdk-nanoserver-ltsc2025
 openjdk:24-ea-31-jdk-oracle
 openjdk:24-ea-31-jdk-oraclelinux8
 openjdk:24-ea-31-jdk-oraclelinux9
@@ -19,8 +21,11 @@ openjdk:24-ea-31-jdk-slim-bullseye
 openjdk:24-ea-31-jdk-windowsservercore
 openjdk:24-ea-31-jdk-windowsservercore-1809
 openjdk:24-ea-31-jdk-windowsservercore-ltsc2022
+openjdk:24-ea-31-jdk-windowsservercore-ltsc2025
 openjdk:24-ea-31-nanoserver
 openjdk:24-ea-31-nanoserver-1809
+openjdk:24-ea-31-nanoserver-ltsc2022
+openjdk:24-ea-31-nanoserver-ltsc2025
 openjdk:24-ea-31-oracle
 openjdk:24-ea-31-oraclelinux8
 openjdk:24-ea-31-oraclelinux9
@@ -30,6 +35,7 @@ openjdk:24-ea-31-slim-bullseye
 openjdk:24-ea-31-windowsservercore
 openjdk:24-ea-31-windowsservercore-1809
 openjdk:24-ea-31-windowsservercore-ltsc2022
+openjdk:24-ea-31-windowsservercore-ltsc2025
 openjdk:24-ea-bookworm
 openjdk:24-ea-bullseye
 openjdk:24-ea-jdk
@@ -37,6 +43,8 @@ openjdk:24-ea-jdk-bookworm
 openjdk:24-ea-jdk-bullseye
 openjdk:24-ea-jdk-nanoserver
 openjdk:24-ea-jdk-nanoserver-1809
+openjdk:24-ea-jdk-nanoserver-ltsc2022
+openjdk:24-ea-jdk-nanoserver-ltsc2025
 openjdk:24-ea-jdk-oracle
 openjdk:24-ea-jdk-oraclelinux8
 openjdk:24-ea-jdk-oraclelinux9
@@ -46,8 +54,11 @@ openjdk:24-ea-jdk-slim-bullseye
 openjdk:24-ea-jdk-windowsservercore
 openjdk:24-ea-jdk-windowsservercore-1809
 openjdk:24-ea-jdk-windowsservercore-ltsc2022
+openjdk:24-ea-jdk-windowsservercore-ltsc2025
 openjdk:24-ea-nanoserver
 openjdk:24-ea-nanoserver-1809
+openjdk:24-ea-nanoserver-ltsc2022
+openjdk:24-ea-nanoserver-ltsc2025
 openjdk:24-ea-oracle
 openjdk:24-ea-oraclelinux8
 openjdk:24-ea-oraclelinux9
@@ -57,11 +68,14 @@ openjdk:24-ea-slim-bullseye
 openjdk:24-ea-windowsservercore
 openjdk:24-ea-windowsservercore-1809
 openjdk:24-ea-windowsservercore-ltsc2022
+openjdk:24-ea-windowsservercore-ltsc2025
 openjdk:24-jdk
 openjdk:24-jdk-bookworm
 openjdk:24-jdk-bullseye
 openjdk:24-jdk-nanoserver
 openjdk:24-jdk-nanoserver-1809
+openjdk:24-jdk-nanoserver-ltsc2022
+openjdk:24-jdk-nanoserver-ltsc2025
 openjdk:24-jdk-oracle
 openjdk:24-jdk-oraclelinux8
 openjdk:24-jdk-oraclelinux9
@@ -71,8 +85,11 @@ openjdk:24-jdk-slim-bullseye
 openjdk:24-jdk-windowsservercore
 openjdk:24-jdk-windowsservercore-1809
 openjdk:24-jdk-windowsservercore-ltsc2022
+openjdk:24-jdk-windowsservercore-ltsc2025
 openjdk:24-nanoserver
 openjdk:24-nanoserver-1809
+openjdk:24-nanoserver-ltsc2022
+openjdk:24-nanoserver-ltsc2025
 openjdk:24-oracle
 openjdk:24-oraclelinux8
 openjdk:24-oraclelinux9
@@ -82,6 +99,7 @@ openjdk:24-slim-bullseye
 openjdk:24-windowsservercore
 openjdk:24-windowsservercore-1809
 openjdk:24-windowsservercore-ltsc2022
+openjdk:24-windowsservercore-ltsc2025
 openjdk:25
 openjdk:25-bookworm
 openjdk:25-bullseye
@@ -94,6 +112,8 @@ openjdk:25-ea-6-jdk-bookworm
 openjdk:25-ea-6-jdk-bullseye
 openjdk:25-ea-6-jdk-nanoserver
 openjdk:25-ea-6-jdk-nanoserver-1809
+openjdk:25-ea-6-jdk-nanoserver-ltsc2022
+openjdk:25-ea-6-jdk-nanoserver-ltsc2025
 openjdk:25-ea-6-jdk-oracle
 openjdk:25-ea-6-jdk-oraclelinux8
 openjdk:25-ea-6-jdk-oraclelinux9
@@ -103,8 +123,11 @@ openjdk:25-ea-6-jdk-slim-bullseye
 openjdk:25-ea-6-jdk-windowsservercore
 openjdk:25-ea-6-jdk-windowsservercore-1809
 openjdk:25-ea-6-jdk-windowsservercore-ltsc2022
+openjdk:25-ea-6-jdk-windowsservercore-ltsc2025
 openjdk:25-ea-6-nanoserver
 openjdk:25-ea-6-nanoserver-1809
+openjdk:25-ea-6-nanoserver-ltsc2022
+openjdk:25-ea-6-nanoserver-ltsc2025
 openjdk:25-ea-6-oracle
 openjdk:25-ea-6-oraclelinux8
 openjdk:25-ea-6-oraclelinux9
@@ -114,6 +137,7 @@ openjdk:25-ea-6-slim-bullseye
 openjdk:25-ea-6-windowsservercore
 openjdk:25-ea-6-windowsservercore-1809
 openjdk:25-ea-6-windowsservercore-ltsc2022
+openjdk:25-ea-6-windowsservercore-ltsc2025
 openjdk:25-ea-bookworm
 openjdk:25-ea-bullseye
 openjdk:25-ea-jdk
@@ -121,6 +145,8 @@ openjdk:25-ea-jdk-bookworm
 openjdk:25-ea-jdk-bullseye
 openjdk:25-ea-jdk-nanoserver
 openjdk:25-ea-jdk-nanoserver-1809
+openjdk:25-ea-jdk-nanoserver-ltsc2022
+openjdk:25-ea-jdk-nanoserver-ltsc2025
 openjdk:25-ea-jdk-oracle
 openjdk:25-ea-jdk-oraclelinux8
 openjdk:25-ea-jdk-oraclelinux9
@@ -130,8 +156,11 @@ openjdk:25-ea-jdk-slim-bullseye
 openjdk:25-ea-jdk-windowsservercore
 openjdk:25-ea-jdk-windowsservercore-1809
 openjdk:25-ea-jdk-windowsservercore-ltsc2022
+openjdk:25-ea-jdk-windowsservercore-ltsc2025
 openjdk:25-ea-nanoserver
 openjdk:25-ea-nanoserver-1809
+openjdk:25-ea-nanoserver-ltsc2022
+openjdk:25-ea-nanoserver-ltsc2025
 openjdk:25-ea-oracle
 openjdk:25-ea-oraclelinux8
 openjdk:25-ea-oraclelinux9
@@ -141,11 +170,14 @@ openjdk:25-ea-slim-bullseye
 openjdk:25-ea-windowsservercore
 openjdk:25-ea-windowsservercore-1809
 openjdk:25-ea-windowsservercore-ltsc2022
+openjdk:25-ea-windowsservercore-ltsc2025
 openjdk:25-jdk
 openjdk:25-jdk-bookworm
 openjdk:25-jdk-bullseye
 openjdk:25-jdk-nanoserver
 openjdk:25-jdk-nanoserver-1809
+openjdk:25-jdk-nanoserver-ltsc2022
+openjdk:25-jdk-nanoserver-ltsc2025
 openjdk:25-jdk-oracle
 openjdk:25-jdk-oraclelinux8
 openjdk:25-jdk-oraclelinux9
@@ -155,8 +187,11 @@ openjdk:25-jdk-slim-bullseye
 openjdk:25-jdk-windowsservercore
 openjdk:25-jdk-windowsservercore-1809
 openjdk:25-jdk-windowsservercore-ltsc2022
+openjdk:25-jdk-windowsservercore-ltsc2025
 openjdk:25-nanoserver
 openjdk:25-nanoserver-1809
+openjdk:25-nanoserver-ltsc2022
+openjdk:25-nanoserver-ltsc2025
 openjdk:25-oracle
 openjdk:25-oraclelinux8
 openjdk:25-oraclelinux9
@@ -166,3 +201,4 @@ openjdk:25-slim-bullseye
 openjdk:25-windowsservercore
 openjdk:25-windowsservercore-1809
 openjdk:25-windowsservercore-ltsc2022
+openjdk:25-windowsservercore-ltsc2025
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index f69aa97..84a24f0 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -6,6 +6,7 @@ openjdk:24-slim
 openjdk:24-slim-bullseye
 openjdk:24-windowsservercore-1809
 openjdk:24-windowsservercore-ltsc2022
+openjdk:24-windowsservercore-ltsc2025
 openjdk:25-bookworm
 openjdk:25-bullseye
 openjdk:25-oracle
@@ -14,5 +15,10 @@ openjdk:25-slim
 openjdk:25-slim-bullseye
 openjdk:25-windowsservercore-1809
 openjdk:25-windowsservercore-ltsc2022
+openjdk:25-windowsservercore-ltsc2025
 openjdk:24-nanoserver-1809
+openjdk:24-nanoserver-ltsc2022
+openjdk:24-nanoserver-ltsc2025
 openjdk:25-nanoserver-1809
+openjdk:25-nanoserver-ltsc2022
+openjdk:25-nanoserver-ltsc2025
diff --git a/openjdk_24-nanoserver-1809/Dockerfile b/openjdk_24-nanoserver-ltsc2022/Dockerfile
similarity index 84%
copy from openjdk_24-nanoserver-1809/Dockerfile
copy to openjdk_24-nanoserver-ltsc2022/Dockerfile
index f213646..6549a35 100644
--- a/openjdk_24-nanoserver-1809/Dockerfile
+++ b/openjdk_24-nanoserver-ltsc2022/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/nanoserver:1809
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
 
 SHELL ["cmd", "/s", "/c"]
 
@@ -22,7 +22,7 @@ USER ContainerUser
 # >
 ENV JAVA_VERSION 24-ea+31
 
-COPY --from=openjdk:24-ea-31-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
+COPY --from=openjdk:24-ea-31-jdk-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
 	&& echo   javac --version && javac --version \
diff --git a/openjdk_24-nanoserver-1809/Dockerfile b/openjdk_24-nanoserver-ltsc2025/Dockerfile
similarity index 84%
copy from openjdk_24-nanoserver-1809/Dockerfile
copy to openjdk_24-nanoserver-ltsc2025/Dockerfile
index f213646..41d002a 100644
--- a/openjdk_24-nanoserver-1809/Dockerfile
+++ b/openjdk_24-nanoserver-ltsc2025/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/nanoserver:1809
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025
 
 SHELL ["cmd", "/s", "/c"]
 
@@ -22,7 +22,7 @@ USER ContainerUser
 # >
 ENV JAVA_VERSION 24-ea+31
 
-COPY --from=openjdk:24-ea-31-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
+COPY --from=openjdk:24-ea-31-jdk-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
 	&& echo   javac --version && javac --version \
diff --git a/openjdk_24-windowsservercore-ltsc2022/Dockerfile b/openjdk_24-windowsservercore-ltsc2025/Dockerfile
similarity index 98%
copy from openjdk_24-windowsservercore-ltsc2022/Dockerfile
copy to openjdk_24-windowsservercore-ltsc2025/Dockerfile
index d9065be..940f7ba 100644
--- a/openjdk_24-windowsservercore-ltsc2022/Dockerfile
+++ b/openjdk_24-windowsservercore-ltsc2025/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:ltsc2022
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/openjdk_25-nanoserver-1809/Dockerfile b/openjdk_25-nanoserver-ltsc2022/Dockerfile
similarity index 84%
copy from openjdk_25-nanoserver-1809/Dockerfile
copy to openjdk_25-nanoserver-ltsc2022/Dockerfile
index 5e66052..0a9fcf7 100644
--- a/openjdk_25-nanoserver-1809/Dockerfile
+++ b/openjdk_25-nanoserver-ltsc2022/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/nanoserver:1809
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
 
 SHELL ["cmd", "/s", "/c"]
 
@@ -22,7 +22,7 @@ USER ContainerUser
 # >
 ENV JAVA_VERSION 25-ea+6
 
-COPY --from=openjdk:25-ea-6-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
+COPY --from=openjdk:25-ea-6-jdk-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
 	&& echo   javac --version && javac --version \
diff --git a/openjdk_25-nanoserver-1809/Dockerfile b/openjdk_25-nanoserver-ltsc2025/Dockerfile
similarity index 84%
copy from openjdk_25-nanoserver-1809/Dockerfile
copy to openjdk_25-nanoserver-ltsc2025/Dockerfile
index 5e66052..b84e9a4 100644
--- a/openjdk_25-nanoserver-1809/Dockerfile
+++ b/openjdk_25-nanoserver-ltsc2025/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/nanoserver:1809
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025
 
 SHELL ["cmd", "/s", "/c"]
 
@@ -22,7 +22,7 @@ USER ContainerUser
 # >
 ENV JAVA_VERSION 25-ea+6
 
-COPY --from=openjdk:25-ea-6-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
+COPY --from=openjdk:25-ea-6-jdk-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
 	&& echo   javac --version && javac --version \
diff --git a/openjdk_25-windowsservercore-ltsc2022/Dockerfile b/openjdk_25-windowsservercore-ltsc2025/Dockerfile
similarity index 98%
copy from openjdk_25-windowsservercore-ltsc2022/Dockerfile
copy to openjdk_25-windowsservercore-ltsc2025/Dockerfile
index 78e3909..dd986cc 100644
--- a/openjdk_25-windowsservercore-ltsc2022/Dockerfile
+++ b/openjdk_25-windowsservercore-ltsc2025/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:ltsc2022
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Relevant Maintainers:

@yosifkit yosifkit merged commit c52f518 into docker-library:master Jan 22, 2025
23 checks passed
@yosifkit yosifkit deleted the openjdk branch January 22, 2025 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants