Skip to content

Commit 39e2e8f

Browse files
Kaniska244Kaniska244
authored
[ruby] - Add support for debian trixie(13) (#1522)
1 parent c5dc00e commit 39e2e8f

File tree

4 files changed

+45
-20
lines changed

4 files changed

+45
-20
lines changed

‎src/ruby/.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# [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
2-
ARG VARIANT=3-bookworm
2+
ARG VARIANT=3-trixie
33
FROM ruby:${VARIANT}
44

55
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

‎src/ruby/.devcontainer/devcontainer-lock.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"features": {
33
"ghcr.io/devcontainers/features/common-utils:2": {
4-
"version": "2.5.3",
5-
"resolved": "ghcr.io/devcontainers/features/common-utils@sha256:3cf7ca93154faf9bdb128f3009cf1d1a91750ec97cc52082cf5d4edef5451f85",
6-
"integrity": "sha256:3cf7ca93154faf9bdb128f3009cf1d1a91750ec97cc52082cf5d4edef5451f85"
4+
"version": "2.5.4",
5+
"resolved": "ghcr.io/devcontainers/features/common-utils@sha256:00fd45550f578d9d515044d9e2226e908dbc3d7aa6fcb9dee4d8bdb60be114cf",
6+
"integrity": "sha256:00fd45550f578d9d515044d9e2226e908dbc3d7aa6fcb9dee4d8bdb60be114cf"
77
},
88
"ghcr.io/devcontainers/features/git:1": {
99
"version": "1.3.4",
@@ -16,9 +16,9 @@
1616
"integrity": "sha256:3c35dff2aedeaeb86f03e10c265c29b56a1b3609324d83d6e901dbb6032543a4"
1717
},
1818
"ghcr.io/devcontainers/features/ruby:1": {
19-
"version": "1.3.1",
20-
"resolved": "ghcr.io/devcontainers/features/ruby@sha256:810d7c68f9393ebe9aaa0ec51ed7172c1ef7e3a73d8bb7c6ebf2b220e183480f",
21-
"integrity": "sha256:810d7c68f9393ebe9aaa0ec51ed7172c1ef7e3a73d8bb7c6ebf2b220e183480f"
19+
"version": "1.3.2",
20+
"resolved": "ghcr.io/devcontainers/features/ruby@sha256:1c9bbde293ba6f21449a58be34a358ffa2b3846f31cb3146409b26ab3f13e1a2",
21+
"integrity": "sha256:1c9bbde293ba6f21449a58be34a358ffa2b3846f31cb3146409b26ab3f13e1a2"
2222
}
2323
}
2424
}

‎src/ruby/README.md‎

