Skip to content

Commit fb5f119

Browse files
J0WIyosifkit
authored andcommitted
Add Alpine 3.14
1 parent 761ae37 commit fb5f119

File tree

6 files changed

+47
-11
lines changed

6 files changed

+47
-11
lines changed

2.6/alpine3.12/Dockerfile renamed to 2.6/alpine3.14/Dockerfile

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

2.7/alpine3.12/Dockerfile renamed to 2.7/alpine3.14/Dockerfile

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.0/alpine3.12/Dockerfile renamed to 3.0/alpine3.14/Dockerfile

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile.template

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,28 @@ RUN set -eux; \
136136
patch -p1 -i thread-stack-fix.patch; \
137137
rm thread-stack-fix.patch; \
138138
\
139+
{{
140+
{
141+
"2.6": {
142+
url: "https://github.com/ruby/ruby/pull/3773",
143+
commit: "fcc88da5eb162043adcba552646677d2ab5adf55",
144+
sha256: "62eefa55030788d409003eccd945ccc408f02fe0d71616ed1c1bdcaf7a2f8a54",
145+
},
146+
"2.7": {
147+
url: "https://github.com/ruby/ruby/pull/4359",
148+
commit: "2f4e2ae7e0f8cdf76360493da2c2201f9ec9a7e2",
149+
sha256: "498852b991bf70132205ed37137630dbcad201a33b24a69dac2fb87b9cd5daf0",
150+
},
151+
}[env.version] | if . and env.variant != "alpine3.13" then (
152+
-}}
153+
# https://bugs.ruby-lang.org/issues/17723 (building with autoconf 2.70+ fails)
154+
# {{ .url }}
155+
wget -O 'autoconf-2.70.patch' 'https://github.com/ruby/ruby/commit/{{ .commit }}.patch'; \
156+
echo '{{ .sha256 }} *autoconf-2.70.patch' | sha256sum --check --strict; \
157+
patch -p1 -i autoconf-2.70.patch; \
158+
rm autoconf-2.70.patch; \
159+
\
160+
{{ ) else "" end -}}
139161
# the configure script does not detect isnan/isinf as macros
140162
export ac_cv_func_isnan=yes ac_cv_func_isinf=yes; \
141163
\

versions.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"slim-buster",
77
"stretch",
88
"slim-stretch",
9-
"alpine3.13",
10-
"alpine3.12"
9+
"alpine3.14",
10+
"alpine3.13"
1111
],
1212
"version": "2.6.8"
1313
},
@@ -16,8 +16,8 @@
1616
"variants": [
1717
"buster",
1818
"slim-buster",
19-
"alpine3.13",
20-
"alpine3.12"
19+
"alpine3.14",
20+
"alpine3.13"
2121
],
2222
"version": "2.7.4"
2323
},
@@ -26,8 +26,8 @@
2626
"variants": [
2727
"buster",
2828
"slim-buster",
29-
"alpine3.13",
30-
"alpine3.12"
29+
"alpine3.14",
30+
"alpine3.13"
3131
],
3232
"version": "3.0.2"
3333
}

versions.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ for version in "${versions[@]}"; do
7474
else empty end
7575
| ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893
7676
(
77-
"3.13",
78-
"3.12"
77+
"3.14",
78+
"3.13"
7979
| "alpine" + .)
8080
],
8181
}

0 commit comments

Comments
 (0)