Update the Rails app devcontainer to use the Rail's orgs ruby feature

Use the feature created by rails/devcontainer@37a2abf
andrewn617 · Mar 7, 2024 · f8440c4 · f8440c4
1 parent af85f74
commit f8440c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/railties/lib/rails/generators/rails/app/templates/.devcontainer/Dockerfile.tt b/railties/lib/rails/generators/rails/app/templates/.devcontainer/Dockerfile.tt
@@ -1,6 +1,6 @@
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version
 ARG RUBY_VERSION=<%= devcontainer_ruby_version %>
-FROM mcr.microsoft.com/devcontainers/ruby:1-$RUBY_VERSION-bookworm
+FROM mcr.microsoft.com/devcontainers/base:1-bookworm
 
 <%- unless options.skip_active_storage -%>
 # Install packages needed to build gems

diff --git a/railties/lib/rails/generators/rails/app/templates/.devcontainer/devcontainer.json.tt b/railties/lib/rails/generators/rails/app/templates/.devcontainer/devcontainer.json.tt
@@ -8,7 +8,10 @@
 
   // Features to add to the dev container. More info: https://containers.dev/features.
   "features": {
-    "ghcr.io/devcontainers/features/github-cli:1": {}
+    "ghcr.io/devcontainers/features/github-cli:1": {},
+    "ghcr.io/rails/devcontainer/features/ruby:latest": {
+      "version": "3.2.2"
+    }
   },
 
 <%- if !devcontainer_variables.empty? -%>