diff --git a/25/jdk/windows/nanoserver-1809/Dockerfile b/25/jdk/windows/nanoserver-1809/Dockerfile deleted file mode 100644 index 38340b18..00000000 --- a/25/jdk/windows/nanoserver-1809/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/nanoserver:1809 - -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+25 - -COPY --from=openjdk:25-ea-25-jdk-windowsservercore-1809 $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/windowsservercore-1809/Dockerfile b/25/jdk/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index 62238392..00000000 --- a/25/jdk/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,65 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# enable TLS 1.2 -# https://docs.microsoft.com/en-us/system-center/vmm/install-tls?view=sc-vmm-1801 -# https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/operations/manage-ssl-protocols-in-ad-fs#enable-tls-12 -RUN Write-Host 'Enabling TLS 1.2 (https://githubengineering.com/crypto-removal-notice/) ...'; \ - $tls12RegBase = 'HKLM:\\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2'; \ - if (Test-Path $tls12RegBase) { throw ('"{0}" already exists!' -f $tls12RegBase) }; \ - New-Item -Path ('{0}/Client' -f $tls12RegBase) -Force; \ - New-Item -Path ('{0}/Server' -f $tls12RegBase) -Force; \ - New-ItemProperty -Path ('{0}/Client' -f $tls12RegBase) -Name 'DisabledByDefault' -PropertyType DWORD -Value 0 -Force; \ - New-ItemProperty -Path ('{0}/Client' -f $tls12RegBase) -Name 'Enabled' -PropertyType DWORD -Value 1 -Force; \ - New-ItemProperty -Path ('{0}/Server' -f $tls12RegBase) -Name 'DisabledByDefault' -PropertyType DWORD -Value 0 -Force; \ - New-ItemProperty -Path ('{0}/Server' -f $tls12RegBase) -Name 'Enabled' -PropertyType DWORD -Value 1 -Force; \ - Write-Host 'Complete.' - -ENV JAVA_HOME C:\\openjdk-25 -RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - setx /M PATH $newPath; \ - Write-Host 'Complete.' - -# https://jdk.java.net/ -# > -# > Java Development Kit builds, from Oracle -# > -ENV JAVA_VERSION 25-ea+25 -ENV JAVA_URL https://download.java.net/java/early_access/jdk25/25/GPL/openjdk-25-ea+25_windows-x64_bin.zip -ENV JAVA_SHA256 a6f3324a22501815f46fc9bd0a1e2e56d83dbad803e421c543644cb50539a8da - -RUN Write-Host ('Downloading {0} ...' -f $env:JAVA_URL); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri $env:JAVA_URL -OutFile 'openjdk.zip'; \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:JAVA_SHA256); \ - if ((Get-FileHash openjdk.zip -Algorithm sha256).Hash -ne $env:JAVA_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Expanding ...'; \ - New-Item -ItemType Directory -Path C:\temp | Out-Null; \ - Expand-Archive openjdk.zip -DestinationPath C:\temp; \ - Move-Item -Path C:\temp\* -Destination $env:JAVA_HOME; \ - Remove-Item C:\temp; \ - \ - Write-Host 'Removing ...'; \ - Remove-Item openjdk.zip -Force; \ - \ - Write-Host 'Verifying install ...'; \ - Write-Host ' javac --version'; javac --version; \ - Write-Host ' java --version'; java --version; \ - \ - Write-Host '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 97acb696..18c879e6 100644 --- a/versions.json +++ b/versions.json @@ -25,10 +25,8 @@ "slim-bullseye", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809", "windows/nanoserver-ltsc2025", - "windows/nanoserver-ltsc2022", - "windows/nanoserver-1809" + "windows/nanoserver-ltsc2022" ], "version": "25-ea+25" } diff --git a/versions.sh b/versions.sh index cff1d31b..9f9d1860 100755 --- a/versions.sh +++ b/versions.sh @@ -168,13 +168,11 @@ for version in "${versions[@]}"; do ( "ltsc2025", "ltsc2022", - "1809", empty | "windows/windowsservercore-" + .), ( "ltsc2025", "ltsc2022", - "1809", empty | "windows/nanoserver-" + .) else empty end