diff --git a/11/jdk/windows/windowsservercore-1709/Dockerfile b/11/jdk/windows/windowsservercore-1709/Dockerfile deleted file mode 100644 index 4a472208..00000000 --- a/11/jdk/windows/windowsservercore-1709/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -FROM mcr.microsoft.com/windows/servercore:1709 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# enable TLS 1.2 (Nano Server doesn't support using "[Net.ServicePointManager]::SecurityProtocol") -# 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 - -ENV JAVA_HOME C:\\openjdk-11 -RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ -# Nano Server does not have "[Environment]::SetEnvironmentVariable()" - setx /M PATH $newPath - -# https://jdk.java.net/ -ENV JAVA_VERSION 11.0.2 -ENV JAVA_URL https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_windows-x64_bin.zip -ENV JAVA_SHA256 cf39490fe042dba1b61d6e9a395095279a69e70086c8c8d5466d9926d80976d8 - -RUN Write-Host ('Downloading {0} ...' -f $env:JAVA_URL); \ - 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 'Verifying install ...'; \ - Write-Host ' java --version'; java --version; \ - Write-Host ' javac --version'; javac --version; \ - \ - Write-Host 'Removing ...'; \ - Remove-Item openjdk.zip -Force; \ - \ - Write-Host 'Complete.' - -# https://docs.oracle.com/javase/10/tools/jshell.htm -# https://en.wikipedia.org/wiki/JShell -CMD ["jshell"] diff --git a/12/jdk/windows/windowsservercore-1709/Dockerfile b/12/jdk/windows/windowsservercore-1709/Dockerfile deleted file mode 100644 index 0a613779..00000000 --- a/12/jdk/windows/windowsservercore-1709/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -FROM mcr.microsoft.com/windows/servercore:1709 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# enable TLS 1.2 (Nano Server doesn't support using "[Net.ServicePointManager]::SecurityProtocol") -# 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 - -ENV JAVA_HOME C:\\openjdk-12 -RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ -# Nano Server does not have "[Environment]::SetEnvironmentVariable()" - setx /M PATH $newPath - -# https://jdk.java.net/ -ENV JAVA_VERSION 12 -ENV JAVA_URL https://download.java.net/java/GA/jdk12/GPL/openjdk-12_windows-x64_bin.zip -ENV JAVA_SHA256 35a8d018f420fb05fe7c2aa9933122896ca50bd23dbd373e90d8e2f3897c4e92 - -RUN Write-Host ('Downloading {0} ...' -f $env:JAVA_URL); \ - 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 'Verifying install ...'; \ - Write-Host ' java --version'; java --version; \ - Write-Host ' javac --version'; javac --version; \ - \ - Write-Host 'Removing ...'; \ - Remove-Item openjdk.zip -Force; \ - \ - Write-Host 'Complete.' - -# https://docs.oracle.com/javase/10/tools/jshell.htm -# https://en.wikipedia.org/wiki/JShell -CMD ["jshell"] diff --git a/13/jdk/windows/windowsservercore-1709/Dockerfile b/13/jdk/windows/windowsservercore-1709/Dockerfile deleted file mode 100644 index 70129693..00000000 --- a/13/jdk/windows/windowsservercore-1709/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -FROM mcr.microsoft.com/windows/servercore:1709 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# enable TLS 1.2 (Nano Server doesn't support using "[Net.ServicePointManager]::SecurityProtocol") -# 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 - -ENV JAVA_HOME C:\\openjdk-13 -RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ -# Nano Server does not have "[Environment]::SetEnvironmentVariable()" - setx /M PATH $newPath - -# https://jdk.java.net/ -ENV JAVA_VERSION 13-ea+16 -ENV JAVA_URL https://download.java.net/java/early_access/jdk13/16/GPL/openjdk-13-ea+16_windows-x64_bin.zip -ENV JAVA_SHA256 0ed244de1bed18e9ed2278dfa422488566e91e7ac7e377e6658ab837eeaf674b - -RUN Write-Host ('Downloading {0} ...' -f $env:JAVA_URL); \ - 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 'Verifying install ...'; \ - Write-Host ' java --version'; java --version; \ - Write-Host ' javac --version'; javac --version; \ - \ - Write-Host 'Removing ...'; \ - Remove-Item openjdk.zip -Force; \ - \ - Write-Host 'Complete.' - -# https://docs.oracle.com/javase/10/tools/jshell.htm -# https://en.wikipedia.org/wiki/JShell -CMD ["jshell"] diff --git a/8/jdk/windows/windowsservercore-1709/Dockerfile b/8/jdk/windows/windowsservercore-1709/Dockerfile deleted file mode 100644 index 4fdc72f5..00000000 --- a/8/jdk/windows/windowsservercore-1709/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM mcr.microsoft.com/windows/servercore:1709 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV JAVA_HOME C:\\ojdkbuild -RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ -# Nano Server does not have "[Environment]::SetEnvironmentVariable()" - setx /M PATH $newPath; - -# https://github.com/ojdkbuild/ojdkbuild/releases -ENV JAVA_VERSION 8u201 -ENV JAVA_OJDKBUILD_VERSION 1.8.0.201-1 -ENV JAVA_OJDKBUILD_ZIP java-1.8.0-openjdk-1.8.0.201-1.b09.ojdkbuild.windows.x86_64.zip -ENV JAVA_OJDKBUILD_SHA256 d74066dc7d6e017388b1eeeb4f4cc0af20337aa6eea8e3a818017ae8d15b988a - -RUN $url = ('https://github.com/ojdkbuild/ojdkbuild/releases/download/{0}/{1}' -f $env:JAVA_OJDKBUILD_VERSION, $env:JAVA_OJDKBUILD_ZIP); \ - Write-Host ('Downloading {0} ...' -f $url); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri $url -OutFile 'ojdkbuild.zip'; \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:JAVA_OJDKBUILD_SHA256); \ - if ((Get-FileHash ojdkbuild.zip -Algorithm sha256).Hash -ne $env:JAVA_OJDKBUILD_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive ojdkbuild.zip -DestinationPath C:\; \ - \ - Write-Host 'Renaming ...'; \ - Move-Item \ - -Path ('C:\{0}' -f ($env:JAVA_OJDKBUILD_ZIP -Replace '.zip$', '')) \ - -Destination $env:JAVA_HOME \ - ; \ - \ - Write-Host 'Verifying install ...'; \ - Write-Host ' java --version'; java --version; \ - Write-Host ' javac --version'; javac --version; \ - \ - Write-Host 'Removing ...'; \ - Remove-Item ojdkbuild.zip -Force; \ - \ - Write-Host 'Complete.'; diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index dc7b84bc..5e03d2fd 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -137,8 +137,8 @@ for javaVersion in "${versions[@]}"; do for javaType in jdk jre; do for v in \ oracle '' slim alpine \ - windows/windowsservercore-{ltsc2016,1709,1803,1809} \ - windows/nanoserver-{sac2016,1709,1803,1809} \ + windows/windowsservercore-{ltsc2016,1803,1809} \ + windows/nanoserver-{sac2016,1803,1809} \ ; do dir="$javaVersion/$javaType${v:+/$v}" [ -n "$v" ] && variant="$(basename "$v")" || variant= diff --git a/update.sh b/update.sh index ae0b6866..85170107 100755 --- a/update.sh +++ b/update.sh @@ -482,8 +482,8 @@ EOD esac for winVariant in \ - nanoserver-{1809,1803,1709,sac2016} \ - windowsservercore-{1809,1803,1709,ltsc2016} \ + nanoserver-{1809,1803,sac2016} \ + windowsservercore-{1809,1803,ltsc2016} \ ; do [ -f "$dir/windows/$winVariant/Dockerfile" ] || continue @@ -497,7 +497,7 @@ EOD case "$winVariant" in *-1803 ) travisEnv='\n - os: windows\n dist: 1803-containers\n env: VERSION='"$javaVersion VARIANT=windows/$winVariant$travisEnv" ;; - *-1709 | *-1809 ) ;; # no AppVeyor or Travis support for 1709 or 1809: https://github.com/appveyor/ci/issues/1885 + *-1809 ) ;; # no AppVeyor or Travis support for 1809: https://github.com/appveyor/ci/issues/1885 * ) appveyorEnv='\n - version: '"$javaVersion"'\n variant: '"$winVariant$appveyorEnv" ;; esac done