Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit 4a6707d

Browse files
bamurtaughbamurtaugh
andauthored
Drop Ruby 2.6 EOL (#1433)
* EOL Ruby 2.6 * Update definitionVersion Co-authored-by: bamurtaugh <[email protected]>
1 parent 508eee6 commit 4a6707d

File tree

5 files changed

+7
-11
lines changed

5 files changed

+7
-11
lines changed

containers/ruby/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.1, 3.0, 2, 2.7, 2.6, 3-bullseye, 3.1-bullseye, 3.0-bullseye, 2-bullseye, 2.7-bullseye, 2.6-bullseye, 3-buster, 3.1-buster, 3.0-buster, 2-buster, 2.7-buster, 2.6-buster
1+
# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.1, 3.0, 2, 2.7, 3-bullseye, 3.1-bullseye, 3.0-bullseye, 2-bullseye, 2.7-bullseye, 3-buster, 3.1-buster, 3.0-buster, 2-buster, 2.7-buster
22
ARG VARIANT=2-bullseye
33
FROM mcr.microsoft.com/vscode/devcontainers/ruby:${VARIANT}
44

containers/ruby/.devcontainer/base.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.1, 3.0, 2, 2.7, 2.6, 3-bullseye, 3.1-bullseye, 3.0-bullseye, 2-bullseye, 2.7-bullseye, 2.6-bullseye, 3-buster, 3.1-buster, 3.0-buster, 2-buster, 2.7-buster, 2.6-buster
1+
# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.1, 3.0, 2, 2.7, 3-bullseye, 3.1-bullseye, 3.0-bullseye, 2-bullseye, 2.7-bullseye, 3-buster, 3.1-buster, 3.0-buster, 2-buster, 2.7-buster
22
ARG VARIANT=2-bullseye
33
FROM ruby:${VARIANT}
44

containers/ruby/.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"build": {
44
"dockerfile": "Dockerfile",
55
"args": {
6-
// Update 'VARIANT' to pick a Ruby version: 3, 3.1, 3.0, 2, 2.7, 2.6
6+
// Update 'VARIANT' to pick a Ruby version: 3, 3.1, 3.0, 2, 2.7
77
// Append -bullseye or -buster to pin to an OS version.
88
// Use -bullseye variants on local on arm64/Apple Silicon.
99
"VARIANT": "3-bullseye",

containers/ruby/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
| *Categories* | Core, Languages |
1111
| *Definition type* | Dockerfile |
1212
| *Published images* | mcr.microsoft.com/vscode/devcontainers/ruby |
13-
| *Available image variants* | 3 / 3-bullseye, 3.1 / 3.1-bullseye, 3.0 / 3.0-bullseye, 2 / 2-bullseye, 2.7 / 2.7-bullseye, 2.6 / 2.7-bullseye, 3-buster, 3.1-buster, 3.0-buster, 2-buster, 2.7-buster, 2.6-buster ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/ruby/tags/list)) |
13+
| *Available image variants* | 3 / 3-bullseye, 3.1 / 3.1-bullseye, 3.0 / 3.0-bullseye, 2 / 2-bullseye, 2.7 / 2.7-bullseye, 2.6 / 2.7-bullseye, 3-buster, 3.1-buster, 3.0-buster, 2-buster, 2.7-buster ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/ruby/tags/list)) |
1414
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye` variants |
1515
| *Works in Codespaces* | Yes |
1616
| *Container host OS support* | Linux, macOS, Windows |
@@ -36,7 +36,6 @@ You can also directly reference pre-built versions of `.devcontainer/base.Docker
3636
- `mcr.microsoft.com/vscode/devcontainers/ruby:3.0` (or `3.0-bullseye`, `3.0-buster` to pin to an OS version)
3737
- `mcr.microsoft.com/vscode/devcontainers/ruby:2` (or `2-bullseye`, `2-buster` to pin to an OS version)
3838
- `mcr.microsoft.com/vscode/devcontainers/ruby:2.7` (or `2.7-bullseye`, `2.7-buster` to pin to an OS version)
39-
- `mcr.microsoft.com/vscode/devcontainers/ruby:2.6` (or `2.6-bullseye`, `2.6-buster` to pin to an OS version)
4039

4140
You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
4241

containers/ruby/definition-manifest.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
{
2-
"variants": ["3.1-bullseye", "3.0-bullseye", "2.7-bullseye", "2.6-bullseye", "3.1-buster", "3.0-buster", "2.7-buster", "2.6-buster"],
3-
"definitionVersion": "0.203.2",
2+
"variants": ["3.1-bullseye", "3.0-bullseye", "2.7-bullseye", "3.1-buster", "3.0-buster", "2.7-buster"],
3+
"definitionVersion": "0.203.3",
44
"build": {
55
"latest": "3.1-bullseye",
66
"rootDistro": "debian",
77
"architectures": {
88
"3.1-bullseye": ["linux/amd64", "linux/arm64"],
99
"3.0-bullseye": ["linux/amd64", "linux/arm64"],
1010
"2.7-bullseye": ["linux/amd64", "linux/arm64"],
11-
"2.6-bullseye": ["linux/amd64", "linux/arm64"],
1211
"3.1-buster": ["linux/amd64"],
1312
"3.0-buster": ["linux/amd64"],
14-
"2.7-buster": ["linux/amd64"],
15-
"2.6-buster": ["linux/amd64"]
13+
"2.7-buster": ["linux/amd64"]
1614
},
1715
"tags": [
1816
"ruby:${VERSION}-${VARIANT}"
@@ -32,7 +30,6 @@
3230
"ruby:${VERSION}-2.7",
3331
"ruby:${VERSION}-2-bullseye"
3432
],
35-
"2.6-bullseye": [ "ruby:${VERSION}-2.6" ],
3633
"3.1-buster": [
3734
"ruby:${VERSION}-3-buster",
3835
"ruby:${VERSION}-buster"

0 commit comments

Comments
 (0)