diff --git a/src/ruby-rails-postgres/.devcontainer/Dockerfile b/src/ruby-rails-postgres/.devcontainer/Dockerfile index d981f177..47767878 100644 --- a/src/ruby-rails-postgres/.devcontainer/Dockerfile +++ b/src/ruby-rails-postgres/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/devcontainers/ruby:1-${templateOption:imageVariant} +FROM mcr.microsoft.com/devcontainers/ruby:2-${templateOption:imageVariant} # Install Rails RUN su vscode -c "gem install rails webdrivers" diff --git a/src/ruby-rails-postgres/README.md b/src/ruby-rails-postgres/README.md index 0cc5f1f7..deb86ec2 100644 --- a/src/ruby-rails-postgres/README.md +++ b/src/ruby-rails-postgres/README.md @@ -7,7 +7,7 @@ Develop Ruby on Rails applications with Postgres. Includes a Rails application c | Options Id | Description | Type | Default Value | |-----|-----|-----|-----| -| imageVariant | Ruby version (use -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 3.4-bullseye | +| imageVariant | Ruby version (use -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon) : | string | 3.4-trixie | This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata. diff --git a/src/ruby-rails-postgres/devcontainer-template.json b/src/ruby-rails-postgres/devcontainer-template.json index fad846b4..e277e7ef 100644 --- a/src/ruby-rails-postgres/devcontainer-template.json +++ b/src/ruby-rails-postgres/devcontainer-template.json @@ -1,6 +1,6 @@ { "id": "ruby-rails-postgres", - "version": "4.2.0", + "version": "5.0.0", "name": "Ruby on Rails & Postgres", "description": "Develop Ruby on Rails applications with Postgres. Includes a Rails application container and PostgreSQL server.", "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/ruby-rails-postgres", @@ -11,6 +11,10 @@ "type": "string", "description": "Ruby version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):", "proposals": [ + "3-trixie", + "3.4-trixie", + "3.3-trixie", + "3.2-trixie", "3-bookworm", "3.4-bookworm", "3.3-bookworm", @@ -20,7 +24,7 @@ "3.3-bullseye", "3.2-bullseye" ], - "default": "3.4-bullseye" + "default": "3.4-trixie" } }, "platforms": ["Ruby"], diff --git a/src/ruby/.devcontainer/devcontainer.json b/src/ruby/.devcontainer/devcontainer.json index 13fbe020..eead7386 100644 --- a/src/ruby/.devcontainer/devcontainer.json +++ b/src/ruby/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ { "name": "Ruby", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/ruby:1-${templateOption:imageVariant}" + "image": "mcr.microsoft.com/devcontainers/ruby:2-${templateOption:imageVariant}" // Features to add to the dev container. More info: https://containers.dev/features. // "features": {}, diff --git a/src/ruby/README.md b/src/ruby/README.md index 03cb37fd..9857029f 100644 --- a/src/ruby/README.md +++ b/src/ruby/README.md @@ -7,7 +7,7 @@ Develop Ruby based applications. includes everything you need to get up and runn | Options Id | Description | Type | Default Value | |-----|-----|-----|-----| -| imageVariant | Ruby version (use -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 3.4-bullseye | +| imageVariant | Ruby version (use -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon) : | string | 3.4-trixie | This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata. diff --git a/src/ruby/devcontainer-template.json b/src/ruby/devcontainer-template.json index 59bac949..d3ae4051 100644 --- a/src/ruby/devcontainer-template.json +++ b/src/ruby/devcontainer-template.json @@ -1,6 +1,6 @@ { "id": "ruby", - "version": "4.2.0", + "version": "5.0.0", "name": "Ruby", "description": "Develop Ruby based applications. includes everything you need to get up and running.", "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/ruby", @@ -9,8 +9,12 @@ "options": { "imageVariant": { "type": "string", - "description": "Ruby version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):", + "description": "Ruby version (use -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon):", "proposals": [ + "3-trixie", + "3.4-trixie", + "3.3-trixie", + "3.2-trixie", "3-bookworm", "3.4-bookworm", "3.3-bookworm", @@ -20,7 +24,7 @@ "3.3-bullseye", "3.2-bullseye" ], - "default": "3.4-bullseye" + "default": "3.4-trixie" } }, "platforms": ["Ruby"],