Merge remote-tracking branch 'upstream/main' into history-issues-fix

Kaniska244 · Kaniska244 · commit 5438454a5979 · 2026-07-02T05:00:45.000Z
# Conflicts:
#	src/java-8/manifest.json
diff --git a/src/anaconda/.devcontainer/devcontainer-lock.json b/src/anaconda/.devcontainer/devcontainer-lock.json
@@ -1,9 +1,9 @@
 {
   "features": {
     "ghcr.io/devcontainers/features/git:1": {
-      "version": "1.3.5",
-      "resolved": "ghcr.io/devcontainers/features/git@sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251",
-      "integrity": "sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251"
+      "version": "1.3.7",
+      "resolved": "ghcr.io/devcontainers/features/git@sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a",
+      "integrity": "sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a"
     },
     "ghcr.io/devcontainers/features/node:1": {
       "version": "1.7.1",
diff --git a/src/anaconda/.devcontainer/devcontainer.json b/src/anaconda/.devcontainer/devcontainer.json
@@ -7,9 +7,11 @@
         "ghcr.io/devcontainers/features/node:1": {
             "version": "none"
         },
+		// This is only anaconda and miniconda specific setting for git feature config.
+		// As the git installation from source has been broken for these images since the
+		// advent of git 2.51.0 in Aug, 2025.
 		"ghcr.io/devcontainers/features/git:1": {
-            "version": "latest",
-            "ppa": "false"
+            "version": "os-provided"
         }
     },
 	// Configure tool-specific properties.
diff --git a/src/anaconda/README.md b/src/anaconda/README.md
@@ -30,7 +30,7 @@ You can decide how often you want updates by referencing a [semantic version](ht
 
 - `mcr.microsoft.com/devcontainers/anaconda:1-3`
 - `mcr.microsoft.com/devcontainers/anaconda:1.3-3`
-- `mcr.microsoft.com/devcontainers/anaconda:1.3.20-3`
+- `mcr.microsoft.com/devcontainers/anaconda:1.3.22-3`
 
 See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/anaconda/tags/list).
 
diff --git a/src/anaconda/manifest.json b/src/anaconda/manifest.json
@@ -1,5 +1,5 @@
 {
-	"version": "1.3.20",
+	"version": "1.3.22",
 	"build": {
 		"latest": true,
 		"rootDistro": "debian",
diff --git a/src/base-alpine/.devcontainer/devcontainer-lock.json b/src/base-alpine/.devcontainer/devcontainer-lock.json
@@ -6,9 +6,9 @@
       "integrity": "sha256:cb0c4d3c276f157eed17935747e364178d75fee17f55c4e129966f64633deb3a"
     },
     "ghcr.io/devcontainers/features/git:1": {
-      "version": "1.3.5",
-      "resolved": "ghcr.io/devcontainers/features/git@sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251",
-      "integrity": "sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251"
+      "version": "1.3.7",
+      "resolved": "ghcr.io/devcontainers/features/git@sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a",
+      "integrity": "sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a"
     }
   }
 }
diff --git a/src/base-alpine/README.md b/src/base-alpine/README.md
@@ -33,7 +33,7 @@ You can decide how often you want updates by referencing a [semantic version](ht
 
 - `mcr.microsoft.com/devcontainers/base:4-alpine`
 - `mcr.microsoft.com/devcontainers/base:4.0-alpine`
-- `mcr.microsoft.com/devcontainers/base:4.0.0-alpine`
+- `mcr.microsoft.com/devcontainers/base:4.0.1-alpine`
 
 See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/base/tags/list).
 
diff --git a/src/base-alpine/manifest.json b/src/base-alpine/manifest.json
@@ -1,5 +1,5 @@
 {
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"variants": [
 		"3.23",
 		"3.22",
diff --git a/src/base-debian/.devcontainer/devcontainer-lock.json b/src/base-debian/.devcontainer/devcontainer-lock.json
@@ -6,9 +6,9 @@
       "integrity": "sha256:cb0c4d3c276f157eed17935747e364178d75fee17f55c4e129966f64633deb3a"
     },
     "ghcr.io/devcontainers/features/git:1": {
-      "version": "1.3.5",
-      "resolved": "ghcr.io/devcontainers/features/git@sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251",
-      "integrity": "sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251"
+      "version": "1.3.7",
+      "resolved": "ghcr.io/devcontainers/features/git@sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a",
+      "integrity": "sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a"
     }
   }
 }
