From dab39cbe82be61cd9801b6a48061e62edf0971e2 Mon Sep 17 00:00:00 2001 From: mashehu Date: Tue, 18 Nov 2025 11:37:47 +0100 Subject: [PATCH 1/3] downgrade to debian 12 and revert setting moby to false tested locally now --- .devcontainer/build-devcontainer/Dockerfile | 4 ++-- .devcontainer/build-devcontainer/devcontainer.json | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.devcontainer/build-devcontainer/Dockerfile b/.devcontainer/build-devcontainer/Dockerfile index 75d83b432b..44272c8928 100644 --- a/.devcontainer/build-devcontainer/Dockerfile +++ b/.devcontainer/build-devcontainer/Dockerfile @@ -1,6 +1,6 @@ # devcontainers/miniconda image based on debian (bookworm) # see tags and images: https://mcr.microsoft.com/en-us/artifact/mar/devcontainers/miniconda/tags -FROM mcr.microsoft.com/devcontainers/miniconda@sha256:19516babd35bccd1429591a255dd867b2c8c01606cc594a8a6fe5db03309ecf8 AS build +FROM mcr.microsoft.com/devcontainers/miniconda@sha256:8e262a2664fab1d53054738d3633338558a2078ce66d3abde55c130f0d5da94f AS build # copy this repo at current revision COPY . /root/nfcore-tools/ @@ -27,7 +27,7 @@ RUN apt-get update --quiet && \ rm -rf /var/lib/apt/lists/* # Final stage to copy only the required files after installation -FROM mcr.microsoft.com/devcontainers/base:debian@sha256:2e826a6ae92e5744cc0a471a03b4411e64f6b7cc6af3adaecddad697f0018f10 AS final +FROM mcr.microsoft.com/devcontainers/base:2.0.2-debian12@sha256:23fa69fed758b7927c60061317d73baf7d66b9fca5c344e80bce3a940b229af0 AS final # Copy only the conda environment and site-packages from build stage COPY --from=build /opt/conda /opt/conda diff --git a/.devcontainer/build-devcontainer/devcontainer.json b/.devcontainer/build-devcontainer/devcontainer.json index cb3882f84f..b367a1b786 100644 --- a/.devcontainer/build-devcontainer/devcontainer.json +++ b/.devcontainer/build-devcontainer/devcontainer.json @@ -9,9 +9,7 @@ }, "features": { - "ghcr.io/devcontainers/features/docker-outside-of-docker:1.6.3": { - "moby": false - } + "ghcr.io/devcontainers/features/docker-outside-of-docker:1.6.3": {} }, "remoteEnv": { From 7eacd234cab79117bb3fbc51cd06507968200796 Mon Sep 17 00:00:00 2001 From: nf-core-bot Date: Tue, 18 Nov 2025 10:42:18 +0000 Subject: [PATCH 2/3] [automated] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2939e8030..099a157eed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ - Update pre-commit hook astral-sh/ruff-pre-commit to v0.14.5 ([#3900](https://github.com/nf-core/tools/pull/3900)) - devcontainer: Set `moby: false` to fix trixie builds ([#3904](https://github.com/nf-core/tools/pull/3904)) - Update actions/checkout digest to 93cb6ef ([#3906](https://github.com/nf-core/tools/pull/3906)) +- set moby to false to fix trixie devcontainer builds ([#3907](https://github.com/nf-core/tools/pull/3907)) ### Template From 563053c62d3e79e2b0d3a754be24181aaf708d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20H=C3=B6rtenhuber?= Date: Tue, 18 Nov 2025 12:06:04 +0100 Subject: [PATCH 3/3] Update CHANGELOG.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Júlia Mir Pedrol --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6eeac650ca..d902443d8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,7 +30,7 @@ - Update pre-commit hook astral-sh/ruff-pre-commit to v0.14.5 ([#3900](https://github.com/nf-core/tools/pull/3900)) - devcontainer: Set `moby: false` to fix trixie builds ([#3904](https://github.com/nf-core/tools/pull/3904)) - Update actions/checkout digest to 93cb6ef ([#3906](https://github.com/nf-core/tools/pull/3906)) -- set moby to false to fix trixie devcontainer builds ([#3907](https://github.com/nf-core/tools/pull/3907)) +- devcontainer: downgrade to debian 12 and revert `moby:false` ([#3907](https://github.com/nf-core/tools/pull/3907)) ### Template