Update to Alpine 3.9 (dropping Alpine 3.7)

This skips Ruby 2.3 since it doesn't support the OpenSSL version in Alpine 3.9, but it will be EOL soon anyhow (so it'll just stay on Alpine 3.7/3.8).
This commit is contained in:
Tianon Gravi 2019-01-30 14:48:46 -08:00
parent 3e2c9f3f3c
commit f29d8d2181
12 changed files with 35 additions and 28 deletions

View File

@ -4,18 +4,18 @@ services: docker
env:
- VERSION=2.6 VARIANT=stretch
- VERSION=2.6 VARIANT=stretch/slim
- VERSION=2.6 VARIANT=alpine3.9
- VERSION=2.6 VARIANT=alpine3.8
- VERSION=2.6 VARIANT=alpine3.7
- VERSION=2.5 VARIANT=stretch
- VERSION=2.5 VARIANT=stretch/slim
- VERSION=2.5 VARIANT=alpine3.9
- VERSION=2.5 VARIANT=alpine3.8
- VERSION=2.5 VARIANT=alpine3.7
- VERSION=2.4 VARIANT=stretch
- VERSION=2.4 VARIANT=stretch/slim
- VERSION=2.4 VARIANT=jessie
- VERSION=2.4 VARIANT=jessie/slim
- VERSION=2.4 VARIANT=alpine3.9
- VERSION=2.4 VARIANT=alpine3.8
- VERSION=2.4 VARIANT=alpine3.7
- VERSION=2.3 VARIANT=stretch
- VERSION=2.3 VARIANT=stretch/slim
- VERSION=2.3 VARIANT=jessie

View File

@ -30,13 +30,13 @@ RUN set -ex \
glib-dev \
libc-dev \
libffi-dev \
libressl \
libressl-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
ncurses-dev \
libressl \
libressl-dev \
procps \
readline-dev \
ruby \

View File

@ -30,13 +30,13 @@ RUN set -ex \
glib-dev \
libc-dev \
libffi-dev \
libressl \
libressl-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
ncurses-dev \
libressl \
libressl-dev \
procps \
readline-dev \
ruby \

View File

@ -30,13 +30,13 @@ RUN set -ex \
glib-dev \
libc-dev \
libffi-dev \
libressl \
libressl-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
ncurses-dev \
libressl \
libressl-dev \
procps \
readline-dev \
ruby \

View File

@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.9
# skip installing gem documentation
RUN mkdir -p /usr/local/etc \
@ -30,13 +30,13 @@ RUN set -ex \
glib-dev \
libc-dev \
libffi-dev \
libressl \
libressl-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
ncurses-dev \
openssl \
openssl-dev \
procps \
readline-dev \
ruby \

View File

@ -30,13 +30,13 @@ RUN set -ex \
glib-dev \
libc-dev \
libffi-dev \
libressl \
libressl-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
ncurses-dev \
libressl \
libressl-dev \
procps \
readline-dev \
ruby \

View File

@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.9
# skip installing gem documentation
RUN mkdir -p /usr/local/etc \
@ -30,13 +30,13 @@ RUN set -ex \
glib-dev \
libc-dev \
libffi-dev \
libressl \
libressl-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
ncurses-dev \
openssl \
openssl-dev \
procps \
readline-dev \
ruby \

View File

@ -29,13 +29,13 @@ RUN set -ex \
glib-dev \
libc-dev \
libffi-dev \
libressl \
libressl-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
ncurses-dev \
libressl \
libressl-dev \
procps \
readline-dev \
ruby \

View File

@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.9
# skip installing gem documentation
RUN mkdir -p /usr/local/etc \
@ -29,13 +29,13 @@ RUN set -ex \
glib-dev \
libc-dev \
libffi-dev \
libressl \
libressl-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
ncurses-dev \
openssl \
openssl-dev \
procps \
readline-dev \
ruby \

View File

@ -30,13 +30,13 @@ RUN set -ex \
glib-dev \
libc-dev \
libffi-dev \
libressl \
libressl-dev \
libxml2-dev \
libxslt-dev \
linux-headers \
make \
ncurses-dev \
openssl \
openssl-dev \
procps \
readline-dev \
ruby \

View File

@ -7,9 +7,9 @@ declare -A aliases=(
)
defaultDebianSuite='stretch'
defaultAlpineVersion='3.8'
defaultAlpineVersion='3.9'
declare -A alpineVersion=(
#[2.5]='3.8'
[2.3]='3.8'
)
self="$(basename "$BASH_SOURCE")"
@ -77,7 +77,7 @@ join() {
for version in "${versions[@]}"; do
for v in \
{stretch,jessie}{,/slim} \
alpine{3.8,3.7,3.6} \
alpine{3.9,3.8,3.7} \
; do
dir="$version/$v"
variant="$(basename "$v")"

View File

@ -70,7 +70,7 @@ for version in "${versions[@]}"; do
echo "$version: $fullVersion; $shaVal"
for v in \
alpine{3.6,3.7,3.8} \
alpine{3.7,3.8,3.9} \
{jessie,stretch}{/slim,} \
; do
dir="$version/$v"
@ -104,6 +104,13 @@ for version in "${versions[@]}"; do
-e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \
"$template" > "$dir/Dockerfile"
case "$variant" in
alpine3.8 | alpine3.7)
# Alpine 3.9+ uses OpenSSL, but 3.8/3.7 still uses LibreSSL
sed -ri -e 's/openssl/libressl/g' "$dir/Dockerfile"
;;
esac
if [ -n "${newEnoughRubygems[$version]:-}" ]; then
sed -ri -e '/RUBYGEMS_VERSION/d' "$dir/Dockerfile"
fi