Merge branch 'main' into javascript-node-trixie-update

Kaniska244 · web-flow · commit c81de8a7d1a3 · 2025-10-28T19:16:06.000+05:30
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-	"image": "mcr.microsoft.com/devcontainers/javascript-node:1-18-bullseye",
+	"image": "mcr.microsoft.com/devcontainers/javascript-node:4-24-trixie",
 	"features": {
 		"ghcr.io/devcontainers/features/docker-in-docker:2": {}
 	},
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,3 +10,7 @@ updates:
    directory: "/"
    schedule:
      interval: weekly
+ - package-ecosystem: "github-actions"
+   directory: "/"
+   schedule:
+     interval: weekly
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -12,7 +12,7 @@ jobs:
     permissions:
       packages: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
 
       - name: "Publish"
         uses: devcontainers/action@v1
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
@@ -8,7 +8,7 @@ jobs:
     outputs:
       templates: ${{ steps.filter.outputs.changes }}
     steps:
-      - uses: dorny/paths-filter@v2
+      - uses: dorny/paths-filter@v3
         id: filter
         with:
           filters: |
@@ -58,7 +58,7 @@ jobs:
       matrix:
         templates: ${{ fromJSON(needs.detect-changes.outputs.templates) }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
diff --git a/.github/workflows/update-documentation.yml b/.github/workflows/update-documentation.yml
@@ -14,7 +14,7 @@ jobs:
       pull-requests: write
     if: "github.ref == 'refs/heads/main'"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
 
       - name: Generate Documentation
         uses: devcontainers/action@v1
diff --git a/src/cpp-mariadb/.devcontainer/reinstall-cmake.sh b/src/cpp-mariadb/.devcontainer/reinstall-cmake.sh
@@ -55,4 +55,8 @@ curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/
 sha256sum -c --ignore-missing "${CMAKE_CHECKSUM_NAME}"
 sh "${TMP_DIR}/${CMAKE_BINARY_NAME}" --prefix=/opt/cmake --skip-license
 
+ln -s /opt/cmake/bin/ccmake /usr/local/bin/ccmake
 ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
+ln -s /opt/cmake/bin/cmake-gui /usr/local/bin/cmake-gui
+ln -s /opt/cmake/bin/cpack /usr/local/bin/cpack
+ln -s /opt/cmake/bin/ctest /usr/local/bin/ctest
diff --git a/src/cpp/.devcontainer/reinstall-cmake.sh b/src/cpp/.devcontainer/reinstall-cmake.sh
@@ -55,5 +55,8 @@ curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/
 sha256sum -c --ignore-missing "${CMAKE_CHECKSUM_NAME}"
 sh "${TMP_DIR}/${CMAKE_BINARY_NAME}" --prefix=/opt/cmake --skip-license
 
+ln -s /opt/cmake/bin/ccmake /usr/local/bin/ccmake
 ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
+ln -s /opt/cmake/bin/cmake-gui /usr/local/bin/cmake-gui
+ln -s /opt/cmake/bin/cpack /usr/local/bin/cpack
 ln -s /opt/cmake/bin/ctest /usr/local/bin/ctest
diff --git a/src/debian/README.md b/src/debian/README.md
@@ -7,14 +7,13 @@ Simple Debian container with Git installed.
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| imageVariant | Debian version (use bookworm or bullseye on local arm64/Apple Silicon): | string | bullseye |
+| imageVariant | Debian version (use trixie bookworm or bullseye on local arm64/Apple Silicon): | string | trixie |
 
 This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.
 
 * **Image**: mcr.microsoft.com/devcontainers/base:debian ([source](https://github.com/devcontainers/images/tree/main/src/base-debian))
 * **Applies devcontainer.json contents from image**: Yes ([source](https://github.com/devcontainers/images/blob/main/src/base-debian/.devcontainer/devcontainer.json))
 
-
 ---
 
 _Note: This file was auto-generated from the [devcontainer-template.json](https://github.com/devcontainers/templates/blob/main/src/debian/devcontainer-template.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/debian/devcontainer-template.json b/src/debian/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "debian",
-    "version": "3.0.2",
+    "version": "4.0.0",
     "name": "Debian",
     "description": "Simple Debian container with Git installed.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/debian",
@@ -9,12 +9,13 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "Debian version (use bookworm or bullseye on local arm64/Apple Silicon):",
+            "description": "Debian version (use trixie bookworm or bullseye on local arm64/Apple Silicon):",
             "proposals": [
+				"trixie",
                 "bookworm",
                 "bullseye"
             ],
-            "default": "bullseye"
+            "default": "trixie"
         }
     },
     "platforms": ["Any"],
diff --git a/src/go-postgres/.devcontainer/Dockerfile b/src/go-postgres/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/go:1-${templateOption:imageVariant}
+FROM mcr.microsoft.com/devcontainers/go:2-${templateOption:imageVariant}
 
 # [Optional] Uncomment this section to install additional OS packages.
 # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
diff --git a/src/go-postgres/README.md b/src/go-postgres/README.md
@@ -7,7 +7,7 @@ Use and develop Go + Postgres applications. Includes appropriate runtime args, G
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| imageVariant | Go version: | string | 1.23-bookworm |
+| imageVariant | Go version: | string | 1.25-trixie |
 
 This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.
 
diff --git a/src/go-postgres/devcontainer-template.json b/src/go-postgres/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "go-postgres",
-    "version": "4.2.0",
+    "version": "5.0.0",
     "name": "Go & PostgreSQL",
     "description": "Use and develop Go + Postgres applications. Includes appropriate runtime args, Go, common tools, extensions, and dependencies.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/go-postgres",
@@ -11,16 +11,16 @@
             "type": "string",
             "description": "Go version:",
             "proposals": [
-                "1-bookworm",
+                "1-trixie",
+				"1.25-trixie",
+				"1.24-trixie",
+				"1-bookworm",
+				"1.25-bookworm",
                 "1.24-bookworm",
-                "1.23-bookworm",
-                "1.22-bookworm",
                 "1-bullseye",
-                "1.24-bullseye",
-                "1.23-bullseye",
-                "1.22-bullseye"
+                "1.24-bullseye"
             ],
-            "default": "1.24-bookworm"
+            "default": "1.25-trixie"
         }
     },
     "platforms": ["Go"],
diff --git a/src/go/.devcontainer/devcontainer.json b/src/go/.devcontainer/devcontainer.json
@@ -1,9 +1,9 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/go
+// README at: https://github.com/devcontainers/templates/tree/main/src/go .
 {
 	"name": "Go",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/go:1-${templateOption:imageVariant}"
+	"image": "mcr.microsoft.com/devcontainers/go:2-${templateOption:imageVariant}"
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},
diff --git a/src/go/README.md b/src/go/README.md
@@ -7,7 +7,7 @@ Develop Go based applications. Includes appropriate runtime args, Go, common too
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| imageVariant | Go version: | string | 1.23-bookworm |
+| imageVariant | Go version: | string | 1.25-trixie |
 
 This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.
 
diff --git a/src/go/devcontainer-template.json b/src/go/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "go",
-    "version": "4.2.0",
+    "version": "5.0.0",
     "name": "Go",
     "description": "Develop Go based applications. Includes appropriate runtime args, Go, common tools, extensions, and dependencies.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/go",
@@ -11,16 +11,14 @@
             "type": "string",
             "description": "Go version:",
             "proposals": [
-                "1-bookworm",
+				"1-trixie",
+				"1.24-trixie",
+				"1.25-trixie",
+                "1.25-bookworm",
                 "1.24-bookworm",
-                "1.23-bookworm",
-                "1.22-bookworm",
-                "1-bullseye",
-                "1.24-bullseye",
-                "1.23-bullseye",
-                "1.22-bullseye"
+                "1.24-bullseye"
             ],
-            "default": "1.24-bookworm"
+            "default": "1.25-trixie"
         }
     },
     "platforms": ["Go"],
