Skip to content

Commit 9fa3f32

Browse files
authored
Merge pull request #417 from wheatevo/add-alpine-3-18
Add Alpine 3.18
2 parents 4041b21 + 10e743e commit 9fa3f32

4 files changed

Lines changed: 10 additions & 11 deletions

File tree

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

‎versions.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"slim-bullseye",
2929
"buster",
3030
"slim-buster",
31-
"alpine3.17",
32-
"alpine3.16"
31+
"alpine3.18",
32+
"alpine3.17"
3333
],
3434
"version": "3.1.4"
3535
},
@@ -72,8 +72,8 @@
7272
"slim-bullseye",
7373
"buster",
7474
"slim-buster",
75-
"alpine3.17",
76-
"alpine3.16"
75+
"alpine3.18",
76+
"alpine3.17"
7777
],
7878
"version": "3.2.2"
7979
}

‎versions.sh‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,14 @@ for version in "${versions[@]}"; do
7575
empty # trailing comma hack
7676
| ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893
7777
(
78-
# Alpine 3.17 defaults to OpenSSL 3 which is not supported (yet?) by Ruby 2.7 or 3.0
78+
# Alpine 3.17+ defaults to OpenSSL 3 which is not supported (yet?) by Ruby 2.7 or 3.0
7979
# https://bugs.ruby-lang.org/issues/18658
8080
# https://github.com/docker-library/ruby/pull/392#issuecomment-1329896174
81-
if [ "2.7", "3.0" ] | index(env.version) then empty else
81+
if [ "2.7", "3.0" ] | index(env.version) then "3.16" else
82+
"3.18",
8283
"3.17",
8384
empty # trailing comma hack
84-
end,
85-
"3.16",
86-
empty # trailing comma hack
85+
end
8786
| "alpine" + .)
8887
],
8988
}

0 commit comments

Comments
 (0)