diff --git a/src/base-debian/README.md b/src/base-debian/README.md
@@ -32,7 +32,7 @@ You can decide how often you want updates by referencing a [semantic version](ht
 
 - `mcr.microsoft.com/devcontainers/base:2-trixie`
 - `mcr.microsoft.com/devcontainers/base:2.1-trixie`
-- `mcr.microsoft.com/devcontainers/base:2.1.10-trixie`
+- `mcr.microsoft.com/devcontainers/base:2.1.11-trixie`
 
 See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/base/tags/list).
 
diff --git a/src/base-debian/manifest.json b/src/base-debian/manifest.json
@@ -1,5 +1,5 @@
 {
-	"version": "2.1.10",
+	"version": "2.1.11",
 	"variants": [
 		"trixie",
 		"bookworm",
diff --git a/src/base-ubuntu/.devcontainer/devcontainer-lock.json b/src/base-ubuntu/.devcontainer/devcontainer-lock.json
@@ -6,9 +6,9 @@
       "integrity": "sha256:cb0c4d3c276f157eed17935747e364178d75fee17f55c4e129966f64633deb3a"
     },
     "ghcr.io/devcontainers/features/git:1": {
-      "version": "1.3.5",
-      "resolved": "ghcr.io/devcontainers/features/git@sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251",
-      "integrity": "sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251"
+      "version": "1.3.7",
+      "resolved": "ghcr.io/devcontainers/features/git@sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a",
+      "integrity": "sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a"
     }
   }
 }
diff --git a/src/base-ubuntu/README.md b/src/base-ubuntu/README.md
@@ -32,7 +32,7 @@ You can decide how often you want updates by referencing a [semantic version](ht
 
 - `mcr.microsoft.com/devcontainers/base:3-jammy`
 - `mcr.microsoft.com/devcontainers/base:3.0-jammy`
-- `mcr.microsoft.com/devcontainers/base:3.0.2-jammy`
+- `mcr.microsoft.com/devcontainers/base:3.0.3-jammy`
 
 See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/base/tags/list).
 