diff --git a/src/postgres/.devcontainer/docker-compose.yml b/src/postgres/.devcontainer/docker-compose.yml
@@ -22,13 +22,13 @@ services:
     image: postgres:latest
     restart: unless-stopped
     volumes:
-      - postgres-data:/var/lib/postgresql/data
+      - postgres-data:/var/lib/postgresql
     environment:
       POSTGRES_USER: postgres
       POSTGRES_DB: postgres
       POSTGRES_PASSWORD: postgres
 
-    # Add "forwardPorts": ["5432"] to **devcontainer.json** to forward PostgreSQL locally.
+    # Add "forwardPorts": [5432] to **devcontainer.json** to forward PostgreSQL locally.
     # (Adding the "ports" property to this file will not forward from a Codespace.)
 
 volumes:
diff --git 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:1-${templateOption:imageVariant}"
+	"image": "mcr.microsoft.com/devcontainers/python:2-${templateOption:imageVariant}"
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},
diff --git a/src/python/README.md b/src/python/README.md
@@ -7,7 +7,7 @@ Develop Python 3 applications.
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| imageVariant | Python version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon): | string | 3.12-bullseye |
+| imageVariant | Python version (use -trixie, -bookworm, or -bullseye variants on local arm64/Apple Silicon): | string | 3.13-trixie |
 
 This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.
 
diff --git a/src/python/devcontainer-template.json b/src/python/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "python",
-    "version": "4.1.0",
+    "version": "5.0.0",
     "name": "Python 3",
     "description": "Develop Python 3 applications.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/python",
@@ -11,18 +11,29 @@
             "type": "string",
             "description": "Python version (use -bookworm, or -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
+                "3-trixie",
+                "3.14-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.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"
             ],
-            "default": "3.12-bullseye"
+            "default": "3.14-trixie"
         }
     },
     "platforms": ["Python"],
