Update to 1.2.0 and add 1.3.0-rc1

docker-library · Aug 20, 2019 · 5f637f2 · 5f637f2
1 parent 473f2e4
commit 5f637f2
Show file tree

Hide file tree

Showing 9 changed files with 111 additions and 22 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -3,7 +3,9 @@ image: Visual Studio 2017
 
 environment:
   matrix:
-    - version: 1.1
+    - version: 1.3-rc
+      variant: windowsservercore-ltsc2016
+    - version: 1.2
       variant: windowsservercore-ltsc2016
     - version: 1.0
       variant: windowsservercore-ltsc2016

diff --git a/.travis.yml b/.travis.yml
@@ -4,16 +4,19 @@ services: docker
 matrix:
   include:
     - os: linux
-      env: VERSION=1.1 VARIANT=buster ARCH=
+      env: VERSION=1.3-rc VARIANT=buster ARCH=
     - os: linux
-      env: VERSION=1.1 VARIANT=buster ARCH=i386
+      env: VERSION=1.3-rc VARIANT=buster ARCH=i386
+    - os: windows
+      dist: 1803-containers
+      env: VERSION=1.3-rc VARIANT=windows/windowsservercore-1803
     - os: linux
-      env: VERSION=1.1 VARIANT=stretch ARCH=
+      env: VERSION=1.2 VARIANT=buster ARCH=
     - os: linux
-      env: VERSION=1.1 VARIANT=stretch ARCH=i386
+      env: VERSION=1.2 VARIANT=buster ARCH=i386
     - os: windows
       dist: 1803-containers
-      env: VERSION=1.1 VARIANT=windows/windowsservercore-1803
+      env: VERSION=1.2 VARIANT=windows/windowsservercore-1803
     - os: linux
       env: VERSION=1.0 VARIANT=buster ARCH=
     - os: linux

diff --git a/1.1/buster/Dockerfile → 1.2/buster/Dockerfile b/1.1/buster/Dockerfile → 1.2/buster/Dockerfile
@@ -17,7 +17,7 @@ ENV PATH $JULIA_PATH/bin:$PATH
 ENV JULIA_GPG 3673DF529D9049477F76B37566E3C7DC03D6E495
 
 # https://julialang.org/downloads/
-ENV JULIA_VERSION 1.1.1
+ENV JULIA_VERSION 1.2.0
 
 RUN set -eux; \
 	\
@@ -32,16 +32,18 @@ RUN set -eux; \
 	fi; \
 	\
 # https://julialang.org/downloads/#julia-command-line-version
-# https://julialang-s3.julialang.org/bin/checksums/julia-1.1.1.sha256
+# https://julialang-s3.julialang.org/bin/checksums/julia-1.2.0.sha256
 # this "case" statement is generated via "update.sh"
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "${dpkgArch##*-}" in \
 # amd64
-		amd64) tarArch='x86_64'; dirArch='x64'; sha256='f0a83a139a89a2ccf2316814e5ee1c0c809fca02cbaf4baf3c1fd8eb71594f06' ;; \
+		amd64) tarArch='x86_64'; dirArch='x64'; sha256='926ced5dec5d726ed0d2919e849ff084a320882fb67ab048385849f9483afc47' ;; \
+# arm32v7
+		armhf) tarArch='armv7l'; dirArch='armv7l'; sha256='71d24159f4f08a327c0a2ba8291654121d5f672422cd89bed3966f8df74d33dc' ;; \
 # arm64v8
-		arm64) tarArch='aarch64'; dirArch='aarch64'; sha256='3d9ba9c2204ea920006b3a91ecd2803cac808b29250f2120000e29fc0384099a' ;; \
+		arm64) tarArch='aarch64'; dirArch='aarch64'; sha256='7dab9aa4a320aedb7a4b68c582f9edd434f58867132cb8c6349df25111c3324a' ;; \
 # i386
-		i386) tarArch='i686'; dirArch='x86'; sha256='3e6941326522ac4bc34c5663c2c5752417e92677ff9befc56ba264eb283f37f1' ;; \
+		i386) tarArch='i686'; dirArch='x86'; sha256='82f68aed874817cc8f8b49e4f9c391c7911863603528b473900ba51f9067fadd' ;; \
 		*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding Julia binary release"; exit 1 ;; \
 	esac; \
 	\

diff --git a/...windows/windowsservercore-1803/Dockerfile → ...windows/windowsservercore-1803/Dockerfile b/...windows/windowsservercore-1803/Dockerfile → ...windows/windowsservercore-1803/Dockerfile
@@ -3,8 +3,8 @@ FROM microsoft/windowsservercore:1803
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JULIA_VERSION 1.1.1
-ENV JULIA_SHA256 26f980a1dd0d93a38c4a5b7e397210a761efed1f87caadc1a7066bb8ab12efab
+ENV JULIA_VERSION 1.2.0
+ENV JULIA_SHA256 7b122501ccce7b66d5e9e7e93fe29c3be8479f9bbdf2b0c9daa7e5572341da7a
 
 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); \

