From de8c2b77b18f44a349d6a91c89cfee9728763ba8 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 04:47:49 +0000
Subject: [PATCH 01/15] Initial plan


From c0d78617c2d6d956961d901014bc84f514ac05eb Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 04:51:06 +0000
Subject: [PATCH 02/15] fix: sync template image versions with
 devcontainers/images manifests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Updated the following image version references to match the current
versions in devcontainers/images manifest.json files:

- typescript-node: 1 → 4 (manifest version 4.0.6)
- javascript-node: 1 → 4 (manifest version 4.0.8)
- python: 2 → 3, 1 → 3 (manifest version 3.0.5)
- java: 1 → 3 (manifest version 3.0.5)
- cpp: 1 → 2 (manifest version 2.1.5)
- ruby: 2 → 3 (manifest version 3.0.2)

All updated tags verified to exist on MCR registry.

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
---
 src/cpp-mariadb/.devcontainer/Dockerfile              | 2 +-
 src/cpp/.devcontainer/Dockerfile                      | 2 +-
 src/java-postgres/.devcontainer/Dockerfile            | 2 +-
 src/java/.devcontainer/devcontainer.json              | 2 +-
 src/javascript-node-mongo/.devcontainer/Dockerfile    | 2 +-
 src/javascript-node-postgres/.devcontainer/Dockerfile | 2 +-
 src/javascript-node/.devcontainer/devcontainer.json   | 2 +-
 src/postgres/.devcontainer/Dockerfile                 | 2 +-
 src/python/.devcontainer/devcontainer.json            | 2 +-
 src/ruby-rails-postgres/.devcontainer/Dockerfile      | 2 +-
 src/ruby/.devcontainer/devcontainer.json              | 2 +-
 src/typescript-node/.devcontainer/devcontainer.json   | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/cpp-mariadb/.devcontainer/Dockerfile b/src/cpp-mariadb/.devcontainer/Dockerfile
index fab07762..cf32009b 100644
--- a/src/cpp-mariadb/.devcontainer/Dockerfile
+++ b/src/cpp-mariadb/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/cpp:1-${templateOption:imageVariant}
+FROM mcr.microsoft.com/devcontainers/cpp:2-${templateOption:imageVariant}
 
 # Everything below this is needed for installing MariaDB
 # Instructions are copied and modified from: https://mariadb.com/docs/clients/mariadb-connectors/connector-cpp/install/
diff --git a/src/cpp/.devcontainer/Dockerfile b/src/cpp/.devcontainer/Dockerfile
index c105b812..1f7e4e08 100644
--- a/src/cpp/.devcontainer/Dockerfile
+++ b/src/cpp/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/cpp:1-${templateOption:imageVariant}
+FROM mcr.microsoft.com/devcontainers/cpp:2-${templateOption:imageVariant}
 
 ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE="${templateOption:reinstallCmakeVersionFromSource}"
 
diff --git a/src/java-postgres/.devcontainer/Dockerfile b/src/java-postgres/.devcontainer/Dockerfile
index 13cbe7e5..1a3ea84d 100644
--- a/src/java-postgres/.devcontainer/Dockerfile
+++ b/src/java-postgres/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/java:1-${templateOption:imageVariant}
+FROM mcr.microsoft.com/devcontainers/java:3-${templateOption:imageVariant}
 
 ARG INSTALL_MAVEN="${templateOption:installMaven}"
 ARG MAVEN_VERSION=""
