Add Debian Buster variants

This commit is contained in:
J0WI 2019-08-07 22:06:17 +02:00 committed by Tianon Gravi
parent 2736a02383
commit 1c1bfc53b1
5 changed files with 158 additions and 5 deletions

View File

@ -3,6 +3,10 @@ services: docker
matrix: matrix:
include: include:
- os: linux
env: VERSION=1.1 VARIANT=buster ARCH=
- os: linux
env: VERSION=1.1 VARIANT=buster ARCH=i386
- os: linux - os: linux
env: VERSION=1.1 VARIANT=stretch ARCH= env: VERSION=1.1 VARIANT=stretch ARCH=
- os: linux - os: linux
@ -10,6 +14,10 @@ matrix:
- os: windows - os: windows
dist: 1803-containers dist: 1803-containers
env: VERSION=1.1 VARIANT=windows/windowsservercore-1803 env: VERSION=1.1 VARIANT=windows/windowsservercore-1803
- os: linux
env: VERSION=1.0 VARIANT=buster ARCH=
- os: linux
env: VERSION=1.0 VARIANT=buster ARCH=i386
- os: linux - os: linux
env: VERSION=1.0 VARIANT=stretch ARCH= env: VERSION=1.0 VARIANT=stretch ARCH=
- os: linux - os: linux

73
1.0/buster/Dockerfile Normal file
View File

@ -0,0 +1,73 @@
FROM debian:buster-slim
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 1.0.4
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-1.0.4.sha256
# this "case" statement is generated via "update.sh"
dpkgArch="$(dpkg --print-architecture)"; \
case "${dpkgArch##*-}" in \
# amd64
amd64) tarArch='x86_64'; dirArch='x64'; sha256='bb9e33d95f47e703d9199f0358c038c61259e2ff9f3fd515c919729ace89443c' ;; \
# arm32v7
armhf) tarArch='armv7l'; dirArch='armv7l'; sha256='2e742f4ddf5ac21779b6943ef210d73dc02f1c6de23836b352336a3dcbb18ae6' ;; \
# arm64v8
arm64) tarArch='aarch64'; dirArch='aarch64'; sha256='7614d4239702c497330c043f37d99600b41e87caa8b92742c7104915eb54648a' ;; \
# i386
i386) tarArch='i686'; dirArch='x86'; sha256='89b71a3558aa4f515becfd21d19651035d909f5f2e3177ccaec77aee01f962b7' ;; \
*) 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"]

71
1.1/buster/Dockerfile Normal file
View File

@ -0,0 +1,71 @@
FROM debian:buster-slim
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 1.1.1
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-1.1.1.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' ;; \
# arm64v8
arm64) tarArch='aarch64'; dirArch='aarch64'; sha256='3d9ba9c2204ea920006b3a91ecd2803cac808b29250f2120000e29fc0384099a' ;; \
# i386
i386) tarArch='i686'; dirArch='x86'; sha256='3e6941326522ac4bc34c5663c2c5752417e92677ff9befc56ba264eb283f37f1' ;; \
*) 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"]

View File

@ -4,7 +4,7 @@ set -Eeuo pipefail
declare -A aliases=( declare -A aliases=(
[1.1]='1 latest' [1.1]='1 latest'
) )
defaultDebianVariant='stretch' defaultDebianVariant='buster'
self="$(basename "$BASH_SOURCE")" self="$(basename "$BASH_SOURCE")"
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
@ -88,7 +88,7 @@ join() {
for version in "${versions[@]}"; do for version in "${versions[@]}"; do
for v in \ for v in \
{stretch,jessie} \ {buster,stretch} \
windows/windowsservercore-{ltsc2016,1803} \ windows/windowsservercore-{ltsc2016,1803} \
; do ; do
dir="$version/$v" dir="$version/$v"

View File

@ -11,7 +11,7 @@ versions=( "${versions[@]%/}" )
source '.architectures-lib' source '.architectures-lib'
# see http://stackoverflow.com/a/2705678/433558 # see https://stackoverflow.com/a/2705678/433558
sed_escape_rhs() { sed_escape_rhs() {
echo "$@" | sed -e 's/[\/&]/\\&/g' | sed -e ':a;N;$!ba;s/\n/\\n/g' echo "$@" | sed -e 's/[\/&]/\\&/g' | sed -e ':a;N;$!ba;s/\n/\\n/g'
} }
@ -66,7 +66,7 @@ for version in "${versions[@]}"; do
for v in \ for v in \
windows/windowsservercore-{ltsc2016,1803} \ windows/windowsservercore-{ltsc2016,1803} \
{jessie,stretch} \ {stretch,buster} \
; do ; do
dir="$version/$v" dir="$version/$v"
variant="$(basename "$v")" variant="$(basename "$v")"
@ -75,7 +75,8 @@ for version in "${versions[@]}"; do
case "$variant" in case "$variant" in
windowsservercore-*) template='windowsservercore'; tag="${variant#*-}" ;; windowsservercore-*) template='windowsservercore'; tag="${variant#*-}" ;;
*) template='debian'; tag="$variant" ;; stretch) template='debian'; tag="${variant}" ;;
*) template='debian'; tag="${variant}-slim" ;;
esac esac
sed -r \ sed -r \