Merge branch 'main' into update_action_#296_VG

Author: gvatsal60

src/cpp-mariadb/devcontainer-template.json

@@ -1,6 +1,6 @@
 {
     "id": "cpp-mariadb",
-    "version": "3.0.2",
+    "version": "3.0.3",
     "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",
@@ -14,8 +14,7 @@
                 "debian-12",
                 "debian-11",
                 "ubuntu-24.04",
-                "ubuntu-22.04",
-                "ubuntu-20.04"
+                "ubuntu-22.04"
             ],
             "default": "debian-11"
         },

src/cpp/devcontainer-template.json

@@ -1,6 +1,6 @@
 {
     "id": "cpp",
-    "version": "3.0.2",
+    "version": "3.0.3",
     "name": "C++",
     "description": "Develop C++ applications on Linux. Includes Debian C++ build tools.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/cpp",
@@ -14,8 +14,7 @@
                 "debian-12",
                 "debian-11",
                 "ubuntu-24.04",
-                "ubuntu-22.04",
-                "ubuntu-20.04"
+                "ubuntu-22.04"
             ],
             "default": "debian-11"
         },

src/ubuntu/README.md

@@ -7,7 +7,7 @@ A simple Ubuntu container with Git and other common utilities installed.
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| imageVariant | Ubuntu version (use ubuntu-22.04 or ubuntu-24.04 on local arm64/Apple Silicon): | string | jammy |
+| imageVariant | Ubuntu version (use ubuntu-22.04 or ubuntu-24.04 on local arm64/Apple Silicon): | string | noble |
 
 This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata.
 

src/ubuntu/devcontainer-template.json

@@ -1,6 +1,6 @@
 {
     "id": "ubuntu",
-    "version": "1.3.2",
+    "version": "2.0.0",
     "name": "Ubuntu",
     "description": "A simple Ubuntu container with Git and other common utilities installed.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/ubuntu",
@@ -12,10 +12,9 @@
             "description": "Ubuntu version (use ubuntu-22.04 or ubuntu-24.04 on local arm64/Apple Silicon):",
             "proposals": [
                 "noble",
-                "jammy",
-                "focal"
+                "jammy"
             ],
-            "default": "jammy"
+            "default": "noble"
         }
     },
     "platforms": ["Any"],