diff --git a/src/java/.devcontainer/devcontainer.json b/src/java/.devcontainer/devcontainer.json
index 4664b357..a3ef6304 100644
--- a/src/java/.devcontainer/devcontainer.json
+++ b/src/java/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
 {
 	"name": "Java",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/java:1-${templateOption:imageVariant}",
+	"image": "mcr.microsoft.com/devcontainers/java:3-${templateOption:imageVariant}",
 
 	"features": {
 		"ghcr.io/devcontainers/features/java:1": {
diff --git a/src/javascript-node-mongo/.devcontainer/Dockerfile b/src/javascript-node-mongo/.devcontainer/Dockerfile
index 796ba510..c97e3129 100644
--- a/src/javascript-node-mongo/.devcontainer/Dockerfile
+++ b/src/javascript-node-mongo/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/javascript-node:1-${templateOption:imageVariant}
+FROM mcr.microsoft.com/devcontainers/javascript-node:4-${templateOption:imageVariant}
 
 # Install MongoDB command line tools - though mongo-database-tools not available on arm64
 ARG MONGO_TOOLS_VERSION=6.0
diff --git a/src/javascript-node-postgres/.devcontainer/Dockerfile b/src/javascript-node-postgres/.devcontainer/Dockerfile
index 75a5be10..3af93a2b 100644
--- a/src/javascript-node-postgres/.devcontainer/Dockerfile
+++ b/src/javascript-node-postgres/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/javascript-node:1-${templateOption:imageVariant}
+FROM mcr.microsoft.com/devcontainers/javascript-node:4-${templateOption:imageVariant}
 
 # [Optional] Uncomment this section to install additional OS packages.
 # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
diff --git a/src/javascript-node/.devcontainer/devcontainer.json b/src/javascript-node/.devcontainer/devcontainer.json
index 1da06303..3cde0288 100644
--- a/src/javascript-node/.devcontainer/devcontainer.json
+++ b/src/javascript-node/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
 {
 	"name": "Node.js",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/javascript-node:1-${templateOption:imageVariant}"
+	"image": "mcr.microsoft.com/devcontainers/javascript-node:4-${templateOption:imageVariant}"
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},
diff --git a/src/postgres/.devcontainer/Dockerfile b/src/postgres/.devcontainer/Dockerfile
index 917fce58..44c4605a 100644
--- a/src/postgres/.devcontainer/Dockerfile
+++ b/src/postgres/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/python:1-${templateOption:imageVariant}
+FROM mcr.microsoft.com/devcontainers/python:3-${templateOption:imageVariant}
 
 ENV PYTHONUNBUFFERED 1
 
diff --git a/src/python/.devcontainer/devcontainer.json b/src/python/.devcontainer/devcontainer.json
index 7bc38796..f18df52f 100644
--- a/src/python/.devcontainer/devcontainer.json
+++ b/src/python/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
 {
 	"name": "Python 3",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/python:2-${templateOption:imageVariant}"
+	"image": "mcr.microsoft.com/devcontainers/python:3-${templateOption:imageVariant}"
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},
diff --git a/src/ruby-rails-postgres/.devcontainer/Dockerfile b/src/ruby-rails-postgres/.devcontainer/Dockerfile
index 47767878..dd84a119 100644
--- a/src/ruby-rails-postgres/.devcontainer/Dockerfile
+++ b/src/ruby-rails-postgres/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/ruby:2-${templateOption:imageVariant}
+FROM mcr.microsoft.com/devcontainers/ruby:3-${templateOption:imageVariant}
 
 # Install Rails
 RUN su vscode -c "gem install rails webdrivers"
diff --git a/src/ruby/.devcontainer/devcontainer.json b/src/ruby/.devcontainer/devcontainer.json
index eead7386..3f642645 100644
--- a/src/ruby/.devcontainer/devcontainer.json
+++ b/src/ruby/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
 {
 	"name": "Ruby",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/ruby:2-${templateOption:imageVariant}"
+	"image": "mcr.microsoft.com/devcontainers/ruby:3-${templateOption:imageVariant}"
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},
diff --git a/src/typescript-node/.devcontainer/devcontainer.json b/src/typescript-node/.devcontainer/devcontainer.json
index 310dbae9..c83df255 100644
--- a/src/typescript-node/.devcontainer/devcontainer.json
+++ b/src/typescript-node/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
 {
 	"name": "Node.js & TypeScript",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/typescript-node:1-${templateOption:imageVariant}"
+	"image": "mcr.microsoft.com/devcontainers/typescript-node:4-${templateOption:imageVariant}"
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},

From edd0fcc5d18d1c1b3d321073c9562c8bc89296c2 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 05:09:34 +0000
Subject: [PATCH 03/15] revert: undo ruby and ruby-rails-postgres template
 changes

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
---
 src/ruby-rails-postgres/.devcontainer/Dockerfile | 2 +-
 src/ruby/.devcontainer/devcontainer.json         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ruby-rails-postgres/.devcontainer/Dockerfile b/src/ruby-rails-postgres/.devcontainer/Dockerfile
index dd84a119..47767878 100644
--- a/src/ruby-rails-postgres/.devcontainer/Dockerfile
+++ b/src/ruby-rails-postgres/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/ruby:3-${templateOption:imageVariant}
+FROM mcr.microsoft.com/devcontainers/ruby:2-${templateOption:imageVariant}
 
 # Install Rails
 RUN su vscode -c "gem install rails webdrivers"
diff --git a/src/ruby/.devcontainer/devcontainer.json b/src/ruby/.devcontainer/devcontainer.json
index 3f642645..eead7386 100644
--- a/src/ruby/.devcontainer/devcontainer.json
+++ b/src/ruby/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
 {
 	"name": "Ruby",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/ruby:3-${templateOption:imageVariant}"
+	"image": "mcr.microsoft.com/devcontainers/ruby:2-${templateOption:imageVariant}"
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},

From 889463c617c63a4e5235024c17e41352aa723cb4 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 05:11:31 +0000
Subject: [PATCH 04/15] feat: add missing trixie variants, update defaults, and
 bump major versions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Updated devcontainer-template.json for all templates where image
versions were changed:

- typescript-node: 4.0.2 → 5.0.0, add trixie variants, default 24-trixie
- javascript-node: 4.0.2 → 5.0.0, add trixie variants, default 24-trixie
- javascript-node-postgres: 4.0.2 → 5.0.0, add trixie variants, default 24-trixie
- javascript-node-mongo: 4.0.2 → 5.0.0, add trixie variants, default 24-trixie
- python: 5.0.0 → 6.0.0
- postgres: 2.2.0 → 3.0.0, add trixie/newer Python variants, default 3.14-trixie
- java: 4.0.2 → 5.0.0, add trixie/Java 25 variants, default 25-trixie
- java-postgres: 4.0.2 → 5.0.0, add trixie/Java 25 variants, default 25-trixie
- cpp: 3.1.0 → 4.0.0, add debian13 (trixie), default debian13
- cpp-mariadb: 3.1.0 → 4.0.0, add debian13 (trixie), default debian13

All new tags verified on MCR registry.

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
---
 src/cpp-mariadb/devcontainer-template.json    |  8 +++---
 src/cpp/devcontainer-template.json            |  8 +++---
 src/java-postgres/devcontainer-template.json  | 18 ++++++-------
 src/java/devcontainer-template.json           | 18 ++++++-------
 .../devcontainer-template.json                | 16 +++++++-----
 .../devcontainer-template.json                | 18 ++++++-------
 .../devcontainer-template.json                | 18 ++++++-------
 src/postgres/devcontainer-template.json       | 26 +++++++++----------
 src/python/devcontainer-template.json         |  2 +-
 .../devcontainer-template.json                | 17 ++++++------
 10 files changed, 75 insertions(+), 74 deletions(-)

diff --git a/src/cpp-mariadb/devcontainer-template.json b/src/cpp-mariadb/devcontainer-template.json
index 0456ddbf..5cca7062 100644
--- a/src/cpp-mariadb/devcontainer-template.json
+++ b/src/cpp-mariadb/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "cpp-mariadb",
-    "version": "3.1.0",
+    "version": "4.0.0",
     "name": "C++ & MariaDB",
     "description": "Develop C++ applications on Linux. Includes Debian C++ build tools.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/cpp-mariadb",
@@ -9,14 +9,14 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon):",
+            "description": "Debian / Ubuntu version (use Debian 13, Debian 12, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon):",
             "proposals": [
+                "debian13",
                 "debian12",
-                "debian11",
                 "ubuntu24.04",
                 "ubuntu22.04"
             ],
-            "default": "debian12"
+            "default": "debian13"
         },
         "reinstallCmakeVersionFromSource": {
             "type": "string",
diff --git a/src/cpp/devcontainer-template.json b/src/cpp/devcontainer-template.json
index 11ac0b29..83d56b45 100644
--- a/src/cpp/devcontainer-template.json
+++ b/src/cpp/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "cpp",
-    "version": "3.1.0",
+    "version": "4.0.0",
     "name": "C++",
     "description": "Develop C++ applications on Linux. Includes Debian C++ build tools.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/cpp",
@@ -9,14 +9,14 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon):",
+            "description": "Debian / Ubuntu version (use Debian 13, Debian 12, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon):",
             "proposals": [
+                "debian13",
                 "debian12",
-                "debian11",
                 "ubuntu24.04",
                 "ubuntu22.04"
             ],
-            "default": "debian12"
+            "default": "debian13"
         },
         "reinstallCmakeVersionFromSource": {
             "type": "string",
diff --git a/src/java-postgres/devcontainer-template.json b/src/java-postgres/devcontainer-template.json
index 23d07574..4b731f73 100644
--- a/src/java-postgres/devcontainer-template.json
+++ b/src/java-postgres/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "java-postgres",
-    "version": "4.0.2",
+    "version": "5.0.0",
     "name": "Java & PostgreSQL",
     "description": "Develop applications with Java and PostgreSQL. Includes a Java application container and PostgreSQL server.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/java-postgres",
@@ -9,18 +9,18 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "Java version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon):",
+            "description": "Java version (use -trixie, or -bookworm variants on local arm64/Apple Silicon):",
             "proposals": [
+                "25-trixie",
+                "21-trixie",
+                "17-trixie",
+                "11-trixie",
+                "25-bookworm",
                 "21-bookworm",
                 "17-bookworm",
-                "11-bookworm",
-                "8-bookworm",
-                "21-bullseye",
-                "17-bullseye",
-                "11-bullseye",
-                "8-bullseye"
+                "11-bookworm"
             ],
-            "default": "21-bullseye"
+            "default": "25-trixie"
         },
         "installMaven": {
             "type": "boolean",
diff --git a/src/java/devcontainer-template.json b/src/java/devcontainer-template.json
index 4dc3c394..cd45cb1d 100644
--- a/src/java/devcontainer-template.json
+++ b/src/java/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "java",
-    "version": "4.0.2",
+    "version": "5.0.0",
     "name": "Java",
     "description": "Develop Java applications. Includes the JDK and Java extensions.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/java",
@@ -9,18 +9,18 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "Java version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon):",
+            "description": "Java version (use -trixie, or -bookworm variants on local arm64/Apple Silicon):",
             "proposals": [
+                "25-trixie",
+                "21-trixie",
+                "17-trixie",
+                "11-trixie",
+                "25-bookworm",
                 "21-bookworm",
                 "17-bookworm",
-                "11-bookworm",
-                "8-bookworm",
-                "21-bullseye",
-                "17-bullseye",
-                "11-bullseye",
-                "8-bullseye"
+                "11-bookworm"
             ],
-            "default": "21-bullseye"
+            "default": "25-trixie"
         },
         "installMaven": {
             "type": "boolean",
diff --git a/src/javascript-node-mongo/devcontainer-template.json b/src/javascript-node-mongo/devcontainer-template.json
index 6238ea1f..bbab3ee7 100644
--- a/src/javascript-node-mongo/devcontainer-template.json
+++ b/src/javascript-node-mongo/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "javascript-node-mongo",
-    "version": "4.0.2",
+    "version": "5.0.0",
     "name": "Node.js & Mongo DB",
     "description": "Develop applications in Node.js and Mongo DB. Includes Node.js, eslint, and yarn in a container linked to a Mongo DB.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/javascript-node-mongo",
@@ -9,17 +9,19 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "Node.js version (use -bullseye variants on local arm64/Apple Silicon):",
+            "description": "Node.js version (use -trixie, -bookworm, or -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
+                "24-trixie",
+                "22-trixie",
+                "20-trixie",
                 "24-bookworm",
-                "24-bullseye",
                 "22-bookworm",
-                "22-bullseye",
                 "20-bookworm",
-                "20-bullseye",
-                "18-bullseye"
+                "24-bullseye",
+                "22-bullseye",
+                "20-bullseye"
             ],
-            "default": "24-bookworm"
+            "default": "24-trixie"
         }
     },
     "platforms": [
diff --git a/src/javascript-node-postgres/devcontainer-template.json b/src/javascript-node-postgres/devcontainer-template.json
index d0c88454..7f2bc7ad 100644
--- a/src/javascript-node-postgres/devcontainer-template.json
+++ b/src/javascript-node-postgres/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "javascript-node-postgres",
-    "version": "4.0.2",
+    "version": "5.0.0",
     "name": "Node.js & PostgreSQL",
     "description": "Develop applications in Node.js and PostgreSQL. Includes Node.js, eslint, and yarn in a container linked to a Postgres DB container",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/javascript-node-postgres",
@@ -9,19 +9,19 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "Node.js version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):",
+            "description": "Node.js version (use -trixie, -bookworm, or -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
+                "24-trixie",
+                "22-trixie",
+                "20-trixie",
                 "24-bookworm",
-                "24-bullseye",
                 "22-bookworm",
-                "22-bullseye",
                 "20-bookworm",
-                "20-bullseye",
-                "18-bookworm",
-                "20-bullseye",
-                "18-bullseye"
+                "24-bullseye",
+                "22-bullseye",
+                "20-bullseye"
             ],
-            "default": "24-bookworm"
+            "default": "24-trixie"
         }
     },
     "platforms": [
diff --git a/src/javascript-node/devcontainer-template.json b/src/javascript-node/devcontainer-template.json
index b33f5861..ed109cea 100644
--- a/src/javascript-node/devcontainer-template.json
+++ b/src/javascript-node/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "javascript-node",
-    "version": "4.0.2",
+    "version": "5.0.0",
     "name": "Node.js & JavaScript",
     "description": "Develop Node.js based applications. Includes Node.js, eslint, nvm, and yarn.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/javascript-node",
@@ -9,19 +9,19 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "Node.js version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):",
+            "description": "Node.js version (use -trixie, -bookworm, or -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
+                "24-trixie",
+                "22-trixie",
+                "20-trixie",
                 "24-bookworm",
-                "24-bullseye",
                 "22-bookworm",
-                "22-bullseye",
                 "20-bookworm",
-                "20-bullseye",
-                "18-bookworm",
-                "20-bullseye",
-                "18-bullseye"
+                "24-bullseye",
+                "22-bullseye",
+                "20-bullseye"
             ],
