Merge branch 'main' into rust_debian_trixie

sireeshajonnalagadda · web-flow · commit ff4cc02542eb · 2025-08-20T13:12:09.000+05:30
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-    "image": "mcr.microsoft.com/devcontainers/javascript-node:0-18",
+    "image": "mcr.microsoft.com/devcontainers/javascript-node:3-22",
     "features": {
         "ghcr.io/devcontainers/features/docker-in-docker:2": {},
         "ghcr.io/devcontainers/features/azure-cli:1": {}
diff --git a/cgmanifest.json b/cgmanifest.json
@@ -1248,6 +1248,16 @@
                 }
             }
         },
+        {
+            "Component": {
+                "Type": "other",
+                "Other": {
+                    "Name": "Docker Image: node",
+                    "Version": "24-bookworm",
+                    "DownloadUrl": "https://hub.docker.com/_/node"
+                }
+            }
+        },
         {
             "Component": {
                 "Type": "other",
@@ -1278,6 +1288,16 @@
                 }
             }
         },
+        {
+            "Component": {
+                "Type": "other",
+                "Other": {
+                    "Name": "Docker Image: node",
+                    "Version": "24-bullseye",
+                    "DownloadUrl": "https://hub.docker.com/_/node"
+                }
+            }
+        },
         {
             "Component": {
                 "Type": "other",
diff --git a/src/base-alpine/.devcontainer/Dockerfile b/src/base-alpine/.devcontainer/Dockerfile
@@ -1,2 +1,2 @@
-ARG VARIANT=3.21
+ARG VARIANT=3.22
 FROM alpine:${VARIANT}
diff --git a/src/base-alpine/README.md b/src/base-alpine/README.md
@@ -9,7 +9,7 @@
 | *Categories* | Core, Other |
 | *Image type* | Dockerfile |
 | *Published images* | mcr.microsoft.com/devcontainers/base:alpine |
-| *Available image variants* | alpine-3.21, alpine-3.20, alpine-3.19, alpine-3.18 ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
+| *Available image variants* | alpine-3.22, alpine-3.21, alpine-3.20, alpine-3.19 ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
 | *Published image architecture(s)* | x86-64, aarch64/arm64 |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Alpine Linux |
@@ -22,10 +22,11 @@ See **[history](history)** for information on the contents of published images.
 You can also directly reference pre-built versions of `.devcontainer/Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own  `Dockerfile` to one of the following. An example `Dockerfile` is included in this repository.
 
 - `mcr.microsoft.com/devcontainers/base:alpine` (latest)
+- `mcr.microsoft.com/devcontainers/base:alpine-3.22`
 - `mcr.microsoft.com/devcontainers/base:alpine-3.21`
 - `mcr.microsoft.com/devcontainers/base:alpine-3.20`
 - `mcr.microsoft.com/devcontainers/base:alpine-3.19`
-- `mcr.microsoft.com/devcontainers/base:alpine-3.18`
+
 
 Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
 
diff --git a/src/base-alpine/manifest.json b/src/base-alpine/manifest.json
@@ -1,10 +1,10 @@
 {
-	"version": "0.210.5",
+	"version": "1.0.0",
 	"variants": [
+		"3.22",
 		"3.21",		
 		"3.20",
-		"3.19",
-		"3.18"
+		"3.19"	
 	],
 	"build": {
 		"latest": false,
@@ -18,7 +18,7 @@
 			"base:${VERSION}-alpine${VARIANT}"
 		],
 		"variantTags": {
-			"3.21": [
+			"3.22": [
 				"base:${VERSION}-alpine"
 			]
 		}
diff --git a/src/go/.devcontainer/Dockerfile b/src/go/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-ARG VARIANT=1.24-bookworm
+ARG VARIANT=1.25-bookworm
 FROM golang:${VARIANT}
 
 # [Optional] Uncomment the next line to use go get to install anything else you need
diff --git a/src/go/README.md b/src/go/README.md
@@ -10,7 +10,7 @@
 | *Categories* | Core, Languages |
 | *Definition type* | Dockerfile |
 | *Published images* | mcr.microsoft.com/devcontainers/go |
-| *Available image variants* | 1 / 1-bookworm, 1.24 / 1.24-bookworm, 1.23 / 1.23-bookworm, 1-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/go/tags/list)) |
+| *Available image variants* | 1 / 1-bookworm, 1.25 / 1.25-bookworm, 1.24 / 1.24-bookworm, 1-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/go/tags/list)) |
 | *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Debian |
@@ -24,16 +24,16 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
 
 - `mcr.microsoft.com/devcontainers/go` (latest)
 - `mcr.microsoft.com/devcontainers/go:1` (or `1-bookworm`, `1-bullseye` to pin to an OS version)
+- `mcr.microsoft.com/devcontainers/go:1.25` (or `1.25-bookworm`, `1.25-bullseye` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/go:1.24` (or `1.24-bookworm`, `1.24-bullseye` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/go:1.23` (or `1.23-bookworm`, `1.23-bullseye` to pin to an OS version)
 
 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/go:1-1.24` (or `1-1.24-bookworm`, `1-1.24-bullseye`)
-- `mcr.microsoft.com/devcontainers/go:1.4-1.24` (or `1.4-1.24-bookworm`, `1.4-1.24-bullseye`)
-- `mcr.microsoft.com/devcontainers/go:1.4.0-1.24` (or `1.4.0-1.24-bookworm`, `1.4.0-1.24-bullseye`)
+- `mcr.microsoft.com/devcontainers/go:1-1.25` (or `1-1.25-bookworm`, `1-1.25-bullseye`)
+- `mcr.microsoft.com/devcontainers/go:1.4-1.25` (or `1.4-1.25-bookworm`, `1.4-1.25-bullseye`)
+- `mcr.microsoft.com/devcontainers/go:1.4.0-1.25` (or `1.4.0-1.25-bookworm`, `1.4.0-1.25-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. `1-1.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/go/manifest.json b/src/go/manifest.json
@@ -1,53 +1,53 @@
 {
   "version": "1.4.5",
   "variants": [
+    "1.25-bookworm",
     "1.24-bookworm",
-    "1.23-bookworm",
-    "1.24-bullseye",
-    "1.23-bullseye"
+    "1.25-bullseye",
+    "1.24-bullseye"
   ],
   "build": {
-    "latest": "1.24-bookworm",
+    "latest": "1.25-bookworm",
     "rootDistro": "debian",
     "tags": [
       "go:${VERSION}-${VARIANT}"
     ],
     "architectures": {
-      "1.24-bookworm": [
+      "1.25-bookworm": [
         "linux/amd64",
         "linux/arm64"
       ],
-      "1.23-bookworm": [
+      "1.24-bookworm": [
         "linux/amd64",
         "linux/arm64"
       ],
-      "1.24-bullseye": [
+      "1.25-bullseye": [
         "linux/amd64",
         "linux/arm64"
       ],
-      "1.23-bullseye": [
+      "1.24-bullseye": [
         "linux/amd64",
         "linux/arm64"
       ]
     },
     "variantTags": {
-      "1.24-bookworm": [
-        "go:${VERSION}-1.24",
+      "1.25-bookworm": [
+        "go:${VERSION}-1.25",
         "go:${VERSION}-1",
         "go:${VERSION}-1-bookworm",
         "go:${VERSION}-bookworm"
       ],
-      "1.23-bookworm": [
-        "go:${VERSION}-1.23",
+      "1.24-bookworm": [
+        "go:${VERSION}-1.24",
         "go:${VERSION}-1",
         "go:${VERSION}-1-bookworm",
         "go:${VERSION}-bookworm"
       ],
-      "1.24-bullseye": [
+      "1.25-bullseye": [
         "go:${VERSION}-1-bullseye",
         "go:${VERSION}-bullseye"
       ],
-      "1.23-bullseye": [
+      "1.24-bullseye": [
         "go:${VERSION}-1-bullseye",
         "go:${VERSION}-bullseye"
       ]
@@ -90,4 +90,4 @@
       "git": {}
     }
   }
-}
+}
diff --git a/src/typescript-node/.devcontainer/Dockerfile b/src/typescript-node/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
-ARG VARIANT=22-bookworm
-FROM mcr.microsoft.com/devcontainers/javascript-node:1-${VARIANT}
+ARG VARIANT=24-bookworm
+FROM mcr.microsoft.com/devcontainers/javascript-node:3-${VARIANT}
 
 # Install tslint, typescript. eslint is installed by javascript image
 ARG NODE_MODULES="tslint-to-eslint-config typescript"
diff --git a/src/typescript-node/README.md b/src/typescript-node/README.md
@@ -9,7 +9,7 @@
 | *Categories* | Core, Languages |
 | *Image type* | Dockerfile |
 | *Published image* | mcr.microsoft.com/devcontainers/typescript-node |
-| *Available image variants* | 22 / 22-bookworm, 20 / 20-bookworm, 22-bullseye, 20-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/typescript-node/tags/list)) |
+| *Available image variants* | 24 / 24-bookworm, 22 / 22-bookworm, 20 / 20-bookworm, 24-bullseye, 22-bullseye, 20-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/typescript-node/tags/list)) |
 | *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Debian |
@@ -20,18 +20,19 @@
 You can directly reference pre-built versions of `Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own  `Dockerfile` to one of the following. An example `Dockerfile` is included in this repository.
 
 - `mcr.microsoft.com/devcontainers/typescript-node` (latest)
+- `mcr.microsoft.com/devcontainers/typescript-node:24` (or `24-bookworm`, `24-bullseye` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/typescript-node:22` (or `22-bookworm`, `22-bullseye` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/typescript-node:20` (or `20-bookworm`, `20-bullseye` to pin to an OS version)
 
 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/typescript-node:2-22` (or `2-22-bookworm`, `2-22-bullseye`)
-- `mcr.microsoft.com/devcontainers/typescript-node:2.0-22` (or `2.0-22-bookworm`, `2.0-22-bullseye`)
-- `mcr.microsoft.com/devcontainers/typescript-node:2.0.0-22` (or `2.0.0-22-bookworm`, `2.0.0-22-bullseye`)
+- `mcr.microsoft.com/devcontainers/typescript-node:3-24` (or `3-24-bookworm`, `3-24-bullseye`)
+- `mcr.microsoft.com/devcontainers/typescript-node:3.0-24` (or `3.0-24-bookworm`, `3.0-24-bullseye`)
+- `mcr.microsoft.com/devcontainers/typescript-node:3.0.0-24` (or `3.0.0-24-bookworm`, `3.0.0-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. `1-1.20`). 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.
+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-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.
 
 Beyond TypeScript, Node.js, and `git`, this image / `Dockerfile` includes `eslint`, `zsh`, [Oh My Zsh!](https://ohmyz.sh/), a non-root `node` user with `sudo` access, and a set of common dependencies for development. Since `tslint` is [now fully deprecated](https://github.com/palantir/tslint/issues/4534), the image includes `tslint-to-eslint-config` globally to help you migrate.
 
diff --git a/src/typescript-node/manifest.json b/src/typescript-node/manifest.json
@@ -1,16 +1,22 @@
 {
-	"version": "2.0.2",
+	"version": "3.0.0",
 	"variants": [
+		"24-bookworm",
 		"22-bookworm",
 		"20-bookworm",
+		"24-bullseye",
 		"22-bullseye",
 		"20-bullseye"
 	],
 	"build": {
-		"latest": "22-bookworm",
+		"latest": "24-bookworm",
 		"rootDistro": "debian",
 		"parent": "javascript-node",
 		"architectures": {
+			"24-bookworm": [
+				"linux/amd64",
+				"linux/arm64"
+			],
 			"22-bookworm": [
 				"linux/amd64",
 				"linux/arm64"
@@ -19,6 +25,10 @@
 				"linux/amd64",
 				"linux/arm64"
 			],
+			"24-bullseye": [
+				"linux/amd64",
+				"linux/arm64"
+			],
 			"22-bullseye": [
 				"linux/amd64",
 				"linux/arm64"
@@ -32,17 +42,17 @@
 			"typescript-node:${VERSION}-${VARIANT}"
 		],
 		"variantTags": {
-			"22-bookworm": [
-				"typescript-node:${VERSION}-22",
+			"24-bookworm": [
+				"typescript-node:${VERSION}-24",
 				"typescript-node:${VERSION}-bookworm"
 			],
+			"22-bookworm": [
+				"typescript-node:${VERSION}-22"
+			],
 			"20-bookworm": [
 				"typescript-node:${VERSION}-20"
 			],
-			"22-bullseye": [
-				"typescript-node:${VERSION}-bullseye"
-			],
-			"20-bullseye": [
+			"24-bullseye": [
 				"typescript-node:${VERSION}-bullseye"
 			]
 		}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "image": "mcr.microsoft.com/devcontainers/javascript-node:0-18",`
	`2`	`+ "image": "mcr.microsoft.com/devcontainers/javascript-node:3-22",`
`3`	`3`	`"features": {`
`4`	`4`	`"ghcr.io/devcontainers/features/docker-in-docker:2": {},`
`5`	`5`	`"ghcr.io/devcontainers/features/azure-cli:1": {}`
Original file line number	Diff line number	Diff line change
`@@ -1248,6 +1248,16 @@`
`1248`	`1248`	`}`
`1249`	`1249`	`}`
`1250`	`1250`	`},`
	`1251`	`+ {`
	`1252`	`+ "Component": {`
	`1253`	`+ "Type": "other",`
	`1254`	`+ "Other": {`
	`1255`	`+ "Name": "Docker Image: node",`
	`1256`	`+ "Version": "24-bookworm",`
	`1257`	`+ "DownloadUrl": "https://hub.docker.com/_/node"`
	`1258`	`+ }`
	`1259`	`+ }`
	`1260`	`+ },`
`1251`	`1261`	`{`
`1252`	`1262`	`"Component": {`
`1253`	`1263`	`"Type": "other",`
`@@ -1278,6 +1288,16 @@`
`1278`	`1288`	`}`
`1279`	`1289`	`}`
`1280`	`1290`	`},`
	`1291`	`+ {`
	`1292`	`+ "Component": {`
	`1293`	`+ "Type": "other",`
	`1294`	`+ "Other": {`
	`1295`	`+ "Name": "Docker Image: node",`
	`1296`	`+ "Version": "24-bullseye",`
	`1297`	`+ "DownloadUrl": "https://hub.docker.com/_/node"`
	`1298`	`+ }`
	`1299`	`+ }`
	`1300`	`+ },`
`1281`	`1301`	`{`
`1282`	`1302`	`"Component": {`
`1283`	`1303`	`"Type": "other",`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-ARG VARIANT=3.21`
	`1`	`+ARG VARIANT=3.22`
`2`	`2`	`FROM alpine:${VARIANT}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG VARIANT=1.24-bookworm`
	`1`	`+ARG VARIANT=1.25-bookworm`
`2`	`2`	`FROM golang:${VARIANT}`
`3`	`3`
`4`	`4`	`# [Optional] Uncomment the next line to use go get to install anything else you need`