From 0e401df00215bc7175fda8b3a292a361583ec9a7 Mon Sep 17 00:00:00 2001 From: Lutz Reinhardt Date: Tue, 17 Mar 2026 16:02:03 +0000 Subject: [PATCH] Bump docker-in-docker feature version dependabot changed the format in such a way that it fails to work on devcontainer features. This is an attempt to fix it. --- .devcontainer/devcontainer-lock.json | 8 ++++---- .devcontainer/devcontainer-lock.json.license | 13 ------------- .devcontainer/devcontainer.json | 2 +- .devcontainer/devcontainer.json.license | 13 ------------- 4 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 .devcontainer/devcontainer-lock.json.license delete mode 100644 .devcontainer/devcontainer.json.license diff --git a/.devcontainer/devcontainer-lock.json b/.devcontainer/devcontainer-lock.json index 71abfcf..7b69d2a 100644 --- a/.devcontainer/devcontainer-lock.json +++ b/.devcontainer/devcontainer-lock.json @@ -5,10 +5,10 @@ "resolved": "ghcr.io/devcontainers-extra/features/pre-commit@sha256:6e0bb2ce80caca1d94f44dab5d0653d88a1c00984e590adb7c6bce012d0ade6e", "integrity": "sha256:6e0bb2ce80caca1d94f44dab5d0653d88a1c00984e590adb7c6bce012d0ade6e" }, - "ghcr.io/devcontainers/features/docker-in-docker:": { - "version": "2.14.0", - "resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:445e84b0c213225bfdae977a72b4125f65e38eadcd49616dae04f1af24aa122d", - "integrity": "sha256:445e84b0c213225bfdae977a72b4125f65e38eadcd49616dae04f1af24aa122d" + "ghcr.io/devcontainers/features/docker-in-docker": { + "version": "2.16.1", + "resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:ce078b7bf7d9ef3bcb9813b32103795d8d72172446890b64772cbe1dec6baafd", + "integrity": "sha256:ce078b7bf7d9ef3bcb9813b32103795d8d72172446890b64772cbe1dec6baafd" } } } \ No newline at end of file diff --git a/.devcontainer/devcontainer-lock.json.license b/.devcontainer/devcontainer-lock.json.license deleted file mode 100644 index 1db4fe4..0000000 --- a/.devcontainer/devcontainer-lock.json.license +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************* -Copyright (c) 2026 Contributors to the Eclipse Foundation - -See the NOTICE file(s) distributed with this work for additional -information regarding copyright ownership. - -This program and the accompanying materials are made available under the -terms of the Apache License Version 2.0 which is available at -https://www.apache.org/licenses/LICENSE-2.0 - -SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation -SPDX-License-Identifier: Apache-2.0 -******************************************************************************* diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a9d4f72..c6cc084 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,7 +1,7 @@ { "image": "mcr.microsoft.com/devcontainers/javascript-node:4-24", "features": { - "ghcr.io/devcontainers/features/docker-in-docker:": { + "ghcr.io/devcontainers/features/docker-in-docker": { "moby": "false" // does not work with Debian Trixie based images }, "ghcr.io/devcontainers-extra/features/pre-commit:2": { diff --git a/.devcontainer/devcontainer.json.license b/.devcontainer/devcontainer.json.license deleted file mode 100644 index 1db4fe4..0000000 --- a/.devcontainer/devcontainer.json.license +++ /dev/null @@ -1,13 +0,0 @@ -******************************************************************************* -Copyright (c) 2026 Contributors to the Eclipse Foundation - -See the NOTICE file(s) distributed with this work for additional -information regarding copyright ownership. - -This program and the accompanying materials are made available under the -terms of the Apache License Version 2.0 which is available at -https://www.apache.org/licenses/LICENSE-2.0 - -SPDX-FileCopyrightText: 2026 Contributors to the Eclipse Foundation -SPDX-License-Identifier: Apache-2.0 -*******************************************************************************