File tree 6 files changed +36
-6
lines changed
6 files changed +36
-6
lines changed Original file line number Diff line number Diff line change 1
- FROM alpine:3.12
1
+ FROM alpine:3.14
2
2
3
3
RUN apk add --no-cache \
4
4
gmp-dev
@@ -67,6 +67,11 @@ RUN set -eux; \
67
67
echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \
68
68
patch -p1 -i thread-stack-fix.patch; \
69
69
rm thread-stack-fix.patch; \
70
+ # https://bugs.ruby-lang.org/issues/17723 (autoconf-2.70.patch)
71
+ wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch' ; \
72
+ echo '62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54 *autoconf-2.70.patch' | sha256sum --check --strict; \
73
+ patch -p1 -i autoconf-2.70.patch; \
74
+ rm autoconf-2.70.patch; \
70
75
\
71
76
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
72
77
# warning: Insecure world writable dir
Original file line number Diff line number Diff line change 1
- FROM alpine:3.12
1
+ FROM alpine:3.14
2
2
3
3
RUN apk add --no-cache \
4
4
gmp-dev
@@ -67,6 +67,11 @@ RUN set -eux; \
67
67
echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \
68
68
patch -p1 -i thread-stack-fix.patch; \
69
69
rm thread-stack-fix.patch; \
70
+ # https://bugs.ruby-lang.org/issues/17723 (autoconf-2.70.patch)
71
+ wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/29bbad939939c6dceb804aac667ba372fdee4ef5.patch' ; \
72
+ echo '7dd6142e83d120968d12a0695b1c8f52380fe9bfec99381c2486f6b65c997f30 *autoconf-2.70.patch' | sha256sum --check --strict; \
73
+ patch -p1 -i autoconf-2.70.patch; \
74
+ rm autoconf-2.70.patch; \
70
75
\
71
76
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
72
77
# warning: Insecure world writable dir
Original file line number Diff line number Diff line change 1
- FROM alpine:3.12
1
+ FROM alpine:3.14
2
2
3
3
RUN apk add --no-cache \
4
4
gmp-dev
Original file line number Diff line number Diff line change @@ -68,6 +68,11 @@ RUN set -eux; \
68
68
echo '3ab628a51d92fdf0d2b5835e93564857aea73e0c1de00313864a94a6255cb645 *thread-stack-fix.patch' | sha256sum --check --strict; \
69
69
patch -p1 -i thread-stack-fix.patch; \
70
70
rm thread-stack-fix.patch; \
71
+ # https://bugs.ruby-lang.org/issues/17723 (autoconf-2.70.patch)
72
+ wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/fcc88da5eb162043adcba552646677d2ab5adf55.patch'; \
73
+ echo '62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54 *autoconf-2.70.patch' | sha256sum --check --strict; \
74
+ patch -p1 -i autoconf-2.70.patch; \
75
+ rm autoconf-2.70.patch; \
71
76
\
72
77
# hack in "ENABLE_PATH_CHECK" disabling to suppress:
73
78
# warning: Insecure world writable dir
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ defaultDebianSuite='buster'
10
10
declare -A debianSuites=(
11
11
# [2.7]='buster'
12
12
)
13
- defaultAlpineVersion=' 3.13 '
13
+ defaultAlpineVersion=' 3.14 '
14
14
declare -A alpineVersion=(
15
15
# [2.3]='3.8'
16
16
)
@@ -80,7 +80,7 @@ join() {
80
80
for version in " ${versions[@]} " ; do
81
81
for v in \
82
82
{buster,stretch}{,/slim} \
83
- alpine{3.13 ,3.12 } \
83
+ alpine{3.14 ,3.13 } \
84
84
; do
85
85
dir=" $version /$v "
86
86
variant=" $( basename " $v " ) "
Original file line number Diff line number Diff line change @@ -58,7 +58,7 @@ for version in "${versions[@]}"; do
58
58
echo " $version : $fullVersion ; $shaVal "
59
59
60
60
for v in \
61
- alpine{3.13 ,3.12 } \
61
+ alpine{3.14 ,3.13 } \
62
62
{stretch,buster}{/slim,} \
63
63
; do
64
64
dir=" $version /$v "
@@ -89,6 +89,21 @@ for version in "${versions[@]}"; do
89
89
stretch/slim)
90
90
sed -i -e ' /libgdbm-compat-dev/d' " $dir /Dockerfile"
91
91
;;
92
+ alpine3.13)
93
+ sed -i -e ' /autoconf-2.70.patch/d' " $dir /Dockerfile"
94
+ ;;
95
+ esac
96
+
97
+ case " $version " in
98
+ ' 2.7' )
99
+ sed -i \
100
+ -e ' s/62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54/7dd6142e83d120968d12a0695b1c8f52380fe9bfec99381c2486f6b65c997f30/g' \
101
+ -e ' s/fcc88da5eb162043adcba552646677d2ab5adf55/29bbad939939c6dceb804aac667ba372fdee4ef5/g' \
102
+ " $dir /Dockerfile"
103
+ ;;
104
+ ' 3.0' )
105
+ sed -i -e ' /autoconf-2.70.patch/d' " $dir /Dockerfile"
106
+ ;;
92
107
esac
93
108
94
109
# https://github.com/docker-library/ruby/issues/246
You can’t perform that action at this time.
0 commit comments