From 82e6160d767ace52f75e47e8392914aa73f666b0 Mon Sep 17 00:00:00 2001 From: Ehren Bendler Date: Thu, 12 Mar 2026 16:24:23 -0400 Subject: [PATCH 1/3] [tech] Fix/update base image tags Microsoft changed how they name the Ubuntu base container from "ubuntu-24.04" to "ubuntu24.04", so it was impossible to automate update detection. The uv tag was updated to "0.10" with a hash to pin so that dependabot can understand it. Add "git" devc feature to the JSON so that the latest git is used instead of the one in apt. Also add a dependabot config to update the base image hashes weekly and check for devc feature updates. --- .github/dependabot.yml | 24 ++++++++++++++++++++++++ Dockerfile | 7 +++---- devcontainer.json | 1 + 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..a7c9b6a --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,24 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "docker" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly" + groups: + base-images: + patterns: + - "*" + + - package-ecosystem: "devcontainers" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly" + groups: + devc-features: + patterns: + - "*" diff --git a/Dockerfile b/Dockerfile index d83aaf0..fa720af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,7 @@ # Claude Code Devcontainer # Based on Microsoft devcontainer image for better devcontainer integration -ARG UV_VERSION=0.10.0 -FROM ghcr.io/astral-sh/uv:${UV_VERSION}@sha256:78a7ff97cd27b7124a5f3c2aefe146170793c56a1e03321dd31a289f6d82a04f AS uv -FROM mcr.microsoft.com/devcontainers/base:ubuntu-24.04@sha256:d94c97dd9cacf183d0a6fd12a8e87b526e9e928307674ae9c94139139c0c6eae +FROM ghcr.io/astral-sh/uv:0.10@sha256:10902f58a1606787602f303954cea099626a4adb02acbac4c69920fe9d278f82 AS uv +FROM mcr.microsoft.com/devcontainers/base:ubuntu24.04@sha256:4bcb1b466771b1ba1ea110e2a27daea2f6093f9527fb75ee59703ec89b5561cb ARG TZ ENV TZ="$TZ" @@ -44,7 +43,7 @@ RUN ARCH=$(dpkg --print-architecture) && \ COPY --from=uv /uv /usr/local/bin/uv # Install fzf from GitHub releases (newer than apt, includes built-in shell integration) -ARG FZF_VERSION=0.67.0 +ARG FZF_VERSION=0.70.0 RUN ARCH=$(dpkg --print-architecture) && \ case "${ARCH}" in \ amd64) FZF_ARCH="linux_amd64" ;; \ diff --git a/devcontainer.json b/devcontainer.json index b10a841..a25cc1a 100644 --- a/devcontainer.json +++ b/devcontainer.json @@ -10,6 +10,7 @@ } }, "features": { + "ghcr.io/devcontainers/features/git:1": {}, "ghcr.io/devcontainers/features/github-cli:1": {} }, "runArgs": [ From 9591da0c02aab42513d7597770ab33daf910dda5 Mon Sep 17 00:00:00 2001 From: dm Date: Mon, 23 Mar 2026 09:17:34 +0100 Subject: [PATCH 2/3] Delete .github/dependabot.yml --- .github/dependabot.yml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index a7c9b6a..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,24 +0,0 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file - -version: 2 -updates: - - package-ecosystem: "docker" # See documentation for possible values - directory: "/" # Location of package manifests - schedule: - interval: "weekly" - groups: - base-images: - patterns: - - "*" - - - package-ecosystem: "devcontainers" # See documentation for possible values - directory: "/" # Location of package manifests - schedule: - interval: "weekly" - groups: - devc-features: - patterns: - - "*" From 5882e044afd87aea49a97a342d9301d530ef77e5 Mon Sep 17 00:00:00 2001 From: dm Date: Mon, 23 Mar 2026 09:18:13 +0100 Subject: [PATCH 3/3] Remove git feature from devcontainer configuration --- devcontainer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/devcontainer.json b/devcontainer.json index a25cc1a..b10a841 100644 --- a/devcontainer.json +++ b/devcontainer.json @@ -10,7 +10,6 @@ } }, "features": { - "ghcr.io/devcontainers/features/git:1": {}, "ghcr.io/devcontainers/features/github-cli:1": {} }, "runArgs": [