From 534646f0941d909897d91eddc7f8c7c7cc53a652 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 21 Jan 2025 17:12:40 -0800 Subject: [PATCH] Add more Nano Server variants --- 24/jdk/windows/nanoserver-ltsc2022/Dockerfile | 33 +++++++++++++++++++ 24/jdk/windows/nanoserver-ltsc2025/Dockerfile | 33 +++++++++++++++++++ 25/jdk/windows/nanoserver-ltsc2022/Dockerfile | 33 +++++++++++++++++++ 25/jdk/windows/nanoserver-ltsc2025/Dockerfile | 33 +++++++++++++++++++ versions.json | 4 +++ versions.sh | 2 ++ 6 files changed, 138 insertions(+) create mode 100644 24/jdk/windows/nanoserver-ltsc2022/Dockerfile create mode 100644 24/jdk/windows/nanoserver-ltsc2025/Dockerfile create mode 100644 25/jdk/windows/nanoserver-ltsc2022/Dockerfile create mode 100644 25/jdk/windows/nanoserver-ltsc2025/Dockerfile diff --git a/24/jdk/windows/nanoserver-ltsc2022/Dockerfile b/24/jdk/windows/nanoserver-ltsc2022/Dockerfile new file mode 100644 index 00000000..6549a352 --- /dev/null +++ b/24/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -0,0 +1,33 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 + +SHELL ["cmd", "/s", "/c"] + +ENV JAVA_HOME C:\\openjdk-24 +# "ERROR: Access to the registry path is denied." +USER ContainerAdministrator +RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \ + && setx /M PATH %JAVA_HOME%\bin;%PATH% \ + && echo Complete. +USER ContainerUser + +# https://jdk.java.net/ +# > +# > Java Development Kit builds, from Oracle +# > +ENV JAVA_VERSION 24-ea+31 + +COPY --from=openjdk:24-ea-31-jdk-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME + +RUN echo Verifying install ... \ + && echo javac --version && javac --version \ + && echo java --version && java --version \ + && echo Complete. + +# "jshell" is an interactive REPL for Java (see https://en.wikipedia.org/wiki/JShell) +CMD ["jshell"] diff --git a/24/jdk/windows/nanoserver-ltsc2025/Dockerfile b/24/jdk/windows/nanoserver-ltsc2025/Dockerfile new file mode 100644 index 00000000..41d002ad --- /dev/null +++ b/24/jdk/windows/nanoserver-ltsc2025/Dockerfile @@ -0,0 +1,33 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2025 + +SHELL ["cmd", "/s", "/c"] + +ENV JAVA_HOME C:\\openjdk-24 +# "ERROR: Access to the registry path is denied." +USER ContainerAdministrator +RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \ + && setx /M PATH %JAVA_HOME%\bin;%PATH% \ + && echo Complete. +USER ContainerUser + +# https://jdk.java.net/ +# > +# > Java Development Kit builds, from Oracle +# > +ENV JAVA_VERSION 24-ea+31 + +COPY --from=openjdk:24-ea-31-jdk-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME + +RUN echo Verifying install ... \ + && echo javac --version && javac --version \ + && echo java --version && java --version \ + && echo Complete. + +# "jshell" is an interactive REPL for Java (see https://en.wikipedia.org/wiki/JShell) +CMD ["jshell"] diff --git a/25/jdk/windows/nanoserver-ltsc2022/Dockerfile b/25/jdk/windows/nanoserver-ltsc2022/Dockerfile new file mode 100644 index 00000000..0a9fcf7c --- /dev/null +++ b/25/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -0,0 +1,33 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 + +SHELL ["cmd", "/s", "/c"] + +ENV JAVA_HOME C:\\openjdk-25 +# "ERROR: Access to the registry path is denied." +USER ContainerAdministrator +RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \ + && setx /M PATH %JAVA_HOME%\bin;%PATH% \ + && echo Complete. +USER ContainerUser + +# https://jdk.java.net/ +# > +# > Java Development Kit builds, from Oracle +# > +ENV JAVA_VERSION 25-ea+6 + +COPY --from=openjdk:25-ea-6-jdk-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME + +RUN echo Verifying install ... \ + && echo javac --version && javac --version \ + && echo java --version && java --version \ + && echo Complete. + +# "jshell" is an interactive REPL for Java (see https://en.wikipedia.org/wiki/JShell) +CMD ["jshell"] diff --git a/25/jdk/windows/nanoserver-ltsc2025/Dockerfile b/25/jdk/windows/nanoserver-ltsc2025/Dockerfile new file mode 100644 index 00000000..b84e9a4d --- /dev/null +++ b/25/jdk/windows/nanoserver-ltsc2025/Dockerfile @@ -0,0 +1,33 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/nanoserver:ltsc2025 + +SHELL ["cmd", "/s", "/c"] + +ENV JAVA_HOME C:\\openjdk-25 +# "ERROR: Access to the registry path is denied." +USER ContainerAdministrator +RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \ + && setx /M PATH %JAVA_HOME%\bin;%PATH% \ + && echo Complete. +USER ContainerUser + +# https://jdk.java.net/ +# > +# > Java Development Kit builds, from Oracle +# > +ENV JAVA_VERSION 25-ea+6 + +COPY --from=openjdk:25-ea-6-jdk-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME + +RUN echo Verifying install ... \ + && echo javac --version && javac --version \ + && echo java --version && java --version \ + && echo Complete. + +# "jshell" is an interactive REPL for Java (see https://en.wikipedia.org/wiki/JShell) +CMD ["jshell"] diff --git a/versions.json b/versions.json index 5ffb452c..6c3ec8d3 100644 --- a/versions.json +++ b/versions.json @@ -26,6 +26,8 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809", + "windows/nanoserver-ltsc2025", + "windows/nanoserver-ltsc2022", "windows/nanoserver-1809" ], "version": "24-ea+31" @@ -57,6 +59,8 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809", + "windows/nanoserver-ltsc2025", + "windows/nanoserver-ltsc2022", "windows/nanoserver-1809" ], "version": "25-ea+6" diff --git a/versions.sh b/versions.sh index 79395b0c..a92de0fd 100755 --- a/versions.sh +++ b/versions.sh @@ -172,6 +172,8 @@ for version in "${versions[@]}"; do empty | "windows/windowsservercore-" + .), ( + "ltsc2025", + "ltsc2022", "1809", empty | "windows/nanoserver-" + .)