From 5331d4e82331b24a7c2f9ac91b1b07345f2d40a4 Mon Sep 17 00:00:00 2001 From: sireeshajonnalagadda Date: Mon, 12 Jan 2026 08:37:40 +0000 Subject: [PATCH 1/4] Adding support for ruby 4.0 --- src/ruby-rails-postgres/.devcontainer/Dockerfile | 2 +- src/ruby-rails-postgres/README.md | 2 +- src/ruby-rails-postgres/devcontainer-template.json | 10 +++++----- src/ruby/.devcontainer/devcontainer.json | 2 +- src/ruby/README.md | 2 +- src/ruby/devcontainer-template.json | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/ruby-rails-postgres/.devcontainer/Dockerfile b/src/ruby-rails-postgres/.devcontainer/Dockerfile index 47767878..dd84a119 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:2-${templateOption:imageVariant} +FROM mcr.microsoft.com/devcontainers/ruby:3-${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 deb86ec2..6a3d0597 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 -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon) : | string | 3.4-trixie | +| imageVariant | Ruby version (use -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon) : | string | 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 e277e7ef..20b64f65 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": "5.0.0", + "version": "6.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,20 +11,20 @@ "type": "string", "description": "Ruby version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):", "proposals": [ - "3-trixie", + "4-trixie", "3.4-trixie", "3.3-trixie", "3.2-trixie", - "3-bookworm", + "4-bookworm", "3.4-bookworm", "3.3-bookworm", "3.2-bookworm", - "3-bullseye", + "4-bullseye", "3.4-bullseye", "3.3-bullseye", "3.2-bullseye" ], - "default": "3.4-trixie" + "default": "4-trixie" } }, "platforms": ["Ruby"], diff --git a/src/ruby/.devcontainer/devcontainer.json b/src/ruby/.devcontainer/devcontainer.json index eead7386..3f642645 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:2-${templateOption:imageVariant}" + "image": "mcr.microsoft.com/devcontainers/ruby:3-${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 9857029f..54896171 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 -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon) : | string | 3.4-trixie | +| imageVariant | Ruby version (use -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon) : | string | 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 d3ae4051..caaebd0f 100644 --- a/src/ruby/devcontainer-template.json +++ b/src/ruby/devcontainer-template.json @@ -1,6 +1,6 @@ { "id": "ruby", - "version": "5.0.0", + "version": "6.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", @@ -11,20 +11,20 @@ "type": "string", "description": "Ruby version (use -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon):", "proposals": [ - "3-trixie", + "4-trixie", "3.4-trixie", "3.3-trixie", "3.2-trixie", - "3-bookworm", + "4-bookworm", "3.4-bookworm", "3.3-bookworm", "3.2-bookworm", - "3-bullseye", + "4-bullseye", "3.4-bullseye", "3.3-bullseye", "3.2-bullseye" ], - "default": "3.4-trixie" + "default": "4-trixie" } }, "platforms": ["Ruby"], From 28625b912b7364499a237990179b21838b73827e Mon Sep 17 00:00:00 2001 From: sireeshajonnalagadda Date: Thu, 5 Feb 2026 10:13:40 +0000 Subject: [PATCH 2/4] update gem installation checks in test script --- test/ruby-rails-postgres/test.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/ruby-rails-postgres/test.sh b/test/ruby-rails-postgres/test.sh index 7ef1d08b..3fed3253 100755 --- a/test/ruby-rails-postgres/test.sh +++ b/test/ruby-rails-postgres/test.sh @@ -15,7 +15,10 @@ check "rails" rails --version check "rails installation path" gem which rails check "user has write permission to rvm gems" [ -w /usr/local/rvm/gems ] check "user has write permission to rvm gems default" [ -w /usr/local/rvm/gems/default ] -check "user can install gems" gem install github-markup +# Verify bundler is available in the gem list +check "user can install gems" gem list | grep -q bundler +# Verify user can successfully install a gem package +check "user can install gems" gem install json --no-document # Report result reportResults From 0bdd85c27721983686a7c00580626d50ef907c85 Mon Sep 17 00:00:00 2001 From: sireeshajonnalagadda Date: Thu, 5 Feb 2026 11:35:48 +0000 Subject: [PATCH 3/4] update Ruby version to 4 in Dockerfile and devcontainer.json --- src/ruby-rails-postgres/.devcontainer/Dockerfile | 2 +- src/ruby/.devcontainer/devcontainer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ruby-rails-postgres/.devcontainer/Dockerfile b/src/ruby-rails-postgres/.devcontainer/Dockerfile index dd84a119..e632973e 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:3-${templateOption:imageVariant} +FROM mcr.microsoft.com/devcontainers/ruby:4-${templateOption:imageVariant} # Install Rails RUN su vscode -c "gem install rails webdrivers" diff --git a/src/ruby/.devcontainer/devcontainer.json b/src/ruby/.devcontainer/devcontainer.json index 3f642645..cf0609c5 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:3-${templateOption:imageVariant}" + "image": "mcr.microsoft.com/devcontainers/ruby:4-${templateOption:imageVariant}" // Features to add to the dev container. More info: https://containers.dev/features. // "features": {}, From 397a30b1addf91f1f51df9181eeeca90e28b4ee6 Mon Sep 17 00:00:00 2001 From: sireeshajonnalagadda Date: Thu, 5 Feb 2026 11:46:07 +0000 Subject: [PATCH 4/4] Revert "update Ruby version to 4 in Dockerfile and devcontainer.json" This reverts commit 0bdd85c27721983686a7c00580626d50ef907c85. --- src/ruby-rails-postgres/.devcontainer/Dockerfile | 2 +- src/ruby/.devcontainer/devcontainer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ruby-rails-postgres/.devcontainer/Dockerfile b/src/ruby-rails-postgres/.devcontainer/Dockerfile index e632973e..dd84a119 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:4-${templateOption:imageVariant} +FROM mcr.microsoft.com/devcontainers/ruby:3-${templateOption:imageVariant} # Install Rails RUN su vscode -c "gem install rails webdrivers" diff --git a/src/ruby/.devcontainer/devcontainer.json b/src/ruby/.devcontainer/devcontainer.json index cf0609c5..3f642645 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:4-${templateOption:imageVariant}" + "image": "mcr.microsoft.com/devcontainers/ruby:3-${templateOption:imageVariant}" // Features to add to the dev container. More info: https://containers.dev/features. // "features": {},