Remove unmaintained 0 and add 1.1
This commit is contained in:
J0WI
parent
60c9e91e86
commit
cccb8b5148
|
|
@ -3,9 +3,9 @@ image: Visual Studio 2017
|
|||
|
||||
environment:
|
||||
matrix:
|
||||
- version: 1.0
|
||||
- version: 1.1
|
||||
variant: windowsservercore-ltsc2016
|
||||
- version: 0
|
||||
- version: 1.0
|
||||
variant: windowsservercore-ltsc2016
|
||||
|
||||
install:
|
||||
|
|
|
|||
15
.travis.yml
15
.travis.yml
|
|
@ -3,6 +3,13 @@ services: docker
|
|||
|
||||
matrix:
|
||||
include:
|
||||
- os: linux
|
||||
env: VERSION=1.1 VARIANT=stretch ARCH=
|
||||
- os: linux
|
||||
env: VERSION=1.1 VARIANT=stretch ARCH=i386
|
||||
- os: windows
|
||||
dist: 1803-containers
|
||||
env: VERSION=1.1 VARIANT=windows/windowsservercore-1803
|
||||
- os: linux
|
||||
env: VERSION=1.0 VARIANT=stretch ARCH=
|
||||
- os: linux
|
||||
|
|
@ -10,14 +17,6 @@ matrix:
|
|||
- os: windows
|
||||
dist: 1803-containers
|
||||
env: VERSION=1.0 VARIANT=windows/windowsservercore-1803
|
||||
- os: linux
|
||||
env: VERSION=0 VARIANT=stretch ARCH=
|
||||
- os: linux
|
||||
env: VERSION=0 VARIANT=stretch ARCH=i386
|
||||
- os: linux
|
||||
env: VERSION=0 VARIANT=jessie ARCH=
|
||||
- os: linux
|
||||
env: VERSION=0 VARIANT=jessie ARCH=i386
|
||||
|
||||
install:
|
||||
- git clone https://github.com/docker-library/official-images.git ~/official-images
|
||||
|
|
|
|||
|
|
@ -1,69 +0,0 @@
|
|||
FROM debian:jessie
|
||||
|
||||
RUN set -eux; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
# ERROR: no download agent available; install curl, wget, or fetch
|
||||
curl \
|
||||
; \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ENV JULIA_PATH /usr/local/julia
|
||||
ENV PATH $JULIA_PATH/bin:$PATH
|
||||
|
||||
# https://julialang.org/juliareleases.asc
|
||||
# Julia (Binary signing key) <buildbot@julialang.org>
|
||||
ENV JULIA_GPG 3673DF529D9049477F76B37566E3C7DC03D6E495
|
||||
|
||||
# https://julialang.org/downloads/
|
||||
ENV JULIA_VERSION 0.7.0
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
savedAptMark="$(apt-mark showmanual)"; \
|
||||
if ! command -v gpg > /dev/null; then \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
gnupg \
|
||||
dirmngr \
|
||||
; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
fi; \
|
||||
\
|
||||
# https://julialang.org/downloads/#julia-command-line-version
|
||||
# https://julialang-s3.julialang.org/bin/checksums/julia-0.7.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='35211bb89b060bfffe81e590b8aeb8103f059815953337453f632db9d96c1bd6' ;; \
|
||||
# i386
|
||||
i386) tarArch='i686'; dirArch='x86'; sha256='36a40cf0c4bd8f82c3c8b270ba34bb83af2d545bfbab135e8e496520304cb160' ;; \
|
||||
*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding Julia binary release"; exit 1 ;; \
|
||||
esac; \
|
||||
\
|
||||
folder="$(echo "$JULIA_VERSION" | cut -d. -f1-2)"; \
|
||||
curl -fL -o julia.tar.gz.asc "https://julialang-s3.julialang.org/bin/linux/${dirArch}/${folder}/julia-${JULIA_VERSION}-linux-${tarArch}.tar.gz.asc"; \
|
||||
curl -fL -o julia.tar.gz "https://julialang-s3.julialang.org/bin/linux/${dirArch}/${folder}/julia-${JULIA_VERSION}-linux-${tarArch}.tar.gz"; \
|
||||
\
|
||||
echo "${sha256} *julia.tar.gz" | sha256sum -c -; \
|
||||
\
|
||||
export GNUPGHOME="$(mktemp -d)"; \
|
||||
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$JULIA_GPG"; \
|
||||
gpg --batch --verify julia.tar.gz.asc julia.tar.gz; \
|
||||
command -v gpgconf > /dev/null && gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME" julia.tar.gz.asc; \
|
||||
\
|
||||
mkdir "$JULIA_PATH"; \
|
||||
tar -xzf julia.tar.gz -C "$JULIA_PATH" --strip-components 1; \
|
||||
rm julia.tar.gz; \
|
||||
\
|
||||
apt-mark auto '.*' > /dev/null; \
|
||||
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
|
||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||
\
|
||||
# smoke test
|
||||
julia --version
|
||||
|
||||
CMD ["julia"]
|
||||
|
|
@ -17,7 +17,7 @@ ENV PATH $JULIA_PATH/bin:$PATH
|
|||
ENV JULIA_GPG 3673DF529D9049477F76B37566E3C7DC03D6E495
|
||||
|
||||
# https://julialang.org/downloads/
|
||||
ENV JULIA_VERSION 0.7.0
|
||||
ENV JULIA_VERSION 1.1.0
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
|
|
@ -32,14 +32,14 @@ RUN set -eux; \
|
|||
fi; \
|
||||
\
|
||||
# https://julialang.org/downloads/#julia-command-line-version
|
||||
# https://julialang-s3.julialang.org/bin/checksums/julia-0.7.0.sha256
|
||||
# https://julialang-s3.julialang.org/bin/checksums/julia-1.1.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='35211bb89b060bfffe81e590b8aeb8103f059815953337453f632db9d96c1bd6' ;; \
|
||||
amd64) tarArch='x86_64'; dirArch='x64'; sha256='80cfd013e526b5145ec3254920afd89bb459f1db7a2a3f21849125af20c05471' ;; \
|
||||
# i386
|
||||
i386) tarArch='i686'; dirArch='x86'; sha256='36a40cf0c4bd8f82c3c8b270ba34bb83af2d545bfbab135e8e496520304cb160' ;; \
|
||||
i386) tarArch='i686'; dirArch='x86'; sha256='9efd7ffd4a246311f544cf0031682f4dcf946b2377abaa285684526071272fe5' ;; \
|
||||
*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding Julia binary release"; exit 1 ;; \
|
||||
esac; \
|
||||
\
|
||||
|
|
@ -3,8 +3,8 @@ FROM microsoft/windowsservercore:1709
|
|||
# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
|
||||
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
|
||||
|
||||
ENV JULIA_VERSION 0.7.0
|
||||
ENV JULIA_SHA256 a42d53d259d1f8f6feefac0da8352c19ca5d9da2303cf1595086867cfb1cd817
|
||||
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); \
|
||||
|
|
@ -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.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"]
|
||||
|
|
@ -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 0.7.0
|
||||
ENV JULIA_SHA256 a42d53d259d1f8f6feefac0da8352c19ca5d9da2303cf1595086867cfb1cd817
|
||||
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); \
|
||||
Loading…
Reference in New Issue