-            "default": "24-bookworm"
+            "default": "24-trixie"
         }
     },
     "platforms": [
diff --git a/src/postgres/devcontainer-template.json b/src/postgres/devcontainer-template.json
index b24554f8..01fe2eb9 100644
--- a/src/postgres/devcontainer-template.json
+++ b/src/postgres/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "postgres",
-    "version": "2.2.0",
+    "version": "3.0.0",
     "name": "Python 3 & PostgreSQL",
     "description": "Develop applications with Python 3 and PostgreSQL. Includes a Python application container and PostgreSQL server.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/postgres",
@@ -9,22 +9,20 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "Python version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon):",
+            "description": "Python version (use -trixie, -bookworm, or -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
-                "3-bookworm",
+                "3.14-trixie",
+                "3.13-trixie",
+                "3.12-trixie",
+                "3.11-trixie",
+                "3.10-trixie",
+                "3.14-bookworm",
+                "3.13-bookworm",
+                "3.12-bookworm",
                 "3.11-bookworm",
-                "3.10-bookworm",
-                "3.9-bookworm",
-                "3-bullseye",
-                "3.11-bullseye",
-                "3.10-bullseye",
-                "3.9-bullseye",
-                "3-buster",
-                "3.11-buster",
-                "3.10-buster",
-                "3.9-buster"
+                "3.10-bookworm"
             ],
-            "default": "3.11-bullseye"
+            "default": "3.14-trixie"
         }
     },
     "platforms": ["Python"],
diff --git a/src/python/devcontainer-template.json b/src/python/devcontainer-template.json
index 8496b57f..f2ca11ba 100644
--- a/src/python/devcontainer-template.json
+++ b/src/python/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "python",
-    "version": "5.0.0",
+    "version": "6.0.0",
     "name": "Python 3",
     "description": "Develop Python 3 applications.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/python",
diff --git a/src/typescript-node/devcontainer-template.json b/src/typescript-node/devcontainer-template.json
index 8e86084a..818e7e1a 100644
--- a/src/typescript-node/devcontainer-template.json
+++ b/src/typescript-node/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "typescript-node",
-    "version": "4.0.2",
+    "version": "5.0.0",
     "name": "Node.js & TypeScript",
     "description": "Develop Node.js based applications in TypeScript. Includes Node.js, eslint, nvm, yarn, and the TypeScript compiler.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/typescript-node",
@@ -9,18 +9,19 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "Node.js version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):",
+            "description": "Node.js version (use -trixie, -bookworm, or -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
+                "24-trixie",
+                "22-trixie",
+                "20-trixie",
                 "24-bookworm",
-                "24-bullseye",
                 "22-bookworm",
-                "22-bullseye",
                 "20-bookworm",
-                "18-bookworm",
-                "20-bullseye",
-                "18-bullseye"
+                "24-bullseye",
+                "22-bullseye",
+                "20-bullseye"
             ],
