From ee2753742a7f0fac80dc04c9fe5133a9b0ea4ac6 Mon Sep 17 00:00:00 2001 From: J0WI Date: Wed, 16 Jun 2021 23:04:12 +0200 Subject: [PATCH] Add Alpine 3.14 --- 2.6/alpine3.13/Dockerfile | 1 + 2.6/{alpine3.12 => alpine3.14}/Dockerfile | 8 +++++++- 2.7/alpine3.13/Dockerfile | 1 + 2.7/{alpine3.12 => alpine3.14}/Dockerfile | 3 ++- 3.0/alpine3.13/Dockerfile | 1 + 3.0/{alpine3.12 => alpine3.14}/Dockerfile | 3 ++- Dockerfile-alpine.template | 6 ++++++ generate-stackbrew-library.sh | 4 ++-- update.sh | 11 ++++++++++- 9 files changed, 32 insertions(+), 6 deletions(-) rename 2.6/{alpine3.12 => alpine3.14}/Dockerfile (89%) rename 2.7/{alpine3.12 => alpine3.14}/Dockerfile (99%) rename 3.0/{alpine3.12 => alpine3.14}/Dockerfile (99%) diff --git a/2.6/alpine3.13/Dockerfile b/2.6/alpine3.13/Dockerfile index f3e13f3fd8..6d9ac95cbb 100644 --- a/2.6/alpine3.13/Dockerfile +++ b/2.6/alpine3.13/Dockerfile @@ -29,6 +29,7 @@ RUN set -eux; \ ca-certificates \ coreutils \ dpkg-dev dpkg \ + g++ \ gcc \ gdbm-dev \ glib-dev \ diff --git a/2.6/alpine3.12/Dockerfile b/2.6/alpine3.14/Dockerfile similarity index 89% rename from 2.6/alpine3.12/Dockerfile rename to 2.6/alpine3.14/Dockerfile index f6a5902f53..248ec88cf4 100644 --- a/2.6/alpine3.12/Dockerfile +++ b/2.6/alpine3.14/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.14 RUN apk add --no-cache \ gmp-dev @@ -29,6 +29,7 @@ RUN set -eux; \ ca-certificates \ coreutils \ dpkg-dev dpkg \ + g++ \ gcc \ gdbm-dev \ glib-dev \ @@ -67,6 +68,11 @@ RUN set -eux; \ echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ +# https://bugs.ruby-lang.org/issues/17723 (autoconf-2.70.patch) + wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch'; \ + echo '62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54 *autoconf-2.70.patch' | sha256sum --check --strict; \ + patch -p1 -i autoconf-2.70.patch; \ + rm autoconf-2.70.patch; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir diff --git a/2.7/alpine3.13/Dockerfile b/2.7/alpine3.13/Dockerfile index f6bdcda93e..874eab81fa 100644 --- a/2.7/alpine3.13/Dockerfile +++ b/2.7/alpine3.13/Dockerfile @@ -29,6 +29,7 @@ RUN set -eux; \ ca-certificates \ coreutils \ dpkg-dev dpkg \ + g++ \ gcc \ gdbm-dev \ glib-dev \ diff --git a/2.7/alpine3.12/Dockerfile b/2.7/alpine3.14/Dockerfile similarity index 99% rename from 2.7/alpine3.12/Dockerfile rename to 2.7/alpine3.14/Dockerfile index 99be65f317..c1aaac6626 100644 --- a/2.7/alpine3.12/Dockerfile +++ b/2.7/alpine3.14/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.14 RUN apk add --no-cache \ gmp-dev @@ -29,6 +29,7 @@ RUN set -eux; \ ca-certificates \ coreutils \ dpkg-dev dpkg \ + g++ \ gcc \ gdbm-dev \ glib-dev \ diff --git a/3.0/alpine3.13/Dockerfile b/3.0/alpine3.13/Dockerfile index 1f004c44e1..7de88e62f6 100644 --- a/3.0/alpine3.13/Dockerfile +++ b/3.0/alpine3.13/Dockerfile @@ -29,6 +29,7 @@ RUN set -eux; \ ca-certificates \ coreutils \ dpkg-dev dpkg \ + g++ \ gcc \ gdbm-dev \ glib-dev \ diff --git a/3.0/alpine3.12/Dockerfile b/3.0/alpine3.14/Dockerfile similarity index 99% rename from 3.0/alpine3.12/Dockerfile rename to 3.0/alpine3.14/Dockerfile index 52ccc65880..880c666aa7 100644 --- a/3.0/alpine3.12/Dockerfile +++ b/3.0/alpine3.14/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.14 RUN apk add --no-cache \ gmp-dev @@ -29,6 +29,7 @@ RUN set -eux; \ ca-certificates \ coreutils \ dpkg-dev dpkg \ + g++ \ gcc \ gdbm-dev \ glib-dev \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 71bff794d5..5f72433948 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -30,6 +30,7 @@ RUN set -eux; \ ca-certificates \ coreutils \ dpkg-dev dpkg \ + g++ \ gcc \ gdbm-dev \ glib-dev \ @@ -68,6 +69,11 @@ RUN set -eux; \ echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \ patch -p1 -i thread-stack-fix.patch; \ rm thread-stack-fix.patch; \ +# https://bugs.ruby-lang.org/issues/17723 (autoconf-2.70.patch) + wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch'; \ + echo '62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54 *autoconf-2.70.patch' | sha256sum --check --strict; \ + patch -p1 -i autoconf-2.70.patch; \ + rm autoconf-2.70.patch; \ \ # hack in "ENABLE_PATH_CHECK" disabling to suppress: # warning: Insecure world writable dir diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 3067c43953..0e586440e8 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.13' +defaultAlpineVersion='3.14' 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.13,3.12} \ + alpine{3.14,3.13} \ ; do dir="$version/$v" variant="$(basename "$v")" diff --git a/update.sh b/update.sh index f34bdc8fab..3b9d085ce2 100755 --- a/update.sh +++ b/update.sh @@ -58,7 +58,7 @@ for version in "${versions[@]}"; do echo "$version: $fullVersion; $shaVal" for v in \ - alpine{3.13,3.12} \ + alpine{3.14,3.13} \ {stretch,buster}{/slim,} \ ; do dir="$version/$v" @@ -89,6 +89,15 @@ for version in "${versions[@]}"; do stretch/slim) sed -i -e '/libgdbm-compat-dev/d' "$dir/Dockerfile" ;; + alpine3.13) + sed -i -e '/autoconf-2.70.patch/d' "$dir/Dockerfile" + ;; + esac + + case "$version" in + '2.7'|'3.0') + sed -i -e '/autoconf-2.70.patch/d' "$dir/Dockerfile" + ;; esac # https://github.com/docker-library/ruby/issues/246