diff --git a/src/base-ubuntu/manifest.json b/src/base-ubuntu/manifest.json
@@ -1,5 +1,5 @@
 {
-	"version": "3.0.2",
+	"version": "3.0.3",
 	"variants": [
 		"resolute",
 		"noble",
diff --git a/src/cpp/.devcontainer/devcontainer-lock.json b/src/cpp/.devcontainer/devcontainer-lock.json
@@ -1,9 +1,9 @@
 {
   "features": {
     "ghcr.io/devcontainers/features/git:1": {
-      "version": "1.3.5",
-      "resolved": "ghcr.io/devcontainers/features/git@sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251",
-      "integrity": "sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251"
+      "version": "1.3.7",
+      "resolved": "ghcr.io/devcontainers/features/git@sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a",
+      "integrity": "sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a"
     }
   }
 }
diff --git a/src/cpp/README.md b/src/cpp/README.md
@@ -35,10 +35,10 @@ Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
 You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
 - `mcr.microsoft.com/devcontainers/cpp:3-trixie`
 - `mcr.microsoft.com/devcontainers/cpp:3.0-trixie`
-- `mcr.microsoft.com/devcontainers/cpp:3.0.0-trixie`
+- `mcr.microsoft.com/devcontainers/cpp:3.0.1-trixie`
 - `mcr.microsoft.com/devcontainers/cpp:3-bookworm`
 - `mcr.microsoft.com/devcontainers/cpp:3.0-bookworm`
-- `mcr.microsoft.com/devcontainers/cpp:3.0.0-bookworm`
+- `mcr.microsoft.com/devcontainers/cpp:3.0.1-bookworm`
 
 However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `0-debian-12`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
 
diff --git a/src/cpp/manifest.json b/src/cpp/manifest.json
@@ -1,5 +1,5 @@
 {
-	"version": "3.0.0",
+	"version": "3.0.1",
 	"variants": [
 		"trixie",
 		"bookworm",
diff --git a/src/dotnet/.devcontainer/devcontainer-lock.json b/src/dotnet/.devcontainer/devcontainer-lock.json
@@ -6,9 +6,9 @@
       "integrity": "sha256:cb0c4d3c276f157eed17935747e364178d75fee17f55c4e129966f64633deb3a"
     },
     "ghcr.io/devcontainers/features/git:1": {
-      "version": "1.3.5",
-      "resolved": "ghcr.io/devcontainers/features/git@sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251",
-      "integrity": "sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251"
+      "version": "1.3.7",
+      "resolved": "ghcr.io/devcontainers/features/git@sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a",
+      "integrity": "sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a"
     },
     "ghcr.io/devcontainers/features/node:1": {
       "version": "1.7.1",
diff --git a/src/dotnet/README.md b/src/dotnet/README.md
@@ -34,10 +34,10 @@ You can decide how often you want updates by referencing a [semantic version](ht
 
 - `mcr.microsoft.com/devcontainers/dotnet:2-10.0-noble`
 - `mcr.microsoft.com/devcontainers/dotnet:2.1-10.0-noble`
-- `mcr.microsoft.com/devcontainers/dotnet:2.1.2-10.0-noble`
+- `mcr.microsoft.com/devcontainers/dotnet:2.1.3-10.0-noble`
 - `mcr.microsoft.com/devcontainers/dotnet:2-9.0`
 - `mcr.microsoft.com/devcontainers/dotnet:2.1-9.0`
-- `mcr.microsoft.com/devcontainers/dotnet:2.1.2-9.0`
+- `mcr.microsoft.com/devcontainers/dotnet:2.1.3-9.0`
 
 See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/dotnet/tags/list).
 
diff --git a/src/go/.devcontainer/devcontainer-lock.json b/src/go/.devcontainer/devcontainer-lock.json
@@ -6,9 +6,9 @@
       "integrity": "sha256:cb0c4d3c276f157eed17935747e364178d75fee17f55c4e129966f64633deb3a"
     },
     "ghcr.io/devcontainers/features/git:1": {
-      "version": "1.3.5",
-      "resolved": "ghcr.io/devcontainers/features/git@sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251",
-      "integrity": "sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251"
+      "version": "1.3.7",
+      "resolved": "ghcr.io/devcontainers/features/git@sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a",
+      "integrity": "sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a"
     },
     "ghcr.io/devcontainers/features/go:1": {
       "version": "1.3.4",
diff --git a/src/go/README.md b/src/go/README.md
@@ -33,7 +33,7 @@ You can decide how often you want updates by referencing a [semantic version](ht
 
 - `mcr.microsoft.com/devcontainers/go:2-1.26` (or `2-1.26-trixie`, `2-1.26-bookworm`)
 - `mcr.microsoft.com/devcontainers/go:2.1-1.26` (or `2.1-1.26-trixie`, `2.1-1.26-bookworm`)
-- `mcr.microsoft.com/devcontainers/go:2.1.4-1.26` (or `2.1.4-1.26-trixie`, `2.1.4-1.26-bookworm`)
+- `mcr.microsoft.com/devcontainers/go:2.1.5-1.26` (or `2.1.5-1.26-trixie`, `2.1.5-1.26-bookworm`)
 
 However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `2-1.26`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
 
diff --git a/src/go/manifest.json b/src/go/manifest.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.1.4",
+  "version": "2.1.5",
   "variants": [
     "1.26-trixie",
     "1.25-trixie",
diff --git a/src/java-8/.devcontainer/devcontainer-lock.json b/src/java-8/.devcontainer/devcontainer-lock.json
@@ -1,9 +1,9 @@
 {
   "features": {
     "ghcr.io/devcontainers/features/git:1": {
-      "version": "1.3.5",
-      "resolved": "ghcr.io/devcontainers/features/git@sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251",
-      "integrity": "sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251"
+      "version": "1.3.7",
+      "resolved": "ghcr.io/devcontainers/features/git@sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a",
+      "integrity": "sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a"
     },
     "ghcr.io/devcontainers/features/java:1": {
       "version": "1.8.0",
diff --git a/src/java-8/README.md b/src/java-8/README.md
@@ -30,8 +30,8 @@ Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
 You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
 
 - `mcr.microsoft.com/devcontainers/java:3-8` (or `3-8-trixie`, `3-8-bookworm` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/java:3.0-8` (or `3.0-8-trixie`, `3.0-8-bookworm` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/java:3.0.10-8` (or `3.0.10-8-trixie`, `3.0.10-8-bookworm` to pin to an OS version)
+- `mcr.microsoft.com/devcontainers/java:3.1-8` (or `3.1-8-trixie`, `3.1-8-bookworm` to pin to an OS version)
+- `mcr.microsoft.com/devcontainers/java:3.1.0-8` (or `3.1.0-8-trixie`, `3.1.0-8-bookworm` to pin to an OS version)
 
 However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `3-8`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
 
diff --git a/src/java/.devcontainer/devcontainer-lock.json b/src/java/.devcontainer/devcontainer-lock.json
@@ -1,9 +1,9 @@
 {
   "features": {
     "ghcr.io/devcontainers/features/git:1": {
-      "version": "1.3.5",
-      "resolved": "ghcr.io/devcontainers/features/git@sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251",
-      "integrity": "sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251"
+      "version": "1.3.7",
+      "resolved": "ghcr.io/devcontainers/features/git@sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a",
+      "integrity": "sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a"
     },
     "ghcr.io/devcontainers/features/java:1": {
       "version": "1.8.0",
diff --git a/src/java/README.md b/src/java/README.md
@@ -33,7 +33,7 @@ You can decide how often you want updates by referencing a [semantic version](ht
 
 - `mcr.microsoft.com/devcontainers/java:3-11` (or `3-11-trixie`, `3-11-bookworm` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/java:3.0-11` (or `3.0-11-trixie`, `3.0-11-bookworm` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/java:3.0.9-11` (or `3.0.9-11-trixie`, `3.0.9-11-bookworm` to pin to an OS version)
+- `mcr.microsoft.com/devcontainers/java:3.0.10-11` (or `3.0.10-11-trixie`, `3.0.10-11-bookworm` to pin to an OS version)
 
 However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `3-11`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
 
diff --git a/src/java/manifest.json b/src/java/manifest.json
@@ -1,5 +1,5 @@
 {
-	"version": "3.0.9",
+	"version": "3.0.10",
 	"variants": [
 		"25-trixie",
 		"21-trixie",
diff --git a/src/javascript-node/.devcontainer/devcontainer-lock.json b/src/javascript-node/.devcontainer/devcontainer-lock.json
@@ -6,9 +6,9 @@
       "integrity": "sha256:cb0c4d3c276f157eed17935747e364178d75fee17f55c4e129966f64633deb3a"
     },
     "ghcr.io/devcontainers/features/git:1": {
-      "version": "1.3.5",
-      "resolved": "ghcr.io/devcontainers/features/git@sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251",
-      "integrity": "sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251"
+      "version": "1.3.7",
+      "resolved": "ghcr.io/devcontainers/features/git@sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a",
+      "integrity": "sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a"
     },
     "ghcr.io/devcontainers/features/node:1": {
       "version": "1.7.1",
diff --git a/src/javascript-node/README.md b/src/javascript-node/README.md
@@ -30,7 +30,7 @@ You can decide how often you want updates by referencing a [semantic version](ht
 
 - `mcr.microsoft.com/devcontainers/javascript-node:4-24` (or `4-24-trixie`, `4-24-bookworm`, `4-24-bullseye`)
 - `mcr.microsoft.com/devcontainers/javascript-node:4.0-24` (or `4.0-24-trixie`, `4.0-24-bookworm`, `4.0-24-bullseye`)
-- `mcr.microsoft.com/devcontainers/javascript-node:4.0.12-24` (or `4.0.12-24-trixie`, `4.0.12-24-bookworm`, `4.0.12-24-bullseye`)
+- `mcr.microsoft.com/devcontainers/javascript-node:4.0.13-24` (or `4.0.13-24-trixie`, `4.0.13-24-bookworm`, `4.0.13-24-bullseye`)
 
 However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `4-24`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
 
diff --git a/src/javascript-node/manifest.json b/src/javascript-node/manifest.json
@@ -1,5 +1,5 @@
 {
-	"version": "4.0.12",
+	"version": "4.0.13",
 	"variants": [
 		"24-trixie",
 		"22-trixie",
diff --git a/src/jekyll/.devcontainer/devcontainer-lock.json b/src/jekyll/.devcontainer/devcontainer-lock.json
@@ -1,9 +1,9 @@
 {
   "features": {
     "ghcr.io/devcontainers/features/git:1": {
-      "version": "1.3.5",
-      "resolved": "ghcr.io/devcontainers/features/git@sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251",
-      "integrity": "sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251"
+      "version": "1.3.7",
+      "resolved": "ghcr.io/devcontainers/features/git@sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a",
+      "integrity": "sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a"
     },
     "ghcr.io/devcontainers/features/node:1": {
       "version": "1.7.1",
diff --git a/src/jekyll/README.md b/src/jekyll/README.md
@@ -37,7 +37,7 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
 You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
 - `mcr.microsoft.com/devcontainers/jekyll:2` (or `2-bookworm`, `2-bullseye` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/jekyll:2.2` (or `2.2-bookworm`, `2.2-bullseye`  to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/jekyll:2.2.10` (or `2.2.10-bookworm`, `2.2.10-bullseye` to pin to an OS version)
+- `mcr.microsoft.com/devcontainers/jekyll:2.2.11` (or `2.2.11-bookworm`, `2.2.11-bullseye` to pin to an OS version)
 
 
 However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `2-bullseye`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
diff --git a/src/jekyll/manifest.json b/src/jekyll/manifest.json
@@ -1,5 +1,5 @@
 {
-	"version": "2.2.10",
+	"version": "2.2.11",
 	"variants": [
 		"3.4-bookworm",
 		"3.3-bookworm",
diff --git a/src/miniconda/.devcontainer/devcontainer-lock.json b/src/miniconda/.devcontainer/devcontainer-lock.json
@@ -1,9 +1,9 @@
 {
   "features": {
     "ghcr.io/devcontainers/features/git:1": {
-      "version": "1.3.5",
-      "resolved": "ghcr.io/devcontainers/features/git@sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251",
-      "integrity": "sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251"
+      "version": "1.3.7",
+      "resolved": "ghcr.io/devcontainers/features/git@sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a",
+      "integrity": "sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a"
     },
     "ghcr.io/devcontainers/features/node:1": {
       "version": "1.7.1",
diff --git a/src/miniconda/.devcontainer/devcontainer.json b/src/miniconda/.devcontainer/devcontainer.json
@@ -6,9 +6,11 @@
     "features": {
         "ghcr.io/devcontainers/features/python:1": "none",
         "ghcr.io/devcontainers/features/node:1": "none",
-		"ghcr.io/devcontainers/features/git:1": {
-            "version": "latest",
-            "ppa": "false"
+        // This is only anaconda and miniconda specific setting for git feature config.
+        // As the git installation from source has been broken for these images since the
+        // advent of git 2.51.0 in Aug, 2025.
+        "ghcr.io/devcontainers/features/git:1": {
+            "version": "os-provided"
         }
     },
 	// Configure tool-specific properties.
diff --git a/src/miniconda/README.md b/src/miniconda/README.md
@@ -30,7 +30,7 @@ You can decide how often you want updates by referencing a [semantic version](ht
 
 - `mcr.microsoft.com/devcontainers/miniconda:1-3`
 - `mcr.microsoft.com/devcontainers/miniconda:1.2-3`
-- `mcr.microsoft.com/devcontainers/miniconda:1.2.8-3`
+- `mcr.microsoft.com/devcontainers/miniconda:1.2.10-3`
 
 See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/miniconda/tags/list).
 
diff --git a/src/miniconda/manifest.json b/src/miniconda/manifest.json
@@ -1,5 +1,5 @@
 {
-	"version": "1.2.8",
+	"version": "1.2.10",
 	"build": {
 		"latest": true,
 		"rootDistro": "debian",
diff --git a/src/php/.devcontainer/devcontainer-lock.json b/src/php/.devcontainer/devcontainer-lock.json
@@ -6,9 +6,9 @@
       "integrity": "sha256:cb0c4d3c276f157eed17935747e364178d75fee17f55c4e129966f64633deb3a"
     },
     "ghcr.io/devcontainers/features/git:1": {
-      "version": "1.3.5",
-      "resolved": "ghcr.io/devcontainers/features/git@sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251",
-      "integrity": "sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251"
+      "version": "1.3.7",
+      "resolved": "ghcr.io/devcontainers/features/git@sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a",
+      "integrity": "sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a"
     },
     "ghcr.io/devcontainers/features/node:1": {
       "version": "1.7.1",
diff --git a/src/php/README.md b/src/php/README.md
diff --git a/src/php/manifest.json b/src/php/manifest.json
diff --git a/src/python/.devcontainer/devcontainer-lock.json b/src/python/.devcontainer/devcontainer-lock.json
diff --git a/src/python/README.md b/src/python/README.md
diff --git a/src/python/manifest.json b/src/python/manifest.json
diff --git a/src/ruby/.devcontainer/devcontainer-lock.json b/src/ruby/.devcontainer/devcontainer-lock.json
diff --git a/src/ruby/README.md b/src/ruby/README.md
diff --git a/src/ruby/manifest.json b/src/ruby/manifest.json
diff --git a/src/rust/.devcontainer/devcontainer-lock.json b/src/rust/.devcontainer/devcontainer-lock.json
diff --git a/src/rust/README.md b/src/rust/README.md
diff --git a/src/rust/manifest.json b/src/rust/manifest.json
diff --git a/src/typescript-node/.devcontainer/devcontainer-lock.json b/src/typescript-node/.devcontainer/devcontainer-lock.json
diff --git a/src/typescript-node/README.md b/src/typescript-node/README.md
diff --git a/src/typescript-node/manifest.json b/src/typescript-node/manifest.json
diff --git a/src/universal/.devcontainer/devcontainer-lock.json b/src/universal/.devcontainer/devcontainer-lock.json
diff --git a/src/universal/README.md b/src/universal/README.md
diff --git a/src/universal/manifest.json b/src/universal/manifest.json

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "1.3.20",`
	`2`	`+ "version": "1.3.22",`
`3`	`3`	`"build": {`
`4`	`4`	`"latest": true,`
`5`	`5`	`"rootDistro": "debian",`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@`
`6`	`6`	`"integrity": "sha256:cb0c4d3c276f157eed17935747e364178d75fee17f55c4e129966f64633deb3a"`
`7`	`7`	`},`
`8`	`8`	`"ghcr.io/devcontainers/features/git:1": {`
`9`		`- "version": "1.3.5",`
`10`		`- "resolved": "ghcr.io/devcontainers/features/git@sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251",`
`11`		`- "integrity": "sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251"`
	`9`	`+ "version": "1.3.7",`
	`10`	`+ "resolved": "ghcr.io/devcontainers/features/git@sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a",`
	`11`	`+ "integrity": "sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a"`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "4.0.0",`
	`2`	`+ "version": "4.0.1",`
`3`	`3`	`"variants": [`
`4`	`4`	`"3.23",`
`5`	`5`	`"3.22",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "2.1.10",`
	`2`	`+ "version": "2.1.11",`
`3`	`3`	`"variants": [`
`4`	`4`	`"trixie",`
`5`	`5`	`"bookworm",`