Skip to content

Commit aebe655

Browse files
authored
[Ruby]- EOL v3.1 changes (#1361)
* Ruby 3.1 EOL changes * Correcting the readme file change * Removing Ruby 3.1 references from Dockefile
1 parent 9a1ee1a commit aebe655

File tree

3 files changed

+6
-20
lines changed

3 files changed

+6
-20
lines changed

src/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.4, 3.3, 3.2, 3.1, 3-bookworm, 3.4-bookworm, 3.3-bookworm, 3.2-bookworm, 3.1-bookworm, 3-bullseye, 3.4-bullseye, 3.3-bullseye, 3.2-bullseye, 3.1-bullseye, 3-buster, 3.2-buster 3.1-buster
1+
# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.4, 3.3, 3.2, 3-bookworm, 3.4-bookworm, 3.3-bookworm, 3.2-bookworm, 3-bullseye, 3.4-bullseye, 3.3-bullseye, 3.2-bullseye, 3-buster, 3.2-buster
22
ARG VARIANT=3-bookworm
33
FROM ruby:${VARIANT}
44

src/ruby/README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
| *Categories* | Core, Languages |
1010
| *Image type* | Dockerfile |
1111
| *Published images* | mcr.microsoft.com/devcontainers/ruby |
12-
| *Available image variants* | 3 / 3-bookworm, 3.4 / 3.4-bookworm, 3.3 / 3.3-bookworm, 3.2 / 3.2-bookworm, 3.1 / 3.1-bookworm, 3-bullseye, 3.4-bullseye, 3.3-bullseye, 3.2-bullseye, 3.1-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/ruby/tags/list)) |
12+
| *Available image variants* | 3 / 3-bookworm, 3.4 / 3.4-bookworm, 3.3 / 3.3-bookworm, 3.2 / 3.2-bookworm, 3-bullseye, 3.4-bullseye, 3.3-bullseye, 3.2-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/ruby/tags/list)) |
1313
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm` , and `bullseye` variants |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Debian |
@@ -26,15 +26,14 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
2626
- `mcr.microsoft.com/devcontainers/ruby:3.4` (or `3.4-bookworm`, `3.4-bullseye` to pin to an OS version)
2727
- `mcr.microsoft.com/devcontainers/ruby:3.3` (or `3.3-bookworm`, `3.3-bullseye` to pin to an OS version)
2828
- `mcr.microsoft.com/devcontainers/ruby:3.2` (or `3.2-bookworm`, `3.2-bullseye` to pin to an OS version)
29-
- `mcr.microsoft.com/devcontainers/ruby:3.1` (or `3.1-bookworm`, `3.1-bullseye` to pin to an OS version)
3029

3130
Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
3231

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

3534
- `mcr.microsoft.com/devcontainers/ruby:1-3` (or `1-3-bookworm`, `1-3-bullseye` to pin to an OS version)
36-
- `mcr.microsoft.com/devcontainers/ruby:1.0-3` (or `1.0-3-bookworm`, `1.0-3-bullseye` to pin to an OS version)
37-
- `mcr.microsoft.com/devcontainers/ruby:1.0.0-3` (or `1.0.0-3-bookworm`, `1.0.0-3-bullseye` to pin to an OS version)
35+
- `mcr.microsoft.com/devcontainers/ruby:1.3-3` (or `1.3-3-bookworm`, `1.3-3-bullseye` to pin to an OS version)
36+
- `mcr.microsoft.com/devcontainers/ruby:1.3.0-3` (or `1.3.0-3-bookworm`, `1.3.0-3-bullseye` to pin to an OS version)
3837

3938
However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `1-3.2`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
4039

src/ruby/manifest.json

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
{
2-
"version": "1.2.0",
2+
"version": "1.3.0",
33
"variants": [
44
"3.4-bookworm",
55
"3.3-bookworm",
66
"3.2-bookworm",
7-
"3.1-bookworm",
87
"3.4-bullseye",
98
"3.3-bullseye",
10-
"3.2-bullseye",
11-
"3.1-bullseye"
9+
"3.2-bullseye"
1210
],
1311
"build": {
1412
"latest": "3.4-bookworm",
@@ -26,10 +24,6 @@
2624
"linux/amd64",
2725
"linux/arm64"
2826
],
29-
"3.1-bookworm": [
30-
"linux/amd64",
31-
"linux/arm64"
32-
],
3327
"3.4-bullseye": [
3428
"linux/amd64",
3529
"linux/arm64"
@@ -41,10 +35,6 @@
4135
"3.2-bullseye": [
4236
"linux/amd64",
4337
"linux/arm64"
44-
],
45-
"3.1-bullseye": [
46-
"linux/amd64",
47-
"linux/arm64"
4838
]
4939
},
5040
"tags": [
@@ -63,9 +53,6 @@
6353
"3.2-bookworm": [
6454
"ruby:${VERSION}-3.2"
6555
],
66-
"3.1-bookworm": [
67-
"ruby:${VERSION}-3.1"
68-
],
6956
"3.4-bullseye": [
7057
"ruby:${VERSION}-3-bullseye",
7158
"ruby:${VERSION}-bullseye"

0 commit comments

Comments
 (0)