diff --git a/src/ruby-rails-postgres/.devcontainer/Dockerfile b/src/ruby-rails-postgres/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/ruby:1-${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-rails-postgres/.devcontainer/docker-compose.yml b/src/ruby-rails-postgres/.devcontainer/docker-compose.yml
@@ -40,6 +40,15 @@ services:
       #    username: postgres
       #    password: postgres
       #    database: myapp_development
+      #
+      #  ...
+      #
+      #  test:
+      #    <<: *default
+      #    host: db
+      #    username: postgres
+      #    password: postgres
+      #    database: myapp_test
 
     # Add "forwardPorts": ["5432"] to **devcontainer.json** to forward PostgreSQL locally.
     # (Adding the "ports" property to this file will not forward from a Codespace.)
diff --git a/src/ruby-rails-postgres/README.md b/src/ruby-rails-postgres/README.md
@@ -7,7 +7,7 @@ Develop Ruby on Rails applications with Postgres. Includes a Rails application c
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| imageVariant | Ruby version (use -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 3.4-bullseye |
+| imageVariant | Ruby version (use -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon) : | string | 3.4-trixie |
 
 This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.
 
diff --git a/src/ruby-rails-postgres/devcontainer-template.json b/src/ruby-rails-postgres/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby-rails-postgres",
-    "version": "4.2.0",
+    "version": "5.0.0",
     "name": "Ruby on Rails & Postgres",
     "description": "Develop Ruby on Rails applications with Postgres. Includes a Rails application container and PostgreSQL server.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/ruby-rails-postgres",
@@ -11,6 +11,10 @@
             "type": "string",
             "description": "Ruby version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
+                "3-trixie",
+                "3.4-trixie",
+                "3.3-trixie",
+                "3.2-trixie",				
                 "3-bookworm",
                 "3.4-bookworm",
                 "3.3-bookworm",
@@ -20,7 +24,7 @@
                 "3.3-bullseye",
                 "3.2-bullseye"
             ],
-            "default": "3.4-bullseye"
+            "default": "3.4-trixie"
         }
     },
     "platforms": ["Ruby"],
diff --git 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:1-${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": {},
diff --git a/src/ruby/README.md b/src/ruby/README.md
@@ -7,7 +7,7 @@ Develop Ruby based applications. includes everything you need to get up and runn
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| imageVariant | Ruby version (use -bookworm, -bullseye variants on local arm64/Apple Silicon): | string | 3.4-bullseye |
+| imageVariant | Ruby version (use -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon) : | string | 3.4-trixie |
 
 This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.
 
diff --git a/src/ruby/devcontainer-template.json b/src/ruby/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "4.2.0",
+    "version": "5.0.0",
     "name": "Ruby",
     "description": "Develop Ruby based applications. includes everything you need to get up and running.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/ruby",
@@ -9,8 +9,12 @@
     "options": {
         "imageVariant": {
             "type": "string",
-            "description": "Ruby version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):",
+            "description": "Ruby version (use -trixie, -bookworm, -bullseye variants on local arm64/Apple Silicon):",
             "proposals": [
+                "3-trixie",
+                "3.4-trixie",				
+                "3.3-trixie",
+                "3.2-trixie",				
                 "3-bookworm",
                 "3.4-bookworm",				
                 "3.3-bookworm",
@@ -20,7 +24,7 @@
                 "3.3-bullseye",
                 "3.2-bullseye"
             ],
-            "default": "3.4-bullseye"
+            "default": "3.4-trixie"
         }
     },
     "platforms": ["Ruby"],
diff --git a/src/rust-postgres/.devcontainer/Dockerfile b/src/rust-postgres/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/rust:1-1-${templateOption:imageVariant}
+FROM mcr.microsoft.com/devcontainers/rust:2-1-${templateOption:imageVariant}
 
 # Include lld linker to improve build times either by using environment variable
 # RUSTFLAGS="-C link-arg=-fuse-ld=lld" or with Cargo's configuration file (i.e see .cargo/config.toml).
diff --git a/src/rust-postgres/README.md b/src/rust-postgres/README.md
diff --git a/src/rust-postgres/devcontainer-template.json b/src/rust-postgres/devcontainer-template.json
diff --git a/src/rust/.devcontainer/devcontainer.json b/src/rust/.devcontainer/devcontainer.json
diff --git a/src/rust/README.md b/src/rust/README.md
diff --git a/src/rust/devcontainer-template.json b/src/rust/devcontainer-template.json

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "image": "mcr.microsoft.com/devcontainers/javascript-node:1-18-bullseye",`
	`2`	`+ "image": "mcr.microsoft.com/devcontainers/javascript-node:4-24-trixie",`
`3`	`3`	`"features": {`
`4`	`4`	`"ghcr.io/devcontainers/features/docker-in-docker:2": {}`
`5`	`5`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM mcr.microsoft.com/devcontainers/go:1-${templateOption:imageVariant}`
	`1`	`+FROM mcr.microsoft.com/devcontainers/go:2-${templateOption:imageVariant}`
`2`	`2`
`3`	`3`	`# [Optional] Uncomment this section to install additional OS packages.`
`4`	`4`	`# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \`