Skip to content

Commit 9c5f02d

Browse files
authored
[ruby, ruby-rails-postgres] - Add support for debian trixie(13) (#358)
* [ruby, ruby-rails-postgres] - Add support for debian trixie(13) * Restart smoke tests
1 parent c762b6a commit 9c5f02d

File tree

6 files changed

+17
-9
lines changed

6 files changed

+17
-9
lines changed

src/ruby-rails-postgres/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/devcontainers/ruby:1-${templateOption:imageVariant}
1+
FROM mcr.microsoft.com/devcontainers/ruby:2-${templateOption:imageVariant}
22

33
# Install Rails
44
RUN su vscode -c "gem install rails webdrivers"

src/ruby-rails-postgres/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Develop Ruby on Rails applications with Postgres. Includes a Rails application c
77

88
| Options Id | Description | Type | Default Value |
99
|-----|-----|-----|-----|
10-
| imageVariant | Ruby version (use -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 3.4-bullseye |
10+
| imageVariant | Ruby version (use -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon) : | string | 3.4-trixie |
1111

1212
This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.
1313

src/ruby-rails-postgres/devcontainer-template.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "ruby-rails-postgres",
3-
"version": "4.2.0",
3+
"version": "5.0.0",
44
"name": "Ruby on Rails & Postgres",
55
"description": "Develop Ruby on Rails applications with Postgres. Includes a Rails application container and PostgreSQL server.",
66
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/ruby-rails-postgres",
@@ -11,6 +11,10 @@
1111
"type": "string",
1212
"description": "Ruby version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):",
1313
"proposals": [
14+
"3-trixie",
15+
"3.4-trixie",
16+
"3.3-trixie",
17+
"3.2-trixie",
1418
"3-bookworm",
1519
"3.4-bookworm",
1620
"3.3-bookworm",
@@ -20,7 +24,7 @@
2024
"3.3-bullseye",
2125
"3.2-bullseye"
2226
],
23-
"default": "3.4-bullseye"
27+
"default": "3.4-trixie"
2428
}
2529
},
2630
"platforms": ["Ruby"],

src/ruby/.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"name": "Ruby",
55
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6-
"image": "mcr.microsoft.com/devcontainers/ruby:1-${templateOption:imageVariant}"
6+
"image": "mcr.microsoft.com/devcontainers/ruby:2-${templateOption:imageVariant}"
77

88
// Features to add to the dev container. More info: https://containers.dev/features.
99
// "features": {},

src/ruby/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Develop Ruby based applications. includes everything you need to get up and runn
77

88
| Options Id | Description | Type | Default Value |
99
|-----|-----|-----|-----|
10-
| imageVariant | Ruby version (use -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 3.4-bullseye |
10+
| imageVariant | Ruby version (use -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon) : | string | 3.4-trixie |
1111

1212
This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.
1313

src/ruby/devcontainer-template.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "ruby",
3-
"version": "4.2.0",
3+
"version": "5.0.0",
44
"name": "Ruby",
55
"description": "Develop Ruby based applications. includes everything you need to get up and running.",
66
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/ruby",
@@ -9,8 +9,12 @@
99
"options": {
1010
"imageVariant": {
1111
"type": "string",
12-
"description": "Ruby version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):",
12+
"description": "Ruby version (use -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon):",
1313
"proposals": [
14+
"3-trixie",
15+
"3.4-trixie",
16+
"3.3-trixie",
17+
"3.2-trixie",
1418
"3-bookworm",
1519
"3.4-bookworm",
1620
"3.3-bookworm",
@@ -20,7 +24,7 @@
2024
"3.3-bullseye",
2125
"3.2-bullseye"
2226
],
23-
"default": "3.4-bullseye"
27+
"default": "3.4-trixie"
2428
}
2529
},
2630
"platforms": ["Ruby"],

0 commit comments

Comments
 (0)