From 4943afae0d9f10645dd233d8bcc6d5321320ddf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 8 Oct 2025 23:15:30 +0000 Subject: [PATCH 1/5] Test with trixie and bookworm base images --- .github/workflows/test-features.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test-features.yaml b/.github/workflows/test-features.yaml index 9dd72b2..7734283 100644 --- a/.github/workflows/test-features.yaml +++ b/.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 From dc2d559b40679434060fdaae4358a43d64b7d6a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 8 Oct 2025 23:16:23 +0000 Subject: [PATCH 2/5] Fix npm test script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 51b3fdf..7e5ce98 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@devcontainers/cli": "^0.56.0" }, "scripts": { - "test": "devcontainer features test" + "test": "devcontainer features test features" }, "private": true } From f0d3469fa9fce3c53a0f5f92ec7e44e9aaa0848a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 8 Oct 2025 23:16:42 +0000 Subject: [PATCH 3/5] Test schenarios using trixie as the base image --- .github/.devcontainer/devcontainer.json | 2 +- features/test/activestorage/scenarios.json | 2 +- features/test/postgres-client/scenarios.json | 4 ++-- features/test/ruby/scenarios.json | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/.devcontainer/devcontainer.json b/.github/.devcontainer/devcontainer.json index 6f010fa..bd564f9 100644 --- a/.github/.devcontainer/devcontainer.json +++ b/.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", diff --git a/features/test/activestorage/scenarios.json b/features/test/activestorage/scenarios.json index 72f7669..37275f8 100644 --- a/features/test/activestorage/scenarios.json +++ b/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" diff --git a/features/test/postgres-client/scenarios.json b/features/test/postgres-client/scenarios.json index 2c0e445..e72a2bc 100644 --- a/features/test/postgres-client/scenarios.json +++ b/features/test/postgres-client/scenarios.json @@ -1,6 +1,6 @@ { "version_16": { - "image": "mcr.microsoft.com/devcontainers/base:1-bookworm", + "image": "mcr.microsoft.com/devcontainers/base:2-trixie", "features": { "postgres-client": { "version": "16" @@ -8,7 +8,7 @@ } }, "version_14": { - "image": "mcr.microsoft.com/devcontainers/base:1-bookworm", + "image": "mcr.microsoft.com/devcontainers/base:2-trixie", "features": { "postgres-client": { "version": "14" diff --git a/features/test/ruby/scenarios.json b/features/test/ruby/scenarios.json index 14061fb..9a9d151 100644 --- a/features/test/ruby/scenarios.json +++ b/features/test/ruby/scenarios.json @@ -1,6 +1,6 @@ { "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" @@ -8,7 +8,7 @@ } }, "with_rbenv": { - "image": "mcr.microsoft.com/devcontainers/base:1-bookworm", + "image": "mcr.microsoft.com/devcontainers/base:2-trixie", "features": { "ruby": { "versionManager": "rbenv" From 40c745a4eef079c4bb5ce4be61b63365964b5f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 8 Oct 2025 23:39:57 +0000 Subject: [PATCH 4/5] Build Ruby image with Trixie base image --- images/ruby/.devcontainer/Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/images/ruby/.devcontainer/Dockerfile b/images/ruby/.devcontainer/Dockerfile index 441da28..e3ce4b7 100644 --- a/images/ruby/.devcontainer/Dockerfile +++ b/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 From 27627131774b0b6423c81543f474e149042022e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Thu, 9 Oct 2025 00:26:43 +0000 Subject: [PATCH 5/5] Test by default with supported Ubuntu LTS --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7e5ce98..b4e096d 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@devcontainers/cli": "^0.56.0" }, "scripts": { - "test": "devcontainer features test features" + "test": "devcontainer features test features -i ubuntu:noble" }, "private": true }