Lines changed: 9 additions & 9 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-bullseye, 3.4-bullseye, 3.3-bullseye, 3.2-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/ruby/tags/list)) |
12+
| *Available image variants* | 3 / 3-trixie, 3.4 / 3.4-trixie, 3.3 / 3.3-trixie, 3.2 / 3.2-trixie, 3-bookworm, 3.4-bookworm, 3.3-bookworm, 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 |
@@ -22,20 +22,20 @@ See **[history](history)** for information on the contents of published images.
2222
You can directly reference pre-built versions of `Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own `Dockerfile` to one of the following. An example `Dockerfile` is included in this repository.
2323

2424
- `mcr.microsoft.com/devcontainers/ruby` (latest)
25-
- `mcr.microsoft.com/devcontainers/ruby:3` (or `3-bookworm`, `3-bullseye` to pin to an OS version)
26-
- `mcr.microsoft.com/devcontainers/ruby:3.4` (or `3.4-bookworm`, `3.4-bullseye` to pin to an OS version)
27-
- `mcr.microsoft.com/devcontainers/ruby:3.3` (or `3.3-bookworm`, `3.3-bullseye` to pin to an OS version)
28-
- `mcr.microsoft.com/devcontainers/ruby:3.2` (or `3.2-bookworm`, `3.2-bullseye` to pin to an OS version)
25+
- `mcr.microsoft.com/devcontainers/ruby:3` (or `3-trixie`, `3-bookworm`, `3-bullseye` to pin to an OS version)
26+
- `mcr.microsoft.com/devcontainers/ruby:3.4` (or `3.4-trixie`, `3.4-bookworm`, `3.4-bullseye` to pin to an OS version)
27+
- `mcr.microsoft.com/devcontainers/ruby:3.3` (or `3.3-trixie`, `3.3-bookworm`, `3.3-bullseye` to pin to an OS version)
28+
- `mcr.microsoft.com/devcontainers/ruby:3.2` (or `3.2-trixie`, `3.2-bookworm`, `3.2-bullseye` to pin to an OS version)
2929

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

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

34-
- `mcr.microsoft.com/devcontainers/ruby:1-3` (or `1-3-bookworm`, `1-3-bullseye` to pin to an OS version)
35-
- `mcr.microsoft.com/devcontainers/ruby:1.4-3` (or `1.4-3-bookworm`, `1.4-3-bullseye` to pin to an OS version)
36-
- `mcr.microsoft.com/devcontainers/ruby:1.4.5-3` (or `1.4.5-3-bookworm`, `1.4.5-3-bullseye` to pin to an OS version)
34+
- `mcr.microsoft.com/devcontainers/ruby:2-3` (or `2-3-trixie`, `2-3-bookworm`, `2-3-bullseye` to pin to an OS version)
35+
- `mcr.microsoft.com/devcontainers/ruby:2.0-3` (or `2.0-3-trixie`, `2.0-3-bookworm`, `2.0-3-bullseye` to pin to an OS version)
36+
- `mcr.microsoft.com/devcontainers/ruby:2.0.0-3` (or `2.0.0-3-trixie`, `2.0.0-3-bookworm`, `2.0.0-3-bullseye` to pin to an OS version)
3737

38-
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.4`). 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.
38+
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. `2-3.4`). 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.
3939

4040
See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/ruby/tags/list).
4141

‎src/ruby/manifest.json‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
2-
"version": "1.4.5",
2+
"version": "2.0.0",
33
"variants": [
4+
"3.4-trixie",
5+
"3.3-trixie",
6+
"3.2-trixie",
47
"3.4-bookworm",
58
"3.3-bookworm",
69
"3.2-bookworm",
@@ -12,6 +15,18 @@
1215
"latest": "3.4-bookworm",
1316
"rootDistro": "debian",
1417
"architectures": {
18+
"3.4-trixie": [
19+
"linux/amd64",
20+
"linux/arm64"
21+
],
22+
"3.3-trixie": [
23+
"linux/amd64",
24+
"linux/arm64"
25+
],
26+
"3.2-trixie": [
27+
"linux/amd64",
28+
"linux/arm64"
29+
],
1530
"3.4-bookworm": [
1631
"linux/amd64",
1732
"linux/arm64"
@@ -41,17 +56,27 @@
4156
"ruby:${VERSION}-${VARIANT}"
4257
],
4358
"variantTags": {
44-
"3.4-bookworm": [
59+
"3.4-trixie": [
4560
"ruby:${VERSION}-3",
4661
"ruby:${VERSION}-3.4",
62+
"ruby:${VERSION}-3-trixie",
63+
"ruby:${VERSION}-trixie"
64+
],
65+
"3.3-trixie": [
66+
"ruby:${VERSION}-3.3"
67+
],
68+
"3.2-trixie": [
69+
"ruby:${VERSION}-3.2"
70+
],
71+
"3.4-bookworm": [
4772
"ruby:${VERSION}-3-bookworm",
4873
"ruby:${VERSION}-bookworm"
4974
],
5075
"3.3-bookworm": [
51-
"ruby:${VERSION}-3.3"
76+
"ruby:${VERSION}-3.3-bookworm"
5277
],
5378
"3.2-bookworm": [
54-
"ruby:${VERSION}-3.2"
79+
"ruby:${VERSION}-3.2-bookworm"
5580
],
5681
"3.4-bullseye": [
5782
"ruby:${VERSION}-3-bullseye",

0 commit comments

Comments
 (0)