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": { diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ae773aa70..d902443d8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +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)) +- devcontainer: downgrade to debian 12 and revert `moby:false` ([#3907](https://github.com/nf-core/tools/pull/3907)) ### Template