From 27938afac28fcb1fc167ddf6ee15520e88d90259 Mon Sep 17 00:00:00 2001 From: J0WI Date: Wed, 10 Jun 2020 23:23:05 +0200 Subject: [PATCH] Add Alpine 3.12 --- 2.5/alpine3.11/Dockerfile | 1 + 2.5/{alpine3.10 => alpine3.12}/Dockerfile | 3 ++- 2.6/alpine3.11/Dockerfile | 1 + 2.6/{alpine3.10 => alpine3.12}/Dockerfile | 3 ++- 2.7/alpine3.11/Dockerfile | 1 + 2.7/{alpine3.10 => alpine3.12}/Dockerfile | 3 ++- Dockerfile-alpine.template | 1 + generate-stackbrew-library.sh | 4 ++-- update.sh | 2 +- 9 files changed, 13 insertions(+), 6 deletions(-) rename 2.5/{alpine3.10 => alpine3.12}/Dockerfile (99%) rename 2.6/{alpine3.10 => alpine3.12}/Dockerfile (99%) rename 2.7/{alpine3.10 => alpine3.12}/Dockerfile (99%) diff --git a/2.5/alpine3.11/Dockerfile b/2.5/alpine3.11/Dockerfile index 9707bb7738..9c077a2e84 100644 --- a/2.5/alpine3.11/Dockerfile +++ b/2.5/alpine3.11/Dockerfile @@ -41,6 +41,7 @@ RUN set -eux; \ ncurses-dev \ openssl \ openssl-dev \ + patch \ procps \ readline-dev \ ruby \ diff --git a/2.5/alpine3.10/Dockerfile b/2.5/alpine3.12/Dockerfile similarity index 99% rename from 2.5/alpine3.10/Dockerfile rename to 2.5/alpine3.12/Dockerfile index 0b50fa1c06..4e72886b1c 100644 --- a/2.5/alpine3.10/Dockerfile +++ b/2.5/alpine3.12/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.10 +FROM alpine:3.12 RUN apk add --no-cache \ gmp-dev @@ -41,6 +41,7 @@ RUN set -eux; \ ncurses-dev \ openssl \ openssl-dev \ + patch \ procps \ readline-dev \ ruby \ diff --git a/2.6/alpine3.11/Dockerfile b/2.6/alpine3.11/Dockerfile index 0fa1ca0569..5f78e80591 100644 --- a/2.6/alpine3.11/Dockerfile +++ b/2.6/alpine3.11/Dockerfile @@ -40,6 +40,7 @@ RUN set -eux; \ ncurses-dev \ openssl \ openssl-dev \ + patch \ procps \ readline-dev \ ruby \ diff --git a/2.6/alpine3.10/Dockerfile b/2.6/alpine3.12/Dockerfile similarity index 99% rename from 2.6/alpine3.10/Dockerfile rename to 2.6/alpine3.12/Dockerfile index dda82a06f6..f59cd698ab 100644 --- a/2.6/alpine3.10/Dockerfile +++ b/2.6/alpine3.12/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.10 +FROM alpine:3.12 RUN apk add --no-cache \ gmp-dev @@ -40,6 +40,7 @@ RUN set -eux; \ ncurses-dev \ openssl \ openssl-dev \ + patch \ procps \ readline-dev \ ruby \ diff --git a/2.7/alpine3.11/Dockerfile b/2.7/alpine3.11/Dockerfile index e075c99ded..0936248b6c 100644 --- a/2.7/alpine3.11/Dockerfile +++ b/2.7/alpine3.11/Dockerfile @@ -40,6 +40,7 @@ RUN set -eux; \ ncurses-dev \ openssl \ openssl-dev \ + patch \ procps \ readline-dev \ ruby \ diff --git a/2.7/alpine3.10/Dockerfile b/2.7/alpine3.12/Dockerfile similarity index 99% rename from 2.7/alpine3.10/Dockerfile rename to 2.7/alpine3.12/Dockerfile index d237a1ad4f..6f45f215f7 100644 --- a/2.7/alpine3.10/Dockerfile +++ b/2.7/alpine3.12/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.10 +FROM alpine:3.12 RUN apk add --no-cache \ gmp-dev @@ -40,6 +40,7 @@ RUN set -eux; \ ncurses-dev \ openssl \ openssl-dev \ + patch \ procps \ readline-dev \ ruby \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 8b46d6afc6..1a72213bd8 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -41,6 +41,7 @@ RUN set -eux; \ ncurses-dev \ openssl \ openssl-dev \ + patch \ procps \ readline-dev \ ruby \ diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index b6bdf9868a..e1b2fe0e2d 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -10,7 +10,7 @@ defaultDebianSuite='buster' declare -A debianSuites=( #[2.7]='buster' ) -defaultAlpineVersion='3.11' +defaultAlpineVersion='3.12' declare -A alpineVersion=( #[2.3]='3.8' ) @@ -80,7 +80,7 @@ join() { for version in "${versions[@]}"; do for v in \ {buster,stretch}{,/slim} \ - alpine{3.11,3.10} \ + alpine{3.12,3.11} \ ; do dir="$version/$v" variant="$(basename "$v")" diff --git a/update.sh b/update.sh index 48a3f3cf39..1df7ba411e 100755 --- a/update.sh +++ b/update.sh @@ -70,7 +70,7 @@ for version in "${versions[@]}"; do echo "$version: $fullVersion; $shaVal" for v in \ - alpine{3.10,3.11} \ + alpine{3.12,3.11} \ {stretch,buster}{/slim,} \ ; do dir="$version/$v"