Skip to content

Add Alpine 3.14 #348

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

Closed
wants to merge 1 commit into from
+32 −6
Closed

Add Alpine 3.14 #348

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
1 change: 1 addition & 0 deletions 2.6/alpine3.13/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@ RUN set -eux; \
ca-certificates \
coreutils \
dpkg-dev dpkg \
g++ \
gcc \
gdbm-dev \
glib-dev \
8 changes: 7 additions & 1 deletion 2.6/alpine3.12/Dockerfile → 2.6/alpine3.14/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions 2.7/alpine3.13/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@ RUN set -eux; \
ca-certificates \
coreutils \
dpkg-dev dpkg \
g++ \
gcc \
gdbm-dev \
glib-dev \
3 changes: 2 additions & 1 deletion 2.7/alpine3.12/Dockerfile → 2.7/alpine3.14/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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 \
1 change: 1 addition & 0 deletions 3.0/alpine3.13/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@ RUN set -eux; \
ca-certificates \
coreutils \
dpkg-dev dpkg \
g++ \
gcc \
gdbm-dev \
glib-dev \
3 changes: 2 additions & 1 deletion 3.0/alpine3.12/Dockerfile → 3.0/alpine3.14/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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 \
6 changes: 6 additions & 0 deletions Dockerfile-alpine.template
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions generate-stackbrew-library.sh
View file
Original file line number Diff line number Diff line change
@@ -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")"
11 changes: 10 additions & 1 deletion update.sh
View file
Original file line number Diff line number Diff line change
@@ -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