diff --git a/...ows/windowsservercore-ltsc2016/Dockerfile → ...ows/windowsservercore-ltsc2016/Dockerfile b/...ows/windowsservercore-ltsc2016/Dockerfile → ...ows/windowsservercore-ltsc2016/Dockerfile
@@ -3,8 +3,8 @@ FROM microsoft/windowsservercore:ltsc2016
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JULIA_VERSION 1.1.1
-ENV JULIA_SHA256 26f980a1dd0d93a38c4a5b7e397210a761efed1f87caadc1a7066bb8ab12efab
+ENV JULIA_VERSION 1.2.0
+ENV JULIA_SHA256 7b122501ccce7b66d5e9e7e93fe29c3be8479f9bbdf2b0c9daa7e5572341da7a
 
 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); \

diff --git a/1.1/stretch/Dockerfile → 1.3-rc/buster/Dockerfile b/1.1/stretch/Dockerfile → 1.3-rc/buster/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM debian:buster-slim
 
 RUN set -eux; \
 	apt-get update; \
@@ -17,7 +17,7 @@ ENV PATH $JULIA_PATH/bin:$PATH
 ENV JULIA_GPG 3673DF529D9049477F76B37566E3C7DC03D6E495
 
 # https://julialang.org/downloads/
-ENV JULIA_VERSION 1.1.1
+ENV JULIA_VERSION 1.3.0-rc1
 
 RUN set -eux; \
 	\
@@ -32,16 +32,18 @@ RUN set -eux; \
 	fi; \
 	\
 # https://julialang.org/downloads/#julia-command-line-version
-# https://julialang-s3.julialang.org/bin/checksums/julia-1.1.1.sha256
+# https://julialang-s3.julialang.org/bin/checksums/julia-1.3.0-rc1.sha256
 # this "case" statement is generated via "update.sh"
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "${dpkgArch##*-}" in \
 # amd64
-		amd64) tarArch='x86_64'; dirArch='x64'; sha256='f0a83a139a89a2ccf2316814e5ee1c0c809fca02cbaf4baf3c1fd8eb71594f06' ;; \
+		amd64) tarArch='x86_64'; dirArch='x64'; sha256='d56bcba7647277c7864da4fc1bb7811a2aa213e2ab8a13c211711ed4e0729e9d' ;; \
+# arm32v7
+		armhf) tarArch='armv7l'; dirArch='armv7l'; sha256='6bb583ffe2fbe93fd50ce52436b17a19f86f58228359dfdff3f028e3aafbfc85' ;; \
 # arm64v8
-		arm64) tarArch='aarch64'; dirArch='aarch64'; sha256='3d9ba9c2204ea920006b3a91ecd2803cac808b29250f2120000e29fc0384099a' ;; \
+		arm64) tarArch='aarch64'; dirArch='aarch64'; sha256='2e257d2dbf22a4351ae7337e5190fe3a6dc41faadec61552fc2a1e158004403a' ;; \
 # i386
-		i386) tarArch='i686'; dirArch='x86'; sha256='3e6941326522ac4bc34c5663c2c5752417e92677ff9befc56ba264eb283f37f1' ;; \
+		i386) tarArch='i686'; dirArch='x86'; sha256='75a0f4d0179c4998a92077688392cf6dcc713dc245ff0fc4e02ca0b6d4fed603' ;; \
 		*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding Julia binary release"; exit 1 ;; \
 	esac; \
 	\

diff --git a/1.3-rc/windows/windowsservercore-1803/Dockerfile b/1.3-rc/windows/windowsservercore-1803/Dockerfile
@@ -0,0 +1,40 @@
+FROM microsoft/windowsservercore:1803
+
+# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ENV JULIA_VERSION 1.3.0-rc1
+ENV JULIA_SHA256 31a7acb889f22518e6c7db2ced7720363373c48ab0f9e27a409a3213adfa0570
+
+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.3-rc/windows/windowsservercore-ltsc2016/Dockerfile b/1.3-rc/windows/windowsservercore-ltsc2016/Dockerfile
@@ -0,0 +1,40 @@
+FROM microsoft/windowsservercore:ltsc2016
+
+# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ENV JULIA_VERSION 1.3.0-rc1
+ENV JULIA_SHA256 31a7acb889f22518e6c7db2ced7720363373c48ab0f9e27a409a3213adfa0570
+
+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
@@ -2,7 +2,7 @@
 set -Eeuo pipefail
 
 declare -A aliases=(
-	[1.1]='1 latest'
+	[1.2]='1 latest'
 )
 defaultDebianVariant='buster'