Skip to content

Commit 10e743e

Browse files
committed
Remove Alpine 3.16 from most versions (max 2 supported Alpine versions at a time), fix ordering
1 parent 3ac53a7 commit 10e743e

4 files changed

Lines changed: 5 additions & 315 deletions

File tree

‎3.1/alpine3.16/Dockerfile‎

Lines changed: 0 additions & 141 deletions
This file was deleted.

‎3.2/alpine3.16/Dockerfile‎

Lines changed: 0 additions & 165 deletions
This file was deleted.

‎versions.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
"buster",
3030
"slim-buster",
3131
"alpine3.18",
32-
"alpine3.17",
33-
"alpine3.16"
32+
"alpine3.17"
3433
],
3534
"version": "3.1.4"
3635
},
@@ -74,8 +73,7 @@
7473
"buster",
7574
"slim-buster",
7675
"alpine3.18",
77-
"alpine3.17",
78-
"alpine3.16"
76+
"alpine3.17"
7977
],
8078
"version": "3.2.2"
8179
}

‎versions.sh‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,11 @@ for version in "${versions[@]}"; do
7878
# 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
82-
"3.17",
81+
if [ "2.7", "3.0" ] | index(env.version) then "3.16" else
8382
"3.18",
83+
"3.17",
8484
empty # trailing comma hack
85-
end,
86-
"3.16",
87-
empty # trailing comma hack
85+
end
8886
| "alpine" + .)
8987
],
9088
}

0 commit comments

Comments
 (0)