Build Ruby image with Trixie by default

.github/.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "mcr.microsoft.com/devcontainers/base:1-bookworm",
+  "image": "mcr.microsoft.com/devcontainers/base:2-trixie",
   "features": {
     "ghcr.io/devcontainers/features/common-utils:2": {
       "installZsh": "true",

.github/workflows/test-features.yaml

@@ -23,6 +23,8 @@ jobs:
           - debian:latest
           - ubuntu:latest
           - mcr.microsoft.com/devcontainers/base:ubuntu
+          - mcr.microsoft.com/devcontainers/base:trixie
+          - mcr.microsoft.com/devcontainers/base:bookworm
     steps:
       - uses: actions/checkout@v4
 

features/test/activestorage/scenarios.json

@@ -1,6 +1,6 @@
 {
   "image_processor_imagemagick": {
-      "image": "mcr.microsoft.com/devcontainers/base:1-bookworm",
+      "image": "mcr.microsoft.com/devcontainers/base:2-trixie",
       "features": {
           "activestorage": {
             "variantProcessor": "mini_magick"

features/test/postgres-client/scenarios.json

@@ -1,14 +1,14 @@
 {
   "version_16": {
-      "image": "mcr.microsoft.com/devcontainers/base:1-bookworm",
+      "image": "mcr.microsoft.com/devcontainers/base:2-trixie",
       "features": {
           "postgres-client": {
             "version": "16"
           }
       }
   },
   "version_14": {
-    "image": "mcr.microsoft.com/devcontainers/base:1-bookworm",
+    "image": "mcr.microsoft.com/devcontainers/base:2-trixie",
     "features": {
       "postgres-client": {
         "version": "14"

features/test/ruby/scenarios.json

@@ -1,14 +1,14 @@
 {
   "version_3_3_0": {
-    "image": "mcr.microsoft.com/devcontainers/base:1-bookworm",
+    "image": "mcr.microsoft.com/devcontainers/base:2-trixie",
     "features": {
       "ruby": {
         "version": "3.3.0"
       }
     }
   },
   "with_rbenv": {
-    "image": "mcr.microsoft.com/devcontainers/base:1-bookworm",
+    "image": "mcr.microsoft.com/devcontainers/base:2-trixie",
     "features": {
       "ruby": {
         "versionManager": "rbenv"

images/ruby/.devcontainer/Dockerfile

@@ -1,8 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/base:1-bookworm
-
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    # Remove imagemagick due to https://security-tracker.debian.org/tracker/CVE-2019-10131
-    && apt-get purge -y imagemagick imagemagick-6-common
+FROM mcr.microsoft.com/devcontainers/base:2-trixie
 
 ENV LANG=C.UTF-8 \
     LC_ALL=C.UTF-8

package.json

@@ -8,7 +8,7 @@
     "@devcontainers/cli": "^0.56.0"
   },
   "scripts": {
-    "test": "devcontainer features test"
+    "test": "devcontainer features test features -i ubuntu:noble"
   },
   "private": true
 }