Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Alpine 3.9 (dropping Alpine 3.7) #262

Merged
merged 1 commit into from
Jan 31, 2019
Merged

Update to Alpine 3.9 (dropping Alpine 3.7) #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions 2.3/alpine3.7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions 2.3/alpine3.8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions 2.4/alpine3.8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions 2.4/alpine3.7/Dockerfile → 2.4/alpine3.9/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.9

# skip installing gem documentation
RUN mkdir -p /usr/local/etc \
Expand Down Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions 2.5/alpine3.8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions 2.5/alpine3.7/Dockerfile → 2.5/alpine3.9/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.9

# skip installing gem documentation
RUN mkdir -p /usr/local/etc \
Expand Down Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions 2.6/alpine3.8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions 2.6/alpine3.7/Dockerfile → 2.6/alpine3.9/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.9

# skip installing gem documentation
RUN mkdir -p /usr/local/etc \
Expand Down Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions generate-stackbrew-library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")"
Expand Down Expand Up @@ -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")"
Expand Down
9 changes: 8 additions & 1 deletion update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down