-            "default": "24-bookworm"
+            "default": "24-trixie"
         }
     },
     "platforms": [

From f80e8eb716ef8d6724cdfb85bc5a762af51ceef6 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 06:05:31 +0000
Subject: [PATCH 05/15] fix: replace flaky GitHub maven-wrapper download with
 Apache Maven in java-postgres test.sh

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
---
 test/java-postgres/test.sh | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/test/java-postgres/test.sh b/test/java-postgres/test.sh
index b6d8fabb..7320eb76 100644
--- a/test/java-postgres/test.sh
+++ b/test/java-postgres/test.sh
@@ -7,21 +7,26 @@ source test-utils.sh vscode
 checkCommon
 
 # Prep
-echo -e "\nGetting Maven wrapper..."
-curl -sSL https://github.com/takari/maven-wrapper/archive/maven-wrapper-0.5.5.tar.gz| tar -xzf - 
-mv maven-wrapper-maven-wrapper-0.5.5/mvnw mvnw
-mv maven-wrapper-maven-wrapper-0.5.5/.mvn .mvn
-rm -rf mv maven-wrapper-maven-wrapper-0.5.5
+echo -e "\nResolving Maven..."
+MAVEN_VERSION="3.9.9"
+MAVEN_DIR="apache-maven-${MAVEN_VERSION}"
+
+if command -v mvn >/dev/null 2>&1; then
+    MVN_CMD="mvn"
+else
+    echo "mvn not found, downloading Apache Maven ${MAVEN_VERSION}..."
+    curl -fsSL "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/${MAVEN_DIR}-bin.tar.gz" | tar -xzf -
+    MVN_CMD="$(pwd)/${MAVEN_DIR}/bin/mvn"
+fi
 
 # template specific tests
 checkExtension "vscjava.vscode-java-pack"
 check "java" java -version
-check "build-and-test-jar" ./mvnw -q package
+check "build-and-test-jar" "$MVN_CMD" -q package
 check "test-project" java -jar target/my-app-1.0-SNAPSHOT.jar
 
 # Clean up
-rm -f mvnw
-rm -rf .mvn
+rm -rf "${MAVEN_DIR}"
 
 # Report result
 reportResults

From 8af970fbf63fdf09e229c98194adc8aaf8ae974b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 06:24:44 +0000
Subject: [PATCH 06/15] revert: rollback java-postgres test.sh to original
 maven-wrapper version

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
---
 test/java-postgres/test.sh | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/test/java-postgres/test.sh b/test/java-postgres/test.sh
index 7320eb76..b6d8fabb 100644
--- a/test/java-postgres/test.sh
+++ b/test/java-postgres/test.sh
@@ -7,26 +7,21 @@ source test-utils.sh vscode
 checkCommon
 
 # Prep
-echo -e "\nResolving Maven..."
-MAVEN_VERSION="3.9.9"
-MAVEN_DIR="apache-maven-${MAVEN_VERSION}"
-
-if command -v mvn >/dev/null 2>&1; then
-    MVN_CMD="mvn"
-else
-    echo "mvn not found, downloading Apache Maven ${MAVEN_VERSION}..."
-    curl -fsSL "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/${MAVEN_DIR}-bin.tar.gz" | tar -xzf -
-    MVN_CMD="$(pwd)/${MAVEN_DIR}/bin/mvn"
-fi
+echo -e "\nGetting Maven wrapper..."
+curl -sSL https://github.com/takari/maven-wrapper/archive/maven-wrapper-0.5.5.tar.gz| tar -xzf - 
+mv maven-wrapper-maven-wrapper-0.5.5/mvnw mvnw
+mv maven-wrapper-maven-wrapper-0.5.5/.mvn .mvn
+rm -rf mv maven-wrapper-maven-wrapper-0.5.5
 
 # template specific tests
 checkExtension "vscjava.vscode-java-pack"
 check "java" java -version
-check "build-and-test-jar" "$MVN_CMD" -q package
+check "build-and-test-jar" ./mvnw -q package
 check "test-project" java -jar target/my-app-1.0-SNAPSHOT.jar
 
 # Clean up
-rm -rf "${MAVEN_DIR}"
+rm -f mvnw
+rm -rf .mvn
 
 # Report result
 reportResults

From 828218ccea4f55b558e427f82cdce3402ca205ea Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 06:33:34 +0000
Subject: [PATCH 07/15] fix: replace network_mode with bridge network in
 java-postgres docker-compose and update test.sh

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
---
 .../.devcontainer/docker-compose.yml          | 27 ++++++++++++++-----
 src/java-postgres/NOTES.md                    |  9 ++-----
 test/java-postgres/test.sh                    | 23 +++++++++-------
 3 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/src/java-postgres/.devcontainer/docker-compose.yml b/src/java-postgres/.devcontainer/docker-compose.yml
index 0a6449b9..a0f4c5de 100644
--- a/src/java-postgres/.devcontainer/docker-compose.yml
+++ b/src/java-postgres/.devcontainer/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 volumes:
   postgres-data:
 
@@ -14,7 +12,7 @@ services:
         POSTGRES_PASSWORD: postgres
         POSTGRES_USER: postgres
         POSTGRES_DB: postgres
-        POSTGRES_HOSTNAME: postgresdb
+        POSTGRES_HOSTNAME: db
 
     volumes:
       - ../..:/workspaces:cached
@@ -22,8 +20,13 @@ services:
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
 
-    # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
-    network_mode: service:db
+    # Use proper Docker networking instead of network_mode: service:db
+    # to ensure reliable DNS resolution in all environments
+    depends_on:
+      db:
+        condition: service_healthy
+    networks:
+      - app-network
 
     # Use "forwardPorts" in **devcontainer.json** to forward an app port locally. 
     # (Adding the "ports" property to this file will not forward from a Codespace.)
@@ -32,6 +35,14 @@ services:
     container_name: postgresdb
     image: postgres:latest
     restart: unless-stopped
+    networks:
+      - app-network
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
     volumes:
       - postgres-data:/var/lib/postgresql/data
     environment:
@@ -41,4 +52,8 @@ services:
       POSTGRES_DB: postgres
 
     # Add "forwardPorts": ["5432"] to **devcontainer.json** to forward PostgreSQL locally.
-    # (Adding the "ports" property to this file will not forward from a Codespace.)
\ No newline at end of file
+    # (Adding the "ports" property to this file will not forward from a Codespace.)
+
+networks:
+  app-network:
+    driver: bridge
\ No newline at end of file
diff --git a/src/java-postgres/NOTES.md b/src/java-postgres/NOTES.md
index 144ed053..6a710d56 100644
--- a/src/java-postgres/NOTES.md
+++ b/src/java-postgres/NOTES.md
@@ -5,7 +5,7 @@ This template references an image that was [pre-built](https://containers.dev/im
 
 ## Using this template
 
-This template creates two containers, one for Java and one for PostgreSQL. You will be connected to the Java container, and from within that container the PostgreSQL container will be available on **`localhost`** port 5432. The default database is named `postgres` with a user of `postgres` whose password is `postgres`, and if desired this may be changed in `.devcontainer/docker-compose.yml`. Data is stored in a volume named `postgres-data`.
+This template creates two containers, one for Java and one for PostgreSQL. You will be connected to the Java container, and from within that container the PostgreSQL container will be available on the hostname **`db`** port 5432. The default database is named `postgres` with a user of `postgres` whose password is `postgres`, and if desired this may be changed in `.devcontainer/docker-compose.yml`. Data is stored in a volume named `postgres-data`.
 
 While the template itself works unmodified, it uses the `mcr.microsoft.com/devcontainers/java` image which includes `git`, a non-root `vscode` user with `sudo` access, and a set of common dependencies and Java tools for development.
 
@@ -28,12 +28,7 @@ If needed, you can use `postCreateCommand` to run commands after the container i
 
 ### Adding another service
 
-You can add other services to your `.devcontainer/docker-compose.yml` file [as described in Docker's documentation](https://docs.docker.com/compose/compose-file/#service-configuration-reference). However, if you want anything running in this service to be available in the container on localhost, or want to forward the service locally, be sure to add this line to the service config:
-
-```yaml
-# Runs the service on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
-network_mode: service:db
-```
+You can add other services to your `.devcontainer/docker-compose.yml` file [as described in Docker's documentation](https://docs.docker.com/compose/compose-file/#service-configuration-reference). For inter-service communication, attach new services to the `app-network` bridge network configured in the compose file.
 
 ### Using the forwardPorts property
 
diff --git a/test/java-postgres/test.sh b/test/java-postgres/test.sh
index b6d8fabb..f0dfb0e1 100644
--- a/test/java-postgres/test.sh
+++ b/test/java-postgres/test.sh
@@ -6,22 +6,27 @@ source test-utils.sh vscode
 # Run common tests
 checkCommon
 
-# Prep
-echo -e "\nGetting Maven wrapper..."
-curl -sSL https://github.com/takari/maven-wrapper/archive/maven-wrapper-0.5.5.tar.gz| tar -xzf - 
-mv maven-wrapper-maven-wrapper-0.5.5/mvnw mvnw
-mv maven-wrapper-maven-wrapper-0.5.5/.mvn .mvn
-rm -rf mv maven-wrapper-maven-wrapper-0.5.5
+# Prep - Download Maven for building (network_mode fix enables outbound access)
+echo -e "\nResolving Maven..."
+MAVEN_VERSION="3.9.9"
+MAVEN_DIR="apache-maven-${MAVEN_VERSION}"
+
+if command -v mvn >/dev/null 2>&1; then
+    MVN_CMD="mvn"
+else
+    echo "mvn not found, downloading Apache Maven ${MAVEN_VERSION}..."
+    curl -fsSL "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/${MAVEN_DIR}-bin.tar.gz" | tar -xzf -
+    MVN_CMD="$(pwd)/${MAVEN_DIR}/bin/mvn"
+fi
 
 # template specific tests
 checkExtension "vscjava.vscode-java-pack"
 check "java" java -version
-check "build-and-test-jar" ./mvnw -q package
+check "build-and-test-jar" "$MVN_CMD" -q package
 check "test-project" java -jar target/my-app-1.0-SNAPSHOT.jar
 
 # Clean up
-rm -f mvnw
-rm -rf .mvn
+rm -rf "${MAVEN_DIR}"
 
 # Report result
 reportResults

From 566d1ec6214de1de1eb047aa597e665da9895e3f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 06:39:51 +0000
Subject: [PATCH 08/15] fix: revert test/java-postgres/test.sh to baseline and
 fix typo on line 14

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
---
 test/java-postgres/test.sh | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/test/java-postgres/test.sh b/test/java-postgres/test.sh
index f0dfb0e1..6d9c6f70 100644
--- a/test/java-postgres/test.sh
+++ b/test/java-postgres/test.sh
@@ -6,27 +6,22 @@ source test-utils.sh vscode
 # Run common tests
 checkCommon
 
-# Prep - Download Maven for building (network_mode fix enables outbound access)
-echo -e "\nResolving Maven..."
-MAVEN_VERSION="3.9.9"
-MAVEN_DIR="apache-maven-${MAVEN_VERSION}"
-
-if command -v mvn >/dev/null 2>&1; then
-    MVN_CMD="mvn"
-else
-    echo "mvn not found, downloading Apache Maven ${MAVEN_VERSION}..."
-    curl -fsSL "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/${MAVEN_DIR}-bin.tar.gz" | tar -xzf -
-    MVN_CMD="$(pwd)/${MAVEN_DIR}/bin/mvn"
-fi
+# Prep
+echo -e "\nGetting Maven wrapper..."
+curl -sSL https://github.com/takari/maven-wrapper/archive/maven-wrapper-0.5.5.tar.gz| tar -xzf - 
+mv maven-wrapper-maven-wrapper-0.5.5/mvnw mvnw
+mv maven-wrapper-maven-wrapper-0.5.5/.mvn .mvn
+rm -rf maven-wrapper-maven-wrapper-0.5.5
 
 # template specific tests
 checkExtension "vscjava.vscode-java-pack"
 check "java" java -version
-check "build-and-test-jar" "$MVN_CMD" -q package
+check "build-and-test-jar" ./mvnw -q package
 check "test-project" java -jar target/my-app-1.0-SNAPSHOT.jar
 
 # Clean up
-rm -rf "${MAVEN_DIR}"
+rm -f mvnw
+rm -rf .mvn
 
 # Report result
 reportResults

From c12ea2e6d344f006e3c80a19ed2df66874646bbe Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 07:43:57 +0000
Subject: [PATCH 09/15] fix: update postgres volume mount path for PostgreSQL
 18+ compatibility

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
---
 src/java-postgres/.devcontainer/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java-postgres/.devcontainer/docker-compose.yml b/src/java-postgres/.devcontainer/docker-compose.yml
index a0f4c5de..4a7db768 100644
--- a/src/java-postgres/.devcontainer/docker-compose.yml
+++ b/src/java-postgres/.devcontainer/docker-compose.yml
@@ -44,7 +44,7 @@ services:
       retries: 5
       start_period: 30s
     volumes:
-      - postgres-data:/var/lib/postgresql/data
+      - postgres-data:/var/lib/postgresql
     environment:
       # NOTE: POSTGRES_DB/USER/PASSWORD should match values in app container
       POSTGRES_PASSWORD: postgres

From d979901160cd59c8c8df40f630e5715cf0b302fa Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 08:01:17 +0000
Subject: [PATCH 10/15] fix: update javascript-node-postgres network config and
 postgres volume mount

Replace network_mode: service:db with bridge network (app-network) to fix
DNS resolution failures in CI. Update postgres volume mount from
/var/lib/postgresql/data to /var/lib/postgresql for PostgreSQL 18+
compatibility. Update NOTES.md to reflect hostname db instead of localhost.

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
---
 .../.devcontainer/docker-compose.yml          | 27 ++++++++++++++-----
 src/javascript-node-postgres/NOTES.md         |  2 +-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/javascript-node-postgres/.devcontainer/docker-compose.yml b/src/javascript-node-postgres/.devcontainer/docker-compose.yml
index 3b7c6e87..5330afed 100644
--- a/src/javascript-node-postgres/.devcontainer/docker-compose.yml
+++ b/src/javascript-node-postgres/.devcontainer/docker-compose.yml
@@ -1,4 +1,5 @@
-version: '3.8'
+volumes:
+  postgres-data:
 
 services:
   app:
@@ -12,8 +13,13 @@ services:
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
 
-    # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
-    network_mode: service:db
+    # Use proper Docker networking instead of network_mode: service:db
+    # to ensure reliable DNS resolution in all environments
+    depends_on:
+      db:
+        condition: service_healthy
+    networks:
+      - app-network
 
     # Use "forwardPorts" in **devcontainer.json** to forward an app port locally. 
     # (Adding the "ports" property to this file will not forward from a Codespace.)
@@ -21,8 +27,16 @@ services:
   db:
     image: postgres:latest
     restart: unless-stopped
+    networks:
+      - app-network
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
     volumes:
-      - postgres-data:/var/lib/postgresql/data
+      - postgres-data:/var/lib/postgresql
     environment:
       POSTGRES_PASSWORD: postgres
       POSTGRES_USER: postgres
@@ -31,5 +45,6 @@ services:
     # Add "forwardPorts": ["5432"] to **devcontainer.json** to forward PostgreSQL locally.
     # (Adding the "ports" property to this file will not forward from a Codespace.)
 
-volumes:
-  postgres-data:
+networks:
+  app-network:
+    driver: bridge
diff --git a/src/javascript-node-postgres/NOTES.md b/src/javascript-node-postgres/NOTES.md
index 2409825d..ae82c96a 100644
--- a/src/javascript-node-postgres/NOTES.md
+++ b/src/javascript-node-postgres/NOTES.md
@@ -5,7 +5,7 @@ This template references an image that was [pre-built](https://containers.dev/im
 
 ## Using this template
 
-This definition creates two containers, one for Node.js and one for PostgreSQL. You will be connected to the Node.js container, and from within that container the PostgreSQL container will be available on **`localhost`** port 5432. The default database is named `postgres` with a user of `postgres` whose password is `postgres`, and if desired this may be changed in `docker-compose.yml`. Data is stored in a volume named `postgres-data`.
+This definition creates two containers, one for Node.js and one for PostgreSQL. You will be connected to the Node.js container, and from within that container the PostgreSQL container will be available on **`db`** port 5432. The default database is named `postgres` with a user of `postgres` whose password is `postgres`, and if desired this may be changed in `docker-compose.yml`. Data is stored in a volume named `postgres-data`.
 
 While the definition itself works unmodified, it uses the `mcr.microsoft.com/devcontainers/javascript-node` image which includes `git`, `eslint`, `zsh`, [Oh My Zsh!](https://ohmyz.sh/), a non-root `vscode` user with `sudo` access, and a set of common dependencies for development.
 

From 5e81cc216f64378e46921b2898135ffdde06d581 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 08:17:25 +0000
Subject: [PATCH 11/15] fix: update javascript-node-postgres test db host from
 localhost to db

Update the PostgreSQL connection host in test/javascript-node-postgres/server.js
from 'localhost' to 'db' to match the bridge network configuration change
in docker-compose.yml.

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
---
 test/javascript-node-postgres/server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/javascript-node-postgres/server.js b/test/javascript-node-postgres/server.js
index 9e997a49..5e2a0a6a 100644
--- a/test/javascript-node-postgres/server.js
+++ b/test/javascript-node-postgres/server.js
@@ -12,7 +12,7 @@ const promise = require('bluebird');
 const PORT = 3000;
 const HOST = '0.0.0.0';
 const cn = {
-	host: 'localhost', // host of db container
+	host: 'db', // host of db container
 	port: 5432, // 5432 is the default;
 	database: 'postgres', // database name
 	user: 'postgres', // database user name

From 8901a1423b8321eb40690e4f46a631137efce258 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 08:37:12 +0000
Subject: [PATCH 12/15] Remove trixie variants from javascript-node-mongo and
 default to 24-bookworm

MongoDB packages are not available for Debian Trixie (13), causing test
failures. Removed all trixie variants and changed the default to
24-bookworm.

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
---
 src/javascript-node-mongo/devcontainer-template.json | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/javascript-node-mongo/devcontainer-template.json b/src/javascript-node-mongo/devcontainer-template.json
index bbab3ee7..3ed7eab9 100644
--- a/src/javascript-node-mongo/devcontainer-template.json
+++ b/src/javascript-node-mongo/devcontainer-template.json
@@ -9,11 +9,8 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "Node.js version (use -trixie, -bookworm, or -bullseye variants on local arm64/Apple Silicon):",
+            "description": "Node.js version (use -bookworm or -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
-                "24-trixie",
-                "22-trixie",
-                "20-trixie",
                 "24-bookworm",
                 "22-bookworm",
                 "20-bookworm",
@@ -21,7 +18,7 @@
                 "22-bullseye",
                 "20-bullseye"
             ],
-            "default": "24-trixie"
+            "default": "24-bookworm"
         }
     },
     "platforms": [

From 3df10ac18527fc670927c5ec8a8a523fe67a2936 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 09:35:32 +0000
Subject: [PATCH 13/15] Include php, php-mariadb, and jekyll template changes
 from closed PR #406

- php: Removed bullseye variants, added 8.2-trixie and 8.2-bookworm, reordered proposals
- php-mariadb: Removed bullseye variants, added 8.2-trixie and 8.2-bookworm, reordered proposals
- jekyll: Removed obsolete buster variant

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
---
 src/jekyll/devcontainer-template.json      |  3 +--
 src/php-mariadb/devcontainer-template.json | 10 ++++------
 src/php/devcontainer-template.json         | 12 ++++++------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/jekyll/devcontainer-template.json b/src/jekyll/devcontainer-template.json
index dd3cc9f9..23b2db7c 100644
--- a/src/jekyll/devcontainer-template.json
+++ b/src/jekyll/devcontainer-template.json
@@ -12,8 +12,7 @@
             "description": "Debian OS version (use bookworm, or bullseye on local arm64/Apple Silicon):",
             "proposals": [
                 "bookworm",
-                "bullseye",
-                "buster"
+                "bullseye"
             ],
             "default": "bullseye"
         }
diff --git a/src/php-mariadb/devcontainer-template.json b/src/php-mariadb/devcontainer-template.json
index a55dee83..fd506752 100644
--- a/src/php-mariadb/devcontainer-template.json
+++ b/src/php-mariadb/devcontainer-template.json
@@ -13,15 +13,13 @@
             "proposals": [
                 "8.5-trixie",
                 "8.5-bookworm",
-                "8.5-bullseye",
                 "8.4-trixie",
-                "8.4-bookworm",				
-                "8.4-bullseye",
+                "8.4-bookworm",
                 "8.3-trixie",
                 "8.3-bookworm",
-                "8.3-bullseye",
-                 "8-bullseye",
-                  "8-trixie"		
+                "8.2-trixie",
+                "8.2-bookworm",
+                "8-trixie"
             ],
             "default": "8.5-trixie"
         }
diff --git a/src/php/devcontainer-template.json b/src/php/devcontainer-template.json
index 6881ce16..217c8c83 100644
--- a/src/php/devcontainer-template.json
+++ b/src/php/devcontainer-template.json
@@ -13,13 +13,13 @@
             "proposals": [
                 "8.5-trixie",
                 "8.5-bookworm",
-                "8.5-bullseye",
-                "8-bookworm",
+                "8.4-trixie",
+                "8.4-bookworm",
+                "8.3-trixie",
                 "8.3-bookworm",
-                "8.4-bookworm",				
-                "8-bullseye",
-                "8.3-bullseye",
-                "8.4-bullseye"				
+                "8.2-trixie",
+                "8.2-bookworm",
+                "8-bookworm"
             ],
             "default": "8.5-trixie"
         }

From c720a30631dc33022a5abf99a8da57a633d99f51 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 09:52:40 +0000
Subject: [PATCH 14/15] Remove invalid Python variants not present in MCR

Removed Python 3.9 variants (3.9-trixie, 3.9-bookworm, 3.9-bullseye) and
all bullseye variants (3-bullseye, 3.14-bullseye through 3.10-bullseye) from
the python template - these tags do not exist in MCR with the version 3
prefix. Verified all remaining variants across all templates against MCR.

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
---
 src/python/devcontainer-template.json | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/python/devcontainer-template.json b/src/python/devcontainer-template.json
index f2ca11ba..7495b03f 100644
--- a/src/python/devcontainer-template.json
+++ b/src/python/devcontainer-template.json
@@ -9,29 +9,20 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "Python version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon):",
+            "description": "Python version (use -trixie, or -bookworm variants on local arm64/Apple Silicon):",
             "proposals": [
                 "3-trixie",
                 "3.14-trixie",
-                "3.13-trixie",				
+                "3.13-trixie",
                 "3.12-trixie",
                 "3.11-trixie",
                 "3.10-trixie",
-                "3.9-trixie",				
                 "3-bookworm",
                 "3.14-bookworm",
-                "3.13-bookworm",				
+                "3.13-bookworm",
                 "3.12-bookworm",
                 "3.11-bookworm",
-                "3.10-bookworm",
-                "3.9-bookworm",
-                "3-bullseye",
-                "3.14-bullseye",
-                "3.13-bullseye",
-                "3.12-bullseye",
-                "3.11-bullseye",
-                "3.10-bullseye",
-                "3.9-bullseye"
+                "3.10-bookworm"
             ],
             "default": "3.14-trixie"
         }

From 4e1f830379bfe68bbc2d2de77b4434bde21b669b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 10:51:55 +0000
Subject: [PATCH 15/15] Add 8-trixie and 8-bookworm variants to java and
 java-postgres templates

Added Java 8 variants (8-trixie, 8-bookworm) to both java and java-postgres
devcontainer-template.json proposals. Tags verified against MCR.

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
---
 src/java-postgres/devcontainer-template.json | 4 +++-
 src/java/devcontainer-template.json          | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/java-postgres/devcontainer-template.json b/src/java-postgres/devcontainer-template.json
index 4b731f73..70b26dab 100644
--- a/src/java-postgres/devcontainer-template.json
+++ b/src/java-postgres/devcontainer-template.json
@@ -15,10 +15,12 @@
                 "21-trixie",
                 "17-trixie",
                 "11-trixie",
+                "8-trixie",
                 "25-bookworm",
                 "21-bookworm",
                 "17-bookworm",
-                "11-bookworm"
+                "11-bookworm",
+                "8-bookworm"
             ],
             "default": "25-trixie"
         },
diff --git a/src/java/devcontainer-template.json b/src/java/devcontainer-template.json
index cd45cb1d..ef2c3dd5 100644
--- a/src/java/devcontainer-template.json
+++ b/src/java/devcontainer-template.json
@@ -15,10 +15,12 @@
                 "21-trixie",
                 "17-trixie",
                 "11-trixie",
+                "8-trixie",
                 "25-bookworm",
                 "21-bookworm",
                 "17-bookworm",
-                "11-bookworm"
+                "11-bookworm",
+                "8-bookworm"
             ],
             "default": "25-trixie"
         },