diff --git a/1.0/windows/windowsservercore-1709/Dockerfile b/1.0/windows/windowsservercore-1709/Dockerfile deleted file mode 100644 index 83cde8d0..00000000 --- a/1.0/windows/windowsservercore-1709/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -FROM microsoft/windowsservercore:1709 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV JULIA_VERSION 1.0.3 -ENV JULIA_SHA256 e62d2755e38dcd100a76bb88b895e3ca3fde586b6bf4b38ea6e801d9b8066ce2 - -RUN $url = ('https://julialang-s3.julialang.org/bin/winnt/x64/{1}/julia-{0}-win64.exe' -f $env:JULIA_VERSION, ($env:JULIA_VERSION.Split('.')[0..1] -Join '.')); \ - Write-Host ('Downloading {0} ...' -f $url); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri $url -OutFile 'julia.exe'; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:JULIA_SHA256); \ - if ((Get-FileHash julia.exe -Algorithm sha256).Hash -ne $env:JULIA_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Installing ...'; \ - Start-Process -Wait -NoNewWindow \ - -FilePath '.\julia.exe' \ - -ArgumentList @( \ - '/S', \ - '/D=C:\julia' \ - ); \ - \ - Write-Host 'Updating PATH ...'; \ - $env:PATH = 'C:\julia\bin;' + $env:PATH; \ - [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); \ - \ - Write-Host 'Verifying install ("julia --version") ...'; \ - julia --version; \ - \ - Write-Host 'Removing ...'; \ - Remove-Item julia.exe -Force; \ - \ - Write-Host 'Complete.' - -CMD ["julia"] diff --git a/1.1/windows/windowsservercore-1709/Dockerfile b/1.1/windows/windowsservercore-1709/Dockerfile deleted file mode 100644 index b456b607..00000000 --- a/1.1/windows/windowsservercore-1709/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -FROM microsoft/windowsservercore:1709 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV JULIA_VERSION 1.1.0 -ENV JULIA_SHA256 15bc552e43f5d83d20e439b6026a95f2fd8d57c32249c602dc836ce2798f4a33 - -RUN $url = ('https://julialang-s3.julialang.org/bin/winnt/x64/{1}/julia-{0}-win64.exe' -f $env:JULIA_VERSION, ($env:JULIA_VERSION.Split('.')[0..1] -Join '.')); \ - Write-Host ('Downloading {0} ...' -f $url); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri $url -OutFile 'julia.exe'; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:JULIA_SHA256); \ - if ((Get-FileHash julia.exe -Algorithm sha256).Hash -ne $env:JULIA_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Installing ...'; \ - Start-Process -Wait -NoNewWindow \ - -FilePath '.\julia.exe' \ - -ArgumentList @( \ - '/S', \ - '/D=C:\julia' \ - ); \ - \ - Write-Host 'Updating PATH ...'; \ - $env:PATH = 'C:\julia\bin;' + $env:PATH; \ - [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); \ - \ - Write-Host 'Verifying install ("julia --version") ...'; \ - julia --version; \ - \ - Write-Host 'Removing ...'; \ - Remove-Item julia.exe -Force; \ - \ - Write-Host 'Complete.' - -CMD ["julia"] diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 361d7871..f1b6d26e 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -89,7 +89,7 @@ join() { for version in "${versions[@]}"; do for v in \ {stretch,jessie} \ - windows/windowsservercore-{ltsc2016,1709,1803} \ + windows/windowsservercore-{ltsc2016,1803} \ ; do dir="$version/$v" dir="${dir#./}" diff --git a/update.sh b/update.sh index 7a0356ef..b3cd637e 100755 --- a/update.sh +++ b/update.sh @@ -65,7 +65,7 @@ for version in "${versions[@]}"; do echo "$version: $fullVersion" for v in \ - windows/windowsservercore-{ltsc2016,1709,1803} \ + windows/windowsservercore-{ltsc2016,1803} \ {jessie,stretch} \ ; do dir="$version/$v" @@ -89,7 +89,6 @@ for version in "${versions[@]}"; do windows/*-1803) travisEnv="\n - os: windows\n dist: 1803-containers\n env: VERSION=$version VARIANT=$v$travisEnv" ;; - windows/*-1709) ;; # no AppVeyor or Travis support for 1709: https://github.com/appveyor/ci/issues/1885 windows/*) appveyorEnv='\n - version: '"$version"'\n variant: '"$variant$appveyorEnv" ;;