From a2b1c19a51b2528af4a7e75e3e1546da56b4c96c Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Sat, 12 Nov 2022 18:33:16 +0000
Subject: [PATCH 001/478] Nix feature: allow extra configuration of
 /etc/nix/nix.conf (#277)

---
 src/nix/devcontainer-feature.json |  5 +++++
 src/nix/install.sh                | 11 +++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/nix/devcontainer-feature.json b/src/nix/devcontainer-feature.json
index ffd3dc9a0..9ab519b4d 100644
--- a/src/nix/devcontainer-feature.json
+++ b/src/nix/devcontainer-feature.json
@@ -25,6 +25,11 @@
             "type": "string",
             "default": "",
             "description": "Optional URI to a Nix Flake to install in profile."
+        },
+        "extraNixConfig": {
+            "type": "string",
+            "default": "",
+            "description": "Optional comma separated list of extra lines to add to /etc/nix/nix.conf."
         }
     },
     "installsAfter": [
diff --git a/src/nix/install.sh b/src/nix/install.sh
index 2fc436743..6141d7e0b 100755
--- a/src/nix/install.sh
+++ b/src/nix/install.sh
@@ -9,6 +9,7 @@ VERSION="${VERSION:-"latest"}"
 MULTIUSER="${MULTIUSER:-"true"}"
 PACKAGES="${PACKAGES//,/ }"
 FLAKEURI="${FLAKEURI:-""}"
+EXTRANIXCONFIG="${EXTRANIXCONFIG:-""}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 
 # Nix keys for securly verifying installer download signature per https://nixos.org/download.html#nix-verify-installation
@@ -99,6 +100,16 @@ create_or_update_file /etc/nix/nix.conf 'sandbox = false'
 if  [ ! -z "${FLAKEURI}" ] && [ "${FLAKEURI}" != "none" ]; then
     create_or_update_file /etc/nix/nix.conf 'experimental-features = nix-command flakes'
 fi
+# Extra nix config
+if [ ! -z "${EXTRANIXCONFIG}" ]; then
+    OLDIFS=$IFS
+    IFS=","
+        read -a extra_nix_config <<< "$EXTRANIXCONFIG"
+        for line in "${extra_nix_config[@]}"; do
+            create_or_update_file /etc/nix/nix.conf "$line"
+        done
+    IFS=$OLDIFS
+fi
 
 # Create entrypoint if needed
 if [ ! -e "/usr/local/share/nix-entrypoint.sh" ]; then

From 1c61d1a0390ad52355e59df898f80a10f683bd12 Mon Sep 17 00:00:00 2001
From: Chuck Lantz <clantz@microsoft.com>
Date: Sat, 12 Nov 2022 11:12:21 -0800
Subject: [PATCH 002/478] Add test, bump version for extraNixConfig (#280)

---
 src/nix/devcontainer-feature.json |  2 +-
 test/nix/extra-config.sh          | 35 +++++++++++++++++++++++++++++++
 test/nix/scenarios.json           |  9 ++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 test/nix/extra-config.sh

diff --git a/src/nix/devcontainer-feature.json b/src/nix/devcontainer-feature.json
index 9ab519b4d..68ccdf78e 100644
--- a/src/nix/devcontainer-feature.json
+++ b/src/nix/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "nix",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "name": "Nix Package Manager",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nix",
     "description": "Installs the Nix package manager and optionally a set of packages.",  
diff --git a/test/nix/extra-config.sh b/test/nix/extra-config.sh
new file mode 100644
index 000000000..724213b24
--- /dev/null
+++ b/test/nix/extra-config.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+source dev-container-features-test-lib
+
+uid="$(id -u)"
+echo "Current user UID is ${uid}."
+if [ "${uid}" != "1000" ]; then
+    echo "Current user UID was adjusted."
+fi
+set +e 
+vscode_uid="$(id -u vscode)"
+set -e
+if [ "${vscode_uid}" != "" ]; then
+    echo "User vscode UID is ${vscode_uid}."
+    if [ "${vscode_uid}" != "1000" ]; then
+        echo "User vscode UID was adjusted."
+    fi
+fi
+nix_uid="$(stat /nix -c "%u")"
+echo "/nix UID is ${nix_uid}."
+
+cat /etc/os-release
+cat /etc/nix/nix.conf 
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib.
+check "nix-env" type nix-env
+check "First added line" grep -E '^extra-substituters = https://foo\.cachix\.org$' /etc/nix/nix.conf 
+check "Second added line" grep -E '^extra-trusted-public-keys = foo\.cachix\.org-1:bar=$' /etc/nix/nix.conf 
+
+# Report result
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults &2>1
\ No newline at end of file
diff --git a/test/nix/scenarios.json b/test/nix/scenarios.json
index 72ad99314..c287f58c7 100644
--- a/test/nix/scenarios.json
+++ b/test/nix/scenarios.json
@@ -89,5 +89,14 @@
                 "flakeUri": "github:nixos/nixpkgs/nixpkgs-unstable#hello"
             }
         }
+    },
+    "extra-config": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "remoteUser": "vscode",
+        "features": {
+            "nix": {
+                "extraNixConfig": "extra-substituters = https://foo.cachix.org,extra-trusted-public-keys = foo.cachix.org-1:bar="
+            }
+        }
     }
 }
\ No newline at end of file

From 00a51775eb76c143c96ca12079c780fef7954955 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 12 Nov 2022 11:14:29 -0800
Subject: [PATCH 003/478] Automated documentation update (#279)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/nix/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/nix/README.md b/src/nix/README.md
index 0ad107790..dcbc9a1df 100644
--- a/src/nix/README.md
+++ b/src/nix/README.md
@@ -21,6 +21,7 @@ Installs the Nix package manager and optionally a set of packages.
 | multiUser | Perform a multi-user install (instead of single user) | boolean | true |
 | packages | Optional comma separated list of Nix packages to install in profile. | string | - |
 | flakeUri | Optional URI to a Nix Flake to install in profile. | string | - |
+| extraNixConfig | Optional comma separated list of extra lines to add to /etc/nix/nix.conf. | string | - |
 
 ## OS Support
 

From 71726415140a08153c9e24336fce7ecaac397880 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 12 Nov 2022 11:14:58 -0800
Subject: [PATCH 004/478] Automated documentation update (#281)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>

From e9c4f9f8c5404d50a6120ff2228f0c34c5d70148 Mon Sep 17 00:00:00 2001
From: Chuck Lantz <clantz@microsoft.com>
Date: Sat, 12 Nov 2022 11:22:41 -0800
Subject: [PATCH 005/478] Fix property name

---
 src/nix/NOTES.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nix/NOTES.md b/src/nix/NOTES.md
index f26196455..fc76a44a3 100644
--- a/src/nix/NOTES.md
+++ b/src/nix/NOTES.md
@@ -15,7 +15,7 @@ This Dev Container Feature supports two installation models for Nix: multi-user
 | Installation Model | Pros | Cons |
 | --- | --- | --- |
 | *Multi-User* | Nix can be used with any user including root.<br /><br />Also still works if the UID or GID of any user is updated. | Only works with Nix 2.11 and up due to a Nix installer limitation.<br /><br />Container must run either: run as root (but `remoteUser` in devcontainer.json can be non-root), or includes `sudo` with the `remoteUser` being configured to use it. <br /><br />Note that automated start of the `nix-daemon` requires passwordless `sudo` if the container itself (e.g., `containerUser`) is not running as root. Manual startup using `sudo` can require a password, however (more next). |
-| *Single-User* | Does not require the container to run as root or `sudo` to be included in the image. | Only works with the user specified in the `userName` property or an auto-detected user. If this user's UID/GID is updated, that user will no longer be able to work with Nix. This is primarily a consideration when running on Linux where the UID/GID is sync'd to the local user. |
+| *Single-User* | Does not require the container to run as root or `sudo` to be included in the image. | Only works with the user specified in the `remoteUser` property or an auto-detected user. If this user's UID/GID is updated, that user will no longer be able to work with Nix. This is primarily a consideration when running on Linux where the UID/GID is sync'd to the local user. |
 
 ### Manually starting the Nix daemon
 
@@ -25,4 +25,4 @@ If you have `sudo` in your base image, but have a password set so automatic star
 sudo /usr/local/share/nix-entrypoint.sh
 ```
 
-This same command can be used to restart the daemon if it has stopped for some reason. Logs are available at `/tmp/nix-daemon.log`.
\ No newline at end of file
+This same command can be used to restart the daemon if it has stopped for some reason. Logs are available at `/tmp/nix-daemon.log`.

From 0e258004862f3c4e33da3138e65bc82036cf768f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 12 Nov 2022 11:24:57 -0800
Subject: [PATCH 006/478] Automated documentation update (#282)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/nix/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nix/README.md b/src/nix/README.md
index dcbc9a1df..4d0e1ad2b 100644
--- a/src/nix/README.md
+++ b/src/nix/README.md
@@ -40,7 +40,7 @@ This Dev Container Feature supports two installation models for Nix: multi-user
 | Installation Model | Pros | Cons |
 | --- | --- | --- |
 | *Multi-User* | Nix can be used with any user including root.<br /><br />Also still works if the UID or GID of any user is updated. | Only works with Nix 2.11 and up due to a Nix installer limitation.<br /><br />Container must run either: run as root (but `remoteUser` in devcontainer.json can be non-root), or includes `sudo` with the `remoteUser` being configured to use it. <br /><br />Note that automated start of the `nix-daemon` requires passwordless `sudo` if the container itself (e.g., `containerUser`) is not running as root. Manual startup using `sudo` can require a password, however (more next). |
-| *Single-User* | Does not require the container to run as root or `sudo` to be included in the image. | Only works with the user specified in the `userName` property or an auto-detected user. If this user's UID/GID is updated, that user will no longer be able to work with Nix. This is primarily a consideration when running on Linux where the UID/GID is sync'd to the local user. |
+| *Single-User* | Does not require the container to run as root or `sudo` to be included in the image. | Only works with the user specified in the `remoteUser` property or an auto-detected user. If this user's UID/GID is updated, that user will no longer be able to work with Nix. This is primarily a consideration when running on Linux where the UID/GID is sync'd to the local user. |
 
 ### Manually starting the Nix daemon
 
@@ -52,6 +52,7 @@ sudo /usr/local/share/nix-entrypoint.sh
 
 This same command can be used to restart the daemon if it has stopped for some reason. Logs are available at `/tmp/nix-daemon.log`.
 
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/nix/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._

From 258b107b39db9f28703bf6bfeed3102d54e1cafe Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 14 Nov 2022 11:40:25 -0800
Subject: [PATCH 007/478] Automated documentation update (#287)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/anaconda/README.md              | 4 +---
 src/aws-cli/README.md               | 4 +---
 src/azure-cli/README.md             | 4 +---
 src/common-utils/README.md          | 4 +---
 src/conda/README.md                 | 4 +---
 src/desktop-lite/README.md          | 4 +---
 src/docker-from-docker/README.md    | 4 +---
 src/docker-in-docker/README.md      | 4 +---
 src/dotnet/README.md                | 4 +---
 src/git-lfs/README.md               | 4 +---
 src/git/README.md                   | 4 +---
 src/github-cli/README.md            | 4 +---
 src/go/README.md                    | 4 +---
 src/hugo/README.md                  | 4 +---
 src/java/README.md                  | 4 +---
 src/kubectl-helm-minikube/README.md | 4 +---
 src/nix/README.md                   | 4 +---
 src/node/README.md                  | 4 +---
 src/nvidia-cuda/README.md           | 4 +---
 src/oryx/README.md                  | 4 +---
 src/php/README.md                   | 4 +---
 src/powershell/README.md            | 4 +---
 src/python/README.md                | 4 +---
 src/ruby/README.md                  | 4 +---
 src/rust/README.md                  | 4 +---
 src/sshd/README.md                  | 4 +---
 src/terraform/README.md             | 4 +---
 27 files changed, 27 insertions(+), 81 deletions(-)

diff --git a/src/anaconda/README.md b/src/anaconda/README.md
index 8f1130279..b230b50df 100644
--- a/src/anaconda/README.md
+++ b/src/anaconda/README.md
@@ -7,9 +7,7 @@
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/anaconda:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/anaconda:1": {}
 }
 ```
 
diff --git a/src/aws-cli/README.md b/src/aws-cli/README.md
index 3fb4688f8..00b8cd583 100644
--- a/src/aws-cli/README.md
+++ b/src/aws-cli/README.md
@@ -7,9 +7,7 @@ Installs the AWS CLI along with needed dependencies. Useful for base Dockerfiles
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/aws-cli:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/aws-cli:1": {}
 }
 ```
 
diff --git a/src/azure-cli/README.md b/src/azure-cli/README.md
index 8b6193ea7..e32467487 100644
--- a/src/azure-cli/README.md
+++ b/src/azure-cli/README.md
@@ -7,9 +7,7 @@ Installs the Azure CLI along with needed dependencies. Useful for base Dockerfil
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/azure-cli:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/azure-cli:1": {}
 }
 ```
 
diff --git a/src/common-utils/README.md b/src/common-utils/README.md
index 0150af31f..06af48460 100644
--- a/src/common-utils/README.md
+++ b/src/common-utils/README.md
@@ -7,9 +7,7 @@ Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-r
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/common-utils:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/common-utils:1": {}
 }
 ```
 
diff --git a/src/conda/README.md b/src/conda/README.md
index 5472af72c..4fb75dd1f 100644
--- a/src/conda/README.md
+++ b/src/conda/README.md
@@ -7,9 +7,7 @@ A cross-platform, language-agnostic binary package manager
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/conda:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/conda:1": {}
 }
 ```
 
diff --git a/src/desktop-lite/README.md b/src/desktop-lite/README.md
index 36d8693a1..9ee8227cc 100644
--- a/src/desktop-lite/README.md
+++ b/src/desktop-lite/README.md
@@ -7,9 +7,7 @@ Adds a lightweight Fluxbox based desktop to the container that can be accessed u
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/desktop-lite:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/desktop-lite:1": {}
 }
 ```
 
diff --git a/src/docker-from-docker/README.md b/src/docker-from-docker/README.md
index 07acb87b8..41d984686 100644
--- a/src/docker-from-docker/README.md
+++ b/src/docker-from-docker/README.md
@@ -7,9 +7,7 @@
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/docker-from-docker:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/docker-from-docker:1": {}
 }
 ```
 
diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index 0a529c42e..8ee91ef2b 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -7,9 +7,7 @@ Create child containers *inside* a container, independent from the host's docker
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/docker-in-docker:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/docker-in-docker:1": {}
 }
 ```
 
diff --git a/src/dotnet/README.md b/src/dotnet/README.md
index d40eb4ad1..784c7362e 100644
--- a/src/dotnet/README.md
+++ b/src/dotnet/README.md
@@ -7,9 +7,7 @@ Installs the .NET CLI. Provides option of installing sdk or runtime, and option
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/dotnet:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/dotnet:1": {}
 }
 ```
 
diff --git a/src/git-lfs/README.md b/src/git-lfs/README.md
index 1f7e6c3a2..a23a639a0 100644
--- a/src/git-lfs/README.md
+++ b/src/git-lfs/README.md
@@ -7,9 +7,7 @@ Installs Git Large File Support (Git LFS) along with needed dependencies. Useful
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/git-lfs:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/git-lfs:1": {}
 }
 ```
 
diff --git a/src/git/README.md b/src/git/README.md
index 54e1fa608..287af4995 100644
--- a/src/git/README.md
+++ b/src/git/README.md
@@ -7,9 +7,7 @@ Install an up-to-date version of Git, built from source as needed. Useful for wh
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/git:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/git:1": {}
 }
 ```
 
diff --git a/src/github-cli/README.md b/src/github-cli/README.md
index 5e95dec13..3670399da 100644
--- a/src/github-cli/README.md
+++ b/src/github-cli/README.md
@@ -7,9 +7,7 @@ Installs the GitHub CLI. Auto-detects latest version and installs needed depende
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/github-cli:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/github-cli:1": {}
 }
 ```
 
diff --git a/src/go/README.md b/src/go/README.md
index 3282b245b..5ea30c1fd 100644
--- a/src/go/README.md
+++ b/src/go/README.md
@@ -7,9 +7,7 @@ Installs Go and common Go utilities. Auto-detects latest version and installs ne
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/go:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/go:1": {}
 }
 ```
 
diff --git a/src/hugo/README.md b/src/hugo/README.md
index afd7aee86..f66f3c7fc 100644
--- a/src/hugo/README.md
+++ b/src/hugo/README.md
@@ -7,9 +7,7 @@
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/hugo:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/hugo:1": {}
 }
 ```
 
diff --git a/src/java/README.md b/src/java/README.md
index 343cc6057..c409b3488 100644
--- a/src/java/README.md
+++ b/src/java/README.md
@@ -7,9 +7,7 @@ Installs Java, SDKMAN! (if not installed), and needed dependencies.
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/java:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/java:1": {}
 }
 ```
 
diff --git a/src/kubectl-helm-minikube/README.md b/src/kubectl-helm-minikube/README.md
index 11a139de2..bbb02028f 100644
--- a/src/kubectl-helm-minikube/README.md
+++ b/src/kubectl-helm-minikube/README.md
@@ -7,9 +7,7 @@ Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {}
 }
 ```
 
diff --git a/src/nix/README.md b/src/nix/README.md
index 4d0e1ad2b..d331f8923 100644
--- a/src/nix/README.md
+++ b/src/nix/README.md
@@ -7,9 +7,7 @@ Installs the Nix package manager and optionally a set of packages.
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/nix:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/nix:1": {}
 }
 ```
 
diff --git a/src/node/README.md b/src/node/README.md
index 5a5f64a3f..0bd837af3 100644
--- a/src/node/README.md
+++ b/src/node/README.md
@@ -7,9 +7,7 @@ Installs Node.js, nvm, yarn, and needed dependencies.
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/node:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/node:1": {}
 }
 ```
 
diff --git a/src/nvidia-cuda/README.md b/src/nvidia-cuda/README.md
index 735e72563..d756a414f 100644
--- a/src/nvidia-cuda/README.md
+++ b/src/nvidia-cuda/README.md
@@ -7,9 +7,7 @@ Installs shared libraries for NVIDIA CUDA.
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/nvidia-cuda:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/nvidia-cuda:1": {}
 }
 ```
 
diff --git a/src/oryx/README.md b/src/oryx/README.md
index 67fd70a88..670a6d1a0 100644
--- a/src/oryx/README.md
+++ b/src/oryx/README.md
@@ -7,9 +7,7 @@ Installs the oryx CLI
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/oryx:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/oryx:1": {}
 }
 ```
 
diff --git a/src/php/README.md b/src/php/README.md
index f0c605cce..c979e39b9 100644
--- a/src/php/README.md
+++ b/src/php/README.md
@@ -7,9 +7,7 @@
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/php:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/php:1": {}
 }
 ```
 
diff --git a/src/powershell/README.md b/src/powershell/README.md
index 24bdb0cb3..0ff0469c5 100644
--- a/src/powershell/README.md
+++ b/src/powershell/README.md
@@ -7,9 +7,7 @@ Installs PowerShell along with needed dependencies. Useful for base Dockerfiles
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/powershell:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/powershell:1": {}
 }
 ```
 
diff --git a/src/python/README.md b/src/python/README.md
index 1f6e18a7f..47abf5e31 100644
--- a/src/python/README.md
+++ b/src/python/README.md
@@ -7,9 +7,7 @@ Installs the provided version of Python, as well as PIPX, and other common Pytho
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/python:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/python:1": {}
 }
 ```
 
diff --git a/src/ruby/README.md b/src/ruby/README.md
index d8ca8555f..ffb136d47 100644
--- a/src/ruby/README.md
+++ b/src/ruby/README.md
@@ -7,9 +7,7 @@ Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/ruby:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/ruby:1": {}
 }
 ```
 
diff --git a/src/rust/README.md b/src/rust/README.md
index 4756cb711..14af4ad49 100644
--- a/src/rust/README.md
+++ b/src/rust/README.md
@@ -7,9 +7,7 @@ Installs Rust, common Rust utilities, and their required dependencies
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/rust:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/rust:1": {}
 }
 ```
 
diff --git a/src/sshd/README.md b/src/sshd/README.md
index 511659e39..5245d6805 100644
--- a/src/sshd/README.md
+++ b/src/sshd/README.md
@@ -7,9 +7,7 @@ Adds a SSH server into a container so that you can use an external terminal, sft
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/sshd:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/sshd:1": {}
 }
 ```
 
diff --git a/src/terraform/README.md b/src/terraform/README.md
index 36c5d7786..8b7a25df2 100644
--- a/src/terraform/README.md
+++ b/src/terraform/README.md
@@ -7,9 +7,7 @@ Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects la
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/terraform:1": {
-        "version": "latest"
-    }
+    "ghcr.io/devcontainers/features/terraform:1": {}
 }
 ```
 

From 17580ee22f38b3a16e6531a8139629fd2fd8234a Mon Sep 17 00:00:00 2001
From: Chuck Lantz <clantz@microsoft.com>
Date: Mon, 14 Nov 2022 11:41:32 -0800
Subject: [PATCH 008/478] Add .NET 7, drop .NET 5 (#269)

* Add .NET 7, drop .NET 5

* Add libssl3 to common-utils for jammy

* Handle lts/latest hard coding

* Fix, improve tests

* Bump version

* Fix situation where version could come from either MS repo or OS

* Remove unused option

* Bump common version

* Remove unused function

* Restore DOTNET_ROOT per feedback
---
 src/common-utils/devcontainer-feature.json |   2 +-
 src/common-utils/install.sh                |   7 +-
 src/dotnet/devcontainer-feature.json       |   4 +-
 src/dotnet/install.sh                      | 138 ++++++++++-----------
 test/dotnet/install_additional_dotnet.sh   |  10 +-
 test/dotnet/install_dotnet_3.sh            |   8 +-
 test/dotnet/install_dotnet_5.sh            |  14 ---
 test/dotnet/install_dotnet_6_bullseye.sh   |  17 +++
 test/dotnet/install_dotnet_6_focal.sh      |  17 +++
 test/dotnet/install_dotnet_7_bullseye.sh   |  17 +++
 test/dotnet/install_dotnet_7_jammy.sh      |  17 +++
 test/dotnet/install_dotnet_latest.sh       |  17 +++
 test/dotnet/install_dotnet_lts.sh          |  17 +++
 test/dotnet/install_wo_apt.sh              |  17 +++
 test/dotnet/scenarios.json                 |  53 +++++++-
 test/dotnet/test.sh                        |   6 +-
 16 files changed, 262 insertions(+), 99 deletions(-)
 delete mode 100644 test/dotnet/install_dotnet_5.sh
 create mode 100644 test/dotnet/install_dotnet_6_bullseye.sh
 create mode 100644 test/dotnet/install_dotnet_6_focal.sh
 create mode 100644 test/dotnet/install_dotnet_7_bullseye.sh
 create mode 100644 test/dotnet/install_dotnet_7_jammy.sh
 create mode 100644 test/dotnet/install_dotnet_latest.sh
 create mode 100644 test/dotnet/install_dotnet_lts.sh
 create mode 100644 test/dotnet/install_wo_apt.sh

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index c5f86215b..9a135d516 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "1.1.3",
+    "version": "1.1.4",
     "name": "Common Debian Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/install.sh b/src/common-utils/install.sh
index 2d51a0b21..8ac0a7c62 100755
--- a/src/common-utils/install.sh
+++ b/src/common-utils/install.sh
@@ -140,7 +140,12 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
     if [[ ! -z $(apt-cache --names-only search ^libssl1.1$) ]]; then
         package_list="${package_list}       libssl1.1"
     fi
-    
+
+    # Install libssl3 if available
+    if [[ ! -z $(apt-cache --names-only search ^libssl3$) ]]; then
+        package_list="${package_list}       libssl3"
+    fi
+
     # Install appropriate version of libssl1.0.x if available
     libssl_package=$(dpkg-query -f '${db:Status-Abbrev}\t${binary:Package}\n' -W 'libssl1\.0\.?' 2>&1 || echo '')
     if [ "$(echo "$LIlibssl_packageBSSL" | grep -o 'libssl1\.0\.[0-9]:' | uniq | sort | wc -l)" -eq 0 ]; then
diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index ce8ef060f..42eb1c287 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "1.0.8",
+    "version": "1.1.0",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "Installs the .NET CLI. Provides option of installing sdk or runtime, and option of versions to install. Uses latest version of .NET sdk as defaults to install.",
@@ -9,8 +9,8 @@
             "type": "string",
             "proposals": [
                 "latest",
+                "7",
                 "6",
-                "5",
                 "3.1"
             ],
             "default": "latest",
diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh
index fe4f58dab..78cd691df 100755
--- a/src/dotnet/install.sh
+++ b/src/dotnet/install.sh
@@ -12,6 +12,9 @@ DOTNET_RUNTIME_ONLY=${RUNTIMEONLY:-"false"}
 OVERRIDE_DEFAULT_VERSION=${OVERRIDEDEFAULTVERSION:-"true"}
 INSTALL_USING_APT=${INSTALLUSINGAPT:-"true"}
 
+DOTNET_LATEST="7"
+DOTNET_LTS="6"
+
 USERNAME=${USERNAME:-"automatic"}
 UPDATE_RC=${UPDATE_RC:-"true"}
 TARGET_DOTNET_ROOT=${TARGET_DOTNET_ROOT:-"/usr/local/dotnet"}
@@ -84,21 +87,6 @@ cleanup() {
 }
 trap cleanup EXIT
 
-# Get central common setting
-get_common_setting() {
-    if [ "${common_settings_file_loaded}" != "true" ]; then
-        curl -sfL "https://aka.ms/vscode-dev-containers/script-library/settings.env" 2>/dev/null -o /tmp/vsdc-settings.env || echo "Could not download settings file. Skipping."
-        common_settings_file_loaded=true
-    fi
-    if [ -f "/tmp/vsdc-settings.env" ]; then
-        local multi_line=""
-        if [ "$2" = "true" ]; then multi_line="-z"; fi
-        local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
-        if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
-    fi
-    echo "$1=${!1}"
-}
-
 # Add dotnet directory to PATH in bashrc/zshrc files if OVERRIDE_DEFAULT_VERSION=true.
 updaterc() {
     if [ "${UPDATE_RC}" = "true" ]; then
@@ -194,72 +182,75 @@ apt_cache_package_and_version_soft_match() {
 }
 
 # Install .NET CLI using apt-get package installer
-install_using_apt_from_microsoft_repo() {
+install_using_apt() {
     local sdk_or_runtime="$1"
-    local dotnet_major_minor_version
-    export DOTNET_PACKAGE="dotnet-${sdk_or_runtime}"
-
-    # Install dependencies
-    check_packages apt-transport-https curl ca-certificates gnupg2 dirmngr
-
-    # Import key safely and import Microsoft apt repo
-    get_common_setting MICROSOFT_GPG_KEYS_URI
-    curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
-    echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
-    apt-get update -y
+    local target_dotnet_version="$2"
+    local use_msft_repo="$3"
+
+    if [ "${use_msft_repo}" = "true" ]; then
+        # Install dependencies
+        check_packages apt-transport-https curl ca-certificates gnupg2 dirmngr
+        # Import key safely and import Microsoft apt repo
+        curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
+        echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
+        apt-get update -y
+    fi
 
-    if [ "${DOTNET_VERSION}" = "latest" ] || [ "${DOTNET_VERSION}" = "lts" ]; then
-        DOTNET_VERSION=""
-        DOTNET_PACKAGE="${DOTNET_PACKAGE}-6.0"
-    else
-        # Sets DOTNET_VERSION and DOTNET_PACKAGE if matches found. 
-        apt_cache_package_and_version_soft_match DOTNET_VERSION DOTNET_PACKAGE false
-        if [ "$?" != 0 ]; then
-            echo "Failed to find requested version."
-            return 1
-        fi
+    # .NET 7 is not a LTS version, so handle latest and LTS versions differently
+    export APT_DOTNET_VERSION="$target_dotnet_version"
+    if [ "${APT_DOTNET_VERSION}" = "latest" ]; then 
+        APT_DOTNET_VERSION="${DOTNET_LATEST}.0"
+    elif [ "${APT_DOTNET_VERSION}" = "lts" ]; then
+        APT_DOTNET_VERSION="${DOTNET_LTS}.0"
+    fi
 
-        if [[ $(dotnet --version) == *"${DOTNET_VERSION}"* ]] ; then
-            echo "Dotnet version ${DOTNET_VERSION} is already installed"
-            return 1
-        fi
+    # Sets target_dotnet_version and dotnet_package if matches found.
+    local base_dotnet_package="dotnet-${sdk_or_runtime}"
+    export DOTNET_PACKAGE="${base_dotnet_package}"
+    apt_cache_package_and_version_soft_match APT_DOTNET_VERSION DOTNET_PACKAGE false
+    if [ "$?" != 0 ] || [ ${DOTNET_PACKAGE} == "${base_dotnet_package}" ]; then
+        echo "Failed to find requested version."
+        return 1
+    fi
 
+    if type dotnet > /dev/null 2>&1 && [[ "$(dotnet --version)" == *"${APT_DOTNET_VERSION}"* ]] ; then
+        echo "dotnet version ${APT_DOTNET_VERSION} is already installed"
+        return 1
     fi
 
-    echo "Installing '${DOTNET_PACKAGE}${DOTNET_VERSION}'..."
-    apt-get install -yq ${DOTNET_PACKAGE}${DOTNET_VERSION}
+    echo "Installing '${DOTNET_PACKAGE}${APT_DOTNET_VERSION}'..."
+    apt-get install -yq ${DOTNET_PACKAGE}${APT_DOTNET_VERSION}
     if [ "$?" != 0 ]; then
-        echo "Failed to complete apt install of ${DOTNET_PACKAGE}${DOTNET_VERSION}"
+        echo "Failed to complete apt install of ${DOTNET_PACKAGE}${TARGET_DOTNET_VERSION}"
         return 1
     fi
-}
-
-install_using_default_apt_repo() {
-    DOTNET_PACKAGE="dotnet6"
 
-    apt_get_update
-
-    if [[ "${DOTNET_VERSION}" = "latest" ]] || [[ "${DOTNET_VERSION}" = "lts" ]] || [[ ${DOTNET_VERSION} = "6"* ]]; then
-        if ! (apt-get install -yq ${DOTNET_PACKAGE}); then
-            echo "Failed to install 'dotnet6' package from default apt repo."
-            return 1
-        fi
+    # Add symlink for current
+    CURRENT_DIR="${TARGET_DOTNET_ROOT}/current"
+    if [[ -d "${CURRENT_DIR}" ]]; then
+        rm -rf "${CURRENT_DIR}"
+    fi
+    mkdir -p "${TARGET_DOTNET_ROOT}"
+    local dotnet_installed_version="$(dotnet --version)"
+    # See if its the distro version
+    if [[ "$(dotnet --info)" == *"Base Path:   /usr/lib/dotnet/dotnet${dotnet_installed_version:0:1}-${dotnet_installed_version}"* ]]; then
+        ln -s "/usr/lib/dotnet/dotnet${dotnet_installed_version:0:1}" "${CURRENT_DIR}"
     else
-        echo "The provided dotnet version is not distributed in this distro's default apt repo."
-        return 1
+        # Location used by MS repo versions
+        ln -s "/usr/share/dotnet" "${CURRENT_DIR}" 
     fi
 }
 
 # Find and extract .NET binary download details based on user-requested version
 # args:
 # sdk_or_runtime $1
+# dotnet_version_to_download $2
 # exports:
 # DOTNET_DOWNLOAD_URL
 # DOTNET_DOWNLOAD_HASH
 # DOTNET_DOWNLOAD_NAME
 get_full_version_details() {
     local sdk_or_runtime="$1"
-    local VERSION="$2"
     local architecture
     local dotnet_channel_version
     local dotnet_releases_url
@@ -267,6 +258,7 @@ get_full_version_details() {
     local dotnet_latest_version
     local dotnet_download_details
 
+    export DOTNET_DOWNLOAD_VERSION="$2"
     export DOTNET_DOWNLOAD_URL
     export DOTNET_DOWNLOAD_HASH
     export DOTNET_DOWNLOAD_NAME
@@ -275,11 +267,11 @@ get_full_version_details() {
     architecture="$(get_architecture_name_for_target_os)"
 
     # Set VERSION to empty string to ensure jq includes all .NET versions in reverse sort below 
-    if [ "${VERSION}" = "latest" ]; then
-        VERSION=""
+    if [ "${DOTNET_DOWNLOAD_VERSION}" = "latest" ]; then
+        DOTNET_DOWNLOAD_VERSION=""
     fi
 
-    dotnet_patchless_version="$(echo "${VERSION}" | cut -d "." --field=1,2)"
+    dotnet_patchless_version="$(echo "${DOTNET_DOWNLOAD_VERSION}" | cut -d "." --field=1,2)"
 
     set +e
     dotnet_channel_version="$(curl -s "${DOTNET_CDN_FEED_URI}/dotnet/release-metadata/releases-index.json" | jq -r --arg channel_version "${dotnet_patchless_version}" '[."releases-index"[]] | sort_by(."channel-version") | reverse | map( select(."channel-version" | startswith($channel_version))) | first | ."channel-version"')"
@@ -299,22 +291,22 @@ get_full_version_details() {
     if [ -n "${dotnet_releases_json}" ] && [[ ! "${dotnet_releases_json}" = *"Error"* ]]; then
         dotnet_latest_version="$(echo "${dotnet_releases_json}" | jq -r --arg sdk_or_runtime "${sdk_or_runtime}" '."latest-\($sdk_or_runtime)"')"
         # If user-specified version has 2 or more dots, use it as is.  Otherwise use latest version.
-        if [ "$(echo "${VERSION}" | grep -o "\." | wc -l)" -lt "2" ]; then
-            VERSION="${dotnet_latest_version}"
+        if [ "$(echo "${DOTNET_DOWNLOAD_VERSION}" | grep -o "\." | wc -l)" -lt "2" ]; then
+            DOTNET_DOWNLOAD_VERSION="${dotnet_latest_version}"
         fi
 
-        dotnet_download_details="$(echo "${dotnet_releases_json}" |  jq -r --arg sdk_or_runtime "${sdk_or_runtime}" --arg dotnet_version "${VERSION}" --arg arch "${architecture}" '.releases[]."\($sdk_or_runtime)" | select(.version==$dotnet_version) | .files[] | select(.name=="dotnet-\($sdk_or_runtime)-linux-\($arch).tar.gz")')"
+        dotnet_download_details="$(echo "${dotnet_releases_json}" |  jq -r --arg sdk_or_runtime "${sdk_or_runtime}" --arg dotnet_version "${DOTNET_DOWNLOAD_VERSION}" --arg arch "${architecture}" '.releases[]."\($sdk_or_runtime)" | select(.version==$dotnet_version) | .files[] | select(.name=="dotnet-\($sdk_or_runtime)-linux-\($arch).tar.gz")')"
         if [ -n "${dotnet_download_details}" ]; then
-            echo "Found .NET binary version ${VERSION}"
+            echo "Found .NET binary version ${DOTNET_DOWNLOAD_VERSION}"
             DOTNET_DOWNLOAD_URL="$(echo "${dotnet_download_details}" | jq -r '.url')"
             DOTNET_DOWNLOAD_HASH="$(echo "${dotnet_download_details}" | jq -r '.hash')"
             DOTNET_DOWNLOAD_NAME="$(echo "${dotnet_download_details}" | jq -r '.name')"
         else
-            err "Unable to find .NET binary for version ${VERSION}"
+            err "Unable to find .NET binary for version ${DOTNET_DOWNLOAD_VERSION}"
             exit 1
         fi
     else
-        err "Unable to find .NET release details for version ${VERSION} at ${dotnet_releases_url}"
+        err "Unable to find .NET release details for version ${DOTNET_DOWNLOAD_VERSION} at ${dotnet_releases_url}"
         exit 1
     fi
 }
@@ -322,7 +314,7 @@ get_full_version_details() {
 # Install .NET CLI using the .NET releases url
 install_using_dotnet_releases_url() {
     local sdk_or_runtime="$1"
-    local VERSION="$2"
+    local version="$2"
 
     # Check listed package dependecies and install them if they are not already installed. 
     # NOTE: icu-devtools is a small package with similar dependecies to .NET. 
@@ -336,14 +328,14 @@ install_using_dotnet_releases_url() {
     if [[  "${DOTNET_VERSION_CODENAMES_REQUIRE_OLDER_LIBSSL_1}" = *"${VERSION_CODENAME}"* ]]; then
         check_packages libssl1.1
     else
-        check_packages libssl3.0
+        check_packages libssl3
     fi
 
-    get_full_version_details "${sdk_or_runtime}" "${VERSION}"
+    get_full_version_details "${sdk_or_runtime}" "${version}"
 
-    DOTNET_INSTALL_PATH="${TARGET_DOTNET_ROOT}/${VERSION}"
+    DOTNET_INSTALL_PATH="${TARGET_DOTNET_ROOT}/${DOTNET_DOWNLOAD_VERSION}"
     if [ -d "${DOTNET_INSTALL_PATH}" ]; then
-        echo "(!) Dotnet version ${VERSION} already exists."
+        echo "(!) Dotnet version ${DOTNET_DOWNLOAD_VERSION} already exists."
         exit 1
     fi
     # exports DOTNET_DOWNLOAD_URL, DOTNET_DOWNLOAD_HASH, DOTNET_DOWNLOAD_NAME
@@ -432,7 +424,7 @@ CHANGE_OWNERSHIP="false"
 if [[ "${DOTNET_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[  "${DOTNET_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]] && [[ "${INSTALL_USING_APT}" = "true" ]]; then
     echo "Detected ${VERSION_CODENAME} on ${architecture}. Attempting to install dotnet from apt"
 
-    install_using_default_apt_repo || install_using_apt_from_microsoft_repo "${DOTNET_SDK_OR_RUNTIME}"
+    install_using_apt "${DOTNET_SDK_OR_RUNTIME}" "${DOTNET_VERSION}" false || install_using_apt "${DOTNET_SDK_OR_RUNTIME}" "${DOTNET_VERSION}" true
     if [ "$?" != 0 ]; then
         echo "Could not install requested version from apt on current distribution."
         exit 1
diff --git a/test/dotnet/install_additional_dotnet.sh b/test/dotnet/install_additional_dotnet.sh
index fdb2da765..e69c7dce1 100644
--- a/test/dotnet/install_additional_dotnet.sh
+++ b/test/dotnet/install_additional_dotnet.sh
@@ -5,9 +5,13 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-check "dotnet version 6.0.301 installed as default" dotnet --version | grep 6.0.301
-check "dotnet version 5.0 installed"  ls -l /usr/local/dotnet | grep 5.0
-check "dotnet version 3.1.420 installed"  ls -l /usr/local/dotnet | grep 3.1.420
+check "dotnet version 6.0.301 installed as default" bash -c "dotnet --version | grep 6.0.301"
+check "dotnet version 5.0 installed"  bash -c "ls -l /usr/local/dotnet | grep 5.0"
+check "dotnet version 3.1.420 installed"  bash -c "ls -l /usr/local/dotnet | grep 3.1.420"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
 
 # Report result
 reportResults
diff --git a/test/dotnet/install_dotnet_3.sh b/test/dotnet/install_dotnet_3.sh
index 0d05215db..51d871bcf 100644
--- a/test/dotnet/install_dotnet_3.sh
+++ b/test/dotnet/install_dotnet_3.sh
@@ -6,8 +6,12 @@ set -e
 source dev-container-features-test-lib
 
 check "dotnet sdks" dotnet --list-sdks
-check "some major version of dotnet 3 is installed" dotnet --list-sdks |  grep '3\.[0-9]*\.[0-9]*'
-check "dotnet version 3 installed"  ls -l /usr/share/dotnet/sdk | grep '3\.[0-9]*\.[0-9]*'
+check "some major version of dotnet 3 is installed" bash -c "dotnet --list-sdks |  grep '3\.[0-9]*\.[0-9]*'"
+check "dotnet version 3 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '3\.[0-9]*\.[0-9]*'"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
 
 # Report result
 reportResults
diff --git a/test/dotnet/install_dotnet_5.sh b/test/dotnet/install_dotnet_5.sh
deleted file mode 100644
index 5f48eb114..000000000
--- a/test/dotnet/install_dotnet_5.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "dotnet sdks" dotnet --list-sdks
-check "some major version of dotnet 5 is installed" dotnet --list-sdks |  grep '5\.[0-9]*\.[0-9]*'
-check "dotnet version 5 installed"  ls -l /usr/share/dotnet/sdk | grep '5\.[0-9]*\.[0-9]*'
-
-
-# Report result
-reportResults
diff --git a/test/dotnet/install_dotnet_6_bullseye.sh b/test/dotnet/install_dotnet_6_bullseye.sh
new file mode 100644
index 000000000..758f0402d
--- /dev/null
+++ b/test/dotnet/install_dotnet_6_bullseye.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "dotnet sdks" dotnet --list-sdks
+check "some major version of dotnet 6 is installed" bash -c "dotnet --list-sdks |  grep '6\.[0-9]*\.[0-9]*'"
+check "dotnet version 6 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '6\.[0-9]*\.[0-9]*'"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
+
+# Report result
+reportResults
diff --git a/test/dotnet/install_dotnet_6_focal.sh b/test/dotnet/install_dotnet_6_focal.sh
new file mode 100644
index 000000000..758f0402d
--- /dev/null
+++ b/test/dotnet/install_dotnet_6_focal.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "dotnet sdks" dotnet --list-sdks
+check "some major version of dotnet 6 is installed" bash -c "dotnet --list-sdks |  grep '6\.[0-9]*\.[0-9]*'"
+check "dotnet version 6 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '6\.[0-9]*\.[0-9]*'"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
+
+# Report result
+reportResults
diff --git a/test/dotnet/install_dotnet_7_bullseye.sh b/test/dotnet/install_dotnet_7_bullseye.sh
new file mode 100644
index 000000000..2c015fc0e
--- /dev/null
+++ b/test/dotnet/install_dotnet_7_bullseye.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "dotnet sdks" dotnet --list-sdks
+check "some major version of dotnet 7 is installed" bash -c "dotnet --list-sdks |  grep '7\.[0-9]*\.[0-9]*'"
+check "dotnet version 7 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '7\.[0-9]*\.[0-9]*'"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
+
+# Report result
+reportResults
diff --git a/test/dotnet/install_dotnet_7_jammy.sh b/test/dotnet/install_dotnet_7_jammy.sh
new file mode 100644
index 000000000..2c015fc0e
--- /dev/null
+++ b/test/dotnet/install_dotnet_7_jammy.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "dotnet sdks" dotnet --list-sdks
+check "some major version of dotnet 7 is installed" bash -c "dotnet --list-sdks |  grep '7\.[0-9]*\.[0-9]*'"
+check "dotnet version 7 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '7\.[0-9]*\.[0-9]*'"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
+
+# Report result
+reportResults
diff --git a/test/dotnet/install_dotnet_latest.sh b/test/dotnet/install_dotnet_latest.sh
new file mode 100644
index 000000000..2c015fc0e
--- /dev/null
+++ b/test/dotnet/install_dotnet_latest.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "dotnet sdks" dotnet --list-sdks
+check "some major version of dotnet 7 is installed" bash -c "dotnet --list-sdks |  grep '7\.[0-9]*\.[0-9]*'"
+check "dotnet version 7 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '7\.[0-9]*\.[0-9]*'"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
+
+# Report result
+reportResults
diff --git a/test/dotnet/install_dotnet_lts.sh b/test/dotnet/install_dotnet_lts.sh
new file mode 100644
index 000000000..758f0402d
--- /dev/null
+++ b/test/dotnet/install_dotnet_lts.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "dotnet sdks" dotnet --list-sdks
+check "some major version of dotnet 6 is installed" bash -c "dotnet --list-sdks |  grep '6\.[0-9]*\.[0-9]*'"
+check "dotnet version 6 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '6\.[0-9]*\.[0-9]*'"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
+
+# Report result
+reportResults
diff --git a/test/dotnet/install_wo_apt.sh b/test/dotnet/install_wo_apt.sh
new file mode 100644
index 000000000..a1745c573
--- /dev/null
+++ b/test/dotnet/install_wo_apt.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "dotnet sdks" dotnet --list-sdks
+check "some major version of dotnet 7 is installed" bash -c "dotnet --list-sdks |  grep '7\.[0-9]*\.[0-9]*'"
+check "dotnet version 7 installed"  bash -c "ls -l /usr/local/dotnet | grep '7\.[0-9]*\.[0-9]*'"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
+
+# Report result
+reportResults
diff --git a/test/dotnet/scenarios.json b/test/dotnet/scenarios.json
index edf4a750f..37f83d5a9 100644
--- a/test/dotnet/scenarios.json
+++ b/test/dotnet/scenarios.json
@@ -16,11 +16,60 @@
             }
         }
     },
-    "install_dotnet_5": {
+    "install_dotnet_6_bullseye": {
+        "image": "debian:bullseye",
+        "features": {
+            "dotnet": {
+                "version": "6"
+            }
+        }
+    },
+    "install_dotnet_6_focal": {
         "image": "ubuntu:focal",
         "features": {
             "dotnet": {
-                "version": "5"
+                "version": "6"
+            }
+        }
+    },
+    "install_dotnet_7_bullseye": {
+        "image": "debian:bullseye",
+        "features": {
+            "dotnet": {
+                "version": "7"
+            }
+        }
+    },
+    "install_dotnet_7_jammy": {
+        "image": "ubuntu:jammy",
+        "features": {
+            "dotnet": {
+                "version": "7"
+            }
+        }
+    },
+    "install_dotnet_latest": {
+        "image": "ubuntu:jammy",
+        "features": {
+            "dotnet": {
+                "version": "latest"
+            }
+        }
+    },
+    "install_dotnet_lts": {
+        "image": "ubuntu:focal",
+        "features": {
+            "dotnet": {
+                "version": "lts"
+            }
+        }
+    },
+    "install_wo_apt": {
+        "image": "ubuntu:jammy",
+        "features": {
+            "dotnet": {
+                "version": "7",
+                "installUsingApt": false
             }
         }
     }
diff --git a/test/dotnet/test.sh b/test/dotnet/test.sh
index a16f91df3..7eb0cf6d5 100755
--- a/test/dotnet/test.sh
+++ b/test/dotnet/test.sh
@@ -11,7 +11,11 @@ check "sdks" dotnet --list-sdks
 check "version" dotnet --version
 
 echo "Validating expected version present..."
-check "some major version of dotnet 6 is installed" dotnet --version |  grep '6\.[0-9]*\.[0-9]*'
+check "some major version of dotnet 7 is installed" bash -c "dotnet --version |  grep '7\.[0-9]*\.[0-9]*'"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
 
 # Report result
 reportResults
\ No newline at end of file

From e00724a0c6d4c4f8fab166e065d2b00c7357514b Mon Sep 17 00:00:00 2001
From: JP Ungaretti <19893438+jungaretti@users.noreply.github.com>
Date: Mon, 14 Nov 2022 11:46:13 -0800
Subject: [PATCH 009/478] Add git extension for JupyterLab to Python feature
 (#286)

* Add git extension

* Bump version
---
 src/python/devcontainer-feature.json         | 2 +-
 src/python/install.sh                        | 1 +
 test/python/install_additional_jupyterlab.sh | 3 +++
 test/python/install_jupyterlab.sh            | 3 +++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index d6fa9bcf3..c1bcdc633 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/python/install.sh b/src/python/install.sh
index e54387ec4..93d9cce69 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -465,6 +465,7 @@ fi
 # Install JupyterLab if needed
 if [ "${INSTALL_JUPYTERLAB}" = "true" ]; then
     install_user_package jupyterlab
+    install_user_package jupyterlab-git
 
     # Configure JupyterLab if needed
     if [ -n "${CONFIGURE_JUPYTERLAB_ALLOW_ORIGIN}" ]; then
diff --git a/test/python/install_additional_jupyterlab.sh b/test/python/install_additional_jupyterlab.sh
index d48bb4683..a5658f0d2 100755
--- a/test/python/install_additional_jupyterlab.sh
+++ b/test/python/install_additional_jupyterlab.sh
@@ -16,6 +16,9 @@ check "version" jupyter lab --version
 packages="$(python3 -m pip list)"
 check "location" grep jupyter <<< "$packages"
 
+# Check for git extension
+check "jupyterlab-git" grep jupyterlab-git <<< "$packages"
+
 # Check for correct JupyterLab configuration
 check "config" grep ".*.allow_origin = '*'" /home/vscode/.jupyter/jupyter_server_config.py
 
diff --git a/test/python/install_jupyterlab.sh b/test/python/install_jupyterlab.sh
index d48bb4683..a5658f0d2 100755
--- a/test/python/install_jupyterlab.sh
+++ b/test/python/install_jupyterlab.sh
@@ -16,6 +16,9 @@ check "version" jupyter lab --version
 packages="$(python3 -m pip list)"
 check "location" grep jupyter <<< "$packages"
 
+# Check for git extension
+check "jupyterlab-git" grep jupyterlab-git <<< "$packages"
+
 # Check for correct JupyterLab configuration
 check "config" grep ".*.allow_origin = '*'" /home/vscode/.jupyter/jupyter_server_config.py
 

From eafa28287e15b51a2aa20a227056f0af43d20275 Mon Sep 17 00:00:00 2001
From: Paul Yu <pauyu@microsoft.com>
Date: Mon, 14 Nov 2022 12:22:02 -0800
Subject: [PATCH 010/478] Add new option to install azure-cli extensions (#165)

* Add new option for azure-cli extensions

* Update to install az extensions as $_REMOTE_USER

* Skip unknown extensions

* Change azure cli extension option type to string

* Adding test for azure-cli extensions
---
 src/azure-cli/devcontainer-feature.json | 19 ++++++++++++-------
 src/azure-cli/install.sh                | 12 ++++++++++++
 test/azure-cli/install_extensions.sh    | 17 +++++++++++++++++
 test/azure-cli/scenarios.json           | 12 ++++++++++++
 4 files changed, 53 insertions(+), 7 deletions(-)
 create mode 100644 test/azure-cli/install_extensions.sh
 create mode 100644 test/azure-cli/scenarios.json

diff --git a/src/azure-cli/devcontainer-feature.json b/src/azure-cli/devcontainer-feature.json
index 12a40921f..012e28784 100644
--- a/src/azure-cli/devcontainer-feature.json
+++ b/src/azure-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "azure-cli",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "name": "Azure CLI",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/azure-cli",
   "description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -12,16 +12,21 @@
       ],
       "default": "latest",
       "description": "Select or enter an Azure CLI version. (Available versions may vary by Linux distribution.)"
+    },
+    "extensions": {
+      "type": "string",
+      "default": "",
+      "description": "Optional comma separated list of Azure CLI extensions to install in profile."
     }
   },
   "customizations": {
-      "vscode": {
-          "extensions": [
-            "ms-vscode.azurecli"
-          ]
-      }
+    "vscode": {
+      "extensions": [
+        "ms-vscode.azurecli"
+      ]
+    }
   },
   "installsAfter": [
     "ghcr.io/devcontainers/features/common-utils"
   ]
-}
+}
\ No newline at end of file
diff --git a/src/azure-cli/install.sh b/src/azure-cli/install.sh
index de5d65dfa..99b4af57e 100755
--- a/src/azure-cli/install.sh
+++ b/src/azure-cli/install.sh
@@ -13,6 +13,7 @@ set -e
 rm -rf /var/lib/apt/lists/*
 
 AZ_VERSION=${VERSION:-"latest"}
+AZ_EXTENSIONS=${EXTENSIONS}
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 AZCLI_ARCHIVE_ARCHITECTURES="amd64"
@@ -185,6 +186,17 @@ if [ "${use_pip}" = "true" ]; then
     fi
 fi
 
+# If Azure CLI extensions are requested, loop through and install 
+if [ ${#AZ_EXTENSIONS[@]} -gt 0 ]; then
+    echo "Installing Azure CLI extensions: ${AZ_EXTENSIONS}"
+    extensions=(`echo ${AZ_EXTENSIONS} | tr ',' ' '`)
+    for i in "${extensions[@]}"
+    do
+        echo "Installing ${i}"
+        su ${_REMOTE_USER} -c "az extension add --name ${i} -y" || continue
+    done
+fi
+
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
diff --git a/test/azure-cli/install_extensions.sh b/test/azure-cli/install_extensions.sh
new file mode 100644
index 000000000..1e66e2633
--- /dev/null
+++ b/test/azure-cli/install_extensions.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+# Extension-specific tests
+check "aks-preview" az extension show --name aks-preview
+check "amg" az extension show --name amg
+check "containerapp" az extension show --name containerapp
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/azure-cli/scenarios.json b/test/azure-cli/scenarios.json
new file mode 100644
index 000000000..aa21f7262
--- /dev/null
+++ b/test/azure-cli/scenarios.json
@@ -0,0 +1,12 @@
+{
+  "install_extensions": {
+    "image": "ubuntu:focal",
+    "user": "vscode",
+    "features": {
+      "azure-cli": {
+        "version": "latest",
+        "extensions": "aks-preview,amg,containerapp"
+      }
+    }
+  }
+}
\ No newline at end of file

From 58fed08dcf698f7c09cc78657689ac1581121737 Mon Sep 17 00:00:00 2001
From: JP Ungaretti <19893438+jungaretti@users.noreply.github.com>
Date: Mon, 14 Nov 2022 13:42:17 -0800
Subject: [PATCH 011/478] Add support for CUDA 11.8 in nvidia-cuda (#267)

* Add latest CUDA versions

* Move cuDNN version check

* Check CUDA version
---
 src/nvidia-cuda/devcontainer-feature.json |  8 +++++---
 src/nvidia-cuda/install.sh                | 14 +++++++-------
 test/nvidia-cuda/test.sh                  |  2 ++
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/nvidia-cuda/devcontainer-feature.json b/src/nvidia-cuda/devcontainer-feature.json
index 76a5ec279..7611b7ef1 100644
--- a/src/nvidia-cuda/devcontainer-feature.json
+++ b/src/nvidia-cuda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "nvidia-cuda",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "name": "NVIDIA CUDA",
   "description": "Installs shared libraries for NVIDIA CUDA.",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nvidia-cuda",
@@ -18,6 +18,7 @@
     "cudaVersion": {
       "type": "string",
       "enum": [
+        "11.8",
         "11.7",
         "11.6",
         "11.5",
@@ -25,12 +26,13 @@
         "11.3",
         "11.2"
       ],
-      "default": "11.7",
+      "default": "11.8",
       "description": "Version of CUDA to install"
     },
     "cudnnVersion": {
       "type": "string",
       "enum": [
+        "8.6.0.163",
         "8.5.0.96",
         "8.4.1.50",
         "8.4.0.27",
@@ -45,7 +47,7 @@
         "8.1.1.33",
         "8.1.0.77"
       ],
-      "default": "8.5.0.96",
+      "default": "8.6.0.163",
       "description": "Version of cuDNN to install"
     }
   },
diff --git a/src/nvidia-cuda/install.sh b/src/nvidia-cuda/install.sh
index 9b417132a..f7db18e5e 100644
--- a/src/nvidia-cuda/install.sh
+++ b/src/nvidia-cuda/install.sh
@@ -52,17 +52,17 @@ if ! apt-cache show "$cuda_pkg"; then
     exit 1
 fi
 
-# Ensure that the requested version of cuDNN is available AND compatible
-cudnn_pkg_version="libcudnn8=${CUDNN_VERSION}-1+cuda${CUDA_VERSION}"
-if ! apt-cache show "$cudnn_pkg_version"; then
-    echo "The requested version of cuDNN is not available: cuDNN $CUDNN_VERSION for CUDA $CUDA_VERSION"
-    exit 1
-fi
-
 echo "Installing CUDA libraries..."
 apt-get install -yq "$cuda_pkg"
 
 if [ "$INSTALL_CUDNN" = "true" ]; then
+    # Ensure that the requested version of cuDNN is available AND compatible
+    cudnn_pkg_version="libcudnn8=${CUDNN_VERSION}-1+cuda${CUDA_VERSION}"
+    if ! apt-cache show "$cudnn_pkg_version"; then
+        echo "The requested version of cuDNN is not available: cuDNN $CUDNN_VERSION for CUDA $CUDA_VERSION"
+        exit 1
+    fi
+
     echo "Installing cuDNN libraries..."
     apt-get install -yq "$cudnn_pkg_version"
 fi
diff --git a/test/nvidia-cuda/test.sh b/test/nvidia-cuda/test.sh
index ef50d7bdf..5c56b178d 100644
--- a/test/nvidia-cuda/test.sh
+++ b/test/nvidia-cuda/test.sh
@@ -5,6 +5,8 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+check "cuda version" test -d /usr/local/cuda-11.8
+
 # Check installation of cuda-libraries-11-<version>
 check "libcudart.so.11.0" test 1 -eq "$(find /usr -name 'libcudart.so.11.0' | wc -l)"
 check "libcublas.so.11" test 1 -eq "$(find /usr -name 'libcublas.so.11' | wc -l)"

From ada30c21f5148715719bf6d6b94f3e5dce50b19d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 14 Nov 2022 13:47:51 -0800
Subject: [PATCH 012/478] Automated documentation update for Azure CLI and CUDA
 (#289)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/azure-cli/README.md   | 1 +
 src/nvidia-cuda/README.md | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/azure-cli/README.md b/src/azure-cli/README.md
index e32467487..bf6004b7b 100644
--- a/src/azure-cli/README.md
+++ b/src/azure-cli/README.md
@@ -16,6 +16,7 @@ Installs the Azure CLI along with needed dependencies. Useful for base Dockerfil
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
 | version | Select or enter an Azure CLI version. (Available versions may vary by Linux distribution.) | string | latest |
+| extensions | Optional comma separated list of Azure CLI extensions to install in profile. | string | - |
 
 
 
diff --git a/src/nvidia-cuda/README.md b/src/nvidia-cuda/README.md
index d756a414f..5e76d7243 100644
--- a/src/nvidia-cuda/README.md
+++ b/src/nvidia-cuda/README.md
@@ -17,8 +17,8 @@ Installs shared libraries for NVIDIA CUDA.
 |-----|-----|-----|-----|
 | installCudnn | Additionally install CUDA Deep Neural Network (cuDNN) shared library | boolean | false |
 | installNvtx | Additionally install NVIDIA Tools Extension (NVTX) | boolean | false |
-| cudaVersion | Version of CUDA to install | string | 11.7 |
-| cudnnVersion | Version of cuDNN to install | string | 8.5.0.96 |
+| cudaVersion | Version of CUDA to install | string | 11.8 |
+| cudnnVersion | Version of cuDNN to install | string | 8.6.0.163 |
 
 ## Compatibility
 

From 474444fa9f0decb2d7734828c7f9d629535dcb94 Mon Sep 17 00:00:00 2001
From: "Mikey Lombardi (He/Him)" <michael.t.lombardi@gmail.com>
Date: Tue, 15 Nov 2022 10:19:33 -0600
Subject: [PATCH 013/478] (GH-198) Add `extended` option to hugo feature (#240)

Prior to this change, the hugo feature only supported specifying the
version of Hugo to install. Hugo is available in two builds: standard,
which the feature already installs, and extended, which includes
functionality for post-processing CSS/SCSS/SASS and JavaScript.

This change adds a new `extended` option to the hugo feature, allowing
users to specify that they require the extended build of Hugo. It
defaults to `false` and installs the standard build of Hugo.

- Resolves #198
---
 src/hugo/devcontainer-feature.json |  7 ++++++-
 src/hugo/install.sh                |  9 ++++++++-
 test/hugo/install_hugo_extended.sh | 12 ++++++++++++
 test/hugo/scenarios.json           | 11 +++++++++++
 4 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 test/hugo/install_hugo_extended.sh
 create mode 100644 test/hugo/scenarios.json

diff --git a/src/hugo/devcontainer-feature.json b/src/hugo/devcontainer-feature.json
index 7a96d8552..37a805dce 100644
--- a/src/hugo/devcontainer-feature.json
+++ b/src/hugo/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "hugo",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "name": "Hugo",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/hugo",
   "options": {
@@ -11,6 +11,11 @@
       ],
       "default": "latest",
       "description": "Select or enter a version."
+    },
+    "extended": {
+      "type": "boolean",
+      "default": false,
+      "description": "Install Hugo extended for SASS/SCSS changes"
     }
   },
   "containerEnv": {
diff --git a/src/hugo/install.sh b/src/hugo/install.sh
index 778b552e7..c5cb628f1 100755
--- a/src/hugo/install.sh
+++ b/src/hugo/install.sh
@@ -106,7 +106,14 @@ if ! hugo version &> /dev/null ; then
         arch="64bit"
     fi
 
-    hugo_filename="hugo_${VERSION}_Linux-${arch}.tar.gz"
+    # Install extended version of hugo if desired
+    if [ "${EXTENDED}" = "true" ]; then
+        extended="extended_"
+    else
+        extended=""
+    fi
+
+    hugo_filename="hugo_${extended}${VERSION}_Linux-${arch}.tar.gz"
 
     curl -fsSLO --compressed "https://github.com/gohugoio/hugo/releases/download/v${VERSION}/${hugo_filename}"
     tar -xzf "$hugo_filename" -C "$installation_dir"
diff --git a/test/hugo/install_hugo_extended.sh b/test/hugo/install_hugo_extended.sh
new file mode 100644
index 000000000..4771d848c
--- /dev/null
+++ b/test/hugo/install_hugo_extended.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Ensure extended version is installed
+check "extended_installed"  bash -c "hugo version | grep extended"
+
+# Report result
+reportResults
diff --git a/test/hugo/scenarios.json b/test/hugo/scenarios.json
new file mode 100644
index 000000000..4c093df1a
--- /dev/null
+++ b/test/hugo/scenarios.json
@@ -0,0 +1,11 @@
+{
+    "install_hugo_extended": {
+        "image": "mcr.microsoft.com/devcontainers/base",
+        "features": {
+            "hugo": {
+                "version": "latest",
+                "extended": true
+            }
+        }
+    }
+}
\ No newline at end of file

From a5655189a24b04fc43f4ae9dcae0be5acf1b9ecb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 08:23:00 -0800
Subject: [PATCH 014/478] Automated documentation update (#292)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/hugo/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hugo/README.md b/src/hugo/README.md
index f66f3c7fc..bc6b99e7f 100644
--- a/src/hugo/README.md
+++ b/src/hugo/README.md
@@ -16,6 +16,7 @@
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
 | version | Select or enter a version. | string | latest |
+| extended | Install Hugo extended for SASS/SCSS changes | boolean | false |
 
 
 

From f9acb6aae1e520b0b61aaac9ab4ecb00dd497451 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 15 Nov 2022 13:26:26 -0800
Subject: [PATCH 015/478] Python bug fix - Add jupyterlab even if python is not
 installed by Feature but exists (#244)

* python fix bug

* fix test

* address comments

* address comment
---
 src/python/devcontainer-feature.json             |  2 +-
 src/python/install.sh                            | 13 +++++++++++--
 .../install_jupyterlab_from_python_image.sh      | 16 ++++++++++++++++
 test/python/scenarios.json                       | 12 ++++++++++++
 4 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 test/python/install_jupyterlab_from_python_image.sh

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index c1bcdc633..fbbf62c60 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/python/install.sh b/src/python/install.sh
index 93d9cce69..79ab7de1c 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -322,7 +322,7 @@ sudo_if() {
 
 install_user_package() {
     PACKAGE="$1"
-    sudo_if "$INSTALL_PATH/bin/python3" -m pip install --user --upgrade --no-cache-dir "$PACKAGE"
+    sudo_if "${PYTHON_SRC}" -m pip install --user --upgrade --no-cache-dir "$PACKAGE"
 }
 
 add_user_jupyter_config() {
@@ -408,11 +408,15 @@ if [ "${PYTHON_VERSION}" != "none" ]; then
         updaterc "if [[ \"\${PATH}\" != *\"${CURRENT_PATH}/bin\"* ]]; then export PATH=${CURRENT_PATH}/bin:\${PATH}; fi"
         PATH="${INSTALL_PATH}/bin:${PATH}"
     fi
-
+    
     # Updates the symlinks for os-provided, or the installed python version in other cases
     chown -R "${USERNAME}:python" "${PYTHON_INSTALL_PATH}"
     chmod -R g+r+w "${PYTHON_INSTALL_PATH}"
     find "${PYTHON_INSTALL_PATH}" -type d -print0 | xargs -0 -n 1 chmod g+s
+
+    PYTHON_SRC="${INSTALL_PATH}/bin/python3"
+else
+    PYTHON_SRC=$(which python)
 fi
 
 # Install Python tools if needed
@@ -464,6 +468,11 @@ fi
 
 # Install JupyterLab if needed
 if [ "${INSTALL_JUPYTERLAB}" = "true" ]; then
+    if [ -z "${PYTHON_SRC}" ]; then
+        echo "(!) Could not install Jupyterlab. Python not found."
+        exit 1
+    fi
+
     install_user_package jupyterlab
     install_user_package jupyterlab-git
 
diff --git a/test/python/install_jupyterlab_from_python_image.sh b/test/python/install_jupyterlab_from_python_image.sh
new file mode 100644
index 000000000..067046b68
--- /dev/null
+++ b/test/python/install_jupyterlab_from_python_image.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Always run these checks as the non-root user
+user="$(whoami)"
+check "user" grep vscode <<< "$user"
+
+# Check for an installation of JupyterLab
+check "version" jupyter lab --version
+
+# Report result
+reportResults
diff --git a/test/python/scenarios.json b/test/python/scenarios.json
index 920f4a270..c3c1a828b 100644
--- a/test/python/scenarios.json
+++ b/test/python/scenarios.json
@@ -13,6 +13,7 @@
         "remoteUser": "vscode",
         "features": {
             "python": {
+                "version": "latest",
                 "installJupyterlab": true,
                 "configureJupyterlabAllowOrigin": "*"
             }
@@ -36,6 +37,17 @@
             "python": "os-provided"
         }
     },
+    "install_jupyterlab_from_python_image": {
+        "image": "mcr.microsoft.com/devcontainers/python:3.10-bullseye",
+        "remoteUser": "vscode",
+        "features": {
+            "python": {
+                "version": "none",
+                "installTools": false,
+                "installJupyterlab": true
+            }
+        }
+    },
     "install_via_oryx": {
         "image": "mcr.microsoft.com/oryx/build:full-debian-bullseye",
         "features": {

From 1e35500bda4b00fadc1b2881865ad3cffaa69ff8 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 15 Nov 2022 14:51:00 -0800
Subject: [PATCH 016/478] Node: Fix bug - version set by Feature is not default
 (#294)

* Node:Fix bug version set by Feature is not default

* node not supported for ubuntu:bionic
---
 src/node/devcontainer-feature.json           |  2 +-
 src/node/install.sh                          |  8 +++++++-
 test/node/install_node_on_universal_image.sh | 11 +++++++++++
 test/node/scenarios.json                     |  9 +++++++++
 4 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 test/node/install_node_on_universal_image.sh

diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index 538ecb252..49d2160fa 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "name": "Node.js (via nvm) and yarn",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, and needed dependencies.",
diff --git a/src/node/install.sh b/src/node/install.sh
index f51306ebe..2f2e7aa38 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -81,6 +81,12 @@ check_packages() {
 # Ensure apt is in non-interactive to avoid prompts
 export DEBIAN_FRONTEND=noninteractive
 
+. /etc/os-release
+if [[ "bionic" = *"${VERSION_CODENAME}"* ]]; then
+    echo "(!) Unsupported distribution version '${VERSION_CODENAME}'. Details: https://github.com/nodejs/node/issues/42351#issuecomment-1068424442"
+    exit 1
+fi
+
 # Install dependencies
 check_packages apt-transport-https curl ca-certificates tar gnupg2 dirmngr
 
@@ -152,7 +158,7 @@ if [ ! -d "${NVM_DIR}" ]; then
 else
     echo "NVM already installed."
     if [ "${NODE_VERSION}" != "" ]; then
-        su ${USERNAME} -c "umask 0002 && . $NVM_DIR/nvm.sh && nvm install ${NODE_VERSION}"
+        su ${USERNAME} -c "umask 0002 && . $NVM_DIR/nvm.sh && nvm install ${NODE_VERSION} && nvm alias default ${NODE_VERSION}"
     fi
 fi
 
diff --git a/test/node/install_node_on_universal_image.sh b/test/node/install_node_on_universal_image.sh
new file mode 100644
index 000000000..faca1ebef
--- /dev/null
+++ b/test/node/install_node_on_universal_image.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "version_on_path" bash -c "node -v | grep 'v19.1.0'"
+
+# Report result
+reportResults
diff --git a/test/node/scenarios.json b/test/node/scenarios.json
index 1240e61cc..70e105146 100644
--- a/test/node/scenarios.json
+++ b/test/node/scenarios.json
@@ -25,5 +25,14 @@
                 "version": "none"
             }
         }
+    },
+    "install_node_on_universal_image": {
+        "image": "mcr.microsoft.com/devcontainers/universal",
+        "remoteUser": "codespace",
+        "features": {
+            "node": {
+                "version": "19.1.0"
+            }
+        }
     }
 }
\ No newline at end of file

From bff31788373499fdc903bad8f1b300d579c42d39 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 16 Nov 2022 10:49:06 -0800
Subject: [PATCH 017/478] Oryx: Unpin git clone from a single commit (#296)

---
 src/oryx/devcontainer-feature.json | 2 +-
 src/oryx/install.sh                | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index 741862fe1..2596bd9f9 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "oryx",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "name": "Oryx",
     "description": "Installs the oryx CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
diff --git a/src/oryx/install.sh b/src/oryx/install.sh
index f613cf002..054983adb 100755
--- a/src/oryx/install.sh
+++ b/src/oryx/install.sh
@@ -146,12 +146,7 @@ GIT_ORYX=/opt/tmp/oryx-repo
 mkdir -p ${BUILD_SCRIPT_GENERATOR}
 mkdir -p ${ORYX}
 
-git clone https://github.com/microsoft/Oryx $GIT_ORYX
-cd $GIT_ORYX
-
-# https://github.com/microsoft/Oryx/commit/74e4830b3636e5cfbce5b3e3358bd5bb66a87f45 is breaking the `oryx` tool
-# Pinning to a previous working commit until the upstream issue is fixed.
-git reset --hard 2b19efca9729673fc259e6a817be3cc0bb73b9d5
+git clone --depth=1 https://github.com/microsoft/Oryx $GIT_ORYX
 
 $GIT_ORYX/build/buildSln.sh
 

From be4f0498e4ad7948804d4be70093c1da8722d222 Mon Sep 17 00:00:00 2001
From: etienne-chrp <66628513+etienne-chrp@users.noreply.github.com>
Date: Thu, 17 Nov 2022 01:46:30 +0100
Subject: [PATCH 018/478] Add Gradle and Maven version parameters to Java
 (#263)

* Refactor java feature tests grep syntax

The grep with pipe syntax was creating problems with the check helper

Change them in favour of process substitution syntax

* Fix java feature tests about java version

Java 18 is not available anymore in SDKMAN

Some tests asserts were generating false positives

* Add Gradle and Maven version parameters to Java
---
 src/java/README.md                            |  2 ++
 src/java/devcontainer-feature.json            | 24 ++++++++++++++++++-
 src/java/install.sh                           |  6 +++--
 test/java/install_additional_java.sh          |  6 ++---
 test/java/install_from_non_default_distro.sh  |  2 +-
 test/java/install_gradle_and_maven.sh         |  6 ++---
 .../java/install_gradle_and_maven_for_user.sh |  6 ++---
 ..._gradle_and_maven_with_specific_version.sh | 21 ++++++++++++++++
 test/java/scenarios.json                      | 18 +++++++++++---
 9 files changed, 75 insertions(+), 16 deletions(-)
 create mode 100644 test/java/install_gradle_and_maven_with_specific_version.sh

diff --git a/src/java/README.md b/src/java/README.md
index c409b3488..a9ef433fb 100644
--- a/src/java/README.md
+++ b/src/java/README.md
@@ -18,7 +18,9 @@ Installs Java, SDKMAN! (if not installed), and needed dependencies.
 | version | Select or enter a Java version to install | string | latest |
 | jdkDistro | Select or enter a JDK distribution | string | ms |
 | installGradle | Install Gradle, a build automation tool for multi-language software development | boolean | false |
+| gradleVersion | Select or enter a Gradle version | string | latest |
 | installMaven | Install Maven, a management tool for Java | boolean | false |
+| mavenVersion | Select or enter a Maven version | string | latest |
 
 ## License
 
diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index 19d6c13a6..c400fb6c7 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.0.11",
+  "version": "1.1.0",
   "name": "Java (via SDKMAN!)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
@@ -33,10 +33,32 @@
       "default": false,
       "description": "Install Gradle, a build automation tool for multi-language software development"
     },
+    "gradleVersion": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "7.5.1",
+        "6.9.3",
+        "5.6.4"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Gradle version"
+    },
     "installMaven": {
       "type": "boolean",
       "default": false,
       "description": "Install Maven, a management tool for Java"
+    },
+    "mavenVersion": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "3.8.6",
+        "3.6.3",
+        "3.5.4"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Maven version"
     }
   },
   "buildArg": "_VSC_INSTALL_JAVA",
diff --git a/src/java/install.sh b/src/java/install.sh
index d2f735d0d..592847800 100755
--- a/src/java/install.sh
+++ b/src/java/install.sh
@@ -11,7 +11,9 @@
 
 JAVA_VERSION=${VERSION:-"lts"}
 INSTALL_GRADLE=${INSTALLGRADLE:-"false"}
+GRADLE_VERSION=${GRADLEVERSION:-"latest"}
 INSTALL_MAVEN=${INSTALLMAVEN:-"false"}
+MAVEN_VERSION=${MAVENVERSION:-"latest"}
 JDK_DISTRO=${JDKDISTRO}
 
 export SDKMAN_DIR=${SDKMAN_DIR:-"/usr/local/sdkman"}
@@ -173,12 +175,12 @@ fi
 
 # Install Gradle
 if [[ "${INSTALL_GRADLE}" = "true" ]] && ! gradle --version > /dev/null; then
-    sdk_install gradle latest
+    sdk_install gradle ${GRADLE_VERSION}
 fi
 
 # Install Maven
 if [[ "${INSTALL_MAVEN}" = "true" ]] && ! mvn --version > /dev/null; then
-    sdk_install maven latest
+    sdk_install maven ${MAVEN_VERSION}
 fi
 
 # Clean up
diff --git a/test/java/install_additional_java.sh b/test/java/install_additional_java.sh
index fcfd6bdb9..882c49d1c 100644
--- a/test/java/install_additional_java.sh
+++ b/test/java/install_additional_java.sh
@@ -5,9 +5,9 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-check "java version 18 installed as default" java --version | grep 18
-check "java version 11 installed"  ls /usr/local/sdkman/candidates/java  | grep 11
-check "java version 8 installed"  ls /usr/local/sdkman/candidates/java | grep 8
+check "java version 11 installed as default" grep "11\." <(java --version)
+check "java version 17 installed" grep "^17\." <(ls /usr/local/sdkman/candidates/java)
+check "java version 8 installed" grep "^8\." <(ls /usr/local/sdkman/candidates/java)
 
 # Report result
 reportResults
diff --git a/test/java/install_from_non_default_distro.sh b/test/java/install_from_non_default_distro.sh
index e45f9dd60..d4f53818e 100644
--- a/test/java/install_from_non_default_distro.sh
+++ b/test/java/install_from_non_default_distro.sh
@@ -5,7 +5,7 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-check "java version 18 installed as default" java --version | grep 18
+check "java version openjdk 11 installed" grep "openjdk 11." <(java --version)
 
 # Report result
 reportResults
diff --git a/test/java/install_gradle_and_maven.sh b/test/java/install_gradle_and_maven.sh
index c6aa3e521..636fd92a0 100644
--- a/test/java/install_gradle_and_maven.sh
+++ b/test/java/install_gradle_and_maven.sh
@@ -5,17 +5,17 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-check "user is root" whoami | grep root
+check "user is root" grep root <(whoami)
 
 check "java" java --version
 check "gradle" gradle --version
 
 cd /tmp && gradle init --type basic --dsl groovy --incubating --project-name test
-check "GRADLE_USER_HOME exists" ls -la /root | grep ".gradle"
+check "GRADLE_USER_HOME exists" grep ".gradle" <(ls -la /root)
 
 check "maven" mvn --version
 cd /tmp && mvn archetype:generate -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false
-check "m2 exists" ls -la /root | grep ".m2"
+check "m2 exists" grep ".m2" <(ls -la /root)
 
 # Report result
 reportResults
diff --git a/test/java/install_gradle_and_maven_for_user.sh b/test/java/install_gradle_and_maven_for_user.sh
index c724092fc..b6ea4266b 100644
--- a/test/java/install_gradle_and_maven_for_user.sh
+++ b/test/java/install_gradle_and_maven_for_user.sh
@@ -5,17 +5,17 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-check "user is vscode" whoami | grep vscode
+check "user is vscode" grep vscode <(whoami)
 
 check "java" java --version
 check "gradle" gradle --version
 
 cd /tmp && gradle init --type basic --dsl groovy --incubating --project-name test
-check "GRADLE_USER_HOME exists" ls -la /home/vscode | grep ".gradle"
+check "GRADLE_USER_HOME exists" grep ".gradle" <(ls -la /home/vscode)
 
 check "maven" mvn --version
 cd /tmp && mvn archetype:generate -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false
-check "m2 exists" ls -la /home/vscode | grep ".m2"
+check "m2 exists" grep ".m2" <(ls -la /home/vscode)
 
 # Report result
 reportResults
diff --git a/test/java/install_gradle_and_maven_with_specific_version.sh b/test/java/install_gradle_and_maven_with_specific_version.sh
new file mode 100644
index 000000000..c6ae6160c
--- /dev/null
+++ b/test/java/install_gradle_and_maven_with_specific_version.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "user is root" grep root <(whoami)
+
+check "java" java --version
+check "gradle version" grep "Gradle 6.8.3" <(gradle --version)
+
+cd /tmp && gradle init --type basic --dsl groovy --project-name test
+check "GRADLE_USER_HOME exists" grep ".gradle" <(ls -la /root)
+
+check "maven version" grep "Apache Maven 3.6.3" <(mvn --version)
+cd /tmp && mvn archetype:generate -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false
+check "m2 exists" grep ".m2" <(ls -la /root)
+
+# Report result
+reportResults
diff --git a/test/java/scenarios.json b/test/java/scenarios.json
index eec7ba53e..c33a0a7d4 100644
--- a/test/java/scenarios.json
+++ b/test/java/scenarios.json
@@ -3,7 +3,7 @@
         "image": "ubuntu:focal",
         "features": {
             "java": {
-                "version": "18",
+                "version": "11",
                 "jdkDistro": "open"
             }
         }
@@ -12,8 +12,8 @@
         "image": "ubuntu:focal",
         "features": {
             "java": {
-                "version": "18",
-                "additionalVersions": "11,8"
+                "version": "11",
+                "additionalVersions": "17,8"
             }
         }
     },
@@ -40,5 +40,17 @@
                 "installMaven": true
             }
         }
+    },
+    "install_gradle_and_maven_with_specific_version": {
+        "image": "ubuntu:focal",
+        "features": {
+            "java": {
+                "version": "latest",
+                "installGradle": "true",
+                "gradleVersion": "6.8.3",
+                "installMaven": "true",
+                "mavenVersion": "3.6.3"
+            }
+        }
     }
 }

From 3fc9604ddadc34ec44651ce981cebc7bd77095e5 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Thu, 17 Nov 2022 11:55:43 -0800
Subject: [PATCH 019/478] Oryx: Build with .NET 6 (#298)

* Oryx: Install dotnet 3.1 runtime

* fix tests

* build with .NET 6 + add tests

* add tests

* fix tests

* shellcheck: nit
---
 src/oryx/devcontainer-feature.json       |  2 +-
 src/oryx/install.sh                      | 20 +++++++++------
 src/python/devcontainer-feature.json     |  2 +-
 src/python/install.sh                    |  2 +-
 test/oryx/sample-python/requirements.txt |  2 ++
 test/oryx/sample-python/src/solve.py     | 12 +++++++++
 test/oryx/scenarios.json                 | 15 +++++++++++
 test/oryx/test_python_project.sh         | 32 ++++++++++++++++++++++++
 8 files changed, 77 insertions(+), 10 deletions(-)
 create mode 100644 test/oryx/sample-python/requirements.txt
 create mode 100644 test/oryx/sample-python/src/solve.py
 create mode 100644 test/oryx/test_python_project.sh

diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index 2596bd9f9..5c643445b 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "oryx",
-    "version": "1.0.11",
+    "version": "1.0.12",
     "name": "Oryx",
     "description": "Installs the oryx CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
diff --git a/src/oryx/install.sh b/src/oryx/install.sh
index 054983adb..aa4af2c8c 100755
--- a/src/oryx/install.sh
+++ b/src/oryx/install.sh
@@ -116,9 +116,8 @@ echo "Installing Oryx..."
 # Ensure apt is in non-interactive to avoid prompts
 export DEBIAN_FRONTEND=noninteractive
 
-
 # Install dependencies
-check_packages git sudo curl ca-certificates apt-transport-https gnupg2 dirmngr libc-bin
+check_packages git sudo curl ca-certificates apt-transport-https gnupg2 dirmngr libc-bin moreutils
 
 if ! cat /etc/group | grep -e "^oryx:" > /dev/null 2>&1; then
     groupadd -r oryx
@@ -127,16 +126,23 @@ usermod -a -G oryx "${USERNAME}"
 
 # Required to decide if we want to clean up dotnet later.
 DOTNET_INSTALLATION_PACKAGE=""
+DOTNET_BINARY=""
+
+if dotnet --version > /dev/null ; then
+    DOTNET_BINARY=$(which dotnet)
+fi
 
-# Install dotnet unless available
-if ! dotnet --version > /dev/null ; then
-    echo "'dotnet' was not detected. Attempting to install the latest version of the dotnet sdk to build oryx."
+# Oryx needs to be built with .NET 6
+if [[ "${DOTNET_BINARY}" = "" ]] || [[ "$(dotnet --version)" != *"6"* ]] ; then
+    echo "'dotnet 6' was not detected. Attempting to install .NET 6 to build oryx."
     install_dotnet_using_apt
 
     if ! dotnet --version > /dev/null ; then
         echo "(!) Please install Dotnet before installing Oryx"
         exit 1
     fi
+
+    DOTNET_BINARY="/usr/bin/dotnet"
 fi
 
 BUILD_SCRIPT_GENERATOR=/usr/local/buildscriptgen
@@ -150,8 +156,8 @@ git clone --depth=1 https://github.com/microsoft/Oryx $GIT_ORYX
 
 $GIT_ORYX/build/buildSln.sh
 
-dotnet publish -property:ValidateExecutableReferencesMatchSelfContained=false -r linux-x64 -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildScriptGeneratorCli/BuildScriptGeneratorCli.csproj
-dotnet publish -r linux-x64 -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildServer/BuildServer.csproj
+${DOTNET_BINARY} publish -property:ValidateExecutableReferencesMatchSelfContained=false -r linux-x64 -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildScriptGeneratorCli/BuildScriptGeneratorCli.csproj
+${DOTNET_BINARY} publish -r linux-x64 -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildServer/BuildServer.csproj
 
 chmod a+x ${BUILD_SCRIPT_GENERATOR}/GenerateBuildScript
 
diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index fbbf62c60..b96511b9f 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/python/install.sh b/src/python/install.sh
index 79ab7de1c..d823cc99e 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -17,7 +17,7 @@ export PIPX_HOME=${PIPX_HOME:-"/usr/local/py-utils"}
 
 USERNAME=${USERNAME:-"automatic"}
 UPDATE_RC=${UPDATE_RC:-"true"}
-USE_ORYX_IF_AVAILABLE=${USE_ORYX_IF_AVAILABLE:-"true"}
+USE_ORYX_IF_AVAILABLE=${USEORYXIFAVAILABLE:-"true"}
 
 INSTALL_JUPYTERLAB=${INSTALLJUPYTERLAB:-"false"}
 CONFIGURE_JUPYTERLAB_ALLOW_ORIGIN=${CONFIGUREJUPYTERLABALLOWORIGIN:-""}
diff --git a/test/oryx/sample-python/requirements.txt b/test/oryx/sample-python/requirements.txt
new file mode 100644
index 000000000..c8a04f68a
--- /dev/null
+++ b/test/oryx/sample-python/requirements.txt
@@ -0,0 +1,2 @@
+mpmath==1.2.1
+sympy==1.11.1
diff --git a/test/oryx/sample-python/src/solve.py b/test/oryx/sample-python/src/solve.py
new file mode 100644
index 000000000..141a99646
--- /dev/null
+++ b/test/oryx/sample-python/src/solve.py
@@ -0,0 +1,12 @@
+from sympy import Symbol, Eq, solve
+
+x = Symbol("x")
+y = Symbol("y")
+
+equation_1 = Eq((x + y), 2)
+equation_2 = Eq((x - y), 4)
+print("Equation 1:", equation_1)
+print("Equation 2:", equation_2)
+
+solution = solve((equation_1, equation_2), (x, y))
+print("Solution:", solution)
diff --git a/test/oryx/scenarios.json b/test/oryx/scenarios.json
index 4b9fa90e9..bbfc277a9 100644
--- a/test/oryx/scenarios.json
+++ b/test/oryx/scenarios.json
@@ -8,5 +8,20 @@
             },
             "oryx": {}
         }
+    },
+    "test_python_project": {
+        "image": "ubuntu:focal",
+        "features": {
+            "python": {
+                "version": "3.10.4",
+                "additionalVersions": "3.9.7",
+                "useOryxIfAvailable": "false"
+            },
+            "dotnet": {
+                "version": "7",
+                "installUsingApt": "false"
+            },
+            "oryx": {}
+        }
     }
 }
\ No newline at end of file
diff --git a/test/oryx/test_python_project.sh b/test/oryx/test_python_project.sh
new file mode 100644
index 000000000..a0d5eef08
--- /dev/null
+++ b/test/oryx/test_python_project.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+cd sample-python
+
+# Replicates Oryx's behavior for universal image
+DEBIAN_FLAVOR="focal-scm"
+mkdir -p /opt/oryx && echo "vso-focal" > /opt/oryx/.imagetype
+echo "DEBIAN|${DEBIAN_FLAVOR}" | tr '[a-z]' '[A-Z]' > /opt/oryx/.ostype
+
+ln -snf /usr/local/oryx/* /opt/oryx
+
+PYTHON_PATH="/home/codespace/.python/current"
+mkdir -p /home/codespace/.python
+ln -snf /usr/local/python/current $PYTHON_PATH
+ln -snf /usr/local/python /opt/python
+
+export PATH="/home/codespace/.python/current/bin:${PATH}"
+which python
+
+pythonVersion=$(python -V 2>&1 | grep -Po '(?<=Python )(.+)')
+pythonSite=`python -m site --user-site`
+check "oryx-build-python" oryx build --property python_version="${pythonVersion}" --property packagedir="${pythonSite}" ./
+check "oryx-build-python-installed" python3 -m pip list | grep mpmath
+check "oryx-build-python-result" python3 ./src/solve.py
+
+# Report result
+reportResults

From 173c7ca3c7ad646e6b9732b5af8d45f08606182e Mon Sep 17 00:00:00 2001
From: Ilkka Poutanen <ilkka@ilkka.dev>
Date: Fri, 18 Nov 2022 20:26:05 +0200
Subject: [PATCH 020/478] Install git before github-cli (#301)

* Install git before github-cli

If building a devcontainer on e.g. `debian:bullseye`, github-cli installation can fail due to git not being installed yet:

```
0 13.38 2022-11-18 13:37:19 (6.08 MB/s) - 'gh_2.20.2_linux_amd64.deb' saved [10
176698/10176698]
#0 13.38
#0 13.40 Selecting previously unselected package gh.
#0 13.41 (Reading database ... 13628 files and directories currently installed.)
#0 13.41 Preparing to unpack .../gh_2.20.2_linux_amd64.deb ...
#0 13.41 Unpacking gh (2.20.2) ...
#0 13.65 dpkg: dependency problems prevent configuration of gh:
#0 13.65  gh depends on git; however:
#0 13.65   Package git is not installed.
#0 13.65
#0 13.65 dpkg: error processing package gh (--install):
#0 13.65  dependency problems - leaving unconfigured
#0 13.66 Errors were encountered while processing:
#0 13.66  gh
#0 13.67 ERROR: Feature "GitHub CLI" (ghcr.io/devcontainers/features/github-cli)
 failed to install! Look at the documentation at https://github.com/devcontainer
s/features/tree/main/src/github-cli for help troubleshooting this error.
```

* bump version

Co-authored-by: Josh Spicer <josh@joshspicer.com>
---
 src/github-cli/devcontainer-feature.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/github-cli/devcontainer-feature.json b/src/github-cli/devcontainer-feature.json
index fe8b76246..65968c173 100644
--- a/src/github-cli/devcontainer-feature.json
+++ b/src/github-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "github-cli",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "name": "GitHub CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/github-cli",
     "description": "Installs the GitHub CLI. Auto-detects latest version and installs needed dependencies.",
@@ -20,7 +20,8 @@
         }
     },
     "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
+        "ghcr.io/devcontainers/features/common-utils",
+        "ghcr.io/devcontainers/features/git"
     ]
 }
 

From c4648ab98cdeeb520e7e629c5db4a471ec802954 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 23 Nov 2022 09:33:50 -0800
Subject: [PATCH 021/478] go: fix bug - Go doesn't update version if go is
 already installed (#303)

* go: fix bug - Go doesn't update version if go is already installed

* Update tests with bash -c
---
 src/go/devcontainer-feature.json         |  2 +-
 src/go/install.sh                        | 11 +++++++----
 test/go/install_go_tool_in_postCreate.sh |  6 +++---
 test/go/install_go_twice.sh              | 11 +++++++++++
 test/go/scenarios.json                   |  8 ++++++++
 test/go/test.sh                          |  2 +-
 6 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 test/go/install_go_twice.sh

diff --git a/src/go/devcontainer-feature.json b/src/go/devcontainer-feature.json
index c83b4f076..b2aa30bc7 100644
--- a/src/go/devcontainer-feature.json
+++ b/src/go/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "go",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "name": "Go",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/go",
     "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/go/install.sh b/src/go/install.sh
index f561144e7..844411fcd 100755
--- a/src/go/install.sh
+++ b/src/go/install.sh
@@ -142,7 +142,8 @@ if ! cat /etc/group | grep -e "^golang:" > /dev/null 2>&1; then
 fi
 usermod -a -G golang "${USERNAME}"
 mkdir -p "${TARGET_GOROOT}" "${TARGET_GOPATH}"
-if [ "${TARGET_GO_VERSION}" != "none" ] && ! type go > /dev/null 2>&1; then
+
+if [[ "${TARGET_GO_VERSION}" != "none" ]] && [[ "$(go version)" != *"${TARGET_GO_VERSION}"* ]]; then
     # Use a temporary locaiton for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
@@ -186,7 +187,7 @@ if [ "${TARGET_GO_VERSION}" != "none" ] && ! type go > /dev/null 2>&1; then
     tar -xzf /tmp/go.tar.gz -C "${TARGET_GOROOT}" --strip-components=1
     rm -rf /tmp/go.tar.gz /tmp/go.tar.gz.asc /tmp/tmp-gnupg
 else
-    echo "Go already installed. Skipping."
+    echo "(!) Go is already installed with version ${TARGET_GO_VERSION}. Skipping."
 fi
 
 # Install Go tools that are isImportant && !replacedByGopls based on
@@ -218,8 +219,10 @@ if [ "${INSTALL_GO_TOOLS}" = "true" ]; then
     (echo "${GO_TOOLS}" | xargs -n 1 go ${go_install_command} -v )2>&1 | tee -a /usr/local/etc/vscode-dev-containers/go.log
 
     # Move Go tools into path and clean up
-    mv /tmp/gotools/bin/* ${TARGET_GOPATH}/bin/
-    rm -rf /tmp/gotools
+    if [ -d /tmp/gotools/bin ]; then
+        mv /tmp/gotools/bin/* ${TARGET_GOPATH}/bin/
+        rm -rf /tmp/gotools
+    fi
 
     # Install golangci-lint from precompiled binares
     if [ "$GOLANGCILINT_VERSION" = "latest" ] || [ "$GOLANGCILINT_VERSION" = "" ]; then
diff --git a/test/go/install_go_tool_in_postCreate.sh b/test/go/install_go_tool_in_postCreate.sh
index dbb086cfc..54637d956 100644
--- a/test/go/install_go_tool_in_postCreate.sh
+++ b/test/go/install_go_tool_in_postCreate.sh
@@ -5,9 +5,9 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-check "mkcert version" mkcert --version | grep "v1.4.2"
-check "mkcert is installed at correct path" which mkcert | grep "/go/bin/mkcert"
-check "golangci-lint version" golangci-lint --version | grep "golangci-lint has version 1.50.0"
+check "mkcert version" bash -c "mkcert --version | grep v1.4.2"
+check "mkcert is installed at correct path" bash -c "which mkcert | grep /go/bin/mkcert"
+check "golangci-lint version" bash -c "golangci-lint --version | grep 'golangci-lint has version 1.50.0'"
 
 # Report result
 reportResults
diff --git a/test/go/install_go_twice.sh b/test/go/install_go_twice.sh
new file mode 100644
index 000000000..8f6ef5431
--- /dev/null
+++ b/test/go/install_go_twice.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "go-version" bash -c "go version | grep 1.19"
+
+# Report result
+reportResults
diff --git a/test/go/scenarios.json b/test/go/scenarios.json
index b3fe49c0a..86e127020 100644
--- a/test/go/scenarios.json
+++ b/test/go/scenarios.json
@@ -8,5 +8,13 @@
             }
         },
         "postCreateCommand": "go install filippo.io/mkcert@v1.4.2"
+    },
+    "install_go_twice": {
+        "image": "mcr.microsoft.com/devcontainers/go:1.18",
+        "features": {
+            "go": {
+                "version": "1.19"
+            }
+        }
     }
 }
diff --git a/test/go/test.sh b/test/go/test.sh
index ee9f171af..ccae6da84 100755
--- a/test/go/test.sh
+++ b/test/go/test.sh
@@ -7,7 +7,7 @@ source dev-container-features-test-lib
 
 check "version" go version
 check "revive version" revive --version
-check "revive is installed at correct path" which revive | grep "/go/bin/revive"
+check "revive is installed at correct path" bash -c "which revive | grep /go/bin/revive"
 
 # Report result
 reportResults
\ No newline at end of file

From 133b4cf23c6e4d6679940a8806f76877790c7f45 Mon Sep 17 00:00:00 2001
From: Paul Yu <paul.d.yu@gmail.com>
Date: Wed, 23 Nov 2022 12:18:22 -0800
Subject: [PATCH 022/478] Optionally install Azure Bicep as part of azure-cli
 feature (#305)

* Adding azure-cli bicep installer to correctly install on arm64 containers

* Adding a few updates following @joshspicer's review.
---
 src/azure-cli/devcontainer-feature.json |  7 ++++++-
 src/azure-cli/install.sh                | 25 +++++++++++++++++++++++++
 test/azure-cli/install_bicep.sh         | 16 ++++++++++++++++
 test/azure-cli/scenarios.json           | 12 +++++++++++-
 4 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 test/azure-cli/install_bicep.sh

diff --git a/src/azure-cli/devcontainer-feature.json b/src/azure-cli/devcontainer-feature.json
index 012e28784..a2ba45221 100644
--- a/src/azure-cli/devcontainer-feature.json
+++ b/src/azure-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "azure-cli",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "name": "Azure CLI",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/azure-cli",
   "description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -17,6 +17,11 @@
       "type": "string",
       "default": "",
       "description": "Optional comma separated list of Azure CLI extensions to install in profile."
+    },
+    "installBicep": {
+      "type": "boolean",
+      "description": "Optionally install Azure Bicep",
+      "default": false
     }
   },
   "customizations": {
diff --git a/src/azure-cli/install.sh b/src/azure-cli/install.sh
index 99b4af57e..31bc6d864 100755
--- a/src/azure-cli/install.sh
+++ b/src/azure-cli/install.sh
@@ -14,6 +14,7 @@ rm -rf /var/lib/apt/lists/*
 
 AZ_VERSION=${VERSION:-"latest"}
 AZ_EXTENSIONS=${EXTENSIONS}
+AZ_INSTALLBICEP=${INSTALLBICEP:-false}
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 AZCLI_ARCHIVE_ARCHITECTURES="amd64"
@@ -197,6 +198,30 @@ if [ ${#AZ_EXTENSIONS[@]} -gt 0 ]; then
     done
 fi
 
+if [ "${AZ_INSTALLBICEP}" = "true" ]; then
+    # Install dependencies
+    check_packages apt-transport-https curl 
+    
+    # Properly install Azure Bicep based on current architecture
+    # The `az bicep install` command installs the linux-x64 binary even on arm64 devcontainers
+    # The `az bicep install --target-platform` could be a solution; however, linux-arm64 is not an allowed value for this argument yet
+    # Manually installing Bicep and moving to the appropriate directory where az expects it to be
+    
+    if [ "${architecture}" = "arm64" ]; then
+        curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep-linux-arm64
+    else 
+        curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep-linux-x64
+    fi
+    
+    chmod +x ./bicep
+    mv ./bicep /usr/local/bin/bicep
+
+    # Add a symlink so bicep can be accessed as a standalone executable or as part of az
+    mkdir -p ${_REMOTE_USER_HOME}/.azure/bin
+    chown -hR ${_REMOTE_USER}:${_REMOTE_USER} ${_REMOTE_USER_HOME}/.azure
+    ln -s /usr/local/bin/bicep ${_REMOTE_USER_HOME}/.azure/bin/bicep
+fi
+
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
diff --git a/test/azure-cli/install_bicep.sh b/test/azure-cli/install_bicep.sh
new file mode 100644
index 000000000..955507fda
--- /dev/null
+++ b/test/azure-cli/install_bicep.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+# Bicep-specific tests
+check "bicep" bicep --version
+check "az bicep" az bicep version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/azure-cli/scenarios.json b/test/azure-cli/scenarios.json
index aa21f7262..cc1fd7512 100644
--- a/test/azure-cli/scenarios.json
+++ b/test/azure-cli/scenarios.json
@@ -1,6 +1,6 @@
 {
   "install_extensions": {
-    "image": "ubuntu:focal",
+    "image": "mcr.microsoft.com/devcontainers/base:jammy",
     "user": "vscode",
     "features": {
       "azure-cli": {
@@ -8,5 +8,15 @@
         "extensions": "aks-preview,amg,containerapp"
       }
     }
+  },
+  "install_bicep": {
+    "image": "mcr.microsoft.com/devcontainers/base:jammy",
+    "user": "vscode",
+    "features": {
+      "azure-cli": {
+        "version": "latest",
+        "installBicep": true
+      }
+    }
   }
 }
\ No newline at end of file

From 188f1ef26bc8fa942d552dfaa8596091a8a39126 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 23 Nov 2022 12:46:03 -0800
Subject: [PATCH 023/478] Automated documentation update (#306)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/azure-cli/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/azure-cli/README.md b/src/azure-cli/README.md
index bf6004b7b..9b7735f70 100644
--- a/src/azure-cli/README.md
+++ b/src/azure-cli/README.md
@@ -17,6 +17,7 @@ Installs the Azure CLI along with needed dependencies. Useful for base Dockerfil
 |-----|-----|-----|-----|
 | version | Select or enter an Azure CLI version. (Available versions may vary by Linux distribution.) | string | latest |
 | extensions | Optional comma separated list of Azure CLI extensions to install in profile. | string | - |
+| installBicep | Optionally install Azure Bicep | boolean | false |
 
 
 

From 4b3ccf36eabcad859a13806a8dc47dfa651182a1 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 23 Nov 2022 15:03:07 -0800
Subject: [PATCH 024/478] Adds test coverage (#308)

* Add test coverage

* temp: debug test

* Update tests
---
 test/desktop-lite/test.sh                         |  4 +++-
 test/docker-from-docker/docker_init.sh            | 15 +++++++++++++++
 test/docker-from-docker/scenarios.json            | 11 +++++++++++
 test/docker-from-docker/test.sh                   |  2 ++
 .../azureDnsAutoDetectionDisabled.sh              |  2 +-
 .../azureDnsAutoDetectionEnabled.sh               |  2 +-
 test/docker-in-docker/dockerDefaultAddressPool.sh |  2 +-
 test/docker-in-docker/test.sh                     |  7 ++++++-
 test/sshd/test.sh                                 |  6 +++++-
 9 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 test/docker-from-docker/docker_init.sh
 create mode 100644 test/docker-from-docker/scenarios.json

diff --git a/test/desktop-lite/test.sh b/test/desktop-lite/test.sh
index bd0a51639..9009aa9c6 100755
--- a/test/desktop-lite/test.sh
+++ b/test/desktop-lite/test.sh
@@ -5,7 +5,9 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-echo 'NO TESTS FOR ME YET!'
+check "desktop-init-exists" bash -c "ls /usr/local/share/desktop-init.sh"
+check "log-exists" bash -c "ls /tmp/container-init.log"
+check "fluxbox-exists" bash -c "ls -la ~/.fluxbox"
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/docker-from-docker/docker_init.sh b/test/docker-from-docker/docker_init.sh
new file mode 100644
index 000000000..216492129
--- /dev/null
+++ b/test/docker-from-docker/docker_init.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "docker-init-exists" bash -c "ls /usr/local/share/docker-init.sh"
+check "log-exists" bash -c "ls /tmp/vscr-docker-from-docker.log"
+check "log-contents-for-success" bash -c "cat /tmp/vscr-docker-from-docker.log | grep 'Success'"
+check "log-contents" bash -c "cat /tmp/vscr-docker-from-docker.log | grep 'Proxying /var/run/docker-host.sock to /var/run/docker.sock for vscode'"
+check "docker-ps" bash -c "docker ps"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/docker-from-docker/scenarios.json b/test/docker-from-docker/scenarios.json
new file mode 100644
index 000000000..196e00bf6
--- /dev/null
+++ b/test/docker-from-docker/scenarios.json
@@ -0,0 +1,11 @@
+{
+    "docker_init": {
+        "image": "mcr.microsoft.com/devcontainers/base",
+        "remoteUser": "vscode",
+        "features": {
+            "docker-from-docker": {
+                "version": "latest"
+            }
+        }
+    }
+}
diff --git a/test/docker-from-docker/test.sh b/test/docker-from-docker/test.sh
index 3a802b59b..517737ada 100755
--- a/test/docker-from-docker/test.sh
+++ b/test/docker-from-docker/test.sh
@@ -7,6 +7,8 @@ source dev-container-features-test-lib
 
 # Definition specific tests
 check "version" docker  --version
+check "docker-init-exists" bash -c "ls /usr/local/share/docker-init.sh"
+check "docker-ps" bash -c "docker ps"
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/docker-in-docker/azureDnsAutoDetectionDisabled.sh b/test/docker-in-docker/azureDnsAutoDetectionDisabled.sh
index d3f4159d0..2415116d1 100644
--- a/test/docker-in-docker/azureDnsAutoDetectionDisabled.sh
+++ b/test/docker-in-docker/azureDnsAutoDetectionDisabled.sh
@@ -6,7 +6,7 @@ set -e
 source dev-container-features-test-lib
 
 # Definition specific tests
-check "dns flag should not be present" test ! "$(ps -ax | grep -E 'dockerd.+\-\-dns')"
+check "dns flag should not be present" test ! "$(ps -ax | grep -v grep | grep -E 'dockerd.+\-\-dns')"
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/docker-in-docker/azureDnsAutoDetectionEnabled.sh b/test/docker-in-docker/azureDnsAutoDetectionEnabled.sh
index e63a1f316..87f158aac 100644
--- a/test/docker-in-docker/azureDnsAutoDetectionEnabled.sh
+++ b/test/docker-in-docker/azureDnsAutoDetectionEnabled.sh
@@ -6,7 +6,7 @@ set -e
 source dev-container-features-test-lib
 
 # Definition specific tests
-check "dns flag should be present" ps -ax | grep -E "dockerd.+\-\-dns"
+check "dns flag should be present" ps -ax | grep -v grep | grep -E "dockerd.+\-\-dns"
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/docker-in-docker/dockerDefaultAddressPool.sh b/test/docker-in-docker/dockerDefaultAddressPool.sh
index 8345357a8..219ad8215 100644
--- a/test/docker-in-docker/dockerDefaultAddressPool.sh
+++ b/test/docker-in-docker/dockerDefaultAddressPool.sh
@@ -6,7 +6,7 @@ set -e
 source dev-container-features-test-lib
 
 # Definition specific tests
-check "default address pool setting set" ps -ax | grep -E "dockerd.+base=192.168.0.0/16,size=24"
+check "default address pool setting set" ps -ax | grep -v grep | grep -E "dockerd.+base=192.168.0.0/16,size=24"
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/docker-in-docker/test.sh b/test/docker-in-docker/test.sh
index 3a802b59b..1eebfd243 100755
--- a/test/docker-in-docker/test.sh
+++ b/test/docker-in-docker/test.sh
@@ -5,8 +5,13 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-# Definition specific tests
+# Feature specific tests
 check "version" docker  --version
+check "docker-init-exists" bash -c "ls /usr/local/share/docker-init.sh"
+check "log-exists" bash -c "ls /tmp/dockerd.log"
+check "log-for-completion" bash -c "cat /tmp/dockerd.log | grep 'Daemon has completed initialization'"
+check "log-contents" bash -c "cat /tmp/dockerd.log | grep 'API listen on /var/run/docker.sock'"
+check "docker-ps" bash -c "docker ps"
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/sshd/test.sh b/test/sshd/test.sh
index bd0a51639..6aac9e588 100755
--- a/test/sshd/test.sh
+++ b/test/sshd/test.sh
@@ -5,7 +5,11 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-echo 'NO TESTS FOR ME YET!'
+check "sshd-init-exists" bash -c "ls /usr/local/share/ssh-init.sh"
+check "sshd-log-exists" bash -c "ls /tmp/sshd.log"
+check "sshd-log-contents" bash -c "cat /tmp/sshd.log | grep 'Starting OpenBSD Secure Shell server'"
+check "sshd-log-has-sshd" bash -c "cat /tmp/sshd.log | grep 'sshd'"
+check "sshd" bash -c "ps -aux | grep -v grep | grep sshd"
 
 # Report result
 reportResults
\ No newline at end of file

From 30f287605354478d4af5d6c8736c9a414369110c Mon Sep 17 00:00:00 2001
From: Chuck Lantz <clantz@microsoft.com>
Date: Mon, 28 Nov 2022 10:10:56 -0600
Subject: [PATCH 025/478] Fix bad path to systemctl (#302)

---
 src/common-utils/devcontainer-feature.json | 2 +-
 src/common-utils/install.sh                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 9a135d516..74b85081b 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "1.1.4",
+    "version": "1.1.5",
     "name": "Common Debian Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/install.sh b/src/common-utils/install.sh
index 8ac0a7c62..878e9caa1 100755
--- a/src/common-utils/install.sh
+++ b/src/common-utils/install.sh
@@ -292,7 +292,7 @@ cat << 'EOF' > /usr/local/bin/systemctl
 #!/bin/sh
 set -e
 if [ -d "/run/systemd/system" ]; then
-    exec /bin/systemctl/systemctl "$@"
+    exec /bin/systemctl "$@"
 else
     echo '\n"systemd" is not running in this container due to its overhead.\nUse the "service" command to start services instead. e.g.: \n\nservice --status-all'
 fi

From 4af4c291225a165e5a9b0e5a65c450e81e5aecf0 Mon Sep 17 00:00:00 2001
From: Claudio Bandera <cbandera@users.noreply.github.com>
Date: Mon, 28 Nov 2022 20:05:21 +0100
Subject: [PATCH 026/478] Proposal for fix of #312 (#313)

* Proposal for fix of #312

This change moves the directory separator into the `PIPX_DIR` variable in order to not introduce an error in the case pipx has already been installed systemwide.

* Bump patch version of python feature to 1.0.16
---
 src/python/devcontainer-feature.json | 2 +-
 src/python/install.sh                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index b96511b9f..ca474ab4c 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/python/install.sh b/src/python/install.sh
index d823cc99e..0c3f9e0fb 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -450,11 +450,11 @@ if [[ "${INSTALL_PYTHON_TOOLS}" = "true" ]] && [[ $(python --version) != "" ]];
     if ! type pipx > /dev/null 2>&1; then
         pip3 install --disable-pip-version-check --no-cache-dir --user pipx 2>&1
         /tmp/pip-tmp/bin/pipx install --pip-args=--no-cache-dir pipx
-        PIPX_DIR="/tmp/pip-tmp/bin"
+        PIPX_DIR="/tmp/pip-tmp/bin/"
     fi
     for util in "${DEFAULT_UTILS[@]}"; do
         if ! type ${util} > /dev/null 2>&1; then
-            "${PIPX_DIR}/pipx" install --system-site-packages --pip-args '--no-cache-dir --force-reinstall' ${util}
+            "${PIPX_DIR}pipx" install --system-site-packages --pip-args '--no-cache-dir --force-reinstall' ${util}
         else
             echo "${util} already installed. Skipping."
         fi

From d1972b4d8d2dc75370c236c9dafe505ea42590f2 Mon Sep 17 00:00:00 2001
From: Chuck Lantz <clantz@microsoft.com>
Date: Mon, 28 Nov 2022 17:07:38 -0600
Subject: [PATCH 027/478] Use _REMOTE_USER when available (#264)

* Use _REMOTE_USER when available

* Update src/python/install.sh

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

* Update src/python/install.sh

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

* Fix java test issue - JDK 18 not available for the "open" distro

* Bump breakfix numbers

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
Co-authored-by: Josh Spicer <joshspicer@github.com>
---
 src/anaconda/devcontainer-feature.json        |  2 +-
 src/anaconda/install.sh                       |  8 +++----
 src/common-utils/devcontainer-feature.json    |  2 +-
 src/common-utils/install.sh                   | 14 ++++++------
 src/conda/devcontainer-feature.json           |  2 +-
 src/conda/install.sh                          |  2 +-
 src/desktop-lite/devcontainer-feature.json    |  2 +-
 src/desktop-lite/install.sh                   |  7 +++---
 .../devcontainer-feature.json                 |  2 +-
 src/docker-from-docker/install.sh             | 16 +++++++-------
 .../devcontainer-feature.json                 |  2 +-
 src/docker-in-docker/install.sh               | 16 +++++++-------
 src/dotnet/devcontainer-feature.json          |  2 +-
 src/dotnet/install.sh                         | 16 +++++++-------
 src/go/devcontainer-feature.json              |  2 +-
 src/go/install.sh                             | 12 +++++-----
 src/hugo/devcontainer-feature.json            |  2 +-
 src/hugo/install.sh                           |  8 +++----
 src/java/devcontainer-feature.json            |  2 +-
 src/java/install.sh                           | 20 ++++++++---------
 src/java/wrapper.sh                           | 10 ++++-----
 .../devcontainer-feature.json                 |  2 +-
 src/kubectl-helm-minikube/install.sh          |  2 +-
 src/node/devcontainer-feature.json            |  2 +-
 src/node/install.sh                           |  8 +++----
 src/oryx/install.sh                           |  4 ++--
 src/php/devcontainer-feature.json             |  2 +-
 src/php/install.sh                            | 14 ++++++------
 src/python/devcontainer-feature.json          |  2 +-
 src/python/install.sh                         | 22 +++++++++----------
 src/ruby/devcontainer-feature.json            |  2 +-
 src/ruby/install.sh                           | 10 ++++-----
 src/rust/devcontainer-feature.json            |  2 +-
 src/rust/install.sh                           | 16 +++++++-------
 src/sshd/devcontainer-feature.json            |  2 +-
 src/sshd/install.sh                           | 10 ++++-----
 test/java/scenarios.json                      |  2 +-
 37 files changed, 125 insertions(+), 126 deletions(-)
 mode change 100755 => 100644 src/dotnet/install.sh
 mode change 100755 => 100644 src/java/install.sh

diff --git a/src/anaconda/devcontainer-feature.json b/src/anaconda/devcontainer-feature.json
index 7308699cf..cdf1fbf7e 100644
--- a/src/anaconda/devcontainer-feature.json
+++ b/src/anaconda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "anaconda",
-    "version": "1.0.9",
+    "version": "1.0.10",
     "name": "Anaconda",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/anaconda",
     "options": {
diff --git a/src/anaconda/install.sh b/src/anaconda/install.sh
index 47f3462d5..53c606a1e 100755
--- a/src/anaconda/install.sh
+++ b/src/anaconda/install.sh
@@ -8,10 +8,10 @@
 # Maintainer: The VS Code and Codespaces Teams
 
 
-VERSION=${VERSION:-"latest"}
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
-CONDA_DIR=${CONDA_DIR:-"/usr/local/conda"}
+VERSION="${VERSION:-"latest"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${UPDATE_RC:-"true"}"
+CONDA_DIR="${CONDA_DIR:-"/usr/local/conda"}"
 
 set -eux
 export DEBIAN_FRONTEND=noninteractive
diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 74b85081b..812e5e9e0 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "1.1.5",
+    "version": "1.1.6",
     "name": "Common Debian Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/install.sh b/src/common-utils/install.sh
index 878e9caa1..5530b96d9 100755
--- a/src/common-utils/install.sh
+++ b/src/common-utils/install.sh
@@ -12,13 +12,13 @@ set -e
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
-INSTALL_ZSH=${INSTALLZSH:-"true"}
-INSTALL_OH_MY_ZSH=${INSTALLOHMYZSH:-"true"}
-UPGRADE_PACKAGES=${UPGRADEPACKAGES:-"true"}
-USERNAME=${USERNAME:-"automatic"}
-USER_UID=${UID:-"automatic"}
-USER_GID=${GID:-"automatic"}
-ADD_NON_FREE_PACKAGES=${NONFREEPACKAGES:-"false"}
+INSTALL_ZSH="${INSTALLZSH:-"true"}"
+INSTALL_OH_MY_ZSH="${INSTALLOHMYZSH:-"true"}"
+UPGRADE_PACKAGES="${UPGRADEPACKAGES:-"true"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+USER_UID="${UID:-"automatic"}"
+USER_GID="${GID:-"automatic"}"
+ADD_NON_FREE_PACKAGES="${NONFREEPACKAGES:-"false"}"
 
 MARKER_FILE="/usr/local/etc/vscode-dev-containers/common"
 
diff --git a/src/conda/devcontainer-feature.json b/src/conda/devcontainer-feature.json
index da4c6746f..8ff6499dd 100644
--- a/src/conda/devcontainer-feature.json
+++ b/src/conda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "conda",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "name": "Conda",
     "description": "A cross-platform, language-agnostic binary package manager",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
diff --git a/src/conda/install.sh b/src/conda/install.sh
index 9b51bbd29..6e9088221 100644
--- a/src/conda/install.sh
+++ b/src/conda/install.sh
@@ -7,7 +7,7 @@
 VERSION=${VERSION:-"latest"}
 ADD_CONDA_FORGE=$ADDCONDAFORGE
 
-USERNAME="automatic"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 UPDATE_RC="true"
 CONDA_DIR="/opt/conda"
 
diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json
index 9420dc3dd..e0333867f 100644
--- a/src/desktop-lite/devcontainer-feature.json
+++ b/src/desktop-lite/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "desktop-lite",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "name": "Light-weight Desktop",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
     "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh
index dc8ee3932..60bec121b 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -7,14 +7,13 @@
 # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/desktop-lite.md
 # Maintainer: The VS Code and Codespaces Teams
 
-NOVNC_VERSION=${NOVNCVERSION:-"1.2.0"} # TODO: Add in a 'latest' auto-detect and swap name to 'version'
+NOVNC_VERSION="${NOVNCVERSION:-"1.2.0"}" # TODO: Add in a 'latest' auto-detect and swap name to 'version'
 VNC_PASSWORD=${PASSWORD:-"vscode"}
 NOVNC_PORT="${WEBPORT:-6080}"
 VNC_PORT="${VNCPORT:-5901}"
 
-INSTALL_NOVNC=${INSTALL_NOVNC:-"true"}
-USERNAME=${USERNAME:-"automatic"}
-
+INSTALL_NOVNC="${INSTALL_NOVNC:-"true"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 
 WEBSOCKETIFY_VERSION=0.10.0
 
diff --git a/src/docker-from-docker/devcontainer-feature.json b/src/docker-from-docker/devcontainer-feature.json
index dc7208973..2ebdd3833 100644
--- a/src/docker-from-docker/devcontainer-feature.json
+++ b/src/docker-from-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-from-docker",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "name": "Docker (Docker-from-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-from-docker",
     "descripton": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
diff --git a/src/docker-from-docker/install.sh b/src/docker-from-docker/install.sh
index d128ab9c9..1307bfc91 100755
--- a/src/docker-from-docker/install.sh
+++ b/src/docker-from-docker/install.sh
@@ -7,14 +7,14 @@
 # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker.md
 # Maintainer: The VS Code and Codespaces Teams
 
-DOCKER_VERSION=${VERSION:-"latest"}
-USE_MOBY=${MOBY:-"true"}
-DOCKER_DASH_COMPOSE_VERSION=${DOCKERDASHCOMPOSEVERSION:-"v1"} # v1 or v2
-
-ENABLE_NONROOT_DOCKER=${ENABLE_NONROOT_DOCKER:-"true"}
-SOURCE_SOCKET=${SOURCE_SOCKET:-"/var/run/docker-host.sock"}
-TARGET_SOCKET=${TARGET_SOCKET:-"/var/run/docker.sock"}
-USERNAME=${USERNAME:-"automatic"}
+DOCKER_VERSION="${VERSION:-"latest"}"
+USE_MOBY="${MOBY:-"true"}"
+DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2
+
+ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"
+SOURCE_SOCKET="${SOURCE_SOCKET:-"/var/run/docker-host.sock"}"
+TARGET_SOCKET="${TARGET_SOCKET:-"/var/run/docker.sock"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy"
diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 95a6a2c5a..95d6841fd 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index fe4692f3e..d35112143 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -8,14 +8,14 @@
 # Maintainer: The VS Code and Codespaces Teams
 
 
-DOCKER_VERSION=${VERSION:-"latest"} # The Docker/Moby Engine + CLI should match in version
-USE_MOBY=${MOBY:-"true"}
-DOCKER_DASH_COMPOSE_VERSION=${DOCKERDASHCOMPOSEVERSION:-"v1"} # v1 or v2
-AZURE_DNS_AUTO_DETECTION=${AZUREDNSAUTODETECTION:-"true"}
-DOCKER_DEFAULT_ADDRESS_POOL=${DOCKERDEFAULTADDRESSPOOL}
-
-ENABLE_NONROOT_DOCKER=${ENABLE_NONROOT_DOCKER:-"true"}
-USERNAME=${USERNAME:-"automatic"}
+DOCKER_VERSION="${VERSION:-"latest"}" # The Docker/Moby Engine + CLI should match in version
+USE_MOBY="${MOBY:-"true"}"
+DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2
+AZURE_DNS_AUTO_DETECTION="${AZUREDNSAUTODETECTION:-"true"}"
+DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL}"
+
+ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy"
diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index 42eb1c287..e8bb9f16c 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "Installs the .NET CLI. Provides option of installing sdk or runtime, and option of versions to install. Uses latest version of .NET sdk as defaults to install.",
diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh
old mode 100755
new mode 100644
index 78cd691df..13285abbd
--- a/src/dotnet/install.sh
+++ b/src/dotnet/install.sh
@@ -7,18 +7,18 @@
 # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/dotnet.md
 # Maintainer: The VS Code and Codespaces Teams
 
-DOTNET_VERSION=${VERSION:-"latest"}
-DOTNET_RUNTIME_ONLY=${RUNTIMEONLY:-"false"}
-OVERRIDE_DEFAULT_VERSION=${OVERRIDEDEFAULTVERSION:-"true"}
-INSTALL_USING_APT=${INSTALLUSINGAPT:-"true"}
+DOTNET_VERSION="${VERSION:-"latest"}"
+DOTNET_RUNTIME_ONLY="${RUNTIMEONLY:-"false"}"
+OVERRIDE_DEFAULT_VERSION="${OVERRIDEDEFAULTVERSION:-"true"}"
+INSTALL_USING_APT="${INSTALLUSINGAPT:-"true"}"
 
 DOTNET_LATEST="7"
 DOTNET_LTS="6"
 
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
-TARGET_DOTNET_ROOT=${TARGET_DOTNET_ROOT:-"/usr/local/dotnet"}
-ACCESS_GROUP=${ACCESS_GROUP:-"dotnet"}
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${UPDATE_RC:-"true"}"
+TARGET_DOTNET_ROOT="${TARGET_DOTNET_ROOT:-"/usr/local/dotnet"}"
+ACCESS_GROUP="${ACCESS_GROUP:-"dotnet"}"
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 DOTNET_ARCHIVE_ARCHITECTURES="amd64"
diff --git a/src/go/devcontainer-feature.json b/src/go/devcontainer-feature.json
index b2aa30bc7..f63d93ec1 100644
--- a/src/go/devcontainer-feature.json
+++ b/src/go/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "go",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "name": "Go",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/go",
     "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/go/install.sh b/src/go/install.sh
index 844411fcd..1b65e50ce 100755
--- a/src/go/install.sh
+++ b/src/go/install.sh
@@ -7,13 +7,13 @@
 # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/go.md
 # Maintainer: The VS Code and Codespaces Teams
 
-TARGET_GO_VERSION=${VERSION:-"latest"}
-GOLANGCILINT_VERSION=${GOLANGCILINTVERSION:-"latest"}
+TARGET_GO_VERSION="${VERSION:-"latest"}"
+GOLANGCILINT_VERSION="${GOLANGCILINTVERSION:-"latest"}"
 
-TARGET_GOROOT=${TARGET_GOROOT:-"/usr/local/go"}
-TARGET_GOPATH=${TARGET_GOPATH:-"/go"}
-USERNAME=${USERNAME:-"automatic"}
-INSTALL_GO_TOOLS=${INSTALL_GO_TOOLS:-"true"}
+TARGET_GOROOT="${TARGET_GOROOT:-"/usr/local/go"}"
+TARGET_GOPATH="${TARGET_GOPATH:-"/go"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+INSTALL_GO_TOOLS="${INSTALL_GO_TOOLS:-"true"}"
 
 # https://www.google.com/linuxrepositories/
 GO_GPG_KEY_URI="https://dl.google.com/linux/linux_signing_key.pub"
diff --git a/src/hugo/devcontainer-feature.json b/src/hugo/devcontainer-feature.json
index 37a805dce..ffc1a3bdb 100644
--- a/src/hugo/devcontainer-feature.json
+++ b/src/hugo/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "hugo",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "name": "Hugo",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/hugo",
   "options": {
diff --git a/src/hugo/install.sh b/src/hugo/install.sh
index c5cb628f1..b268e384b 100755
--- a/src/hugo/install.sh
+++ b/src/hugo/install.sh
@@ -7,12 +7,12 @@
 # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/hugo.md
 # Maintainer: The VS Code and Codespaces Teams
 
-VERSION=${VERSION:-"latest"}
+VERSION="${VERSION:-"latest"}"
 
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${UPDATE_RC:-"true"}"
 
-HUGO_DIR=${HUGO_DIR:-"/usr/local/hugo"}
+HUGO_DIR="${HUGO_DIR:-"/usr/local/hugo"}"
 
 set -e
 
diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index c400fb6c7..4c7df039b 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "name": "Java (via SDKMAN!)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
diff --git a/src/java/install.sh b/src/java/install.sh
old mode 100755
new mode 100644
index 592847800..bf9496304
--- a/src/java/install.sh
+++ b/src/java/install.sh
@@ -9,20 +9,20 @@
 #
 # Syntax: ./java-debian.sh [JDK version] [SDKMAN_DIR] [non-root user] [Add to rc files flag]
 
-JAVA_VERSION=${VERSION:-"lts"}
-INSTALL_GRADLE=${INSTALLGRADLE:-"false"}
-GRADLE_VERSION=${GRADLEVERSION:-"latest"}
-INSTALL_MAVEN=${INSTALLMAVEN:-"false"}
-MAVEN_VERSION=${MAVENVERSION:-"latest"}
-JDK_DISTRO=${JDKDISTRO}
+JAVA_VERSION="${VERSION:-"lts"}"
+INSTALL_GRADLE="${INSTALLGRADLE:-"false"}"
+GRADLE_VERSION="${GRADLEVERSION:-"latest"}"
+INSTALL_MAVEN="${INSTALLMAVEN:-"false"}"
+MAVEN_VERSION="${MAVENVERSION:-"latest"}"
+JDK_DISTRO="${JDKDISTRO}"
 
-export SDKMAN_DIR=${SDKMAN_DIR:-"/usr/local/sdkman"}
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
+export SDKMAN_DIR="${SDKMAN_DIR:-"/usr/local/sdkman"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${UPDATE_RC:-"true"}"
 
 # Comma-separated list of java versions to be installed
 # alongside JAVA_VERSION, but not set as default.
-ADDITIONAL_VERSIONS=${ADDITIONALVERSIONS:-""}
+ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 
 set -e
 
diff --git a/src/java/wrapper.sh b/src/java/wrapper.sh
index d7f05de6c..bea343f96 100644
--- a/src/java/wrapper.sh
+++ b/src/java/wrapper.sh
@@ -3,11 +3,11 @@
 
 set -e
 
-JAVA_VERSION=${1:-"default"}
-SDKMAN_DIR=${2:-"/usr/local/sdkman"}
-USERNAME=${3:-"automatic"}
-UPDATE_RC=${4:-"true"}
-ADDITIONAL_JAVA_VERSION=11
+JAVA_VERSION="${1:-"default"}"
+SDKMAN_DIR="${2:-"/usr/local/sdkman"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${4:-"true"}"
+ADDITIONAL_JAVA_VERSION="11"
 
 cd "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 chmod +x install.sh
diff --git a/src/kubectl-helm-minikube/devcontainer-feature.json b/src/kubectl-helm-minikube/devcontainer-feature.json
index f8098b403..beea80a2e 100644
--- a/src/kubectl-helm-minikube/devcontainer-feature.json
+++ b/src/kubectl-helm-minikube/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "kubectl-helm-minikube",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "name": "Kubectl, Helm, and Minikube",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
     "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
diff --git a/src/kubectl-helm-minikube/install.sh b/src/kubectl-helm-minikube/install.sh
index c961e5652..3ab65356f 100755
--- a/src/kubectl-helm-minikube/install.sh
+++ b/src/kubectl-helm-minikube/install.sh
@@ -19,7 +19,7 @@ MINIKUBE_VERSION="${MINIKUBE:-"none"}" # latest is also valid
 KUBECTL_SHA256="${KUBECTL_SHA256:-"automatic"}"
 HELM_SHA256="${HELM_SHA256:-"automatic"}"
 MINIKUBE_SHA256="${MINIKUBE_SHA256:-"automatic"}"
-USERNAME=${USERNAME:-"automatic"}
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 
 HELM_GPG_KEYS_URI="https://raw.githubusercontent.com/helm/helm/main/KEYS"
 GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80
diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index 49d2160fa..3abfb0400 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "name": "Node.js (via nvm) and yarn",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, and needed dependencies.",
diff --git a/src/node/install.sh b/src/node/install.sh
index 2f2e7aa38..9b027d861 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -7,17 +7,17 @@
 # Docs: https://github.com/devcontainers/features/tree/main/src/node
 # Maintainer: The Dev Container spec maintainers
 
-export NODE_VERSION=${VERSION:-"lts"}
+export NODE_VERSION="${VERSION:-"lts"}"
 export NVM_VERSION="${NVMVERSION:-"0.39.2"}"
 export NVM_DIR=${NVMINSTALLPATH:-"/usr/local/share/nvm"}
 INSTALL_TOOLS_FOR_NODE_GYP="${NODEGYPDEPENDENCIES:-true}"
 
 # Comma-separated list of node versions to be installed (with nvm)
 # alongside NODE_VERSION, but not set as default.
-ADDITIONAL_VERSIONS=${ADDITIONALVERSIONS:-""}
+ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${UPDATE_RC:-"true"}"
 
 set -e
 
diff --git a/src/oryx/install.sh b/src/oryx/install.sh
index aa4af2c8c..a1b64d3e9 100755
--- a/src/oryx/install.sh
+++ b/src/oryx/install.sh
@@ -5,8 +5,8 @@
 #-------------------------------------------------------------------------------------------------------------
 
 
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${UPDATE_RC:-"true"}"
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 
diff --git a/src/php/devcontainer-feature.json b/src/php/devcontainer-feature.json
index 181851e32..bad987872 100644
--- a/src/php/devcontainer-feature.json
+++ b/src/php/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "php",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "name": "PHP",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/php",
     "options": {
diff --git a/src/php/install.sh b/src/php/install.sh
index 70b63da69..381bec21b 100755
--- a/src/php/install.sh
+++ b/src/php/install.sh
@@ -11,17 +11,17 @@ set -eux
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
-VERSION=${VERSION:-"latest"}
-INSTALL_COMPOSER=${INSTALLCOMPOSER:-"true"}
-OVERRIDE_DEFAULT_VERSION=${OVERRIDEDEFAULTVERSION:-"true"}
+VERSION="${VERSION:-"latest"}"
+INSTALL_COMPOSER="${INSTALLCOMPOSER:-"true"}"
+OVERRIDE_DEFAULT_VERSION="${OVERRIDEDEFAULTVERSION:-"true"}"
 
-export PHP_DIR=${PHP_DIR:-"/usr/local/php"}
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
+export PHP_DIR="${PHP_DIR:-"/usr/local/php"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${UPDATE_RC:-"true"}"
 
 # Comma-separated list of php versions to be installed
 # alongside VERSION, but not set as default.
-ADDITIONAL_VERSIONS=${ADDITIONALVERSIONS:-""}
+ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index ca474ab4c..8daf3e90b 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/python/install.sh b/src/python/install.sh
index 0c3f9e0fb..76fd6f09f 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -7,24 +7,24 @@
 # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/python.md
 # Maintainer: The VS Code and Codespaces Teams
 
-PYTHON_VERSION=${VERSION:-"latest"} # 'system' checks the base image first, else installs 'latest'
-INSTALL_PYTHON_TOOLS=${INSTALLTOOLS:-"true"}
-OPTIMIZE_BUILD_FROM_SOURCE=${OPTIMIZE:-"false"}
-PYTHON_INSTALL_PATH=${INSTALLPATH:-"/usr/local/python"}
-OVERRIDE_DEFAULT_VERSION=${OVERRIDEDEFAULTVERSION:-"true"}
+PYTHON_VERSION="${VERSION:-"latest"}" # 'system' or 'os-provided' checks the base image first, else installs 'latest'
+INSTALL_PYTHON_TOOLS="${INSTALLTOOLS:-"true"}"
+OPTIMIZE_BUILD_FROM_SOURCE="${OPTIMIZE:-"false"}"
+PYTHON_INSTALL_PATH="${INSTALLPATH:-"/usr/local/python"}"
+OVERRIDE_DEFAULT_VERSION="${OVERRIDEDEFAULTVERSION:-"true"}"
 
 export PIPX_HOME=${PIPX_HOME:-"/usr/local/py-utils"}
 
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
-USE_ORYX_IF_AVAILABLE=${USEORYXIFAVAILABLE:-"true"}
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${UPDATE_RC:-"true"}"
+USE_ORYX_IF_AVAILABLE="${USEORYXIFAVAILABLE:-"true"}"
 
-INSTALL_JUPYTERLAB=${INSTALLJUPYTERLAB:-"false"}
-CONFIGURE_JUPYTERLAB_ALLOW_ORIGIN=${CONFIGUREJUPYTERLABALLOWORIGIN:-""}
+INSTALL_JUPYTERLAB="${INSTALLJUPYTERLAB:-"false"}"
+CONFIGURE_JUPYTERLAB_ALLOW_ORIGIN="${CONFIGUREJUPYTERLABALLOWORIGIN:-""}"
 
 # Comma-separated list of python versions to be installed
 # alongside PYTHON_VERSION, but not set as default.
-ADDITIONAL_VERSIONS=${ADDITIONALVERSIONS:-""}
+ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 
 DEFAULT_UTILS=("pylint" "flake8" "autopep8" "black" "yapf" "mypy" "pydocstyle" "pycodestyle" "bandit" "pipenv" "virtualenv")
 PYTHON_SOURCE_GPG_KEYS="64E628F8D684696D B26995E310250568 2D347EA6AA65421D FB9921286F5E1540 3A5CA953F73C700D 04C367C218ADD4FF 0EDDC5F26A45C816 6AF053F07D9DC8D2 C9BE28DEE6DF025C 126EB563A74B06BF D9866941EA5BBD71 ED9D77D5"
diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json
index c76d85dbc..e11c1727a 100644
--- a/src/ruby/devcontainer-feature.json
+++ b/src/ruby/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "name": "Ruby (via rvm)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
     "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
diff --git a/src/ruby/install.sh b/src/ruby/install.sh
index 22285225b..dcf404229 100755
--- a/src/ruby/install.sh
+++ b/src/ruby/install.sh
@@ -7,15 +7,15 @@
 # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/ruby.md
 # Maintainer: The VS Code and Codespaces Teams
 
-RUBY_VERSION=${VERSION:-"latest"}
+RUBY_VERSION="${VERSION:-"latest"}"
 
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
-INSTALL_RUBY_TOOLS=${INSTALL_RUBY_TOOLS:-"true"}
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${UPDATE_RC:-"true"}"
+INSTALL_RUBY_TOOLS="${INSTALL_RUBY_TOOLS:-"true"}"
 
 # Comma-separated list of ruby versions to be installed (with rvm)
 # alongside RUBY_VERSION, but not set as default.
-ADDITIONAL_VERSIONS=${ADDITIONALVERSIONS:-""}
+ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 
 # Note: ruby-debug-ide will install the right version of debase if missing and
 # installing debase directly fails on Ruby 3.1.0 as of 1/7/2022, so omitting.
diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index 2dca581fc..8a7f5b432 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "rust",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "name": "Rust",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
     "description": "Installs Rust, common Rust utilities, and their required dependencies",
diff --git a/src/rust/install.sh b/src/rust/install.sh
index e7cfb7151..1a309923a 100755
--- a/src/rust/install.sh
+++ b/src/rust/install.sh
@@ -7,14 +7,14 @@
 # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/rust.md
 # Maintainer: The VS Code and Codespaces Teams
 
-RUST_VERSION=${VERSION:-"latest"}
-RUSTUP_PROFILE=${PROFILE:-"minimal"}
-
-export CARGO_HOME=${CARGO_HOME:-"/usr/local/cargo"}
-export RUSTUP_HOME=${RUSTUP_HOME:-"/usr/local/rustup"}
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
-UPDATE_RUST=${UPDATE_RUST:-"false"}
+RUST_VERSION="${VERSION:-"latest"}"
+RUSTUP_PROFILE="${PROFILE:-"minimal"}"
+
+export CARGO_HOME="${CARGO_HOME:-"/usr/local/cargo"}"
+export RUSTUP_HOME="${RUSTUP_HOME:-"/usr/local/rustup"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+UPDATE_RC="${UPDATE_RC:-"true"}"
+UPDATE_RUST="${UPDATE_RUST:-"false"}"
 
 set -e
 
diff --git a/src/sshd/devcontainer-feature.json b/src/sshd/devcontainer-feature.json
index 6433f3f1f..b8b7badaf 100644
--- a/src/sshd/devcontainer-feature.json
+++ b/src/sshd/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "sshd",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "name": "SSH server",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/sshd",
     "description": "Adds a SSH server into a container so that you can use an external terminal, sftp, or SSHFS to interact with it.",
diff --git a/src/sshd/install.sh b/src/sshd/install.sh
index a93b927f5..634f16301 100755
--- a/src/sshd/install.sh
+++ b/src/sshd/install.sh
@@ -9,11 +9,11 @@
 #
 # Note: You can change your user's password with "sudo passwd $(whoami)" (or just "passwd" if running as root).
 
-SSHD_PORT=${SSHD_PORT:-"2222"}
-USERNAME=${USERNAME:-"automatic"}
-START_SSHD=${START_SSHD:-"false"}
-NEW_PASSWORD=${NEW_PASSWORD:-"skip"}
-FIX_ENVIRONMENT=${FIX_ENVIRONMENT:-"true"}
+SSHD_PORT="${SSHD_PORT:-"2222"}"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+START_SSHD="${START_SSHD:-"false"}"
+NEW_PASSWORD="${NEW_PASSWORD:-"skip"}"
+FIX_ENVIRONMENT="${FIX_ENVIRONMENT:-"true"}"
 
 set -e
 
diff --git a/test/java/scenarios.json b/test/java/scenarios.json
index c33a0a7d4..479ee4703 100644
--- a/test/java/scenarios.json
+++ b/test/java/scenarios.json
@@ -3,7 +3,7 @@
         "image": "ubuntu:focal",
         "features": {
             "java": {
-                "version": "11",
+                "version": "19",
                 "jdkDistro": "open"
             }
         }

From cf36e7ac3aa76ddf73cdcb082aee4ccdd8b58a08 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 29 Nov 2022 17:08:10 -0800
Subject: [PATCH 028/478] docker-in-docker fix : Use ${devcontainerId} for
 volume name (#314)

Fix
---
 src/docker-in-docker/devcontainer-feature.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 95d6841fd..0ac565e7b 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "1.0.9",
+    "version": "2.0.0",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
@@ -55,7 +55,7 @@
     },
     "mounts": [
         {
-            "source": "dind-var-lib-docker",
+            "source": "dind-var-lib-docker-${devcontainerId}",
             "target": "/var/lib/docker",
             "type": "volume"
         }

From 64f0e10fab232f132c566f5c70d419f3106c381b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 29 Nov 2022 17:10:37 -0800
Subject: [PATCH 029/478] Automated documentation update (#315)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/docker-in-docker/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index 8ee91ef2b..58f72c5a5 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -7,7 +7,7 @@ Create child containers *inside* a container, independent from the host's docker
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/docker-in-docker:1": {}
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {}
 }
 ```
 

From 46dfa11ecd3c507187eebbd6784c09d736737255 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 30 Nov 2022 13:42:57 -0800
Subject: [PATCH 030/478] Github cli - Adds retry logic for find git tags
 (#310)

* Github cli - Adds retry logic for find git tags

* re-add set -e

* address comment
---
 src/github-cli/devcontainer-feature.json |  2 +-
 src/github-cli/install.sh                | 49 +++++++++++++
 src/nix/utils.sh                         | 13 +++-
 test/github-cli/test.sh                  | 88 ++++++++++++++++++++++++
 4 files changed, 148 insertions(+), 4 deletions(-)

diff --git a/src/github-cli/devcontainer-feature.json b/src/github-cli/devcontainer-feature.json
index 65968c173..824602c53 100644
--- a/src/github-cli/devcontainer-feature.json
+++ b/src/github-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "github-cli",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "name": "GitHub CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/github-cli",
     "description": "Installs the GitHub CLI. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/github-cli/install.sh b/src/github-cli/install.sh
index b46a6a221..65bbfc479 100755
--- a/src/github-cli/install.sh
+++ b/src/github-cli/install.sh
@@ -158,6 +158,46 @@ find_version_from_git_tags() {
     echo "${variable_name}=${!variable_name}"
 }
 
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
 
 # Fall back on direct download if no apt package exists
 # Fetches .deb file to be installed with dpkg
@@ -171,6 +211,15 @@ install_deb_using_github() {
     mkdir -p /tmp/ghcli
     pushd /tmp/ghcli
     wget https://github.com/cli/cli/releases/download/v${CLI_VERSION}/${cli_filename}
+    exit_code=$?
+    set -e
+    if [ "$exit_code" != "0" ]; then
+        # Handle situation where git tags are ahead of what was is available to actually download
+        echo "(!) github-cli version ${CLI_VERSION} failed to download. Attempting to fall back one version to retry..."
+        find_prev_version_from_git_tags CLI_VERSION https://github.com/cli/cli
+        wget https://github.com/cli/cli/releases/download/v${CLI_VERSION}/${cli_filename}
+    fi
+
     dpkg -i /tmp/ghcli/${cli_filename}
     popd
     rm -rf /tmp/ghcli
diff --git a/src/nix/utils.sh b/src/nix/utils.sh
index 68cdd9d1b..5753e5a02 100755
--- a/src/nix/utils.sh
+++ b/src/nix/utils.sh
@@ -282,14 +282,19 @@ find_prev_version_from_git_tags() {
     major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
     minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
     breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
-    set -e
+
+    if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+        ((major=major-1))
+        declare -g ${variable_name}="${major}"
+        # Look for latest version from previous major release
+        find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
     # Handle situations like Go's odd version pattern where "0" releases omit the last part
-    if [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+    elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
         ((minor=minor-1))
         declare -g ${variable_name}="${major}.${minor}"
         # Look for latest version from previous minor release
         find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
-    else 
+    else
         ((breakfix=breakfix-1))
         if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
             declare -g ${variable_name}="${major}.${minor}"
@@ -297,4 +302,6 @@ find_prev_version_from_git_tags() {
             declare -g ${variable_name}="${major}.${minor}.${breakfix}"
         fi
     fi
+
+    set -e
 }
\ No newline at end of file
diff --git a/test/github-cli/test.sh b/test/github-cli/test.sh
index a419c3463..58df559d7 100755
--- a/test/github-cli/test.sh
+++ b/test/github-cli/test.sh
@@ -8,5 +8,93 @@ source dev-container-features-test-lib
 # Definition specific tests
 check "version" gh  --version
 
+find_version_from_git_tags() {
+    local variable_name=$1
+    local requested_version=${!variable_name}
+    if [ "${requested_version}" = "none" ]; then return; fi
+    local repository=$2
+    local prefix=${3:-"tags/v"}
+    local separator=${4:-"."}
+    local last_part_optional=${5:-"false"}    
+    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
+        local escaped_separator=${separator//./\\.}
+        local last_part
+        if [ "${last_part_optional}" = "true" ]; then
+            last_part="(${escaped_separator}[0-9]+)?"
+        else
+            last_part="${escaped_separator}[0-9]+"
+        fi
+        local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
+        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
+            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+        else
+            set +e
+            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            set -e
+        fi
+    fi
+    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
+        echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
+        exit 1
+    fi
+    echo "${variable_name}=${!variable_name}"
+}
+
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+    major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+    minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+    breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+    if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+        ((major=major-1))
+        declare -g ${variable_name}="${major}"
+        # Look for latest version from previous major release
+        find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+    # Handle situations like Go's odd version pattern where "0" releases omit the last part
+    elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+        ((minor=minor-1))
+        declare -g ${variable_name}="${major}.${minor}"
+        # Look for latest version from previous minor release
+        find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+    else
+        ((breakfix=breakfix-1))
+        if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+            declare -g ${variable_name}="${major}.${minor}"
+        else 
+            declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+        fi
+    fi
+}
+
+CLI_VERSION="2.20.0"
+find_prev_version_from_git_tags CLI_VERSION https://github.com/cli/cli
+check "pre-version-to-2.20.0" bash -c "echo ${CLI_VERSION} | grep '2.19.0'"
+
+CLI_VERSION="2.18.1"
+find_prev_version_from_git_tags CLI_VERSION https://github.com/cli/cli
+check "pre-version-to-2.18.1" bash -c "echo ${CLI_VERSION} | grep '2.18.0'"
+
+CLI_VERSION="2.15.0"
+find_prev_version_from_git_tags CLI_VERSION https://github.com/cli/cli
+check "pre-version-to-2.15.0" bash -c "echo ${CLI_VERSION} | grep '2.14.7'"
+
+CLI_VERSION="2.0.0"
+find_prev_version_from_git_tags CLI_VERSION https://github.com/cli/cli
+check "pre-version-to-2.0.0" bash -c "echo ${CLI_VERSION} | grep '1.14.0'"
+
 # Report result
 reportResults
\ No newline at end of file

From 7a47fbff000bff65bec9fa4687eed87cc0bc39c3 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Fri, 2 Dec 2022 09:48:04 -0800
Subject: [PATCH 031/478] Node: Fix regression - Installing in ubuntu 18.04
 (#319)

Node: Fix regression https://github.com/devcontainers/features/issues/317
---
 src/node/devcontainer-feature.json     |  2 +-
 src/node/install.sh                    |  6 ++++--
 test/node/install_node_16_on_bionic.sh | 13 +++++++++++++
 test/node/scenarios.json               | 10 +++++++++-
 4 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100755 test/node/install_node_16_on_bionic.sh

diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index 3abfb0400..216f29b80 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.1.3",
+    "version": "1.1.4",
     "name": "Node.js (via nvm) and yarn",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, and needed dependencies.",
diff --git a/src/node/install.sh b/src/node/install.sh
index 9b027d861..4c02c9514 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -83,8 +83,10 @@ export DEBIAN_FRONTEND=noninteractive
 
 . /etc/os-release
 if [[ "bionic" = *"${VERSION_CODENAME}"* ]]; then
-    echo "(!) Unsupported distribution version '${VERSION_CODENAME}'. Details: https://github.com/nodejs/node/issues/42351#issuecomment-1068424442"
-    exit 1
+    if [[ "${NODE_VERSION}" =~ "18" ]] || [[ "${NODE_VERSION}" = "lts" ]]; then
+        echo "(!) Unsupported distribution version '${VERSION_CODENAME}' for Node 18. Details: https://github.com/nodejs/node/issues/42351#issuecomment-1068424442"
+        exit 1
+    fi
 fi
 
 # Install dependencies
diff --git a/test/node/install_node_16_on_bionic.sh b/test/node/install_node_16_on_bionic.sh
new file mode 100755
index 000000000..1b301d34c
--- /dev/null
+++ b/test/node/install_node_16_on_bionic.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" bash -c "node --version | grep 16"
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+
+# Report result
+reportResults
diff --git a/test/node/scenarios.json b/test/node/scenarios.json
index 70e105146..6112a6ea4 100644
--- a/test/node/scenarios.json
+++ b/test/node/scenarios.json
@@ -34,5 +34,13 @@
                 "version": "19.1.0"
             }
         }
+    },
+    "install_node_16_on_bionic": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-18.04",
+        "features": {
+            "node": {
+                "version": "16"
+            }
+        }
     }
-}
\ No newline at end of file
+}

From 57e15bc8e8b6ad1ff677548ae9d9baa8a49754f5 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Fri, 2 Dec 2022 09:49:20 -0800
Subject: [PATCH 032/478] Update docker-in-docker version (#320)

update dnd
---
 .devcontainer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer.json b/.devcontainer.json
index 81b3c1ff6..c24649ab6 100644
--- a/.devcontainer.json
+++ b/.devcontainer.json
@@ -9,7 +9,7 @@
         }
     },
     "features": {
-        "ghcr.io/devcontainers/features/docker-in-docker:1": {}
+        "ghcr.io/devcontainers/features/docker-in-docker:2": {}
     },
     "postCreateCommand": "npm install -g @devcontainers/cli",
     "hostRequirements": {

From 779fa44930a7348523ec62c9201dd167412a05eb Mon Sep 17 00:00:00 2001
From: Josh Spicer <josh@joshspicer.com>
Date: Fri, 2 Dec 2022 11:52:53 -0800
Subject: [PATCH 033/478] add 'vim' as a common util to install

---
 src/common-utils/install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/common-utils/install.sh b/src/common-utils/install.sh
index 5530b96d9..e7f60e5cf 100755
--- a/src/common-utils/install.sh
+++ b/src/common-utils/install.sh
@@ -91,6 +91,7 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
         bzip2 \
         zip \
         nano \
+        vim \
         vim-tiny \
         less \
         jq \

From e28358e33b98998e00c2c62d5d561626d96bed24 Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Fri, 2 Dec 2022 11:53:32 -0800
Subject: [PATCH 034/478] revert accidental push

---
 src/common-utils/install.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/common-utils/install.sh b/src/common-utils/install.sh
index e7f60e5cf..5530b96d9 100755
--- a/src/common-utils/install.sh
+++ b/src/common-utils/install.sh
@@ -91,7 +91,6 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
         bzip2 \
         zip \
         nano \
-        vim \
         vim-tiny \
         less \
         jq \

From aae9de7ebc96170ddbaf8996d8ee2289176000aa Mon Sep 17 00:00:00 2001
From: Jacob Woffenden <jacob@woffenden.io>
Date: Fri, 9 Dec 2022 22:08:20 +0000
Subject: [PATCH 035/478] Change default shell if installing ZSH (#325)

* Added new option to configure zsh as default shell
Added test scenario
Bumped feature version

* Update test/common-utils/scenarios.json

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

* Update src/common-utils/devcontainer-feature.json

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

* Update test/common-utils/configure_zsh_as_default_shell.sh

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
---
 src/common-utils/devcontainer-feature.json          |  7 ++++++-
 src/common-utils/install.sh                         |  7 +++++++
 test/common-utils/configure_zsh_as_default_shell.sh | 12 ++++++++++++
 test/common-utils/scenarios.json                    | 10 ++++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 test/common-utils/configure_zsh_as_default_shell.sh
 create mode 100644 test/common-utils/scenarios.json

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 812e5e9e0..d2a97d6c9 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "1.1.6",
+    "version": "1.2.0",
     "name": "Common Debian Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
@@ -10,6 +10,11 @@
             "default": true,
             "description": "Install ZSH?"
         },
+        "configureZshAsDefaultShell": {
+            "type": "boolean",
+            "default": false,
+            "description": "Change default shell to ZSH?"
+        },
         "installOhMyZsh": {
             "type": "boolean",
             "default": true,
diff --git a/src/common-utils/install.sh b/src/common-utils/install.sh
index 5530b96d9..eb0e62425 100755
--- a/src/common-utils/install.sh
+++ b/src/common-utils/install.sh
@@ -13,6 +13,7 @@ set -e
 rm -rf /var/lib/apt/lists/*
 
 INSTALL_ZSH="${INSTALLZSH:-"true"}"
+CONFIGURE_ZSH_AS_DEFAULT_SHELL="${CONFIGUREZSHASDEFAULTSHELL:-"false"}"
 INSTALL_OH_MY_ZSH="${INSTALLOHMYZSH:-"true"}"
 UPGRADE_PACKAGES="${UPGRADEPACKAGES:-"true"}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
@@ -378,6 +379,12 @@ if [ "${INSTALL_ZSH}" = "true" ]; then
         ZSH_ALREADY_INSTALLED="true"
     fi
 
+    # Change shell of determined user
+    if [[ "${CONFIGURE_ZSH_AS_DEFAULT_SHELL}" == "true" ]]; then
+      chsh --shell /bin/zsh ${USERNAME}
+    fi
+
+
     # Adapted, simplified inline Oh My Zsh! install steps that adds, defaults to a codespaces theme.
     # See https://github.com/ohmyzsh/ohmyzsh/blob/master/tools/install.sh for official script.
     oh_my_install_dir="${user_rc_path}/.oh-my-zsh"
diff --git a/test/common-utils/configure_zsh_as_default_shell.sh b/test/common-utils/configure_zsh_as_default_shell.sh
new file mode 100644
index 000000000..e5cc89e51
--- /dev/null
+++ b/test/common-utils/configure_zsh_as_default_shell.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "default-shell-is-zsh" bash -c "getent passwd $(whoami) | awk -F: '{ print $7 }' | grep '/bin/zsh'"
+
+# Report result
+reportResults
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
new file mode 100644
index 000000000..aa36fcb6e
--- /dev/null
+++ b/test/common-utils/scenarios.json
@@ -0,0 +1,10 @@
+{
+  "configure_zsh_as_default_shell": {
+    "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+    "features": {
+      "common-utils": {
+        "configureZshAsDefaultShell": true
+      }
+    }
+  }
+}

From 7b009e661f13085629b19fc157b577916587f6bc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 9 Dec 2022 14:10:41 -0800
Subject: [PATCH 036/478] Automated documentation update (#328)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/common-utils/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/common-utils/README.md b/src/common-utils/README.md
index 06af48460..123b7d5f8 100644
--- a/src/common-utils/README.md
+++ b/src/common-utils/README.md
@@ -16,6 +16,7 @@ Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-r
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
 | installZsh | Install ZSH? | boolean | true |
+| configureZshAsDefaultShell | Change default shell to ZSH? | boolean | false |
 | installOhMyZsh | Install Oh My Zsh!? | boolean | true |
 | upgradePackages | Upgrade OS packages? | boolean | true |
 | username | Enter name of non-root user to configure or none to skip | string | automatic |

From 84f3e62d1c5ea8a62152606e7aec81ef711eae0a Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Mercier <acesyde@gmail.com>
Date: Tue, 13 Dec 2022 19:58:22 +0100
Subject: [PATCH 037/478] Add TFSec and Terraform Docs to Terraform features
 (#327)

* Add TFSec and Terraform Docs

* PR Review

* code review
---
 src/terraform/devcontainer-feature.json  | 14 ++++++--
 src/terraform/install.sh                 | 44 ++++++++++++++++++++++++
 test/terraform/install_terraform_docs.sh | 15 ++++++++
 test/terraform/install_tfsec.sh          | 15 ++++++++
 test/terraform/scenarios.json            | 18 ++++++++++
 5 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 test/terraform/install_terraform_docs.sh
 create mode 100644 test/terraform/install_tfsec.sh
 create mode 100644 test/terraform/scenarios.json

diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index f8274c62b..66e53f09d 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.0.7",
+    "version": "1.1.0",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
@@ -32,6 +32,16 @@
             ],
             "default": "latest",
             "description": "Terragrunt version"
+        },
+        "installTFsec": {
+            "type": "boolean",
+            "default": false,
+            "description": "Install tfsec, a tool to spot potential misconfigurations for your terraform code"
+        },
+        "installTerraformDocs": {
+            "type": "boolean",
+            "default": false,
+            "description": "Install terraform-docs, a utility to generate documentation from Terraform modules"
         }
     },
     "customizations": {
@@ -52,4 +62,4 @@
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
-}
+}
\ No newline at end of file
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index fc523b8ca..0f9e4db54 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -15,10 +15,14 @@ rm -rf /var/lib/apt/lists/*
 TERRAFORM_VERSION="${VERSION:-"latest"}"
 TFLINT_VERSION="${TFLINT:-"latest"}"
 TERRAGRUNT_VERSION="${TERRAGRUNT:-"latest"}"
+INSTALL_TFSEC=${INSTALLTFSEC:-false}
+INSTALL_TERRAFORM_DOCS=${INSTALLTERRAFORMDOCS:-false}
 
 TERRAFORM_SHA256="${TERRAFORM_SHA256:-"automatic"}"
 TFLINT_SHA256="${TFLINT_SHA256:-"automatic"}"
 TERRAGRUNT_SHA256="${TERRAGRUNT_SHA256:-"automatic"}"
+TFSEC_SHA256="${TFSEC_SHA256:-"automatic"}"
+TERRAFORM_DOCS_SHA256="${TERRAFORM_DOCS_SHA256:-"automatic"}"
 
 TERRAFORM_GPG_KEY="72D7468F"
 TFLINT_GPG_KEY_URI="https://raw.githubusercontent.com/terraform-linters/tflint/master/8CE69160EB3F2FE9.key"
@@ -212,6 +216,46 @@ if [ "${TERRAGRUNT_VERSION}" != "none" ]; then
     mv -f /tmp/tf-downloads/${terragrunt_filename} /usr/local/bin/terragrunt
 fi
 
+if [ "${INSTALL_TFSEC}" = "true" ]; then
+    TFSEC_VERSION="latest"
+    find_version_from_git_tags TFSEC_VERSION 'https://github.com/aquasecurity/tfsec'
+    tfsec_filename="tfsec_${TFSEC_VERSION}_linux_${architecture}.tar.gz"
+    echo "(*) Downloading TFSec... ${tfsec_filename}"
+    curl -sSL -o /tmp/tf-downloads/${tfsec_filename} https://github.com/aquasecurity/tfsec/releases/download/v${TFSEC_VERSION}/${tfsec_filename}
+    if [ "${TFSEC_SHA256}" != "dev-mode" ]; then
+        if [ "${TFSEC_SHA256}" = "automatic" ]; then
+            curl -sSL -o tfsec_SHA256SUMS https://github.com/aquasecurity/tfsec/releases/download/v${TFSEC_VERSION}/tfsec_${TFSEC_VERSION}_checksums.txt
+        else
+            echo "${TFSEC_SHA256} *${tfsec_filename}" > tfsec_SHA256SUMS
+        fi
+        sha256sum --ignore-missing -c tfsec_SHA256SUMS
+    fi
+    mkdir -p /tmp/tf-downloads/tfsec
+    tar -xzf /tmp/tf-downloads/${tfsec_filename} -C /tmp/tf-downloads/tfsec
+    chmod a+x /tmp/tf-downloads/tfsec/tfsec
+    mv -f /tmp/tf-downloads/tfsec/tfsec /usr/local/bin/tfsec
+fi
+
+if [ "${INSTALL_TERRAFORM_DOCS}" = "true" ]; then
+    TERRAFORM_DOCS_VERSION="latest"
+    find_version_from_git_tags TERRAFORM_DOCS_VERSION 'https://github.com/terraform-docs/terraform-docs'
+    tfdocs_filename="terraform-docs-v${TERRAFORM_DOCS_VERSION}-linux-${architecture}.tar.gz"
+    echo "(*) Downloading Terraform docs... ${tfdocs_filename}"
+    curl -sSL -o /tmp/tf-downloads/${tfdocs_filename} https://github.com/terraform-docs/terraform-docs/releases/download/v${TERRAFORM_DOCS_VERSION}/${tfdocs_filename}
+    if [ "${TERRAFORM_DOCS_SHA256}" != "dev-mode" ]; then
+        if [ "${TERRAFORM_DOCS_SHA256}" = "automatic" ]; then
+            curl -sSL -o tfdocs_SHA256SUMS https://github.com/terraform-docs/terraform-docs/releases/download/v${TERRAFORM_DOCS_VERSION}/terraform-docs-v${TERRAFORM_DOCS_VERSION}.sha256sum
+        else
+            echo "${TERRAFORM_DOCS_SHA256} *${tfsec_filename}" > tfdocs_SHA256SUMS
+        fi
+        sha256sum --ignore-missing -c tfdocs_SHA256SUMS
+    fi
+    mkdir -p /tmp/tf-downloads/tfdocs
+    tar -xzf /tmp/tf-downloads/${tfdocs_filename} -C /tmp/tf-downloads/tfdocs
+    chmod a+x /tmp/tf-downloads/tfdocs/terraform-docs
+    mv -f /tmp/tf-downloads/tfdocs/terraform-docs /usr/local/bin/terraform-docs
+fi
+
 rm -rf /tmp/tf-downloads ${GNUPGHOME}
 
 # Clean up
diff --git a/test/terraform/install_terraform_docs.sh b/test/terraform/install_terraform_docs.sh
new file mode 100644
index 000000000..4ca0b161d
--- /dev/null
+++ b/test/terraform/install_terraform_docs.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+# Terraform Docs specific tests
+check "tfsec" terraform-docs --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/terraform/install_tfsec.sh b/test/terraform/install_tfsec.sh
new file mode 100644
index 000000000..0c9a48b37
--- /dev/null
+++ b/test/terraform/install_tfsec.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+# TFSec specific tests
+check "tfsec" tfsec --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/terraform/scenarios.json b/test/terraform/scenarios.json
new file mode 100644
index 000000000..2365643b6
--- /dev/null
+++ b/test/terraform/scenarios.json
@@ -0,0 +1,18 @@
+{
+    "install_tfsec": {
+        "image": "mcr.microsoft.com/devcontainers/base:jammy",
+        "features": {
+            "terraform": {
+                "installTFsec": true
+            }
+        }
+    },
+    "install_terraform_docs": {
+        "image": "mcr.microsoft.com/devcontainers/base:jammy",
+        "features": {
+            "terraform": {
+                "installTerraformDocs": true
+            }
+        }
+    }
+}
\ No newline at end of file

From baf47e22b0c3dc5b418ac57aae2e750d14bbc9a3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 13 Dec 2022 10:59:48 -0800
Subject: [PATCH 038/478] Automated documentation update (#332)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/terraform/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/terraform/README.md b/src/terraform/README.md
index 8b7a25df2..5d6b47fec 100644
--- a/src/terraform/README.md
+++ b/src/terraform/README.md
@@ -18,6 +18,8 @@ Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects la
 | version | Terraform version | string | latest |
 | tflint | Tflint version | string | latest |
 | terragrunt | Terragrunt version | string | latest |
+| installTFsec | Install tfsec, a tool to spot potential misconfigurations for your terraform code | boolean | false |
+| installTerraformDocs | Install terraform-docs, a utility to generate documentation from Terraform modules | boolean | false |
 
 
 

From 7fa90110d762797cc0b1c2fe8fcc028c9b813d56 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 13 Dec 2022 14:09:16 -0800
Subject: [PATCH 039/478] Git: Build from source with USE_LIBPCRE (#331)

---
 src/git/devcontainer-feature.json | 2 +-
 src/git/install.sh                | 4 +++-
 test/git/install_git_from_src.sh  | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
index ef2b85665..a8ea798c7 100644
--- a/src/git/devcontainer-feature.json
+++ b/src/git/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.0.5",
+    "version": "1.1.0",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
diff --git a/src/git/install.sh b/src/git/install.sh
index 153b4e13f..7ffa01eb3 100755
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -147,11 +147,13 @@ if [ "$(echo "${GIT_VERSION}" | grep -o '\.' | wc -l)" != "2" ]; then
     fi
 fi
 
+check_packages libpcre2-posix2 libpcre2-dev
+
 echo "Downloading source for ${GIT_VERSION}..."
 curl -sL https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz | tar -xzC /tmp 2>&1
 echo "Building..."
 cd /tmp/git-${GIT_VERSION}
-make -s prefix=/usr/local all && make -s prefix=/usr/local install 2>&1
+make -s USE_LIBPCRE=YesPlease prefix=/usr/local all && make -s USE_LIBPCRE=YesPlease prefix=/usr/local install 2>&1
 rm -rf /tmp/git-${GIT_VERSION}
 rm -rf /var/lib/apt/lists/*
 echo "Done!"
diff --git a/test/git/install_git_from_src.sh b/test/git/install_git_from_src.sh
index 226278a39..4bdcf3066 100644
--- a/test/git/install_git_from_src.sh
+++ b/test/git/install_git_from_src.sh
@@ -8,5 +8,9 @@ source dev-container-features-test-lib
 check "version" git  --version
 check "gettext" dpkg-query -l gettext
 
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
 # Report result
 reportResults

From bf058dc49492b3a102a28ed25764a517fcebfb40 Mon Sep 17 00:00:00 2001
From: Chuck Lantz <clantz@microsoft.com>
Date: Fri, 16 Dec 2022 09:47:21 -0800
Subject: [PATCH 040/478] Multi-distro support for common script, refactor,
 fixes (#326)

---
 README.md                                     |   2 +-
 src/common-utils/NOTES.md                     |  19 +-
 src/common-utils/bin/code                     |  16 +
 src/common-utils/bin/devcontainer-info        |  27 +
 src/common-utils/bin/systemctl                |   7 +
 src/common-utils/devcontainer-feature.json    |  17 +-
 src/common-utils/install.sh                   | 461 +---------------
 src/common-utils/main.sh                      | 496 ++++++++++++++++++
 .../scripts/bash_theme_snippet.sh             |  25 +
 .../scripts/devcontainers.zsh-theme           |  26 +
 src/common-utils/scripts/rc_snippet.sh        |  26 +
 test/common-utils/alpine.sh                   |  14 +
 test/common-utils/already-run.sh              |  18 +
 test/common-utils/alternate-values.sh         |  19 +
 test/common-utils/bionic.sh                   |  14 +
 test/common-utils/bullseye.sh                 |  14 +
 test/common-utils/buster.sh                   |  14 +
 test/common-utils/centos-7.sh                 |  14 +
 test/common-utils/fedora.sh                   |  14 +
 test/common-utils/focal.sh                    |  14 +
 test/common-utils/jammy.sh                    |  14 +
 test/common-utils/rocky-8.sh                  |  14 +
 test/common-utils/rocky-9.sh                  |  14 +
 test/common-utils/scenarios.json              | 115 +++-
 test/common-utils/test.sh                     |   5 +
 test/common-utils/username-default.sh         |  15 +
 test/common-utils/username-detected.sh        |  14 +
 27 files changed, 979 insertions(+), 469 deletions(-)
 create mode 100755 src/common-utils/bin/code
 create mode 100755 src/common-utils/bin/devcontainer-info
 create mode 100755 src/common-utils/bin/systemctl
 create mode 100644 src/common-utils/main.sh
 create mode 100644 src/common-utils/scripts/bash_theme_snippet.sh
 create mode 100644 src/common-utils/scripts/devcontainers.zsh-theme
 create mode 100644 src/common-utils/scripts/rc_snippet.sh
 create mode 100755 test/common-utils/alpine.sh
 create mode 100755 test/common-utils/already-run.sh
 create mode 100755 test/common-utils/alternate-values.sh
 create mode 100755 test/common-utils/bionic.sh
 create mode 100755 test/common-utils/bullseye.sh
 create mode 100755 test/common-utils/buster.sh
 create mode 100755 test/common-utils/centos-7.sh
 create mode 100755 test/common-utils/fedora.sh
 create mode 100755 test/common-utils/focal.sh
 create mode 100755 test/common-utils/jammy.sh
 create mode 100755 test/common-utils/rocky-8.sh
 create mode 100755 test/common-utils/rocky-9.sh
 create mode 100755 test/common-utils/username-default.sh
 create mode 100755 test/common-utils/username-detected.sh

diff --git a/README.md b/README.md
index 897d43eab..b887c00d9 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 </tr></table>
 
 'Features' are self-contained units of installation code and development container configuration. Features are designed
-to install atop a wide-range of base container images (**this repo focuses on `debian` based images**).
+to install atop a wide-range of base container images.
 
 Missing a CLI or language in your otherwise _perfect_ container image? Add the relevant Feature to the `features`
 property of a [`devcontainer.json`](https://containers.dev/implementors/json_reference/#general-properties). A
diff --git a/src/common-utils/NOTES.md b/src/common-utils/NOTES.md
index 2c0724589..77dfd1d99 100644
--- a/src/common-utils/NOTES.md
+++ b/src/common-utils/NOTES.md
@@ -1,12 +1,21 @@
-## Speeding up the command prompt in large repositories
+## OS Support
 
-This script provides a custom command prompt that includes information about the git repository for the current folder. However, with certain large repositories, this can result in a slow command prompt since the required git status command can be slow. To resolve this, you can update a git setting to remove the git portion of the command prompt.
+This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, RockyLinux, and Alpine Linux.
 
-To disable the prompt for the current folder's repository, enter the following in a terminal or add it to your `postCreateCommand` or dotfiles:
+## Customizing the command prompt
+
+By default, this script provides a custom command prompt that includes information about the git repository for the current folder. However, with certain large repositories, this can result in a slow command prompt due to the performance of needed git operations.
+
+For performance reasons, a "dirty" indicator that tells you whether or not there are uncommitted changes is disabled by default. You can opt to turn this on for smaller repositories by entering the following in a terminal or adding it to your `postCreateCommand`:
 
 ```bash
-git config codespaces-theme.hide-status 1
+git config devcontainers-theme.show-dirty 1
 ```
 
-This setting will survive a rebuild since it is applied to the repository rather than the container.
+To completely disable the git portion of the prompt for the current folder's repository, you can use this configuration setting instead:
+
+```bash
+git config devcontainers-theme.hide-status 1
+```
 
+For `zsh`, the default theme is a [standard Oh My Zsh! theme](https://ohmyz.sh/). You may pick a different one by modifying the `ZSH_THEME` variable in `~/.zshrc`.
\ No newline at end of file
diff --git a/src/common-utils/bin/code b/src/common-utils/bin/code
new file mode 100755
index 000000000..b0d517f84
--- /dev/null
+++ b/src/common-utils/bin/code
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+get_in_path_except_current() {
+    which -a "$1" | grep -A1 "$0" | grep -v "$0"
+}
+
+code="$(get_in_path_except_current code)"
+
+if [ -n "$code" ]; then
+    exec "$code" "$@"
+elif [ "$(command -v code-insiders)" ]; then
+    exec code-insiders "$@"
+else
+    echo "code or code-insiders is not installed" >&2
+    exit 127
+fi
diff --git a/src/common-utils/bin/devcontainer-info b/src/common-utils/bin/devcontainer-info
new file mode 100755
index 000000000..2c74fea6e
--- /dev/null
+++ b/src/common-utils/bin/devcontainer-info
@@ -0,0 +1,27 @@
+#!/bin/sh
+. /usr/local/etc/vscode-dev-containers/meta.env
+
+# Minimal output
+if [ "$1" = "version" ] || [ "$1" = "image-version" ]; then
+    echo "${VERSION}"
+    exit 0
+elif [ "$1" = "release" ]; then
+    echo "${GIT_REPOSITORY_RELEASE}"
+    exit 0
+elif [ "$1" = "content" ] || [ "$1" = "content-url" ] || [ "$1" = "contents" ] || [ "$1" = "contents-url" ]; then
+    echo "${CONTENTS_URL}"
+    exit 0
+fi
+
+#Full output
+echo
+echo "Development container image information"
+echo
+if [ ! -z "${VERSION}" ]; then echo "- Image version: ${VERSION}"; fi
+if [ ! -z "${DEFINITION_ID}" ]; then echo "- Definition ID: ${DEFINITION_ID}"; fi
+if [ ! -z "${VARIANT}" ]; then echo "- Variant: ${VARIANT}"; fi
+if [ ! -z "${GIT_REPOSITORY}" ]; then echo "- Source code repository: ${GIT_REPOSITORY}"; fi
+if [ ! -z "${GIT_REPOSITORY_RELEASE}" ]; then echo "- Source code release/branch: ${GIT_REPOSITORY_RELEASE}"; fi
+if [ ! -z "${BUILD_TIMESTAMP}" ]; then echo "- Timestamp: ${BUILD_TIMESTAMP}"; fi
+if [ ! -z "${CONTENTS_URL}" ]; then echo && echo "More info: ${CONTENTS_URL}"; fi
+echo
diff --git a/src/common-utils/bin/systemctl b/src/common-utils/bin/systemctl
new file mode 100755
index 000000000..4ead9853d
--- /dev/null
+++ b/src/common-utils/bin/systemctl
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+if [ -d "/run/systemd/system" ]; then
+    exec /bin/systemctl "$@"
+else
+    echo '\n"systemd" is not running in this container due to its overhead.\nUse the "service" command to start services instead. e.g.: \n\nservice --status-all'
+fi
diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index d2a97d6c9..05bf067e7 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
     "id": "common-utils",
-    "version": "1.2.0",
-    "name": "Common Debian Utilities",
+    "version": "2.0.0",
+    "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
     "options": {
@@ -28,36 +28,37 @@
         "username": {
             "type": "string",
             "proposals": [
+                "devcontainer",
                 "vscode",
                 "codespace",
                 "none",
                 "automatic"
             ],
             "default": "automatic",
-            "description": "Enter name of non-root user to configure or none to skip"
+            "description": "Enter name of a non-root user to configure or none to skip"
         },
-        "uid": {
+        "userUid": {
             "type": "string",
             "proposals": [
                 "1000",
                 "automatic"
             ],
             "default": "automatic",
-            "description": "Enter uid for non-root user"
+            "description": "Enter UID for non-root user"
         },
-        "gid": {
+        "userGid": {
             "type": "string",
             "proposals": [
                 "1000",
                 "automatic"
             ],
             "default": "automatic",
-            "description": "Enter gid for non-root user"
+            "description": "Enter GID for non-root user"
         },
         "nonFreePackages": {
             "type": "boolean",
             "default": false,
-            "description": "Add packages from non-free Debian repository?"
+            "description": "Add packages from non-free Debian repository? (Debian only)"
         }
     }
 }
diff --git a/src/common-utils/install.sh b/src/common-utils/install.sh
index eb0e62425..d08a2f2c1 100755
--- a/src/common-utils/install.sh
+++ b/src/common-utils/install.sh
@@ -1,22 +1,19 @@
-#!/usr/bin/env bash
-#-------------------------------------------------------------------------------------------------------------
+#!/bin/sh
+#-------------------------------------------------------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
-#-------------------------------------------------------------------------------------------------------------
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
 #
-# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/common.md
-# Maintainer: The VS Code and Codespaces Teams
+# Docs: https://github.com/devcontainers/features/tree/main/src/common-utils
+# Maintainer: The Dev Container spec maintainers
 
 set -e
 
-# Clean up
-rm -rf /var/lib/apt/lists/*
-
 INSTALL_ZSH="${INSTALLZSH:-"true"}"
 CONFIGURE_ZSH_AS_DEFAULT_SHELL="${CONFIGUREZSHASDEFAULTSHELL:-"false"}"
 INSTALL_OH_MY_ZSH="${INSTALLOHMYZSH:-"true"}"
 UPGRADE_PACKAGES="${UPGRADEPACKAGES:-"true"}"
-USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+USERNAME="${USERNAME:-"automatic"}"
 USER_UID="${UID:-"automatic"}"
 USER_GID="${GID:-"automatic"}"
 ADD_NON_FREE_PACKAGES="${NONFREEPACKAGES:-"false"}"
@@ -28,443 +25,11 @@ if [ "$(id -u)" -ne 0 ]; then
     exit 1
 fi
 
-# Ensure that login shells get the correct path if the user updated the PATH using ENV.
-rm -f /etc/profile.d/00-restore-env.sh
-echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
-chmod +x /etc/profile.d/00-restore-env.sh
-
-# If in automatic mode, determine if a user already exists, if not use vscode
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=vscode
-    fi
-elif [ "${USERNAME}" = "none" ]; then
-    USERNAME=root
-    USER_UID=0
-    USER_GID=0
-fi
-
-# Load markers to see which steps have already run
-if [ -f "${MARKER_FILE}" ]; then
-    echo "Marker file found:"
-    cat "${MARKER_FILE}"
-    source "${MARKER_FILE}"
-fi
-
-# Ensure apt is in non-interactive to avoid prompts
-export DEBIAN_FRONTEND=noninteractive
-
-apt_get_update()
-{
-    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
-        echo "Running apt-get update..."
-        apt-get update -y
-    fi
-}
-
-# Run install apt-utils to avoid debconf warning then verify presence of other common developer tools and dependencies
-if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
-
-    package_list="apt-utils \
-        openssh-client \
-        gnupg2 \
-        dirmngr \
-        iproute2 \
-        procps \
-        lsof \
-        htop \
-        net-tools \
-        psmisc \
-        curl \
-        tree \
-        wget \
-        rsync \
-        ca-certificates \
-        unzip \
-        bzip2 \
-        zip \
-        nano \
-        vim-tiny \
-        less \
-        jq \
-        lsb-release \
-        apt-transport-https \
-        dialog \
-        libc6 \
-        libgcc1 \
-        libkrb5-3 \
-        libgssapi-krb5-2 \
-        libicu[0-9][0-9] \
-        liblttng-ust[0-9] \
-        libstdc++6 \
-        zlib1g \
-        locales \
-        sudo \
-        ncdu \
-        man-db \
-        strace \
-        manpages \
-        manpages-dev \
-        init-system-helpers"
-        
-    # Needed for adding manpages-posix and manpages-posix-dev which are non-free packages in Debian
-    if [ "${ADD_NON_FREE_PACKAGES}" = "true" ]; then
-        # Bring in variables from /etc/os-release like VERSION_CODENAME
-        . /etc/os-release
-        sed -i -E "s/deb http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME} main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME} main contrib non-free/" /etc/apt/sources.list
-        sed -i -E "s/deb-src http:\/\/(deb|httredir)\.debian\.org\/debian ${VERSION_CODENAME} main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME} main contrib non-free/" /etc/apt/sources.list
-        sed -i -E "s/deb http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME}-updates main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME}-updates main contrib non-free/" /etc/apt/sources.list
-        sed -i -E "s/deb-src http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME}-updates main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME}-updates main contrib non-free/" /etc/apt/sources.list
-        sed -i "s/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main contrib non-free/" /etc/apt/sources.list
-        sed -i "s/deb-src http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main contrib non-free/" /etc/apt/sources.list
-        sed -i "s/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main contrib non-free/" /etc/apt/sources.list 
-        sed -i "s/deb-src http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main contrib non-free/" /etc/apt/sources.list
-        # Handle bullseye location for security https://www.debian.org/releases/bullseye/amd64/release-notes/ch-information.en.html
-        sed -i "s/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main contrib non-free/" /etc/apt/sources.list
-        sed -i "s/deb-src http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main contrib non-free/" /etc/apt/sources.list
-        echo "Running apt-get update..."
-        apt-get update
-        package_list="${package_list} manpages-posix manpages-posix-dev"
-    else
-        apt_get_update
-    fi
-
-    # Install libssl1.1 if available
-    if [[ ! -z $(apt-cache --names-only search ^libssl1.1$) ]]; then
-        package_list="${package_list}       libssl1.1"
-    fi
-
-    # Install libssl3 if available
-    if [[ ! -z $(apt-cache --names-only search ^libssl3$) ]]; then
-        package_list="${package_list}       libssl3"
-    fi
-
-    # Install appropriate version of libssl1.0.x if available
-    libssl_package=$(dpkg-query -f '${db:Status-Abbrev}\t${binary:Package}\n' -W 'libssl1\.0\.?' 2>&1 || echo '')
-    if [ "$(echo "$LIlibssl_packageBSSL" | grep -o 'libssl1\.0\.[0-9]:' | uniq | sort | wc -l)" -eq 0 ]; then
-        if [[ ! -z $(apt-cache --names-only search ^libssl1.0.2$) ]]; then
-            # Debian 9
-            package_list="${package_list}       libssl1.0.2"
-        elif [[ ! -z $(apt-cache --names-only search ^libssl1.0.0$) ]]; then
-            # Ubuntu 18.04, 16.04, earlier
-            package_list="${package_list}       libssl1.0.0"
-        fi
-    fi
-
-    echo "Packages to verify are installed: ${package_list}"
-    apt-get -y install --no-install-recommends ${package_list} 2> >( grep -v 'debconf: delaying package configuration, since apt-utils is not installed' >&2 )
-        
-    # Install git if not already installed (may be more recent than distro version)
-    if ! type git > /dev/null 2>&1; then
-        apt-get -y install --no-install-recommends git
-    fi
-
-    PACKAGES_ALREADY_INSTALLED="true"
-fi
-
-# Get to latest versions of all packages
-if [ "${UPGRADE_PACKAGES}" = "true" ]; then
-    apt_get_update
-    apt-get -y upgrade --no-install-recommends
-    apt-get autoremove -y
-fi
-
-# Ensure at least the en_US.UTF-8 UTF-8 locale is available.
-# Common need for both applications and things like the agnoster ZSH theme.
-if [ "${LOCALE_ALREADY_SET}" != "true" ] && ! grep -o -E '^\s*en_US.UTF-8\s+UTF-8' /etc/locale.gen > /dev/null; then
-    echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen 
-    locale-gen
-    LOCALE_ALREADY_SET="true"
-fi
-
-# Create or update a non-root user to match UID/GID.
-group_name="${USERNAME}"
-if id -u ${USERNAME} > /dev/null 2>&1; then
-    # User exists, update if needed
-    if [ "${USER_GID}" != "automatic" ] && [ "$USER_GID" != "$(id -g $USERNAME)" ]; then 
-        group_name="$(id -gn $USERNAME)"
-        groupmod --gid $USER_GID ${group_name}
-        usermod --gid $USER_GID $USERNAME
-    fi
-    if [ "${USER_UID}" != "automatic" ] && [ "$USER_UID" != "$(id -u $USERNAME)" ]; then 
-        usermod --uid $USER_UID $USERNAME
-    fi
-else
-    # Create user
-    if [ "${USER_GID}" = "automatic" ]; then
-        groupadd $USERNAME
-    else
-        groupadd --gid $USER_GID $USERNAME
-    fi
-    if [ "${USER_UID}" = "automatic" ]; then 
-        useradd -s /bin/bash --gid $USERNAME -m $USERNAME
-    else
-        useradd -s /bin/bash --uid $USER_UID --gid $USERNAME -m $USERNAME
-    fi
-fi
-
-# Add add sudo support for non-root user
-if [ "${USERNAME}" != "root" ] && [ "${EXISTING_NON_ROOT_USER}" != "${USERNAME}" ]; then
-    echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME
-    chmod 0440 /etc/sudoers.d/$USERNAME
-    EXISTING_NON_ROOT_USER="${USERNAME}"
-fi
-
-# ** Shell customization section **
-if [ "${USERNAME}" = "root" ]; then 
-    user_rc_path="/root"
-else
-    user_rc_path="/home/${USERNAME}"
-fi
-
-# Restore user .bashrc defaults from skeleton file if it doesn't exist or is empty
-if [ ! -f "${user_rc_path}/.bashrc" ] || [ ! -s "${user_rc_path}/.bashrc" ] ; then
-    cp  /etc/skel/.bashrc "${user_rc_path}/.bashrc"
-fi
-
-# Restore user .profile defaults from skeleton file if it doesn't exist or is empty
-if  [ ! -f "${user_rc_path}/.profile" ] || [ ! -s "${user_rc_path}/.profile" ] ; then
-    cp  /etc/skel/.profile "${user_rc_path}/.profile"
-fi
-
-# .bashrc/.zshrc snippet
-rc_snippet="$(cat << 'EOF'
-
-if [ -z "${USER}" ]; then export USER=$(whoami); fi
-if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi
-
-# Display optional first run image specific notice if configured and terminal is interactive
-if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespaces" ]] && [ ! -f "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed" ]; then
-    if [ -f "/usr/local/etc/vscode-dev-containers/first-run-notice.txt" ]; then
-        cat "/usr/local/etc/vscode-dev-containers/first-run-notice.txt"
-    elif [ -f "/workspaces/.codespaces/shared/first-run-notice.txt" ]; then
-        cat "/workspaces/.codespaces/shared/first-run-notice.txt"
-    fi
-    mkdir -p "$HOME/.config/vscode-dev-containers"
-    # Mark first run notice as displayed after 10s to avoid problems with fast terminal refreshes hiding it
-    ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
-fi
-
-# Set the default git editor if not already set
-if [ -z "$(git config --get core.editor)" ] && [ -z "${GIT_EDITOR}" ]; then
-    if  [ "${TERM_PROGRAM}" = "vscode" ]; then
-        if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
-            export GIT_EDITOR="code-insiders --wait"
-        else 
-            export GIT_EDITOR="code --wait"
-        fi
-    fi
+# If we're using Alpine, install bash before executing
+. /etc/os-release
+if [ "${ID}" = "alpine" ]; then
+    apk add --no-cache bash
 fi
 
-EOF
-)"
-
-# code shim, it fallbacks to code-insiders if code is not available
-cat << 'EOF' > /usr/local/bin/code
-#!/bin/sh
-
-get_in_path_except_current() {
-    which -a "$1" | grep -A1 "$0" | grep -v "$0"
-}
-
-code="$(get_in_path_except_current code)"
-
-if [ -n "$code" ]; then
-    exec "$code" "$@"
-elif [ "$(command -v code-insiders)" ]; then
-    exec code-insiders "$@"
-else
-    echo "code or code-insiders is not installed" >&2
-    exit 127
-fi
-EOF
-chmod +x /usr/local/bin/code
-
-# systemctl shim - tells people to use 'service' if systemd is not running
-cat << 'EOF' > /usr/local/bin/systemctl
-#!/bin/sh
-set -e
-if [ -d "/run/systemd/system" ]; then
-    exec /bin/systemctl "$@"
-else
-    echo '\n"systemd" is not running in this container due to its overhead.\nUse the "service" command to start services instead. e.g.: \n\nservice --status-all'
-fi
-EOF
-chmod +x /usr/local/bin/systemctl
-
-# Codespaces bash and OMZ themes - partly inspired by https://github.com/ohmyzsh/ohmyzsh/blob/master/themes/robbyrussell.zsh-theme
-codespaces_bash="$(cat \
-<<'EOF'
-
-# Codespaces bash prompt theme
-__bash_prompt() {
-    local userpart='`export XIT=$? \
-        && [ ! -z "${GITHUB_USER}" ] && echo -n "\[\033[0;32m\]@${GITHUB_USER} " || echo -n "\[\033[0;32m\]\u " \
-        && [ "$XIT" -ne "0" ] && echo -n "\[\033[1;31m\]➜" || echo -n "\[\033[0m\]➜"`'
-    local gitbranch='`\
-        if [ "$(git config --get codespaces-theme.hide-status 2>/dev/null)" != 1 ]; then \
-            export BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null || git rev-parse --short HEAD 2>/dev/null); \
-            if [ "${BRANCH}" != "" ]; then \
-                echo -n "\[\033[0;36m\](\[\033[1;31m\]${BRANCH}" \
-                && if git ls-files --error-unmatch -m --directory --no-empty-directory -o --exclude-standard ":/*" > /dev/null 2>&1; then \
-                        echo -n " \[\033[1;33m\]✗"; \
-                fi \
-                && echo -n "\[\033[0;36m\]) "; \
-            fi; \
-        fi`'
-    local lightblue='\[\033[1;34m\]'
-    local removecolor='\[\033[0m\]'
-    PS1="${userpart} ${lightblue}\w ${gitbranch}${removecolor}\$ "
-    unset -f __bash_prompt
-}
-__bash_prompt
-
-EOF
-)"
-
-codespaces_zsh="$(cat \
-<<'EOF'
-# Codespaces zsh prompt theme
-__zsh_prompt() {
-    local prompt_username
-    if [ ! -z "${GITHUB_USER}" ]; then 
-        prompt_username="@${GITHUB_USER}"
-    else
-        prompt_username="%n"
-    fi
-    PROMPT="%{$fg[green]%}${prompt_username} %(?:%{$reset_color%}➜ :%{$fg_bold[red]%}➜ )" # User/exit code arrow
-    PROMPT+='%{$fg_bold[blue]%}%(5~|%-1~/…/%3~|%4~)%{$reset_color%} ' # cwd
-    PROMPT+='$([ "$(git config --get codespaces-theme.hide-status 2>/dev/null)" != 1 ] && git_prompt_info)' # Git status
-    PROMPT+='%{$fg[white]%}$ %{$reset_color%}'
-    unset -f __zsh_prompt
-}
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[cyan]%}(%{$fg_bold[red]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
-ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
-__zsh_prompt
-
-EOF
-)"
-
-# Add RC snippet and custom bash prompt
-if [ "${RC_SNIPPET_ALREADY_ADDED}" != "true" ]; then
-    echo "${rc_snippet}" >> /etc/bash.bashrc
-    echo "${codespaces_bash}" >> "${user_rc_path}/.bashrc"
-    echo 'export PROMPT_DIRTRIM=4' >> "${user_rc_path}/.bashrc"
-    if [ "${USERNAME}" != "root" ]; then
-        echo "${codespaces_bash}" >> "/root/.bashrc"
-        echo 'export PROMPT_DIRTRIM=4' >> "/root/.bashrc"
-    fi
-    chown ${USERNAME}:${group_name} "${user_rc_path}/.bashrc"
-    RC_SNIPPET_ALREADY_ADDED="true"
-fi
-
-# Optionally install and configure zsh and Oh My Zsh!
-if [ "${INSTALL_ZSH}" = "true" ]; then
-    if ! type zsh > /dev/null 2>&1; then
-        apt_get_update
-        apt-get install -y zsh
-    fi
-    if [ "${ZSH_ALREADY_INSTALLED}" != "true" ]; then
-        echo "${rc_snippet}" >> /etc/zsh/zshrc
-        ZSH_ALREADY_INSTALLED="true"
-    fi
-
-    # Change shell of determined user
-    if [[ "${CONFIGURE_ZSH_AS_DEFAULT_SHELL}" == "true" ]]; then
-      chsh --shell /bin/zsh ${USERNAME}
-    fi
-
-
-    # Adapted, simplified inline Oh My Zsh! install steps that adds, defaults to a codespaces theme.
-    # See https://github.com/ohmyzsh/ohmyzsh/blob/master/tools/install.sh for official script.
-    oh_my_install_dir="${user_rc_path}/.oh-my-zsh"
-    if [ ! -d "${oh_my_install_dir}" ] && [ "${INSTALL_OH_MY_ZSH}" = "true" ]; then
-        template_path="${oh_my_install_dir}/templates/zshrc.zsh-template"
-        user_rc_file="${user_rc_path}/.zshrc"
-        umask g-w,o-w
-        mkdir -p ${oh_my_install_dir}
-        git clone --depth=1 \
-            -c core.eol=lf \
-            -c core.autocrlf=false \
-            -c fsck.zeroPaddedFilemode=ignore \
-            -c fetch.fsck.zeroPaddedFilemode=ignore \
-            -c receive.fsck.zeroPaddedFilemode=ignore \
-            "https://github.com/ohmyzsh/ohmyzsh" "${oh_my_install_dir}" 2>&1
-        echo -e "$(cat "${template_path}")\nDISABLE_AUTO_UPDATE=true\nDISABLE_UPDATE_PROMPT=true" > ${user_rc_file}
-        sed -i -e 's/ZSH_THEME=.*/ZSH_THEME="codespaces"/g' ${user_rc_file}
-
-        mkdir -p ${oh_my_install_dir}/custom/themes
-        echo "${codespaces_zsh}" > "${oh_my_install_dir}/custom/themes/codespaces.zsh-theme"
-        # Shrink git while still enabling updates
-        cd "${oh_my_install_dir}"
-        git repack -a -d -f --depth=1 --window=1
-        # Copy to non-root user if one is specified
-        if [ "${USERNAME}" != "root" ]; then
-            cp -rf "${user_rc_file}" "${oh_my_install_dir}" /root
-            chown -R ${USERNAME}:${group_name} "${user_rc_path}"
-        fi
-    fi
-fi
-
-# Persist image metadata info, script if meta.env found in same directory
-meta_info_script="$(cat << 'EOF'
-#!/bin/sh
-. /usr/local/etc/vscode-dev-containers/meta.env
-
-# Minimal output
-if [ "$1" = "version" ] || [ "$1" = "image-version" ]; then
-    echo "${VERSION}"
-    exit 0
-elif [ "$1" = "release" ]; then
-    echo "${GIT_REPOSITORY_RELEASE}"
-    exit 0
-elif [ "$1" = "content" ] || [ "$1" = "content-url" ] || [ "$1" = "contents" ] || [ "$1" = "contents-url" ]; then
-    echo "${CONTENTS_URL}"
-    exit 0
-fi
-
-#Full output
-echo
-echo "Development container image information"
-echo
-if [ ! -z "${VERSION}" ]; then echo "- Image version: ${VERSION}"; fi
-if [ ! -z "${DEFINITION_ID}" ]; then echo "- Definition ID: ${DEFINITION_ID}"; fi
-if [ ! -z "${VARIANT}" ]; then echo "- Variant: ${VARIANT}"; fi
-if [ ! -z "${GIT_REPOSITORY}" ]; then echo "- Source code repository: ${GIT_REPOSITORY}"; fi
-if [ ! -z "${GIT_REPOSITORY_RELEASE}" ]; then echo "- Source code release/branch: ${GIT_REPOSITORY_RELEASE}"; fi
-if [ ! -z "${BUILD_TIMESTAMP}" ]; then echo "- Timestamp: ${BUILD_TIMESTAMP}"; fi
-if [ ! -z "${CONTENTS_URL}" ]; then echo && echo "More info: ${CONTENTS_URL}"; fi
-echo
-EOF
-)"
-if [ -f "/usr/local/etc/vscode-dev-containers/meta.env" ]; then
-    echo "${meta_info_script}" > /usr/local/bin/devcontainer-info
-    chmod +x /usr/local/bin/devcontainer-info
-fi
-
-if [ ! -d "/usr/local/etc/vscode-dev-containers" ]; then
-    mkdir -p "$(dirname "${MARKER_FILE}")"
-fi
-
-# Write marker file
-echo -e "\
-    PACKAGES_ALREADY_INSTALLED=${PACKAGES_ALREADY_INSTALLED}\n\
-    LOCALE_ALREADY_SET=${LOCALE_ALREADY_SET}\n\
-    EXISTING_NON_ROOT_USER=${EXISTING_NON_ROOT_USER}\n\
-    RC_SNIPPET_ALREADY_ADDED=${RC_SNIPPET_ALREADY_ADDED}\n\
-    ZSH_ALREADY_INSTALLED=${ZSH_ALREADY_INSTALLED}" > "${MARKER_FILE}"
-
-# Clean up
-rm -rf /var/lib/apt/lists/*
-
-echo "Done!"
+exec /bin/bash "$(dirname $0)/main.sh" "$@"
+exit $?
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
new file mode 100644
index 000000000..63f64ab60
--- /dev/null
+++ b/src/common-utils/main.sh
@@ -0,0 +1,496 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Docs: https://github.com/devcontainers/features/tree/main/src/common-utils
+# Maintainer: The Dev Container spec maintainers
+
+set -e
+
+INSTALL_ZSH="${INSTALLZSH:-"true"}"
+CONFIGURE_ZSH_AS_DEFAULT_SHELL="${CONFIGUREZSHASDEFAULTSHELL:-"false"}"
+INSTALL_OH_MY_ZSH="${INSTALLOHMYZSH:-"true"}"
+UPGRADE_PACKAGES="${UPGRADEPACKAGES:-"true"}"
+USERNAME="${USERNAME:-"automatic"}"
+USER_UID="${USERUID:-"automatic"}"
+USER_GID="${USERGID:-"automatic"}"
+ADD_NON_FREE_PACKAGES="${NONFREEPACKAGES:-"false"}"
+
+MARKER_FILE="/usr/local/etc/vscode-dev-containers/common"
+
+FEATURE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# Debian / Ubuntu packages
+install_debian_packages() {
+    # Ensure apt is in non-interactive to avoid prompts
+    export DEBIAN_FRONTEND=noninteractive
+
+    local package_list="apt-utils \
+        openssh-client \
+        gnupg2 \
+        dirmngr \
+        iproute2 \
+        procps \
+        lsof \
+        htop \
+        net-tools \
+        psmisc \
+        curl \
+        tree \
+        wget \
+        rsync \
+        ca-certificates \
+        unzip \
+        bzip2 \
+        zip \
+        nano \
+        vim-tiny \
+        less \
+        jq \
+        lsb-release \
+        apt-transport-https \
+        dialog \
+        libc6 \
+        libgcc1 \
+        libkrb5-3 \
+        libgssapi-krb5-2 \
+        libicu[0-9][0-9] \
+        liblttng-ust[0-9] \
+        libstdc++6 \
+        zlib1g \
+        locales \
+        sudo \
+        ncdu \
+        man-db \
+        strace \
+        manpages \
+        manpages-dev \
+        init-system-helpers"
+        
+    # Needed for adding manpages-posix and manpages-posix-dev which are non-free packages in Debian
+    if [ "${ADD_NON_FREE_PACKAGES}" = "true" ]; then
+        # Bring in variables from /etc/os-release like VERSION_CODENAME
+        sed -i -E "s/deb http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME} main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME} main contrib non-free/" /etc/apt/sources.list
+        sed -i -E "s/deb-src http:\/\/(deb|httredir)\.debian\.org\/debian ${VERSION_CODENAME} main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME} main contrib non-free/" /etc/apt/sources.list
+        sed -i -E "s/deb http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME}-updates main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME}-updates main contrib non-free/" /etc/apt/sources.list
+        sed -i -E "s/deb-src http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME}-updates main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME}-updates main contrib non-free/" /etc/apt/sources.list
+        sed -i "s/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main contrib non-free/" /etc/apt/sources.list
+        sed -i "s/deb-src http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main contrib non-free/" /etc/apt/sources.list
+        sed -i "s/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main contrib non-free/" /etc/apt/sources.list 
+        sed -i "s/deb-src http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main contrib non-free/" /etc/apt/sources.list
+        # Handle bullseye location for security https://www.debian.org/releases/bullseye/amd64/release-notes/ch-information.en.html
+        sed -i "s/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main contrib non-free/" /etc/apt/sources.list
+        sed -i "s/deb-src http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main contrib non-free/" /etc/apt/sources.list
+        echo "Running apt-get update..."
+        package_list="${package_list} manpages-posix manpages-posix-dev"
+    fi
+
+    # Include libssl1.1 if available
+    if [[ ! -z $(apt-cache --names-only search ^libssl1.1$) ]]; then
+        package_list="${package_list} libssl1.1"
+    fi
+
+    # Include libssl3 if available
+    if [[ ! -z $(apt-cache --names-only search ^libssl3$) ]]; then
+        package_list="${package_list} libssl3"
+    fi
+
+    # Include appropriate version of libssl1.0.x if available
+    local libssl_package=$(dpkg-query -f '${db:Status-Abbrev}\t${binary:Package}\n' -W 'libssl1\.0\.?' 2>&1 || echo '')
+    if [ "$(echo "$libssl_package" | grep -o 'libssl1\.0\.[0-9]:' | uniq | sort | wc -l)" -eq 0 ]; then
+        if [[ ! -z $(apt-cache --names-only search ^libssl1.0.2$) ]]; then
+            # Debian 9
+            package_list="${package_list} libssl1.0.2"
+        elif [[ ! -z $(apt-cache --names-only search ^libssl1.0.0$) ]]; then
+            # Ubuntu 18.04
+            package_list="${package_list} libssl1.0.0"
+        fi
+    fi
+
+    # Include git if not already installed (may be more recent than distro version)
+    if ! type git > /dev/null 2>&1; then
+        package_list="${package_list} git"
+    fi
+
+    # Install the list of packages
+    echo "Packages to verify are installed: ${package_list}"
+    rm -rf /var/lib/apt/lists/*
+    apt-get update -y
+    apt-get -y install --no-install-recommends ${package_list} 2> >( grep -v 'debconf: delaying package configuration, since apt-utils is not installed' >&2 )
+
+    # Install zsh (and recommended packages) if needed
+    if [ "${INSTALL_ZSH}" = "true" ] && ! type zsh > /dev/null 2>&1; then
+        apt-get install -y zsh
+    fi
+
+    # Get to latest versions of all packages
+    if [ "${UPGRADE_PACKAGES}" = "true" ]; then
+        apt-get -y upgrade --no-install-recommends
+        apt-get autoremove -y
+    fi
+
+    # Ensure at least the en_US.UTF-8 UTF-8 locale is available = common need for both applications and things like the agnoster ZSH theme.
+    if [ "${LOCALE_ALREADY_SET}" != "true" ] && ! grep -o -E '^\s*en_US.UTF-8\s+UTF-8' /etc/locale.gen > /dev/null; then
+        echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen 
+        locale-gen
+        LOCALE_ALREADY_SET="true"
+    fi
+
+    # Clean up
+    apt-get -y clean 
+    rm -rf /var/lib/apt/lists/*
+}
+
+# RedHat / RockyLinux / CentOS / Fedora packages
+install_redhat_packages() {
+    local package_list="\
+        openssh-clients \
+        gnupg2 \
+        iproute \
+        procps \
+        lsof \
+        net-tools \
+        psmisc \
+        curl \
+        wget \
+        ca-certificates \
+        rsync \
+        unzip \
+        zip \
+        nano \
+        vim-minimal \
+        less \
+        jq \
+        openssl-libs \
+        krb5-libs \
+        libicu \
+        zlib \
+        sudo \
+        sed \
+        grep \
+        which \
+        man-db \
+        strace"
+
+    # Install OpenSSL 1.0 compat if needed
+    if ${install_cmd} -q list compat-openssl10 >/dev/null 2>&1; then
+        package_list="${package_list} compat-openssl10"
+    fi
+
+    # Install lsb_release if available
+    if ${install_cmd} -q list redhat-lsb-core >/dev/null 2>&1; then
+        package_list="${package_list} redhat-lsb-core"
+    fi
+
+    # Install git if not already installed (may be more recent than distro version)
+    if ! type git > /dev/null 2>&1; then
+        package_list="${package_list} git"
+    fi
+
+    # Install zsh if needed
+    if [ "${INSTALL_ZSH}" = "true" ] && ! type zsh > /dev/null 2>&1; then
+        package_list="${package_list} zsh"
+    fi
+
+    local install_cmd=dnf
+    if ! type dnf > /dev/null 2>&1; then
+        install_cmd=yum
+    fi
+    ${install_cmd} -y install ${package_list}
+
+    # Get to latest versions of all packages
+    if [ "${UPGRADE_PACKAGES}" = "true" ]; then
+        ${install_cmd} upgrade -y
+    fi
+}
+
+# Alpine Linux packages
+install_alpine_packages() {
+    apk update
+    apk add --no-cache \
+        openssh-client \
+        gnupg \
+        procps \
+        lsof \
+        htop \
+        net-tools \
+        psmisc \
+        curl \
+        wget \
+        rsync \
+        ca-certificates \
+        unzip \
+        zip \
+        nano \
+        vim \
+        less \
+        jq \
+        libgcc \
+        libstdc++ \
+        krb5-libs \
+        libintl \
+        libssl1.1 \
+        lttng-ust \
+        tzdata \
+        userspace-rcu \
+        zlib \
+        sudo \
+        coreutils \
+        sed \
+        grep \
+        which \
+        ncdu \
+        shadow \
+        strace
+
+    # Install man pages - package name varies between 3.12 and earlier versions
+    if apk info man > /dev/null 2>&1; then
+        apk add --no-cache man man-pages
+    else 
+        apk add --no-cache mandoc man-pages
+    fi
+
+    # Install git if not already installed (may be more recent than distro version)
+    if ! type git > /dev/null 2>&1; then
+        apk add --no-cache git
+    fi
+
+    # Install zsh if needed
+    if [ "${INSTALL_ZSH}" = "true" ] && ! type zsh > /dev/null 2>&1; then
+        apk add --no-cache zsh
+    fi
+}
+
+# ******************
+# ** Main section **
+# ******************
+
+if [ "$(id -u)" -ne 0 ]; then
+    echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
+    exit 1
+fi
+
+# Load markers to see which steps have already run
+if [ -f "${MARKER_FILE}" ]; then
+    echo "Marker file found:"
+    cat "${MARKER_FILE}"
+    source "${MARKER_FILE}"
+fi
+
+# Ensure that login shells get the correct path if the user updated the PATH using ENV.
+rm -f /etc/profile.d/00-restore-env.sh
+echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
+chmod +x /etc/profile.d/00-restore-env.sh
+
+# Bring in ID, ID_LIKE, VERSION_ID, VERSION_CODENAME
+. /etc/os-release
+# Get an adjusted ID independant of distro variants
+if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
+    ADJUSTED_ID="debian"
+elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* ]]; then
+    ADJUSTED_ID="rhel"
+elif [ "${ID}" = "alpine" ]; then
+    ADJUSTED_ID="alpine"
+else
+    echo "Linux distro ${ID} not supported."
+    exit 1
+fi
+
+# Install packages for appropriate OS
+if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
+    case "${ADJUSTED_ID}" in
+        "debian")
+            install_debian_packages
+            ;;
+        "rhel")
+            install_redhat_packages
+            ;;
+        "alpine")
+            install_alpine_packages
+            ;;
+    esac
+    PACKAGES_ALREADY_INSTALLED="true"
+fi
+
+# If in automatic mode, determine if a user already exists, if not use vscode
+if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
+    if [ "${_REMOTE_USER}" != "root" ]; then
+        USERNAME="${_REMOTE_USER}"
+    else 
+        USERNAME=""
+        POSSIBLE_USERS=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
+        for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
+            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+                USERNAME=${CURRENT_USER}
+                break
+            fi
+        done
+        if [ "${USERNAME}" = "" ]; then
+            USERNAME=vscode
+        fi
+    fi
+elif [ "${USERNAME}" = "none" ]; then
+    USERNAME=root
+    USER_UID=0
+    USER_GID=0
+fi
+# Create or update a non-root user to match UID/GID.
+group_name="${USERNAME}"
+if id -u ${USERNAME} > /dev/null 2>&1; then
+    # User exists, update if needed
+    if [ "${USER_GID}" != "automatic" ] && [ "$USER_GID" != "$(id -g $USERNAME)" ]; then 
+        group_name="$(id -gn $USERNAME)"
+        groupmod --gid $USER_GID ${group_name}
+        usermod --gid $USER_GID $USERNAME
+    fi
+    if [ "${USER_UID}" != "automatic" ] && [ "$USER_UID" != "$(id -u $USERNAME)" ]; then 
+        usermod --uid $USER_UID $USERNAME
+    fi
+else
+    # Create user
+    if [ "${USER_GID}" = "automatic" ]; then
+        groupadd $USERNAME
+    else
+        groupadd --gid $USER_GID $USERNAME
+    fi
+    if [ "${USER_UID}" = "automatic" ]; then 
+        useradd -s /bin/bash --gid $USERNAME -m $USERNAME
+    else
+        useradd -s /bin/bash --uid $USER_UID --gid $USERNAME -m $USERNAME
+    fi
+fi
+
+# Add add sudo support for non-root user
+if [ "${USERNAME}" != "root" ] && [ "${EXISTING_NON_ROOT_USER}" != "${USERNAME}" ]; then
+    echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME
+    chmod 0440 /etc/sudoers.d/$USERNAME
+    EXISTING_NON_ROOT_USER="${USERNAME}"
+fi
+
+# *********************************
+# ** Shell customization section **
+# *********************************
+
+if [ "${USERNAME}" = "root" ]; then 
+    user_rc_path="/root"
+else
+    user_rc_path="/home/${USERNAME}"
+fi
+
+# Restore user .bashrc / .profile / .zshrc defaults from skeleton file if it doesn't exist or is empty
+possible_rc_files=( ".bashrc" ".profile" ".zshrc" )
+for rc_file in "${possible_rc_files[@]}"; do
+    if [ -f "/etc/skel/${rc_file}" ]; then
+        if [ ! -e "${user_rc_path}/${rc_file}" ] || [ -s "${user_rc_path}/${rc_file}" ]; then
+            cp "/etc/skel/${rc_file}" "${user_rc_path}/${rc_file}"
+            chown ${USERNAME}:${group_name} "${user_rc_path}/${rc_file}"
+        fi
+    fi
+done
+
+# Add RC snippet and custom bash prompt
+if [ "${RC_SNIPPET_ALREADY_ADDED}" != "true" ]; then
+    case "${ADJUSTED_ID}" in
+        "debian")
+            global_rc_path="/etc/bash.bashrc"
+            ;;
+        "rhel")
+            global_rc_path="/etc/bashrc"
+            ;;
+        "alpine")
+            global_rc_path="/etc/bash/bashrc"
+            ;;
+    esac
+    cat "${FEATURE_DIR}/scripts/rc_snippet.sh" >> ${global_rc_path}
+    cat "${FEATURE_DIR}/scripts/bash_theme_snippet.sh" >> "${user_rc_path}/.bashrc"
+    if [ "${USERNAME}" != "root" ]; then
+        cat "${FEATURE_DIR}/scripts/bash_theme_snippet.sh" >> "/root/.bashrc"
+        chown ${USERNAME}:${group_name} "${user_rc_path}/.bashrc"
+    fi
+    RC_SNIPPET_ALREADY_ADDED="true"
+fi
+
+# Optionally configure zsh and Oh My Zsh!
+if [ "${INSTALL_ZSH}" = "true" ]; then
+    if [ "${ZSH_ALREADY_INSTALLED}" != "true" ]; then
+        if [ "${ADJUSTED_ID}" = "rhel" ]; then
+             global_rc_path="/etc/zshrc"
+        else
+            global_rc_path="/etc/zsh/zshrc"
+        fi
+        cat "${FEATURE_DIR}/scripts/rc_snippet.sh" >> /etc/zshrc
+        ZSH_ALREADY_INSTALLED="true"
+    fi
+
+    if [ "${CONFIGURE_ZSH_AS_DEFAULT_SHELL}" == "true" ]; then
+        chsh --shell /bin/zsh ${USERNAME}
+    fi
+
+    # Adapted, simplified inline Oh My Zsh! install steps that adds, defaults to a codespaces theme.
+    # See https://github.com/ohmyzsh/ohmyzsh/blob/master/tools/install.sh for official script.
+    oh_my_install_dir="${user_rc_path}/.oh-my-zsh"
+    if [ ! -d "${oh_my_install_dir}" ] && [ "${INSTALL_OH_MY_ZSH}" = "true" ]; then
+        template_path="${oh_my_install_dir}/templates/zshrc.zsh-template"
+        user_rc_file="${user_rc_path}/.zshrc"
+        umask g-w,o-w
+        mkdir -p ${oh_my_install_dir}
+        git clone --depth=1 \
+            -c core.eol=lf \
+            -c core.autocrlf=false \
+            -c fsck.zeroPaddedFilemode=ignore \
+            -c fetch.fsck.zeroPaddedFilemode=ignore \
+            -c receive.fsck.zeroPaddedFilemode=ignore \
+            "https://github.com/ohmyzsh/ohmyzsh" "${oh_my_install_dir}" 2>&1
+        echo -e "$(cat "${template_path}")\nDISABLE_AUTO_UPDATE=true\nDISABLE_UPDATE_PROMPT=true" > ${user_rc_file}
+        sed -i -e 's/ZSH_THEME=.*/ZSH_THEME="devcontainers"/g' ${user_rc_file}
+
+        # Add Dev Containers theme
+        mkdir -p ${oh_my_install_dir}/custom/themes
+        cp -f "${FEATURE_DIR}/scripts/devcontainers.zsh-theme" "${oh_my_install_dir}/custom/themes/devcontainers.zsh-theme"
+        ln -s "${oh_my_install_dir}/custom/themes/devcontainers.zsh-theme" "${oh_my_install_dir}/custom/themes/codespaces.zsh-theme"
+
+        # Shrink git while still enabling updates
+        cd "${oh_my_install_dir}"
+        git repack -a -d -f --depth=1 --window=1
+        # Copy to non-root user if one is specified
+        if [ "${USERNAME}" != "root" ]; then
+            cp -rf "${user_rc_file}" "${oh_my_install_dir}" /root
+            chown -R ${USERNAME}:${group_name} "${oh_my_install_dir}" "${user_rc_file}"
+        fi
+    fi
+fi
+
+# ****************************
+# ** Utilities and commands **
+# ****************************
+
+# code shim, it fallbacks to code-insiders if code is not available
+cp -f "${FEATURE_DIR}/bin/code" /usr/local/bin/
+chmod +x /usr/local/bin/code
+
+# systemctl shim for Debian/Ubuntu - tells people to use 'service' if systemd is not running
+if [ "${ADJUSTED_ID}" = "debian" ]; then
+    cp -f "${FEATURE_DIR}/bin/systemctl" /usr/local/bin/systemctl
+    chmod +x /usr/local/bin/systemctl
+fi
+
+# Persist image metadata info, script if meta.env found in same directory
+if [ -f "/usr/local/etc/vscode-dev-containers/meta.env" ]; then
+    cp -f "${FEATURE_DIR}/bin/devcontainer-info" /usr/local/bin/devcontainer-info
+    chmod +x /usr/local/bin/devcontainer-info
+fi
+
+# Write marker file
+if [ ! -d "/usr/local/etc/vscode-dev-containers" ]; then
+    mkdir -p "$(dirname "${MARKER_FILE}")"
+fi
+echo -e "\
+    PACKAGES_ALREADY_INSTALLED=${PACKAGES_ALREADY_INSTALLED}\n\
+    LOCALE_ALREADY_SET=${LOCALE_ALREADY_SET}\n\
+    EXISTING_NON_ROOT_USER=${EXISTING_NON_ROOT_USER}\n\
+    RC_SNIPPET_ALREADY_ADDED=${RC_SNIPPET_ALREADY_ADDED}\n\
+    ZSH_ALREADY_INSTALLED=${ZSH_ALREADY_INSTALLED}" > "${MARKER_FILE}"
+
+echo "Done!"
diff --git a/src/common-utils/scripts/bash_theme_snippet.sh b/src/common-utils/scripts/bash_theme_snippet.sh
new file mode 100644
index 000000000..a028e4b63
--- /dev/null
+++ b/src/common-utils/scripts/bash_theme_snippet.sh
@@ -0,0 +1,25 @@
+
+# bash theme - partly inspired by https://github.com/ohmyzsh/ohmyzsh/blob/master/themes/robbyrussell.zsh-theme
+__bash_prompt() {
+    local userpart='`export XIT=$? \
+        && [ ! -z "${GITHUB_USER}" ] && echo -n "\[\033[0;32m\]@${GITHUB_USER} " || echo -n "\[\033[0;32m\]\u " \
+        && [ "$XIT" -ne "0" ] && echo -n "\[\033[1;31m\]➜" || echo -n "\[\033[0m\]➜"`'
+    local gitbranch='`\
+        if [ "$(git config --get devcontainers-theme.hide-status 2>/dev/null)" != 1 ] && [ "$(git config --get codespaces-theme.hide-status 2>/dev/null)" != 1 ]; then \
+            export BRANCH=$(git --no-optional-locks symbolic-ref --short HEAD 2>/dev/null || git --no-optional-locks rev-parse --short HEAD 2>/dev/null); \
+            if [ "${BRANCH}" != "" ]; then \
+                echo -n "\[\033[0;36m\](\[\033[1;31m\]${BRANCH}" \
+                && if [ "$(git config --get devcontainers-theme.show-dirty 2>/dev/null)" = 1 ] && \
+                    git --no-optional-locks ls-files --error-unmatch -m --directory --no-empty-directory -o --exclude-standard ":/*" > /dev/null 2>&1; then \
+                        echo -n " \[\033[1;33m\]✗"; \
+                fi \
+                && echo -n "\[\033[0;36m\]) "; \
+            fi; \
+        fi`'
+    local lightblue='\[\033[1;34m\]'
+    local removecolor='\[\033[0m\]'
+    PS1="${userpart} ${lightblue}\w ${gitbranch}${removecolor}\$ "
+    unset -f __bash_prompt
+}
+__bash_prompt
+export PROMPT_DIRTRIM=4
diff --git a/src/common-utils/scripts/devcontainers.zsh-theme b/src/common-utils/scripts/devcontainers.zsh-theme
new file mode 100644
index 000000000..ff11c917e
--- /dev/null
+++ b/src/common-utils/scripts/devcontainers.zsh-theme
@@ -0,0 +1,26 @@
+# Oh My Zsh! theme - partly inspired by https://github.com/ohmyzsh/ohmyzsh/blob/master/themes/robbyrussell.zsh-theme
+__zsh_prompt() {
+    local prompt_username
+    if [ ! -z "${GITHUB_USER}" ]; then 
+        prompt_username="@${GITHUB_USER}"
+    else
+        prompt_username="%n"
+    fi
+    PROMPT="%{$fg[green]%}${prompt_username} %(?:%{$reset_color%}➜ :%{$fg_bold[red]%}➜ )" # User/exit code arrow
+    PROMPT+='%{$fg_bold[blue]%}%(5~|%-1~/…/%3~|%4~)%{$reset_color%} ' # cwd
+    PROMPT+='`\
+        if [ "$(git config --get devcontainers-theme.hide-status 2>/dev/null)" != 1 ] && [ "$(git config --get codespaces-theme.hide-status 2>/dev/null)" != 1 ]; then \
+            export BRANCH=$(git --no-optional-locks symbolic-ref --short HEAD 2>/dev/null || git --no-optional-locks rev-parse --short HEAD 2>/dev/null); \
+            if [ "${BRANCH}" != "" ]; then \
+                echo -n "%{$fg_bold[cyan]%}(%{$fg_bold[red]%}${BRANCH}" \
+                && if [ "$(git config --get devcontainers-theme.show-dirty 2>/dev/null)" = 1 ] && \
+                    git --no-optional-locks ls-files --error-unmatch -m --directory --no-empty-directory -o --exclude-standard ":/*" > /dev/null 2>&1; then \
+                        echo -n " %{$fg_bold[yellow]%}✗"; \
+                fi \
+                && echo -n "%{$fg_bold[cyan]%})%{$reset_color%} "; \
+            fi; \
+        fi`'
+    PROMPT+='%{$fg[white]%}$ %{$reset_color%}'
+    unset -f __zsh_prompt
+}
+__zsh_prompt
diff --git a/src/common-utils/scripts/rc_snippet.sh b/src/common-utils/scripts/rc_snippet.sh
new file mode 100644
index 000000000..3aa319a15
--- /dev/null
+++ b/src/common-utils/scripts/rc_snippet.sh
@@ -0,0 +1,26 @@
+
+if [ -z "${USER}" ]; then export USER=$(whoami); fi
+if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi
+
+# Display optional first run image specific notice if configured and terminal is interactive
+if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespaces" ]] && [ ! -f "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed" ]; then
+    if [ -f "/usr/local/etc/vscode-dev-containers/first-run-notice.txt" ]; then
+        cat "/usr/local/etc/vscode-dev-containers/first-run-notice.txt"
+    elif [ -f "/workspaces/.codespaces/shared/first-run-notice.txt" ]; then
+        cat "/workspaces/.codespaces/shared/first-run-notice.txt"
+    fi
+    mkdir -p "$HOME/.config/vscode-dev-containers"
+    # Mark first run notice as displayed after 10s to avoid problems with fast terminal refreshes hiding it
+    ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
+fi
+
+# Set the default git editor if not already set
+if [ -z "$(git config --get core.editor)" ] && [ -z "${GIT_EDITOR}" ]; then
+    if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+        if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+            export GIT_EDITOR="code-insiders --wait"
+        else 
+            export GIT_EDITOR="code --wait"
+        fi
+    fi
+fi
\ No newline at end of file
diff --git a/test/common-utils/alpine.sh b/test/common-utils/alpine.sh
new file mode 100755
index 000000000..c5ff86613
--- /dev/null
+++ b/test/common-utils/alpine.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${ID}" = "alpine"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/already-run.sh b/test/common-utils/already-run.sh
new file mode 100755
index 000000000..39d6f9ee2
--- /dev/null
+++ b/test/common-utils/already-run.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "non-root user" test "$(whoami)" = "vscode"
+check "jq" jq  --version
+check "curl" curl  --version
+check "git" git  --version
+check "zsh" zsh --version
+check "ps" ps --version
+check "Oh My Zsh! theme" test -e $HOME/.oh-my-zsh/custom/themes
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/alternate-values.sh b/test/common-utils/alternate-values.sh
new file mode 100755
index 000000000..d208a2730
--- /dev/null
+++ b/test/common-utils/alternate-values.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "non-root user" id alternate
+check "running as root" test "$(whoami)" = "root"
+check "jq" jq  --version
+check "curl" curl  --version
+check "git" git  --version
+check "ps" ps --version
+check "no zsh" bash -c '! zsh --version'
+check "No Oh My Zsh!" test ! -e /home/alternate/.oh-my-zsh/custom/themes/devcontainers.zsh-theme
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/bionic.sh b/test/common-utils/bionic.sh
new file mode 100755
index 000000000..349b4c32d
--- /dev/null
+++ b/test/common-utils/bionic.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${VERSION_CODENAME}" = "bionic"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/bullseye.sh b/test/common-utils/bullseye.sh
new file mode 100755
index 000000000..5a396a7f4
--- /dev/null
+++ b/test/common-utils/bullseye.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${VERSION_CODENAME}" = "bullseye"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/buster.sh b/test/common-utils/buster.sh
new file mode 100755
index 000000000..9fd2f409f
--- /dev/null
+++ b/test/common-utils/buster.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${VERSION_CODENAME}" = "buster"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/centos-7.sh b/test/common-utils/centos-7.sh
new file mode 100755
index 000000000..a81ae2f3e
--- /dev/null
+++ b/test/common-utils/centos-7.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${VERSION_ID}" = "7"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/fedora.sh b/test/common-utils/fedora.sh
new file mode 100755
index 000000000..b32a7f112
--- /dev/null
+++ b/test/common-utils/fedora.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${ID}" = "fedora"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/focal.sh b/test/common-utils/focal.sh
new file mode 100755
index 000000000..28d8b8bcc
--- /dev/null
+++ b/test/common-utils/focal.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${VERSION_CODENAME}" = "focal"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/jammy.sh b/test/common-utils/jammy.sh
new file mode 100755
index 000000000..f11cac69e
--- /dev/null
+++ b/test/common-utils/jammy.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${VERSION_CODENAME}" = "jammy"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/rocky-8.sh b/test/common-utils/rocky-8.sh
new file mode 100755
index 000000000..f6606dbb2
--- /dev/null
+++ b/test/common-utils/rocky-8.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${PLATFORM_ID}" = "platform:el8"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/rocky-9.sh b/test/common-utils/rocky-9.sh
new file mode 100755
index 000000000..c4b5244bc
--- /dev/null
+++ b/test/common-utils/rocky-9.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${PLATFORM_ID}" = "platform:el9"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index aa36fcb6e..9b0bc85c9 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -1,10 +1,111 @@
 {
-  "configure_zsh_as_default_shell": {
-    "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
-    "features": {
-      "common-utils": {
-        "configureZshAsDefaultShell": true
-      }
+    "bionic": {
+        "image": "ubuntu:bionic",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "focal": {
+        "image": "ubuntu:focal",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "jammy": {
+        "image": "ubuntu:jammy",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "buster": {
+        "image": "debian:buster",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "bullseye": {
+        "image": "debian:bullseye",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "centos-7": {
+        "image": "centos:7",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "rocky-8": {
+        "image": "rockylinux:8",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "rocky-9": {
+        "image": "rockylinux:9",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "fedora": {
+        "image": "fedora",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "alpine": {
+        "image": "alpine",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "alternate-values": {
+        "image": "debian:bullseye",
+        "features": {
+            "common-utils": {
+                "username": "alternate",
+                "userUid": "1001",
+                "userGid": "1002",
+                "upgradePackages": false,
+                "installZsh": false,
+                "nonFreePackages": true
+            }
+        }
+    },
+    "username-default": {
+        "image": "debian:bullseye",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "username-detected": {
+        "image": "node",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "already-run": {
+        "image": "mcr.microsoft.com/devcontainers/base:jammy",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "configure_zsh_as_default_shell": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "features": {
+            "common-utils": {
+                "configureZshAsDefaultShell": true
+            }
+        }
     }
-  }
 }
diff --git a/test/common-utils/test.sh b/test/common-utils/test.sh
index 128201548..5e16a33c7 100755
--- a/test/common-utils/test.sh
+++ b/test/common-utils/test.sh
@@ -8,6 +8,11 @@ source dev-container-features-test-lib
 # Definition specific tests
 check "jq" jq  --version
 check "curl" curl  --version
+check "git" git  --version
+check "zsh" zsh --version
+check "ps" ps --version
+check "Oh My Zsh! theme" test -e $HOME/.oh-my-zsh/custom/themes/devcontainers.zsh-theme
+check "zsh theme symlink" test -e $HOME/.oh-my-zsh/custom/themes/codespaces.zsh-theme
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/common-utils/username-default.sh b/test/common-utils/username-default.sh
new file mode 100755
index 000000000..49784b759
--- /dev/null
+++ b/test/common-utils/username-default.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+# .oh-my-zsh folder would only exist if user defaulting worked
+check "non-root user" ls /home/vscode/.oh-my-zsh
+
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/username-detected.sh b/test/common-utils/username-detected.sh
new file mode 100755
index 000000000..39c1b2998
--- /dev/null
+++ b/test/common-utils/username-detected.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+# .oh-my-zsh folder would only exist if user detection worked
+check "non-root user" ls /home/node/.oh-my-zsh
+
+# Report result
+reportResults
\ No newline at end of file

From a3dc31d31fec8b52c63b756d1df17b602e141b9b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 16 Dec 2022 11:33:40 -0800
Subject: [PATCH 041/478] Automated documentation update (#338)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/common-utils/README.md | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/common-utils/README.md b/src/common-utils/README.md
index 123b7d5f8..e028faca7 100644
--- a/src/common-utils/README.md
+++ b/src/common-utils/README.md
@@ -1,5 +1,5 @@
 
-# Common Debian Utilities (common-utils)
+# Common Utilities (common-utils)
 
 Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.
 
@@ -7,7 +7,7 @@ Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-r
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/common-utils:1": {}
+    "ghcr.io/devcontainers/features/common-utils:2": {}
 }
 ```
 
@@ -19,24 +19,32 @@ Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-r
 | configureZshAsDefaultShell | Change default shell to ZSH? | boolean | false |
 | installOhMyZsh | Install Oh My Zsh!? | boolean | true |
 | upgradePackages | Upgrade OS packages? | boolean | true |
-| username | Enter name of non-root user to configure or none to skip | string | automatic |
-| uid | Enter uid for non-root user | string | automatic |
-| gid | Enter gid for non-root user | string | automatic |
-| nonFreePackages | Add packages from non-free Debian repository? | boolean | false |
+| username | Enter name of a non-root user to configure or none to skip | string | automatic |
+| userUid | Enter UID for non-root user | string | automatic |
+| userGid | Enter GID for non-root user | string | automatic |
+| nonFreePackages | Add packages from non-free Debian repository? (Debian only) | boolean | false |
 
-## Speeding up the command prompt in large repositories
+## OS Support
 
-This script provides a custom command prompt that includes information about the git repository for the current folder. However, with certain large repositories, this can result in a slow command prompt since the required git status command can be slow. To resolve this, you can update a git setting to remove the git portion of the command prompt.
+This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, RockyLinux, and Alpine Linux.
 
-To disable the prompt for the current folder's repository, enter the following in a terminal or add it to your `postCreateCommand` or dotfiles:
+## Customizing the command prompt
+
+By default, this script provides a custom command prompt that includes information about the git repository for the current folder. However, with certain large repositories, this can result in a slow command prompt due to the performance of needed git operations.
+
+For performance reasons, a "dirty" indicator that tells you whether or not there are uncommitted changes is disabled by default. You can opt to turn this on for smaller repositories by entering the following in a terminal or adding it to your `postCreateCommand`:
 
 ```bash
-git config codespaces-theme.hide-status 1
+git config devcontainers-theme.show-dirty 1
 ```
 
-This setting will survive a rebuild since it is applied to the repository rather than the container.
+To completely disable the git portion of the prompt for the current folder's repository, you can use this configuration setting instead:
 
+```bash
+git config devcontainers-theme.hide-status 1
+```
 
+For `zsh`, the default theme is a [standard Oh My Zsh! theme](https://ohmyz.sh/). You may pick a different one by modifying the `ZSH_THEME` variable in `~/.zshrc`.
 
 ---
 

From e46c73de74942438e079564405c5c4b0291a4aae Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Fri, 16 Dec 2022 14:21:05 -0800
Subject: [PATCH 042/478] Git - Bug Fix: Feature fails with "ppa:false" for
 bionic & jammy (#339)

---
 src/git/devcontainer-feature.json       |  2 +-
 src/git/install.sh                      | 10 +++++++++-
 test/git/install_git_from_src_bionic.sh | 16 ++++++++++++++++
 test/git/install_git_from_src_jammy.sh  | 16 ++++++++++++++++
 test/git/scenarios.json                 | 18 ++++++++++++++++++
 5 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 test/git/install_git_from_src_bionic.sh
 create mode 100644 test/git/install_git_from_src_jammy.sh

diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
index a8ea798c7..bc5767534 100644
--- a/src/git/devcontainer-feature.json
+++ b/src/git/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
diff --git a/src/git/install.sh b/src/git/install.sh
index 7ffa01eb3..2463cc9ff 100755
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -147,7 +147,15 @@ if [ "$(echo "${GIT_VERSION}" | grep -o '\.' | wc -l)" != "2" ]; then
     fi
 fi
 
-check_packages libpcre2-posix2 libpcre2-dev
+check_packages libpcre2-dev
+
+if [ "${VERSION_CODENAME}" = "focal" ]; then
+    check_packages libpcre2-posix2
+elif [ "${VERSION_CODENAME}" = "bionic" ]; then
+    check_packages libpcre2-posix0
+else
+    check_packages libpcre2-posix3
+fi
 
 echo "Downloading source for ${GIT_VERSION}..."
 curl -sL https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz | tar -xzC /tmp 2>&1
diff --git a/test/git/install_git_from_src_bionic.sh b/test/git/install_git_from_src_bionic.sh
new file mode 100644
index 000000000..4bdcf3066
--- /dev/null
+++ b/test/git/install_git_from_src_bionic.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "version" git  --version
+check "gettext" dpkg-query -l gettext
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/install_git_from_src_jammy.sh b/test/git/install_git_from_src_jammy.sh
new file mode 100644
index 000000000..4bdcf3066
--- /dev/null
+++ b/test/git/install_git_from_src_jammy.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "version" git  --version
+check "gettext" dpkg-query -l gettext
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/scenarios.json b/test/git/scenarios.json
index a57bea77f..90aa7e30a 100644
--- a/test/git/scenarios.json
+++ b/test/git/scenarios.json
@@ -7,5 +7,23 @@
                 "ppa": "false"
             }
         }
+    },
+    "install_git_from_src_jammy": {
+        "image": "ubuntu:jammy",
+        "features": {
+            "git": {
+                "version": "latest",
+                "ppa": "false"
+            }
+        }
+    },
+    "install_git_from_src_bionic": {
+        "image": "ubuntu:bionic",
+        "features": {
+            "git": {
+                "version": "latest",
+                "ppa": "false"
+            }
+        }
     }
 }

From 2af02c198adabacff30c400b0bfcad972ce5abcc Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Fri, 16 Dec 2022 16:08:37 -0800
Subject: [PATCH 043/478] Git - Bug Fix: Feature fails with "ppa:false" for
 "buster" & "bullseye" (#340)

---
 src/git/devcontainer-feature.json         |  2 +-
 src/git/install.sh                        |  4 ++--
 test/git/install_git_from_src_bullseye.sh | 16 ++++++++++++++++
 test/git/install_git_from_src_buster.sh   | 16 ++++++++++++++++
 test/git/scenarios.json                   | 18 ++++++++++++++++++
 5 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 test/git/install_git_from_src_bullseye.sh
 create mode 100644 test/git/install_git_from_src_buster.sh

diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
index bc5767534..c68d69d9a 100644
--- a/src/git/devcontainer-feature.json
+++ b/src/git/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
diff --git a/src/git/install.sh b/src/git/install.sh
index 2463cc9ff..24e08e857 100755
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -149,9 +149,9 @@ fi
 
 check_packages libpcre2-dev
 
-if [ "${VERSION_CODENAME}" = "focal" ]; then
+if [ "${VERSION_CODENAME}" = "focal" ] || [ "${VERSION_CODENAME}" = "bullseye" ]; then
     check_packages libpcre2-posix2
-elif [ "${VERSION_CODENAME}" = "bionic" ]; then
+elif [ "${VERSION_CODENAME}" = "bionic" ] || [ "${VERSION_CODENAME}" = "buster" ]; then
     check_packages libpcre2-posix0
 else
     check_packages libpcre2-posix3
diff --git a/test/git/install_git_from_src_bullseye.sh b/test/git/install_git_from_src_bullseye.sh
new file mode 100644
index 000000000..4bdcf3066
--- /dev/null
+++ b/test/git/install_git_from_src_bullseye.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "version" git  --version
+check "gettext" dpkg-query -l gettext
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/install_git_from_src_buster.sh b/test/git/install_git_from_src_buster.sh
new file mode 100644
index 000000000..4bdcf3066
--- /dev/null
+++ b/test/git/install_git_from_src_buster.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "version" git  --version
+check "gettext" dpkg-query -l gettext
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/scenarios.json b/test/git/scenarios.json
index 90aa7e30a..22af7a860 100644
--- a/test/git/scenarios.json
+++ b/test/git/scenarios.json
@@ -25,5 +25,23 @@
                 "ppa": "false"
             }
         }
+    },
+    "install_git_from_src_bullseye": {
+        "image": "debian:bullseye",
+        "features": {
+            "git": {
+                "version": "latest",
+                "ppa": "false"
+            }
+        }
+    },
+    "install_git_from_src_buster": {
+        "image": "debian:buster",
+        "features": {
+            "git": {
+                "version": "latest",
+                "ppa": "false"
+            }
+        }
     }
 }

From 7867e008c1d87c0e5bc4294a0d36d765b0cbd3ca Mon Sep 17 00:00:00 2001
From: eitsupi <50911393+eitsupi@users.noreply.github.com>
Date: Tue, 20 Dec 2022 01:23:05 +0900
Subject: [PATCH 044/478] Fix /etc/bash.bashrc generated by common-utils (#342)

* Fix /etc/bash.bashrc generated by common-utils

* bump version
---
 src/common-utils/devcontainer-feature.json | 2 +-
 src/common-utils/scripts/rc_snippet.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 05bf067e7..d9ecc8877 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/scripts/rc_snippet.sh b/src/common-utils/scripts/rc_snippet.sh
index 3aa319a15..4810cd993 100644
--- a/src/common-utils/scripts/rc_snippet.sh
+++ b/src/common-utils/scripts/rc_snippet.sh
@@ -23,4 +23,4 @@ if [ -z "$(git config --get core.editor)" ] && [ -z "${GIT_EDITOR}" ]; then
             export GIT_EDITOR="code --wait"
         fi
     fi
-fi
\ No newline at end of file
+fi

From 9af65a01c7052821daf7fbbf93e65698c9053f27 Mon Sep 17 00:00:00 2001
From: zephyros-dev <67867662+zephyros-dev@users.noreply.github.com>
Date: Mon, 19 Dec 2022 23:24:59 +0700
Subject: [PATCH 045/478] docs: add bind mount docs for docker from docker
 (#343)

Co-authored-by: ptn <ptn@cct-technology.com>
---
 src/docker-from-docker/NOTES.md | 45 +++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/docker-from-docker/NOTES.md b/src/docker-from-docker/NOTES.md
index 672904427..fe658bc4f 100644
--- a/src/docker-from-docker/NOTES.md
+++ b/src/docker-from-docker/NOTES.md
@@ -1,25 +1,54 @@
 ## Limitations
 
-* As the name implies, the Feature is expected to work when the host is running Docker (or the OSS Moby container engine it is built on). It may be possible to get running in other container engines, but it has not been tested with them.
-* The host and the container must be running on the same chip architecture. You will not be able to use it with an emulated x86 image with Docker Desktop on an Apple Silicon Mac, for example.
-* This approach does not currently enable bind mounting the workspace folder by default, and cannot support folders outside of the workspace folder. Consider whether the [Docker-in-Docker Feature](../docker-in-docker) would better meet your needs given it does not have this limitation.
+- As the name implies, the Feature is expected to work when the host is running Docker (or the OSS Moby container engine it is built on). It may be possible to get running in other container engines, but it has not been tested with them.
+- The host and the container must be running on the same chip architecture. You will not be able to use it with an emulated x86 image with Docker Desktop on an Apple Silicon Mac, for example.
+- This approach does not currently enable bind mounting the workspace folder by default, and cannot support folders outside of the workspace folder. Consider whether the [Docker-in-Docker Feature](../docker-in-docker) would better meet your needs given it does not have this limitation.
 
 ## Supporting bind mounts from the workspace folder
 
-A common question that comes up is how you can use `bind` mounts from the Docker CLI from within the a dev container using this Feature (e.g. via `-v`). If you cannot use the [Docker-in-Docker Feature](../docker-in-docker), the only way to work around this is to use the **host**'s folder paths instead of the container's paths.
+A common question that comes up is how you can use `bind` mounts from the Docker CLI from within the a dev container using this Feature (e.g. via `-v`). If you cannot use the [Docker-in-Docker Feature](../docker-in-docker), the only way to work around this is to use the **host**'s folder paths instead of the container's paths. There are 2 ways to do this
 
-A simple way to do this is to put `${localWorkspaceFolder}` in an environment variable that you then use when doing bind mounts inside the container.
+### 1. Use the `${localWorkspaceFolder}` as environment variable in your code
 
-Add the following to `devcontainer.json`:
+1. Add the following to `devcontainer.json`:
 
 ```json
 "remoteEnv": { "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" }
 ```
 
-Then reference the env var when running Docker commands from the terminal inside the container.
+2. Usage with Docker commands
 
 ```bash
 docker run -it --rm -v ${LOCAL_WORKSPACE_FOLDER}:/workspace debian bash
 ```
 
-> **Note:** There is no `${localWorkspaceFolder}` when using the **Clone Repository in Container Volume** command in the VS Code Dev Containers extension ([info](https://github.com/microsoft/vscode-remote-release/issues/6160#issuecomment-1014701007)).
\ No newline at end of file
+3. Usage with Docker-compose
+
+```yaml
+version: "3.9"
+
+services:
+  debian:
+    image: debian
+    volumes:
+      - ${LOCAL_WORKSPACE_FOLDER:-./}:/workspace
+```
+
+- The defaults value `./` is added so that the `docker-compose.yaml` file can work when it is run outside of the container
+
+### Change the workspace to `${localWorkspaceFolder}`
+
+- This is useful if we don't want to edit the `docker-compose.yaml` file
+
+1. Add the following to `devcontainer.json`
+
+```json
+"workspaceFolder": "${localWorkspaceFolder}",
+"workspaceMount": "source=${localWorkspaceFolder},target=${localWorkspaceFolder},type=bind"
+```
+
+2. Rebuild the container.
+3. When the container first started with this settings, select the Workspace with the absolute path to the working directory inside the container
+4. Docker commands with bind mount should work as they did outside of the devcontainer
+
+> **Note:** There is no `${localWorkspaceFolder}` when using the **Clone Repository in Container Volume** command in the VS Code Dev Containers extension ([info](https://github.com/microsoft/vscode-remote-release/issues/6160#issuecomment-1014701007)).

From fede4055495a9d44efbb65848eb7799771d23f9b Mon Sep 17 00:00:00 2001
From: Mark Phippard <markphip@gmail.com>
Date: Mon, 19 Dec 2022 11:25:32 -0500
Subject: [PATCH 046/478] Add support for mariner (#344)

---
 src/common-utils/main.sh         |  2 +-
 test/common-utils/mariner.sh     | 14 ++++++++++++++
 test/common-utils/scenarios.json |  7 +++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100755 test/common-utils/mariner.sh

diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 63f64ab60..f0fedcf82 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -289,7 +289,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 # Get an adjusted ID independant of distro variants
 if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
     ADJUSTED_ID="debian"
-elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* ]]; then
+elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
     ADJUSTED_ID="rhel"
 elif [ "${ID}" = "alpine" ]; then
     ADJUSTED_ID="alpine"
diff --git a/test/common-utils/mariner.sh b/test/common-utils/mariner.sh
new file mode 100755
index 000000000..ab6cb6e13
--- /dev/null
+++ b/test/common-utils/mariner.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${ID}" = "mariner"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index 9b0bc85c9..bc1c784bf 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -62,6 +62,13 @@
             "common-utils": {}
         }
     },
+    "mariner": {
+        "image": "mcr.microsoft.com/cbl-mariner/base/core:2.0",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
     "alpine": {
         "image": "alpine",
         "remoteUser": "devcontainer",

From e46fe0eb3460bf888e84451d727a7ed83f0f0404 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 19 Dec 2022 11:27:18 -0500
Subject: [PATCH 047/478] Automated documentation update (#349)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/docker-from-docker/README.md | 44 +++++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/docker-from-docker/README.md b/src/docker-from-docker/README.md
index 41d984686..e1de84b5e 100644
--- a/src/docker-from-docker/README.md
+++ b/src/docker-from-docker/README.md
@@ -21,30 +21,60 @@
 
 ## Limitations
 
-* As the name implies, the Feature is expected to work when the host is running Docker (or the OSS Moby container engine it is built on). It may be possible to get running in other container engines, but it has not been tested with them.
-* The host and the container must be running on the same chip architecture. You will not be able to use it with an emulated x86 image with Docker Desktop on an Apple Silicon Mac, for example.
-* This approach does not currently enable bind mounting the workspace folder by default, and cannot support folders outside of the workspace folder. Consider whether the [Docker-in-Docker Feature](../docker-in-docker) would better meet your needs given it does not have this limitation.
+- As the name implies, the Feature is expected to work when the host is running Docker (or the OSS Moby container engine it is built on). It may be possible to get running in other container engines, but it has not been tested with them.
+- The host and the container must be running on the same chip architecture. You will not be able to use it with an emulated x86 image with Docker Desktop on an Apple Silicon Mac, for example.
+- This approach does not currently enable bind mounting the workspace folder by default, and cannot support folders outside of the workspace folder. Consider whether the [Docker-in-Docker Feature](../docker-in-docker) would better meet your needs given it does not have this limitation.
 
 ## Supporting bind mounts from the workspace folder
 
-A common question that comes up is how you can use `bind` mounts from the Docker CLI from within the a dev container using this Feature (e.g. via `-v`). If you cannot use the [Docker-in-Docker Feature](../docker-in-docker), the only way to work around this is to use the **host**'s folder paths instead of the container's paths.
+A common question that comes up is how you can use `bind` mounts from the Docker CLI from within the a dev container using this Feature (e.g. via `-v`). If you cannot use the [Docker-in-Docker Feature](../docker-in-docker), the only way to work around this is to use the **host**'s folder paths instead of the container's paths. There are 2 ways to do this
 
-A simple way to do this is to put `${localWorkspaceFolder}` in an environment variable that you then use when doing bind mounts inside the container.
+### 1. Use the `${localWorkspaceFolder}` as environment variable in your code
 
-Add the following to `devcontainer.json`:
+1. Add the following to `devcontainer.json`:
 
 ```json
 "remoteEnv": { "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" }
 ```
 
-Then reference the env var when running Docker commands from the terminal inside the container.
+2. Usage with Docker commands
 
 ```bash
 docker run -it --rm -v ${LOCAL_WORKSPACE_FOLDER}:/workspace debian bash
 ```
 
+3. Usage with Docker-compose
+
+```yaml
+version: "3.9"
+
+services:
+  debian:
+    image: debian
+    volumes:
+      - ${LOCAL_WORKSPACE_FOLDER:-./}:/workspace
+```
+
+- The defaults value `./` is added so that the `docker-compose.yaml` file can work when it is run outside of the container
+
+### Change the workspace to `${localWorkspaceFolder}`
+
+- This is useful if we don't want to edit the `docker-compose.yaml` file
+
+1. Add the following to `devcontainer.json`
+
+```json
+"workspaceFolder": "${localWorkspaceFolder}",
+"workspaceMount": "source=${localWorkspaceFolder},target=${localWorkspaceFolder},type=bind"
+```
+
+2. Rebuild the container.
+3. When the container first started with this settings, select the Workspace with the absolute path to the working directory inside the container
+4. Docker commands with bind mount should work as they did outside of the devcontainer
+
 > **Note:** There is no `${localWorkspaceFolder}` when using the **Clone Repository in Container Volume** command in the VS Code Dev Containers extension ([info](https://github.com/microsoft/vscode-remote-release/issues/6160#issuecomment-1014701007)).
 
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/docker-from-docker/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._

From 2472653c316e318f36eeaf97248665bbc3ed9fc8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 19 Dec 2022 09:11:02 -0800
Subject: [PATCH 048/478] Automated documentation update (#351)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>

From 42e5a013cc914f87d0ff7bf613a1f80d9ff57579 Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Mon, 19 Dec 2022 12:19:46 -0500
Subject: [PATCH 049/478] common-utils 2.0.2 (#350)

Will release staged change: https://github.com/devcontainers/features/commit/fede4055495a9d44efbb65848eb7799771d23f9b
---
 src/common-utils/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index d9ecc8877..cbb853edf 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",

From 48678001d1e910477390c475165564a38936b058 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 21 Dec 2022 09:11:10 -0800
Subject: [PATCH 050/478] Terraform: Update GPG_KEY_SERVERS (#353)

* Terraform: Update GPG_KEY_SERVERS

* add check
---
 src/terraform/devcontainer-feature.json |  2 +-
 src/terraform/install.sh                | 20 +-------------------
 test/terraform/test.sh                  |  2 +-
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index 66e53f09d..490a05b2d 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index 0f9e4db54..b324eb644 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -26,7 +26,7 @@ TERRAFORM_DOCS_SHA256="${TERRAFORM_DOCS_SHA256:-"automatic"}"
 
 TERRAFORM_GPG_KEY="72D7468F"
 TFLINT_GPG_KEY_URI="https://raw.githubusercontent.com/terraform-linters/tflint/master/8CE69160EB3F2FE9.key"
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80
+GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
 
@@ -44,26 +44,9 @@ if [ "$(id -u)" -ne 0 ]; then
     exit 1
 fi
 
-# Get central common setting
-get_common_setting() {
-    if [ "${common_settings_file_loaded}" != "true" ]; then
-        curl -sfL "https://aka.ms/vscode-dev-containers/script-library/settings.env" 2>/dev/null -o /tmp/vsdc-settings.env || echo "Could not download settings file. Skipping."
-        common_settings_file_loaded=true
-    fi
-    if [ -f "/tmp/vsdc-settings.env" ]; then
-        local multi_line=""
-        if [ "$2" = "true" ]; then multi_line="-z"; fi
-        local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
-        if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
-    fi
-    echo "$1=${!1}"
-}
-
 # Import the specified key in a variable name passed in as 
 receive_gpg_keys() {
-    get_common_setting $1
     local keys=${!1}
-    get_common_setting GPG_KEY_SERVERS true
     local keyring_args=""
     if [ ! -z "$2" ]; then
         keyring_args="--no-default-keyring --keyring $2"
@@ -186,7 +169,6 @@ if [ "${TFLINT_VERSION}" != "none" ]; then
     curl -sSL -o /tmp/tf-downloads/${TFLINT_FILENAME} https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/${TFLINT_FILENAME}
     if [ "${TFLINT_SHA256}" != "dev-mode" ]; then
         if [ "${TFLINT_SHA256}" = "automatic" ]; then
-            get_common_setting TFLINT_GPG_KEY_URI
             curl -sSL -o tflint_key "${TFLINT_GPG_KEY_URI}"
             gpg -q --import tflint_key
             curl -sSL -o tflint_checksums.txt https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt
diff --git a/test/terraform/test.sh b/test/terraform/test.sh
index bd0a51639..ef7b14e10 100755
--- a/test/terraform/test.sh
+++ b/test/terraform/test.sh
@@ -5,7 +5,7 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-echo 'NO TESTS FOR ME YET!'
+check "terraform" terraform -version
 
 # Report result
 reportResults
\ No newline at end of file

From b9bfe406d211ce5645a165a73b72048e9ea9e88e Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 21 Dec 2022 12:15:24 -0800
Subject: [PATCH 051/478] Update GPG_KEY_SERVERS: Remove `:80` from Ubuntu
 Keyserver (#354)

* Update GPG_KEY_SERVERS: Remove `:80` from Ubuntu Keyserver

* Fix ruby tests
---
 src/git-lfs/devcontainer-feature.json         |  2 +-
 src/git-lfs/install.sh                        | 20 +-------
 src/git/devcontainer-feature.json             |  2 +-
 src/git/install.sh                            | 19 +------
 src/github-cli/devcontainer-feature.json      |  2 +-
 src/github-cli/install.sh                     | 50 +------------------
 .../devcontainer-feature.json                 |  2 +-
 src/kubectl-helm-minikube/install.sh          | 20 +-------
 src/nix/devcontainer-feature.json             |  2 +-
 src/nix/install.sh                            |  2 +-
 src/powershell/devcontainer-feature.json      |  2 +-
 src/powershell/install.sh                     | 18 +------
 src/python/devcontainer-feature.json          |  2 +-
 src/python/install.sh                         | 19 +------
 src/ruby/devcontainer-feature.json            |  2 +-
 src/ruby/install.sh                           | 19 +------
 .../install_git_cli_from_release.sh           | 11 ++++
 test/github-cli/scenarios.json                | 11 ++++
 18 files changed, 38 insertions(+), 167 deletions(-)
 create mode 100644 test/github-cli/install_git_cli_from_release.sh
 create mode 100644 test/github-cli/scenarios.json

diff --git a/src/git-lfs/devcontainer-feature.json b/src/git-lfs/devcontainer-feature.json
index 9911e252b..7916ea1c3 100644
--- a/src/git-lfs/devcontainer-feature.json
+++ b/src/git-lfs/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git-lfs",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "name": "Git Large File Support (LFS)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git-lfs",
     "description": "Installs Git Large File Support (Git LFS) along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like git and curl.",
diff --git a/src/git-lfs/install.sh b/src/git-lfs/install.sh
index f24ed9252..f0ce9ff7e 100755
--- a/src/git-lfs/install.sh
+++ b/src/git-lfs/install.sh
@@ -13,7 +13,7 @@ GIT_LFS_ARCHIVE_GPG_KEY_URI="https://packagecloud.io/github/git-lfs/gpgkey"
 GIT_LFS_ARCHIVE_ARCHITECTURES="amd64 arm64"
 GIT_LFS_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal jammy"
 GIT_LFS_CHECKSUM_GPG_KEYS="0x88ace9b29196305ba9947552f1ba225c0223b187 0x86cd3297749375bcf8206715f54fe648088335a9 0xaa3b3450295830d2de6db90caba67be5a5795889"
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80
+GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
 
@@ -27,21 +27,6 @@ if [ "$(id -u)" -ne 0 ]; then
     exit 1
 fi
 
-# Get central common setting
-get_common_setting() {
-    if [ "${common_settings_file_loaded}" != "true" ]; then
-        curl -sfL "https://aka.ms/vscode-dev-containers/script-library/settings.env" 2>/dev/null -o /tmp/vsdc-settings.env || echo "Could not download settings file. Skipping."
-        common_settings_file_loaded=true
-    fi
-    if [ -f "/tmp/vsdc-settings.env" ]; then
-        local multi_line=""
-        if [ "$2" = "true" ]; then multi_line="-z"; fi
-        local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
-        if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
-    fi
-    echo "$1=${!1}"
-}
-
 # Figure out correct version of a three part version number is not passed
 find_version_from_git_tags() {
     local variable_name=$1
@@ -78,9 +63,7 @@ find_version_from_git_tags() {
 
 # Import the specified key in a variable name passed in as 
 receive_gpg_keys() {
-    get_common_setting $1
     local keys=${!1}
-    get_common_setting GPG_KEY_SERVERS true
 
     # Use a temporary locaiton for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
@@ -133,7 +116,6 @@ install_using_apt() {
         version_suffix=""
     fi
     # Install
-    get_common_setting GIT_LFS_ARCHIVE_GPG_KEY_URI
     curl -sSL "${GIT_LFS_ARCHIVE_GPG_KEY_URI}" | gpg --dearmor > /usr/share/keyrings/gitlfs-archive-keyring.gpg
     echo -e "deb [arch=${architecture} signed-by=/usr/share/keyrings/gitlfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/${ID} ${VERSION_CODENAME} main\ndeb-src [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/gitlfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/${ID} ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/git-lfs.list
 
diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
index c68d69d9a..ea35c4bbe 100644
--- a/src/git/devcontainer-feature.json
+++ b/src/git/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
diff --git a/src/git/install.sh b/src/git/install.sh
index 24e08e857..52081f17c 100755
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -11,7 +11,7 @@ GIT_VERSION=${VERSION} # 'system' checks the base image first, else installs 'la
 USE_PPA_IF_AVAILABLE=${PPA}
 
 GIT_CORE_PPA_ARCHIVE_GPG_KEY=E1DD270288B4E6030699E45FA1715D88E1DF1F24
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80
+GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
 
@@ -25,26 +25,9 @@ if [ "$(id -u)" -ne 0 ]; then
     exit 1
 fi
 
-# Get central common setting
-get_common_setting() {
-    if [ "${common_settings_file_loaded}" != "true" ]; then
-        curl -sfL "https://aka.ms/vscode-dev-containers/script-library/settings.env" 2>/dev/null -o /tmp/vsdc-settings.env || echo "Could not download settings file. Skipping."
-        common_settings_file_loaded=true
-    fi
-    if [ -f "/tmp/vsdc-settings.env" ]; then
-        local multi_line=""
-        if [ "$2" = "true" ]; then multi_line="-z"; fi
-        local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
-        if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
-    fi
-    echo "$1=${!1}"
-}
-
 # Import the specified key in a variable name passed in as 
 receive_gpg_keys() {
-    get_common_setting $1
     local keys=${!1}
-    get_common_setting GPG_KEY_SERVERS true
     local keyring_args=""
     if [ ! -z "$2" ]; then
         mkdir -p "$(dirname \"$2\")"
diff --git a/src/github-cli/devcontainer-feature.json b/src/github-cli/devcontainer-feature.json
index 824602c53..0e68a6028 100644
--- a/src/github-cli/devcontainer-feature.json
+++ b/src/github-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "github-cli",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "name": "GitHub CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/github-cli",
     "description": "Installs the GitHub CLI. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/github-cli/install.sh b/src/github-cli/install.sh
index 65bbfc479..1856115c5 100755
--- a/src/github-cli/install.sh
+++ b/src/github-cli/install.sh
@@ -11,7 +11,7 @@ CLI_VERSION=${VERSION:-"latest"}
 INSTALL_DIRECTLY_FROM_GITHUB_RELEASE=${INSTALLDIRECTLYFROMGITHUBRELEASE:-"true"}
 
 GITHUB_CLI_ARCHIVE_GPG_KEY=23F3D4EA75716059
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80
+GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
 
@@ -25,58 +25,10 @@ if [ "$(id -u)" -ne 0 ]; then
     exit 1
 fi
 
-# Get central common setting
-get_common_setting() {
-    if [ "${common_settings_file_loaded}" != "true" ]; then
-        curl -sfL "https://aka.ms/vscode-dev-containers/script-library/settings.env" 2>/dev/null -o /tmp/vsdc-settings.env || echo "Could not download settings file. Skipping."
-        common_settings_file_loaded=true
-    fi
-    if [ -f "/tmp/vsdc-settings.env" ]; then
-        local multi_line=""
-        if [ "$2" = "true" ]; then multi_line="-z"; fi
-        local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
-        if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
-    fi
-    echo "$1=${!1}"
-}
-
-# Import the specified key in a variable name passed in as 
-receive_gpg_keys() {
-    get_common_setting $1
-    local keys=${!1}
-    get_common_setting GPG_KEY_SERVERS true
-
-    # Use a temporary locaiton for gpg keys to avoid polluting image
-    export GNUPGHOME="/tmp/tmp-gnupg"
-    mkdir -p ${GNUPGHOME}
-    chmod 700 ${GNUPGHOME}
-    echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" > ${GNUPGHOME}/dirmngr.conf
-    # GPG key download sometimes fails for some reason and retrying fixes it.
-    local retry_count=0
-    local gpg_ok="false"
-    set +e
-    until [ "${gpg_ok}" = "true" ] || [ "${retry_count}" -eq "5" ]; 
-    do
-        echo "(*) Downloading GPG key..."
-        ( echo "${keys}" | xargs -n 1 gpg --recv-keys) 2>&1 && gpg_ok="true"
-        if [ "${gpg_ok}" != "true" ]; then
-            echo "(*) Failed getting key, retring in 10s..."
-            (( retry_count++ ))
-            sleep 10s
-        fi
-    done
-    set -e
-    if [ "${gpg_ok}" = "false" ]; then
-        echo "(!) Failed to get gpg key."
-        exit 1
-    fi
-}
 
 # Import the specified key in a variable name passed in as 
 receive_gpg_keys() {
-    get_common_setting $1
     local keys=${!1}
-    get_common_setting GPG_KEY_SERVERS true
     local keyring_args=""
     if [ ! -z "$2" ]; then
         keyring_args="--no-default-keyring --keyring $2"
diff --git a/src/kubectl-helm-minikube/devcontainer-feature.json b/src/kubectl-helm-minikube/devcontainer-feature.json
index beea80a2e..076af3912 100644
--- a/src/kubectl-helm-minikube/devcontainer-feature.json
+++ b/src/kubectl-helm-minikube/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "kubectl-helm-minikube",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "name": "Kubectl, Helm, and Minikube",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
     "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
diff --git a/src/kubectl-helm-minikube/install.sh b/src/kubectl-helm-minikube/install.sh
index 3ab65356f..af8b0ae50 100755
--- a/src/kubectl-helm-minikube/install.sh
+++ b/src/kubectl-helm-minikube/install.sh
@@ -22,7 +22,7 @@ MINIKUBE_SHA256="${MINIKUBE_SHA256:-"automatic"}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 
 HELM_GPG_KEYS_URI="https://raw.githubusercontent.com/helm/helm/main/KEYS"
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80
+GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
 
@@ -53,22 +53,6 @@ if [ "$USERNAME" = "root" ]; then
     USERHOME="/root"
 fi
 
-
-# Get central common setting
-get_common_setting() {
-    if [ "${common_settings_file_loaded}" != "true" ]; then
-        curl -sfL "https://aka.ms/vscode-dev-containers/script-library/settings.env" 2>/dev/null -o /tmp/vsdc-settings.env || echo "Could not download settings file. Skipping."
-        common_settings_file_loaded=true
-    fi
-    if [ -f "/tmp/vsdc-settings.env" ]; then
-        local multi_line=""
-        if [ "$2" = "true" ]; then multi_line="-z"; fi
-        local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
-        if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
-    fi
-    echo "$1=${!1}"
-}
-
 # Figure out correct version of a three part version number is not passed
 find_version_from_git_tags() {
     local variable_name=$1
@@ -182,8 +166,6 @@ curl -sSL "https://github.com/helm/helm/releases/download/${HELM_VERSION}/${helm
 export GNUPGHOME="/tmp/helm/gnupg"
 mkdir -p "${GNUPGHOME}"
 chmod 700 ${GNUPGHOME}
-get_common_setting HELM_GPG_KEYS_URI
-get_common_setting GPG_KEY_SERVERS true
 curl -sSL "${HELM_GPG_KEYS_URI}" -o /tmp/helm/KEYS
 echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" > ${GNUPGHOME}/dirmngr.conf
 gpg -q --import "/tmp/helm/KEYS"
diff --git a/src/nix/devcontainer-feature.json b/src/nix/devcontainer-feature.json
index 68ccdf78e..b112040d3 100644
--- a/src/nix/devcontainer-feature.json
+++ b/src/nix/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "nix",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "name": "Nix Package Manager",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nix",
     "description": "Installs the Nix package manager and optionally a set of packages.",  
diff --git a/src/nix/install.sh b/src/nix/install.sh
index 6141d7e0b..dcddcfdb4 100755
--- a/src/nix/install.sh
+++ b/src/nix/install.sh
@@ -14,7 +14,7 @@ USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 
 # Nix keys for securly verifying installer download signature per https://nixos.org/download.html#nix-verify-installation
 NIX_GPG_KEYS="B541D55301270E0BCF15CA5D8170B4726D7198DE"
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80
+GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
 
diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json
index 04dbe491a..84c39feb6 100644
--- a/src/powershell/devcontainer-feature.json
+++ b/src/powershell/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "powershell",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "name": "PowerShell",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
     "description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/powershell/install.sh b/src/powershell/install.sh
index ea3b6e8bc..3f19f47ea 100755
--- a/src/powershell/install.sh
+++ b/src/powershell/install.sh
@@ -17,7 +17,7 @@ POWERSHELL_VERSION=${VERSION:-"latest"}
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 POWERSHELL_ARCHIVE_ARCHITECTURES="amd64"
 POWERSHELL_ARCHIVE_VERSION_CODENAMES="stretch buster bionic focal bullseye jammy"
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80
+GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
 
@@ -60,21 +60,6 @@ find_version_from_git_tags() {
     echo "${variable_name}=${!variable_name}"
 }
 
-# Get central common setting
-get_common_setting() {
-    if [ "${common_settings_file_loaded}" != "true" ]; then
-        curl -sfL "https://aka.ms/vscode-dev-containers/script-library/settings.env" 2>/dev/null -o /tmp/vsdc-settings.env || echo "Could not download settings file. Skipping."
-        common_settings_file_loaded=true
-    fi
-    if [ -f "/tmp/vsdc-settings.env" ]; then
-        local multi_line=""
-        if [ "$2" = "true" ]; then multi_line="-z"; fi
-        local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
-        if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
-    fi
-    echo "$1=${!1}"
-}
-
 apt_get_update()
 {
     if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
@@ -95,7 +80,6 @@ install_using_apt() {
     # Install dependencies
     check_packages apt-transport-https curl ca-certificates gnupg2 dirmngr
     # Import key safely (new 'signed-by' method rather than deprecated apt-key approach) and install
-    get_common_setting MICROSOFT_GPG_KEYS_URI
     curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
     echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
 
diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 8daf3e90b..fa5932035 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/python/install.sh b/src/python/install.sh
index 76fd6f09f..92b8368f1 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -28,7 +28,7 @@ ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 
 DEFAULT_UTILS=("pylint" "flake8" "autopep8" "black" "yapf" "mypy" "pydocstyle" "pycodestyle" "bandit" "pipenv" "virtualenv")
 PYTHON_SOURCE_GPG_KEYS="64E628F8D684696D B26995E310250568 2D347EA6AA65421D FB9921286F5E1540 3A5CA953F73C700D 04C367C218ADD4FF 0EDDC5F26A45C816 6AF053F07D9DC8D2 C9BE28DEE6DF025C 126EB563A74B06BF D9866941EA5BBD71 ED9D77D5"
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80
+GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
 
@@ -76,26 +76,9 @@ updaterc() {
     fi
 }
 
-# Get central common setting
-get_common_setting() {
-    if [ "${common_settings_file_loaded}" != "true" ]; then
-        curl -sfL "https://aka.ms/vscode-dev-containers/script-library/settings.env" 2>/dev/null -o /tmp/vsdc-settings.env || echo "Could not download settings file. Skipping."
-        common_settings_file_loaded=true
-    fi
-    if [ -f "/tmp/vsdc-settings.env" ]; then
-        local multi_line=""
-        if [ "$2" = "true" ]; then multi_line="-z"; fi
-        local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
-        if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
-    fi
-    echo "$1=${!1}"
-}
-
 # Import the specified key in a variable name passed in as 
 receive_gpg_keys() {
-    get_common_setting $1
     local keys=${!1}
-    get_common_setting GPG_KEY_SERVERS true
     local keyring_args=""
     if [ ! -z "$2" ]; then
         mkdir -p "$(dirname \"$2\")"
diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json
index e11c1727a..68951d899 100644
--- a/src/ruby/devcontainer-feature.json
+++ b/src/ruby/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "name": "Ruby (via rvm)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
     "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
diff --git a/src/ruby/install.sh b/src/ruby/install.sh
index dcf404229..c879dec7e 100755
--- a/src/ruby/install.sh
+++ b/src/ruby/install.sh
@@ -22,7 +22,7 @@ ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 DEFAULT_GEMS="rake ruby-debug-ide"
 
 RVM_GPG_KEYS="409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80
+GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
 
@@ -70,26 +70,9 @@ updaterc() {
     fi
 }
 
-# Get central common setting
-get_common_setting() {
-    if [ "${common_settings_file_loaded}" != "true" ]; then
-        curl -sfL "https://aka.ms/vscode-dev-containers/script-library/settings.env" 2>/dev/null -o /tmp/vsdc-settings.env || echo "Could not download settings file. Skipping."
-        common_settings_file_loaded=true
-    fi
-    if [ -f "/tmp/vsdc-settings.env" ]; then
-        local multi_line=""
-        if [ "$2" = "true" ]; then multi_line="-z"; fi
-        local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
-        if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
-    fi
-    echo "$1=${!1}"
-}
-
 # Import the specified key in a variable name passed in as 
 receive_gpg_keys() {
-    get_common_setting $1
     local keys=${!1}
-    get_common_setting GPG_KEY_SERVERS true
     local keyring_args=""
     if [ ! -z "$2" ]; then
         keyring_args="--no-default-keyring --keyring \"$2\""
diff --git a/test/github-cli/install_git_cli_from_release.sh b/test/github-cli/install_git_cli_from_release.sh
new file mode 100644
index 000000000..d81c1c414
--- /dev/null
+++ b/test/github-cli/install_git_cli_from_release.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "version" gh --version
+
+# Report result
+reportResults
diff --git a/test/github-cli/scenarios.json b/test/github-cli/scenarios.json
new file mode 100644
index 000000000..d41019aeb
--- /dev/null
+++ b/test/github-cli/scenarios.json
@@ -0,0 +1,11 @@
+{
+    "install_git_cli_from_release": {
+        "image": "ubuntu:focal",
+        "features": {
+            "github-cli": {
+                "version": "latest",
+                "installDirectlyFromGitHubRelease": "false"
+            }
+        }
+    }
+}
\ No newline at end of file

From b6921f9b9f594b6674b25189eee41783e6c6f22e Mon Sep 17 00:00:00 2001
From: eitsupi <50911393+eitsupi@users.noreply.github.com>
Date: Tue, 27 Dec 2022 22:25:33 +0900
Subject: [PATCH 052/478] feat(common-utils): Support the new path of
 `meta.env` file and the new field for saving source revisions (#359)

* support the new path of meta.env

* support the new field for the image revision

* minor formatting
---
 src/common-utils/bin/devcontainer-info | 10 +++++++++-
 src/common-utils/main.sh               |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/common-utils/bin/devcontainer-info b/src/common-utils/bin/devcontainer-info
index 2c74fea6e..abbb682eb 100755
--- a/src/common-utils/bin/devcontainer-info
+++ b/src/common-utils/bin/devcontainer-info
@@ -1,5 +1,12 @@
 #!/bin/sh
-. /usr/local/etc/vscode-dev-containers/meta.env
+
+# Load meta.env
+if [ -f "/usr/local/etc/vscode-dev-containers/meta.env" ]; then
+    . /usr/local/etc/vscode-dev-containers/meta.env
+fi
+if [ -f "/usr/local/etc/dev-containers/meta.env" ]; then
+    . /usr/local/etc/dev-containers/meta.env
+fi
 
 # Minimal output
 if [ "$1" = "version" ] || [ "$1" = "image-version" ]; then
@@ -22,6 +29,7 @@ if [ ! -z "${DEFINITION_ID}" ]; then echo "- Definition ID: ${DEFINITION_ID}"; f
 if [ ! -z "${VARIANT}" ]; then echo "- Variant: ${VARIANT}"; fi
 if [ ! -z "${GIT_REPOSITORY}" ]; then echo "- Source code repository: ${GIT_REPOSITORY}"; fi
 if [ ! -z "${GIT_REPOSITORY_RELEASE}" ]; then echo "- Source code release/branch: ${GIT_REPOSITORY_RELEASE}"; fi
+if [ ! -z "${GIT_REPOSITORY_REVISION}" ]; then echo "- Source code revision: ${GIT_REPOSITORY_REVISION}"; fi
 if [ ! -z "${BUILD_TIMESTAMP}" ]; then echo "- Timestamp: ${BUILD_TIMESTAMP}"; fi
 if [ ! -z "${CONTENTS_URL}" ]; then echo && echo "More info: ${CONTENTS_URL}"; fi
 echo
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index f0fedcf82..6b1df8a63 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -477,7 +477,7 @@ if [ "${ADJUSTED_ID}" = "debian" ]; then
 fi
 
 # Persist image metadata info, script if meta.env found in same directory
-if [ -f "/usr/local/etc/vscode-dev-containers/meta.env" ]; then
+if [ -f "/usr/local/etc/vscode-dev-containers/meta.env" ] || [ -f "/usr/local/etc/dev-containers/meta.env" ]; then
     cp -f "${FEATURE_DIR}/bin/devcontainer-info" /usr/local/bin/devcontainer-info
     chmod +x /usr/local/bin/devcontainer-info
 fi

From 5fb5c388b5cf00ba9d4c09aa753fbd032f396507 Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Tue, 27 Dec 2022 09:32:34 -0500
Subject: [PATCH 053/478] typo

---
 src/docker-from-docker/devcontainer-feature.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/docker-from-docker/devcontainer-feature.json b/src/docker-from-docker/devcontainer-feature.json
index 2ebdd3833..9948a62e1 100644
--- a/src/docker-from-docker/devcontainer-feature.json
+++ b/src/docker-from-docker/devcontainer-feature.json
@@ -1,9 +1,9 @@
 {
     "id": "docker-from-docker",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "name": "Docker (Docker-from-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-from-docker",
-    "descripton": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
+    "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
     "options": {
         "version": {
             "type": "string",

From 592fdc8177f1993b26e5322be2e5fb82b2dff3d5 Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Tue, 27 Dec 2022 09:36:51 -0500
Subject: [PATCH 054/478] typo in 'dotnet' Feature schema

---
 src/dotnet/devcontainer-feature.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index e8bb9f16c..e66550e76 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "Installs the .NET CLI. Provides option of installing sdk or runtime, and option of versions to install. Uses latest version of .NET sdk as defaults to install.",
@@ -23,7 +23,7 @@
         },
         "installUsingApt": {
             "type": "boolean",
-            "default": "true",
+            "default": true,
             "description": "If true, it installs using apt instead of the release URL"
         }
     },

From 00dd4f4a198d0172bd1fcf6ef7292407b120dd35 Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Tue, 27 Dec 2022 14:49:40 +0000
Subject: [PATCH 055/478] remove unused buildArg in java Feature

---
 src/java/devcontainer-feature.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index 4c7df039b..113c75d7b 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -61,7 +61,6 @@
       "description": "Select or enter a Maven version"
     }
   },
-  "buildArg": "_VSC_INSTALL_JAVA",
   "customizations": {
     "vscode": {
       "extensions": [

From 80ed2fbc302db2d2e9053dbd042815e700f00a66 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 27 Dec 2022 09:51:25 -0500
Subject: [PATCH 056/478] Automated documentation update (#365)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/docker-from-docker/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docker-from-docker/README.md b/src/docker-from-docker/README.md
index e1de84b5e..be32ce9dd 100644
--- a/src/docker-from-docker/README.md
+++ b/src/docker-from-docker/README.md
@@ -1,7 +1,7 @@
 
 # Docker (Docker-from-Docker) (docker-from-docker)
 
-
+Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.
 
 ## Example Usage
 

From 19bc8bb633a8eb41b581296f468b85b7ac31a828 Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Tue, 27 Dec 2022 17:27:57 +0000
Subject: [PATCH 057/478] OS support in Feature NOTES.md (#366)

* https://github.com/devcontainers/features/issues/360

* omit from common utils
---
 src/anaconda/NOTES.md              | 7 +++++++
 src/aws-cli/NOTES.md               | 8 +++++++-
 src/azure-cli/NOTES.md             | 7 +++++++
 src/common-utils/NOTES.md          | 2 +-
 src/conda/NOTES.md                 | 7 +++++++
 src/desktop-lite/NOTES.md          | 7 +++++++
 src/docker-from-docker/NOTES.md    | 7 +++++++
 src/docker-in-docker/NOTES.md      | 7 +++++++
 src/dotnet/NOTES.md                | 7 +++++++
 src/git-lfs/NOTES.md               | 7 +++++++
 src/git/NOTES.md                   | 7 +++++++
 src/github-cli/NOTES.md            | 7 +++++++
 src/go/NOTES.md                    | 7 +++++++
 src/hugo/NOTES.md                  | 7 +++++++
 src/java/NOTES.md                  | 7 +++++++
 src/kubectl-helm-minikube/NOTES.md | 7 +++++++
 src/nix/NOTES.md                   | 7 +++++++
 src/node/NOTES.md                  | 7 +++++++
 src/nvidia-cuda/NOTES.md           | 7 +++++++
 src/oryx/NOTES.md                  | 7 +++++++
 src/php/NOTES.md                   | 7 +++++++
 src/powershell/NOTES.md            | 7 +++++++
 src/python/NOTES.md                | 7 +++++++
 src/ruby/NOTES.md                  | 7 +++++++
 src/rust/NOTES.md                  | 7 +++++++
 src/sshd/NOTES.md                  | 7 +++++++
 src/terraform/NOTES.md             | 7 +++++++
 27 files changed, 183 insertions(+), 2 deletions(-)
 create mode 100644 src/azure-cli/NOTES.md
 create mode 100644 src/dotnet/NOTES.md
 create mode 100644 src/git-lfs/NOTES.md
 create mode 100644 src/git/NOTES.md
 create mode 100644 src/github-cli/NOTES.md
 create mode 100644 src/go/NOTES.md
 create mode 100644 src/hugo/NOTES.md
 create mode 100644 src/oryx/NOTES.md
 create mode 100644 src/php/NOTES.md
 create mode 100644 src/powershell/NOTES.md
 create mode 100644 src/python/NOTES.md
 create mode 100644 src/ruby/NOTES.md
 create mode 100644 src/rust/NOTES.md
 create mode 100644 src/terraform/NOTES.md

diff --git a/src/anaconda/NOTES.md b/src/anaconda/NOTES.md
index f2ecdc102..394dd6f1d 100644
--- a/src/anaconda/NOTES.md
+++ b/src/anaconda/NOTES.md
@@ -11,3 +11,10 @@ As covered in the [user FAQ](https://docs.anaconda.com/anaconda/user-guide/faq)
 ```bash
 conda install python=3.7
 ```
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/aws-cli/NOTES.md b/src/aws-cli/NOTES.md
index b1cb1f90a..b8a279717 100644
--- a/src/aws-cli/NOTES.md
+++ b/src/aws-cli/NOTES.md
@@ -1 +1,7 @@
-Available versions of the AWS CLI can be found here: https://github.com/aws/aws-cli/blob/v2/CHANGELOG.rst.
\ No newline at end of file
+Available versions of the AWS CLI can be found here: https://github.com/aws/aws-cli/blob/v2/CHANGELOG.rst.
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/azure-cli/NOTES.md b/src/azure-cli/NOTES.md
new file mode 100644
index 000000000..19fe92f31
--- /dev/null
+++ b/src/azure-cli/NOTES.md
@@ -0,0 +1,7 @@
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/common-utils/NOTES.md b/src/common-utils/NOTES.md
index 77dfd1d99..e9b27131e 100644
--- a/src/common-utils/NOTES.md
+++ b/src/common-utils/NOTES.md
@@ -18,4 +18,4 @@ To completely disable the git portion of the prompt for the current folder's rep
 git config devcontainers-theme.hide-status 1
 ```
 
-For `zsh`, the default theme is a [standard Oh My Zsh! theme](https://ohmyz.sh/). You may pick a different one by modifying the `ZSH_THEME` variable in `~/.zshrc`.
\ No newline at end of file
+For `zsh`, the default theme is a [standard Oh My Zsh! theme](https://ohmyz.sh/). You may pick a different one by modifying the `ZSH_THEME` variable in `~/.zshrc`.
diff --git a/src/conda/NOTES.md b/src/conda/NOTES.md
index 58450c6a0..ef8657ab4 100644
--- a/src/conda/NOTES.md
+++ b/src/conda/NOTES.md
@@ -11,3 +11,10 @@ As covered in the [user FAQ](https://docs.anaconda.com/anaconda/user-guide/faq)
 ```bash
 conda install python=3.7
 ```
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/desktop-lite/NOTES.md b/src/desktop-lite/NOTES.md
index 28865a374..891ce6c4a 100644
--- a/src/desktop-lite/NOTES.md
+++ b/src/desktop-lite/NOTES.md
@@ -62,3 +62,10 @@ If you want the full version of **Google Chrome** in the desktop:
 2. Chrome sandbox support requires you set up and run as a non-root user. The [`common-utils`](https://github.com/devcontainers/features/tree/main/src/common-utils) script can do this for you, or you [set one up yourself](https://aka.ms/vscode-remote/containers/non-root). Alternatively, you can start Chrome using `google-chrome --no-sandbox`
 
 That's it!
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/docker-from-docker/NOTES.md b/src/docker-from-docker/NOTES.md
index fe658bc4f..fede053ae 100644
--- a/src/docker-from-docker/NOTES.md
+++ b/src/docker-from-docker/NOTES.md
@@ -52,3 +52,10 @@ services:
 4. Docker commands with bind mount should work as they did outside of the devcontainer
 
 > **Note:** There is no `${localWorkspaceFolder}` when using the **Clone Repository in Container Volume** command in the VS Code Dev Containers extension ([info](https://github.com/microsoft/vscode-remote-release/issues/6160#issuecomment-1014701007)).
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/docker-in-docker/NOTES.md b/src/docker-in-docker/NOTES.md
index befd4aae4..a22e61c51 100644
--- a/src/docker-in-docker/NOTES.md
+++ b/src/docker-in-docker/NOTES.md
@@ -4,3 +4,10 @@ This docker-in-docker Dev Container Feature is roughly based on the [official do
 * As the name implies, the Feature is expected to work when the host is running Docker (or the OSS Moby container engine it is built on). It may be possible to get running in other container engines, but it has not been tested with them.
 * The host and the container must be running on the same chip architecture. You will not be able to use it with an emulated x86 image with Docker Desktop on an Apple Silicon Mac, for example.
 
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/dotnet/NOTES.md b/src/dotnet/NOTES.md
new file mode 100644
index 000000000..19fe92f31
--- /dev/null
+++ b/src/dotnet/NOTES.md
@@ -0,0 +1,7 @@
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/git-lfs/NOTES.md b/src/git-lfs/NOTES.md
new file mode 100644
index 000000000..19fe92f31
--- /dev/null
+++ b/src/git-lfs/NOTES.md
@@ -0,0 +1,7 @@
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/git/NOTES.md b/src/git/NOTES.md
new file mode 100644
index 000000000..19fe92f31
--- /dev/null
+++ b/src/git/NOTES.md
@@ -0,0 +1,7 @@
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/github-cli/NOTES.md b/src/github-cli/NOTES.md
new file mode 100644
index 000000000..19fe92f31
--- /dev/null
+++ b/src/github-cli/NOTES.md
@@ -0,0 +1,7 @@
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/go/NOTES.md b/src/go/NOTES.md
new file mode 100644
index 000000000..19fe92f31
--- /dev/null
+++ b/src/go/NOTES.md
@@ -0,0 +1,7 @@
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/hugo/NOTES.md b/src/hugo/NOTES.md
new file mode 100644
index 000000000..19fe92f31
--- /dev/null
+++ b/src/hugo/NOTES.md
@@ -0,0 +1,7 @@
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/java/NOTES.md b/src/java/NOTES.md
index 7e10513ee..63622afaf 100644
--- a/src/java/NOTES.md
+++ b/src/java/NOTES.md
@@ -1,3 +1,10 @@
 ## License
 
 For the Java Feature from this repository, see [NOTICE.txt](https://github.com/devcontainers/features/tree/main/src/java/NOTICE.txt) for licensing information on JDK distributions.
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/kubectl-helm-minikube/NOTES.md b/src/kubectl-helm-minikube/NOTES.md
index b0d1a8089..6626d2c93 100644
--- a/src/kubectl-helm-minikube/NOTES.md
+++ b/src/kubectl-helm-minikube/NOTES.md
@@ -10,3 +10,10 @@ minikube addons enable ingress
 # Run this to forward to localhost in the background
 nohup kubectl port-forward --pod-running-timeout=24h -n ingress-nginx service/ingress-nginx-controller :80 &
 ```
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/nix/NOTES.md b/src/nix/NOTES.md
index fc76a44a3..b3b53476a 100644
--- a/src/nix/NOTES.md
+++ b/src/nix/NOTES.md
@@ -26,3 +26,10 @@ sudo /usr/local/share/nix-entrypoint.sh
 ```
 
 This same command can be used to restart the daemon if it has stopped for some reason. Logs are available at `/tmp/nix-daemon.log`.
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/node/NOTES.md b/src/node/NOTES.md
index a6a4ababd..65eb93bf3 100644
--- a/src/node/NOTES.md
+++ b/src/node/NOTES.md
@@ -16,3 +16,10 @@ Alternatively, you can start up an interactive shell which will in turn source `
 "postCreateCommand": "bash -i -c 'nvm install --lts'"
 ```
 
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/nvidia-cuda/NOTES.md b/src/nvidia-cuda/NOTES.md
index b19fde2ac..cab2bbec7 100644
--- a/src/nvidia-cuda/NOTES.md
+++ b/src/nvidia-cuda/NOTES.md
@@ -17,3 +17,10 @@ Enable GPU passthrough to your devcontainer by adding `["--gpus", "all"]` to you
   "runArgs": ["--gpus", "all"]
 }
 ```
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/oryx/NOTES.md b/src/oryx/NOTES.md
new file mode 100644
index 000000000..19fe92f31
--- /dev/null
+++ b/src/oryx/NOTES.md
@@ -0,0 +1,7 @@
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/php/NOTES.md b/src/php/NOTES.md
new file mode 100644
index 000000000..19fe92f31
--- /dev/null
+++ b/src/php/NOTES.md
@@ -0,0 +1,7 @@
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/powershell/NOTES.md b/src/powershell/NOTES.md
new file mode 100644
index 000000000..19fe92f31
--- /dev/null
+++ b/src/powershell/NOTES.md
@@ -0,0 +1,7 @@
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/python/NOTES.md b/src/python/NOTES.md
new file mode 100644
index 000000000..19fe92f31
--- /dev/null
+++ b/src/python/NOTES.md
@@ -0,0 +1,7 @@
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/ruby/NOTES.md b/src/ruby/NOTES.md
new file mode 100644
index 000000000..19fe92f31
--- /dev/null
+++ b/src/ruby/NOTES.md
@@ -0,0 +1,7 @@
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/rust/NOTES.md b/src/rust/NOTES.md
new file mode 100644
index 000000000..19fe92f31
--- /dev/null
+++ b/src/rust/NOTES.md
@@ -0,0 +1,7 @@
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/sshd/NOTES.md b/src/sshd/NOTES.md
index 3126a1bef..e0e7acc82 100644
--- a/src/sshd/NOTES.md
+++ b/src/sshd/NOTES.md
@@ -60,3 +60,10 @@ While the some services automates SSH setup (e.g., when using the GitHub CLI for
         ...where `vscode` above is the user you are running as in the container and `2222` after the `!` is the same local port you used in the `ssh` command in the previous seciton.
 
 4. Your dev container's filesystem should now be available in the `~/sshfs/devcontainer` folder on macOS or Linux or in a new explorer window on Windows.
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/terraform/NOTES.md b/src/terraform/NOTES.md
new file mode 100644
index 000000000..19fe92f31
--- /dev/null
+++ b/src/terraform/NOTES.md
@@ -0,0 +1,7 @@
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.

From f9de0e43f8a9d2f590ad1d733772d4c25179db07 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 27 Dec 2022 12:42:28 -0500
Subject: [PATCH 058/478] Automated documentation update (#368)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/anaconda/README.md              | 7 +++++++
 src/aws-cli/README.md               | 7 +++++++
 src/azure-cli/README.md             | 7 +++++++
 src/common-utils/README.md          | 1 +
 src/conda/README.md                 | 7 +++++++
 src/desktop-lite/README.md          | 7 +++++++
 src/docker-from-docker/README.md    | 7 +++++++
 src/docker-in-docker/README.md      | 7 +++++++
 src/dotnet/README.md                | 7 +++++++
 src/git-lfs/README.md               | 7 +++++++
 src/git/README.md                   | 7 +++++++
 src/github-cli/README.md            | 7 +++++++
 src/go/README.md                    | 7 +++++++
 src/hugo/README.md                  | 7 +++++++
 src/java/README.md                  | 7 +++++++
 src/kubectl-helm-minikube/README.md | 7 +++++++
 src/nix/README.md                   | 7 +++++++
 src/node/README.md                  | 7 +++++++
 src/nvidia-cuda/README.md           | 7 +++++++
 src/oryx/README.md                  | 7 +++++++
 src/php/README.md                   | 7 +++++++
 src/powershell/README.md            | 7 +++++++
 src/python/README.md                | 7 +++++++
 src/ruby/README.md                  | 7 +++++++
 src/rust/README.md                  | 7 +++++++
 src/sshd/README.md                  | 7 +++++++
 src/terraform/README.md             | 7 +++++++
 27 files changed, 183 insertions(+)

diff --git a/src/anaconda/README.md b/src/anaconda/README.md
index b230b50df..3346823b4 100644
--- a/src/anaconda/README.md
+++ b/src/anaconda/README.md
@@ -32,6 +32,13 @@ conda install python=3.7
 ```
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/anaconda/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/aws-cli/README.md b/src/aws-cli/README.md
index 00b8cd583..40cc4ae98 100644
--- a/src/aws-cli/README.md
+++ b/src/aws-cli/README.md
@@ -19,6 +19,13 @@ Installs the AWS CLI along with needed dependencies. Useful for base Dockerfiles
 
 Available versions of the AWS CLI can be found here: https://github.com/aws/aws-cli/blob/v2/CHANGELOG.rst.
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/aws-cli/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/azure-cli/README.md b/src/azure-cli/README.md
index 9b7735f70..cb792d120 100644
--- a/src/azure-cli/README.md
+++ b/src/azure-cli/README.md
@@ -21,6 +21,13 @@ Installs the Azure CLI along with needed dependencies. Useful for base Dockerfil
 
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/azure-cli/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/common-utils/README.md b/src/common-utils/README.md
index e028faca7..9102c950b 100644
--- a/src/common-utils/README.md
+++ b/src/common-utils/README.md
@@ -46,6 +46,7 @@ git config devcontainers-theme.hide-status 1
 
 For `zsh`, the default theme is a [standard Oh My Zsh! theme](https://ohmyz.sh/). You may pick a different one by modifying the `ZSH_THEME` variable in `~/.zshrc`.
 
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/common-utils/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/conda/README.md b/src/conda/README.md
index 4fb75dd1f..2e123f2c7 100644
--- a/src/conda/README.md
+++ b/src/conda/README.md
@@ -33,6 +33,13 @@ conda install python=3.7
 ```
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/conda/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/desktop-lite/README.md b/src/desktop-lite/README.md
index 9ee8227cc..ad05e4ff2 100644
--- a/src/desktop-lite/README.md
+++ b/src/desktop-lite/README.md
@@ -87,6 +87,13 @@ If you want the full version of **Google Chrome** in the desktop:
 That's it!
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/desktop-lite/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/docker-from-docker/README.md b/src/docker-from-docker/README.md
index be32ce9dd..e2ddb8472 100644
--- a/src/docker-from-docker/README.md
+++ b/src/docker-from-docker/README.md
@@ -75,6 +75,13 @@ services:
 > **Note:** There is no `${localWorkspaceFolder}` when using the **Clone Repository in Container Volume** command in the VS Code Dev Containers extension ([info](https://github.com/microsoft/vscode-remote-release/issues/6160#issuecomment-1014701007)).
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/docker-from-docker/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index 58f72c5a5..4196892b0 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -29,6 +29,13 @@ This docker-in-docker Dev Container Feature is roughly based on the [official do
 
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/docker-in-docker/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/dotnet/README.md b/src/dotnet/README.md
index 784c7362e..c13c998fd 100644
--- a/src/dotnet/README.md
+++ b/src/dotnet/README.md
@@ -21,6 +21,13 @@ Installs the .NET CLI. Provides option of installing sdk or runtime, and option
 
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/dotnet/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/git-lfs/README.md b/src/git-lfs/README.md
index a23a639a0..9fc3281fe 100644
--- a/src/git-lfs/README.md
+++ b/src/git-lfs/README.md
@@ -19,6 +19,13 @@ Installs Git Large File Support (Git LFS) along with needed dependencies. Useful
 
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/git-lfs/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/git/README.md b/src/git/README.md
index 287af4995..a9e54fa18 100644
--- a/src/git/README.md
+++ b/src/git/README.md
@@ -20,6 +20,13 @@ Install an up-to-date version of Git, built from source as needed. Useful for wh
 
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/git/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/github-cli/README.md b/src/github-cli/README.md
index 3670399da..07945081a 100644
--- a/src/github-cli/README.md
+++ b/src/github-cli/README.md
@@ -20,6 +20,13 @@ Installs the GitHub CLI. Auto-detects latest version and installs needed depende
 
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/github-cli/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/go/README.md b/src/go/README.md
index 5ea30c1fd..e7a692443 100644
--- a/src/go/README.md
+++ b/src/go/README.md
@@ -20,6 +20,13 @@ Installs Go and common Go utilities. Auto-detects latest version and installs ne
 
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/go/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/hugo/README.md b/src/hugo/README.md
index bc6b99e7f..3d346c39b 100644
--- a/src/hugo/README.md
+++ b/src/hugo/README.md
@@ -20,6 +20,13 @@
 
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/hugo/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/java/README.md b/src/java/README.md
index a9ef433fb..f3e35e38a 100644
--- a/src/java/README.md
+++ b/src/java/README.md
@@ -27,6 +27,13 @@ Installs Java, SDKMAN! (if not installed), and needed dependencies.
 For the Java Feature from this repository, see [NOTICE.txt](https://github.com/devcontainers/features/tree/main/src/java/NOTICE.txt) for licensing information on JDK distributions.
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/java/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/kubectl-helm-minikube/README.md b/src/kubectl-helm-minikube/README.md
index bbb02028f..81ce8c574 100644
--- a/src/kubectl-helm-minikube/README.md
+++ b/src/kubectl-helm-minikube/README.md
@@ -33,6 +33,13 @@ nohup kubectl port-forward --pod-running-timeout=24h -n ingress-nginx service/in
 ```
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/kubectl-helm-minikube/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/nix/README.md b/src/nix/README.md
index d331f8923..3ab9b0017 100644
--- a/src/nix/README.md
+++ b/src/nix/README.md
@@ -51,6 +51,13 @@ sudo /usr/local/share/nix-entrypoint.sh
 This same command can be used to restart the daemon if it has stopped for some reason. Logs are available at `/tmp/nix-daemon.log`.
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/nix/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/node/README.md b/src/node/README.md
index 0bd837af3..2e5dba386 100644
--- a/src/node/README.md
+++ b/src/node/README.md
@@ -40,6 +40,13 @@ Alternatively, you can start up an interactive shell which will in turn source `
 
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/node/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/nvidia-cuda/README.md b/src/nvidia-cuda/README.md
index 5e76d7243..38a989a04 100644
--- a/src/nvidia-cuda/README.md
+++ b/src/nvidia-cuda/README.md
@@ -41,6 +41,13 @@ Enable GPU passthrough to your devcontainer by adding `["--gpus", "all"]` to you
 ```
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/nvidia-cuda/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/oryx/README.md b/src/oryx/README.md
index 670a6d1a0..7d3d3d11a 100644
--- a/src/oryx/README.md
+++ b/src/oryx/README.md
@@ -15,6 +15,13 @@ Installs the oryx CLI
 
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/oryx/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/php/README.md b/src/php/README.md
index c979e39b9..3a9be7a98 100644
--- a/src/php/README.md
+++ b/src/php/README.md
@@ -20,6 +20,13 @@
 
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/php/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/powershell/README.md b/src/powershell/README.md
index 0ff0469c5..ba300d5cd 100644
--- a/src/powershell/README.md
+++ b/src/powershell/README.md
@@ -19,6 +19,13 @@ Installs PowerShell along with needed dependencies. Useful for base Dockerfiles
 
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/powershell/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/python/README.md b/src/python/README.md
index 47abf5e31..05742910a 100644
--- a/src/python/README.md
+++ b/src/python/README.md
@@ -24,6 +24,13 @@ Installs the provided version of Python, as well as PIPX, and other common Pytho
 
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/python/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/ruby/README.md b/src/ruby/README.md
index ffb136d47..8a0ff877d 100644
--- a/src/ruby/README.md
+++ b/src/ruby/README.md
@@ -19,6 +19,13 @@ Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.
 
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/ruby/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/rust/README.md b/src/rust/README.md
index 14af4ad49..372b56f97 100644
--- a/src/rust/README.md
+++ b/src/rust/README.md
@@ -20,6 +20,13 @@ Installs Rust, common Rust utilities, and their required dependencies
 
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/rust/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/sshd/README.md b/src/sshd/README.md
index 5245d6805..6e9382c04 100644
--- a/src/sshd/README.md
+++ b/src/sshd/README.md
@@ -81,6 +81,13 @@ While the some services automates SSH setup (e.g., when using the GitHub CLI for
 4. Your dev container's filesystem should now be available in the `~/sshfs/devcontainer` folder on macOS or Linux or in a new explorer window on Windows.
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/sshd/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/terraform/README.md b/src/terraform/README.md
index 5d6b47fec..ee87d069d 100644
--- a/src/terraform/README.md
+++ b/src/terraform/README.md
@@ -23,6 +23,13 @@ Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects la
 
 
 
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+
+`bash` is required to execute the `install.sh` script.
+
+
 ---
 
 _Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/terraform/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._

From 29babe4245e35bbdfca1f0279f6cf0f6530282ca Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 27 Dec 2022 18:35:13 +0000
Subject: [PATCH 059/478] fix test

---
 src/common-utils/main.sh     | 7 ++++++-
 test/common-utils/rocky-8.sh | 1 +
 test/common-utils/rocky-9.sh | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 6b1df8a63..b6793d603 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -153,7 +153,6 @@ install_redhat_packages() {
         lsof \
         net-tools \
         psmisc \
-        curl \
         wget \
         ca-certificates \
         rsync \
@@ -174,6 +173,12 @@ install_redhat_packages() {
         man-db \
         strace"
 
+    # rockylinux:9 installs 'curl-minimal' which clashes with 'curl'
+    # Install 'curl' for every OS except this rockylinux:9
+    if [[ "${ID}" = "rocky" ]] && [[ "${VERSION}" != *"9."* ]]; then
+        package_list="${package_list} curl"
+    fi
+
     # Install OpenSSL 1.0 compat if needed
     if ${install_cmd} -q list compat-openssl10 >/dev/null 2>&1; then
         package_list="${package_list} compat-openssl10"
diff --git a/test/common-utils/rocky-8.sh b/test/common-utils/rocky-8.sh
index f6606dbb2..be1223b3c 100755
--- a/test/common-utils/rocky-8.sh
+++ b/test/common-utils/rocky-8.sh
@@ -9,6 +9,7 @@ source dev-container-features-test-lib
 . /etc/os-release
 check "non-root user" test "$(whoami)" = "devcontainer"
 check "distro" test "${PLATFORM_ID}" = "platform:el8"
+check "curl" curl --version
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/common-utils/rocky-9.sh b/test/common-utils/rocky-9.sh
index c4b5244bc..452c1935f 100755
--- a/test/common-utils/rocky-9.sh
+++ b/test/common-utils/rocky-9.sh
@@ -9,6 +9,7 @@ source dev-container-features-test-lib
 . /etc/os-release
 check "non-root user" test "$(whoami)" = "devcontainer"
 check "distro" test "${PLATFORM_ID}" = "platform:el9"
+check "curl" curl --version
 
 # Report result
 reportResults
\ No newline at end of file

From dbf069a5db328e0413300094a0dc37f520000375 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 27 Dec 2022 10:50:33 -0800
Subject: [PATCH 060/478] Common-utils : Version bump (#367)

Common-utils - Version bump
---
 src/common-utils/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index cbb853edf..8d1ed8286 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.0.2",
+    "version": "2.0.3",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",

From 6c76a7b4883a2639cedf805ed786b5b84100841d Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Tue, 3 Jan 2023 14:52:56 -0800
Subject: [PATCH 061/478] Add validate workflow (#369)

* add validate workflow

* make typo to test 3c61c88

* remove unneeded if

* fix typo

* better names

* Update validate-metadata-files.yml
---
 .github/workflows/validate-metadata-files.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .github/workflows/validate-metadata-files.yml

diff --git a/.github/workflows/validate-metadata-files.yml b/.github/workflows/validate-metadata-files.yml
new file mode 100644
index 000000000..dbba8e2b4
--- /dev/null
+++ b/.github/workflows/validate-metadata-files.yml
@@ -0,0 +1,16 @@
+name: "Validate devcontainer-feature.json files"
+on:
+  workflow_dispatch:
+  pull_request:
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      
+      - name: "Validate devcontainer-feature.json files"
+        uses: devcontainers/action@v1
+        with:
+          validate-only: "true"
+          base-path-to-features: "./src"

From eef35a4399a17546051fc5597440d38c36022f06 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 4 Jan 2023 11:52:05 -0800
Subject: [PATCH 062/478] Rename "docker-from-docker" to
 "docker-outside-of-docker" (#373)

* Rename to "docker-outside-of-docker"

* rename test folder
---
 .github/workflows/test-all.yaml                       |  4 ++--
 .github/workflows/test-pr.yaml                        |  2 +-
 .../NOTES.md                                          |  0
 .../README.md                                         |  0
 .../devcontainer-feature.json                         | 11 +++++++----
 .../install.sh                                        |  0
 .../docker_init.sh                                    |  0
 .../scenarios.json                                    |  2 +-
 .../test.sh                                           |  0
 9 files changed, 11 insertions(+), 8 deletions(-)
 rename src/{docker-from-docker => docker-outside-of-docker}/NOTES.md (100%)
 rename src/{docker-from-docker => docker-outside-of-docker}/README.md (100%)
 rename src/{docker-from-docker => docker-outside-of-docker}/devcontainer-feature.json (88%)
 rename src/{docker-from-docker => docker-outside-of-docker}/install.sh (100%)
 rename test/{docker-from-docker => docker-outside-of-docker}/docker_init.sh (100%)
 rename test/{docker-from-docker => docker-outside-of-docker}/scenarios.json (82%)
 rename test/{docker-from-docker => docker-outside-of-docker}/test.sh (100%)

diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml
index cf876a481..d2238a707 100644
--- a/.github/workflows/test-all.yaml
+++ b/.github/workflows/test-all.yaml
@@ -18,7 +18,7 @@ jobs:
             "common-utils",
             "conda",
             "desktop-lite",
-            "docker-from-docker",
+            "docker-outside-of-docker",
             "docker-in-docker",
             "dotnet",
             "git",
@@ -71,7 +71,7 @@ jobs:
             "common-utils",
             "conda",
             "desktop-lite",
-            "docker-from-docker",
+            "docker-outside-of-docker",
             "docker-in-docker",
             "dotnet",
             "git",
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index f89923dc6..69b39423b 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -18,7 +18,7 @@ jobs:
             common-utils: ./**/common-utils/**
             conda: ./**/conda/**
             desktop-lite: ./**/desktop-lite/** 
-            docker-from-docker: ./**/docker-from-docker/**
+            docker-outside-of-docker: ./**/docker-outside-of-docker/**
             docker-in-docker: ./**/docker-in-docker/**
             dotnet: ./**/dotnet/**
             git: ./**/git/**
diff --git a/src/docker-from-docker/NOTES.md b/src/docker-outside-of-docker/NOTES.md
similarity index 100%
rename from src/docker-from-docker/NOTES.md
rename to src/docker-outside-of-docker/NOTES.md
diff --git a/src/docker-from-docker/README.md b/src/docker-outside-of-docker/README.md
similarity index 100%
rename from src/docker-from-docker/README.md
rename to src/docker-outside-of-docker/README.md
diff --git a/src/docker-from-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
similarity index 88%
rename from src/docker-from-docker/devcontainer-feature.json
rename to src/docker-outside-of-docker/devcontainer-feature.json
index 9948a62e1..69aa2f49a 100644
--- a/src/docker-from-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,8 +1,8 @@
 {
-    "id": "docker-from-docker",
-    "version": "1.0.8",
-    "name": "Docker (Docker-from-Docker)",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-from-docker",
+    "id": "docker-outside-of-docker",
+    "version": "1.0.9",
+    "name": "Docker (docker-outside-of-docker)",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
     "options": {
         "version": {
@@ -50,5 +50,8 @@
     ],
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
+    ],
+    "legacyIds": [
+        "docker-from-docker"
     ]
 }
diff --git a/src/docker-from-docker/install.sh b/src/docker-outside-of-docker/install.sh
similarity index 100%
rename from src/docker-from-docker/install.sh
rename to src/docker-outside-of-docker/install.sh
diff --git a/test/docker-from-docker/docker_init.sh b/test/docker-outside-of-docker/docker_init.sh
similarity index 100%
rename from test/docker-from-docker/docker_init.sh
rename to test/docker-outside-of-docker/docker_init.sh
diff --git a/test/docker-from-docker/scenarios.json b/test/docker-outside-of-docker/scenarios.json
similarity index 82%
rename from test/docker-from-docker/scenarios.json
rename to test/docker-outside-of-docker/scenarios.json
index 196e00bf6..804b52242 100644
--- a/test/docker-from-docker/scenarios.json
+++ b/test/docker-outside-of-docker/scenarios.json
@@ -3,7 +3,7 @@
         "image": "mcr.microsoft.com/devcontainers/base",
         "remoteUser": "vscode",
         "features": {
-            "docker-from-docker": {
+            "docker-outside-of-docker": {
                 "version": "latest"
             }
         }
diff --git a/test/docker-from-docker/test.sh b/test/docker-outside-of-docker/test.sh
similarity index 100%
rename from test/docker-from-docker/test.sh
rename to test/docker-outside-of-docker/test.sh

From 2c646ed9fe2e34197e5632f71bce4aa59cdbcc4d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 4 Jan 2023 11:53:48 -0800
Subject: [PATCH 063/478] Automated documentation update (#377)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/anaconda/README.md                 | 1 +
 src/aws-cli/README.md                  | 1 +
 src/azure-cli/README.md                | 1 +
 src/common-utils/README.md             | 1 +
 src/conda/README.md                    | 1 +
 src/desktop-lite/README.md             | 1 +
 src/docker-in-docker/README.md         | 1 +
 src/docker-outside-of-docker/README.md | 9 ++++++---
 src/dotnet/README.md                   | 1 +
 src/git-lfs/README.md                  | 1 +
 src/git/README.md                      | 1 +
 src/github-cli/README.md               | 1 +
 src/go/README.md                       | 1 +
 src/hugo/README.md                     | 1 +
 src/java/README.md                     | 1 +
 src/kubectl-helm-minikube/README.md    | 1 +
 src/nix/README.md                      | 1 +
 src/node/README.md                     | 1 +
 src/nvidia-cuda/README.md              | 1 +
 src/oryx/README.md                     | 1 +
 src/php/README.md                      | 1 +
 src/powershell/README.md               | 1 +
 src/python/README.md                   | 1 +
 src/ruby/README.md                     | 1 +
 src/rust/README.md                     | 1 +
 src/sshd/README.md                     | 1 +
 src/terraform/README.md                | 1 +
 27 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/anaconda/README.md b/src/anaconda/README.md
index 3346823b4..ae91026d3 100644
--- a/src/anaconda/README.md
+++ b/src/anaconda/README.md
@@ -1,4 +1,5 @@
 
+
 # Anaconda (anaconda)
 
 
diff --git a/src/aws-cli/README.md b/src/aws-cli/README.md
index 40cc4ae98..6cac4bc91 100644
--- a/src/aws-cli/README.md
+++ b/src/aws-cli/README.md
@@ -1,4 +1,5 @@
 
+
 # AWS CLI (aws-cli)
 
 Installs the AWS CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.
diff --git a/src/azure-cli/README.md b/src/azure-cli/README.md
index cb792d120..63404beaf 100644
--- a/src/azure-cli/README.md
+++ b/src/azure-cli/README.md
@@ -1,4 +1,5 @@
 
+
 # Azure CLI (azure-cli)
 
 Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.
diff --git a/src/common-utils/README.md b/src/common-utils/README.md
index 9102c950b..f127698ff 100644
--- a/src/common-utils/README.md
+++ b/src/common-utils/README.md
@@ -1,4 +1,5 @@
 
+
 # Common Utilities (common-utils)
 
 Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.
diff --git a/src/conda/README.md b/src/conda/README.md
index 2e123f2c7..8bd788d2b 100644
--- a/src/conda/README.md
+++ b/src/conda/README.md
@@ -1,4 +1,5 @@
 
+
 # Conda (conda)
 
 A cross-platform, language-agnostic binary package manager
diff --git a/src/desktop-lite/README.md b/src/desktop-lite/README.md
index ad05e4ff2..27ca32390 100644
--- a/src/desktop-lite/README.md
+++ b/src/desktop-lite/README.md
@@ -1,4 +1,5 @@
 
+
 # Light-weight Desktop (desktop-lite)
 
 Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.
diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index 4196892b0..cd9ff1a99 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -1,4 +1,5 @@
 
+
 # Docker (Docker-in-Docker) (docker-in-docker)
 
 Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.
diff --git a/src/docker-outside-of-docker/README.md b/src/docker-outside-of-docker/README.md
index e2ddb8472..cbd2d63e9 100644
--- a/src/docker-outside-of-docker/README.md
+++ b/src/docker-outside-of-docker/README.md
@@ -1,5 +1,8 @@
 
-# Docker (Docker-from-Docker) (docker-from-docker)
+### **IMPORTANT NOTE**
+- **Ids used to publish this Feature in the past - 'docker-from-docker'**
+
+# Docker (docker-outside-of-docker) (docker-outside-of-docker)
 
 Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.
 
@@ -7,7 +10,7 @@ Re-use the host docker socket, adding the Docker CLI to a container. Feature inv
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/docker-from-docker:1": {}
+    "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
 }
 ```
 
@@ -84,4 +87,4 @@ This Feature should work on recent versions of Debian/Ubuntu-based distributions
 
 ---
 
-_Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/docker-from-docker/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
+_Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/docker-outside-of-docker/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
diff --git a/src/dotnet/README.md b/src/dotnet/README.md
index c13c998fd..edd38214a 100644
--- a/src/dotnet/README.md
+++ b/src/dotnet/README.md
@@ -1,4 +1,5 @@
 
+
 # Dotnet CLI (dotnet)
 
 Installs the .NET CLI. Provides option of installing sdk or runtime, and option of versions to install. Uses latest version of .NET sdk as defaults to install.
diff --git a/src/git-lfs/README.md b/src/git-lfs/README.md
index 9fc3281fe..7a6802c84 100644
--- a/src/git-lfs/README.md
+++ b/src/git-lfs/README.md
@@ -1,4 +1,5 @@
 
+
 # Git Large File Support (LFS) (git-lfs)
 
 Installs Git Large File Support (Git LFS) along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like git and curl.
diff --git a/src/git/README.md b/src/git/README.md
index a9e54fa18..2f88d80d6 100644
--- a/src/git/README.md
+++ b/src/git/README.md
@@ -1,4 +1,5 @@
 
+
 # Git (from source) (git)
 
 Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.
diff --git a/src/github-cli/README.md b/src/github-cli/README.md
index 07945081a..761ba0852 100644
--- a/src/github-cli/README.md
+++ b/src/github-cli/README.md
@@ -1,4 +1,5 @@
 
+
 # GitHub CLI (github-cli)
 
 Installs the GitHub CLI. Auto-detects latest version and installs needed dependencies.
diff --git a/src/go/README.md b/src/go/README.md
index e7a692443..4ab962b6b 100644
--- a/src/go/README.md
+++ b/src/go/README.md
@@ -1,4 +1,5 @@
 
+
 # Go (go)
 
 Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.
diff --git a/src/hugo/README.md b/src/hugo/README.md
index 3d346c39b..405273635 100644
--- a/src/hugo/README.md
+++ b/src/hugo/README.md
@@ -1,4 +1,5 @@
 
+
 # Hugo (hugo)
 
 
diff --git a/src/java/README.md b/src/java/README.md
index f3e35e38a..117575c65 100644
--- a/src/java/README.md
+++ b/src/java/README.md
@@ -1,4 +1,5 @@
 
+
 # Java (via SDKMAN!) (java)
 
 Installs Java, SDKMAN! (if not installed), and needed dependencies.
diff --git a/src/kubectl-helm-minikube/README.md b/src/kubectl-helm-minikube/README.md
index 81ce8c574..0af0f5db7 100644
--- a/src/kubectl-helm-minikube/README.md
+++ b/src/kubectl-helm-minikube/README.md
@@ -1,4 +1,5 @@
 
+
 # Kubectl, Helm, and Minikube (kubectl-helm-minikube)
 
 Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.
diff --git a/src/nix/README.md b/src/nix/README.md
index 3ab9b0017..d29b50ffd 100644
--- a/src/nix/README.md
+++ b/src/nix/README.md
@@ -1,4 +1,5 @@
 
+
 # Nix Package Manager (nix)
 
 Installs the Nix package manager and optionally a set of packages.
diff --git a/src/node/README.md b/src/node/README.md
index 2e5dba386..fb00c42da 100644
--- a/src/node/README.md
+++ b/src/node/README.md
@@ -1,4 +1,5 @@
 
+
 # Node.js (via nvm) and yarn (node)
 
 Installs Node.js, nvm, yarn, and needed dependencies.
diff --git a/src/nvidia-cuda/README.md b/src/nvidia-cuda/README.md
index 38a989a04..097afd47b 100644
--- a/src/nvidia-cuda/README.md
+++ b/src/nvidia-cuda/README.md
@@ -1,4 +1,5 @@
 
+
 # NVIDIA CUDA (nvidia-cuda)
 
 Installs shared libraries for NVIDIA CUDA.
diff --git a/src/oryx/README.md b/src/oryx/README.md
index 7d3d3d11a..1ee6d790c 100644
--- a/src/oryx/README.md
+++ b/src/oryx/README.md
@@ -1,4 +1,5 @@
 
+
 # Oryx (oryx)
 
 Installs the oryx CLI
diff --git a/src/php/README.md b/src/php/README.md
index 3a9be7a98..9921721b2 100644
--- a/src/php/README.md
+++ b/src/php/README.md
@@ -1,4 +1,5 @@
 
+
 # PHP (php)
 
 
diff --git a/src/powershell/README.md b/src/powershell/README.md
index ba300d5cd..e80f43dc8 100644
--- a/src/powershell/README.md
+++ b/src/powershell/README.md
@@ -1,4 +1,5 @@
 
+
 # PowerShell (powershell)
 
 Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.
diff --git a/src/python/README.md b/src/python/README.md
index 05742910a..8ab50effb 100644
--- a/src/python/README.md
+++ b/src/python/README.md
@@ -1,4 +1,5 @@
 
+
 # Python (python)
 
 Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.
diff --git a/src/ruby/README.md b/src/ruby/README.md
index 8a0ff877d..3e09336e6 100644
--- a/src/ruby/README.md
+++ b/src/ruby/README.md
@@ -1,4 +1,5 @@
 
+
 # Ruby (via rvm) (ruby)
 
 Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.
diff --git a/src/rust/README.md b/src/rust/README.md
index 372b56f97..57c72821b 100644
--- a/src/rust/README.md
+++ b/src/rust/README.md
@@ -1,4 +1,5 @@
 
+
 # Rust (rust)
 
 Installs Rust, common Rust utilities, and their required dependencies
diff --git a/src/sshd/README.md b/src/sshd/README.md
index 6e9382c04..7f447fa89 100644
--- a/src/sshd/README.md
+++ b/src/sshd/README.md
@@ -1,4 +1,5 @@
 
+
 # SSH server (sshd)
 
 Adds a SSH server into a container so that you can use an external terminal, sftp, or SSHFS to interact with it.
diff --git a/src/terraform/README.md b/src/terraform/README.md
index ee87d069d..4209c7a8f 100644
--- a/src/terraform/README.md
+++ b/src/terraform/README.md
@@ -1,4 +1,5 @@
 
+
 # Terraform, tflint, and TFGrunt (terraform)
 
 Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.

From 8f7eec80d44f74c3aaa20634e938b071d95ff5c3 Mon Sep 17 00:00:00 2001
From: Julien Boudry <julien.boudry@gmail.com>
Date: Wed, 4 Jan 2023 22:12:53 +0100
Subject: [PATCH 064/478] [PHP] Enable Mbstring (#371)

Mbstring is such a popular PHP extension that it is used everywhere and most libraries don't work without it. It can be compiled directly with PHP.
The official Docker images of PHP include it.
---
 src/php/devcontainer-feature.json | 2 +-
 src/php/install.sh                | 2 +-
 test/php/test.sh                  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/php/devcontainer-feature.json b/src/php/devcontainer-feature.json
index bad987872..edf56eb4d 100644
--- a/src/php/devcontainer-feature.json
+++ b/src/php/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "php",
-    "version": "1.0.9",
+    "version": "1.0.10",
     "name": "PHP",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/php",
     "options": {
diff --git a/src/php/install.sh b/src/php/install.sh
index 381bec21b..4d0b2eae9 100755
--- a/src/php/install.sh
+++ b/src/php/install.sh
@@ -169,7 +169,7 @@ install_php() {
         VERSION_CONFIG="--with-pear"
     fi
 
-    ./configure --prefix="${PHP_INSTALL_DIR}" --with-config-file-path="$PHP_INI_DIR" --with-config-file-scan-dir="$CONF_DIR" --enable-option-checking=fatal --with-curl --with-libedit --with-openssl --with-zlib --with-password-argon2 --with-sodium=shared "$VERSION_CONFIG" EXTENSION_DIR="$PHP_EXT_DIR";
+    ./configure --prefix="${PHP_INSTALL_DIR}" --with-config-file-path="$PHP_INI_DIR" --with-config-file-scan-dir="$CONF_DIR" --enable-option-checking=fatal --with-curl --with-libedit --enable-mbstring --with-openssl --with-zlib --with-password-argon2 --with-sodium=shared "$VERSION_CONFIG" EXTENSION_DIR="$PHP_EXT_DIR";
 
     make -j "$(nproc)"
     find -type f -name '*.a' -delete
diff --git a/test/php/test.sh b/test/php/test.sh
index 3e4e7223a..0f49c1a18 100755
--- a/test/php/test.sh
+++ b/test/php/test.sh
@@ -6,6 +6,7 @@ set -e
 source dev-container-features-test-lib
 
 check "PHP version" php --version
+check "Mbstring loaded" php -r "extension_loaded('mbstring') || throw new Error('Extension Mbstring is not loaded');"
 check "Composer version" composer --version
 
 # Report result

From ef192bf4677f35c18d9f0812ed2902a682c7bdeb Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 4 Jan 2023 14:59:24 -0800
Subject: [PATCH 065/478] PHP: Fix build failures for 'ubuntu:bionic' (#378)

* PHP: Fix build failures for 'ubuntu:bionic'

* update VERSION
---
 src/php/devcontainer-feature.json |  2 +-
 src/php/install.sh                | 30 +++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/php/devcontainer-feature.json b/src/php/devcontainer-feature.json
index edf56eb4d..2ea56d2ba 100644
--- a/src/php/devcontainer-feature.json
+++ b/src/php/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "php",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "name": "PHP",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/php",
     "options": {
diff --git a/src/php/install.sh b/src/php/install.sh
index 4d0b2eae9..c0bcb0426 100755
--- a/src/php/install.sh
+++ b/src/php/install.sh
@@ -11,7 +11,7 @@ set -eux
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
-VERSION="${VERSION:-"latest"}"
+PHP_VERSION="${VERSION:-"latest"}"
 INSTALL_COMPOSER="${INSTALLCOMPOSER:-"true"}"
 OVERRIDE_DEFAULT_VERSION="${OVERRIDEDEFAULTVERSION:-"true"}"
 
@@ -20,7 +20,7 @@ USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 UPDATE_RC="${UPDATE_RC:-"true"}"
 
 # Comma-separated list of php versions to be installed
-# alongside VERSION, but not set as default.
+# alongside PHP_VERSION, but not set as default.
 ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 
 export DEBIAN_FRONTEND=noninteractive
@@ -92,7 +92,7 @@ find_version_from_git_tags() {
     local last_part="${escaped_separator}[0-9]+"
     local regex="\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
     local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
-    VERSION="$(echo "${version_list}" | head -n 1)"
+    PHP_VERSION="$(echo "${version_list}" | head -n 1)"
 }
 
 # Install PHP Composer
@@ -113,7 +113,15 @@ addcomposer() {
 RUNTIME_DEPS="wget ca-certificates git build-essential xz-utils"
 
 # PHP dependencies
-PHP_DEPS="libssl-dev libcurl4-openssl-dev libedit-dev libsqlite3-dev libxml2-dev zlib1g-dev libsodium-dev libargon2-dev libonig-dev"
+PHP_DEPS="libssl-dev libcurl4-openssl-dev libedit-dev libsqlite3-dev libxml2-dev zlib1g-dev libsodium-dev libonig-dev"
+
+. /etc/os-release
+
+if [ "${VERSION_CODENAME}" = "bionic" ]; then
+    PHP_DEPS="${PHP_DEPS} libargon2-0-dev"
+else
+    PHP_DEPS="${PHP_DEPS} libargon2-dev"
+fi
 
 # Dependencies required for running "phpize"
 PHPIZE_DEPS="autoconf dpkg-dev file g++ gcc libc-dev make pkg-config re2c"
@@ -122,16 +130,16 @@ PHPIZE_DEPS="autoconf dpkg-dev file g++ gcc libc-dev make pkg-config re2c"
 check_packages $RUNTIME_DEPS $PHP_DEPS $PHPIZE_DEPS
 
 install_php() {
-    VERSION="$1"
+    PHP_VERSION="$1"
 
     # Fetch latest version of PHP if needed
-    if [ "${VERSION}" = "latest" ] || [ "${VERSION}" = "lts" ]; then
+    if [ "${PHP_VERSION}" = "latest" ] || [ "${PHP_VERSION}" = "lts" ]; then
         find_version_from_git_tags
     fi
 
-    PHP_INSTALL_DIR="${PHP_DIR}/${VERSION}"
+    PHP_INSTALL_DIR="${PHP_DIR}/${PHP_VERSION}"
     if [ -d "${PHP_INSTALL_DIR}" ]; then
-        echo "(!) PHP version ${VERSION} already exists."
+        echo "(!) PHP version ${PHP_VERSION} already exists."
         exit 1
     fi
 
@@ -140,7 +148,7 @@ install_php() {
     fi
     usermod -a -G php "${USERNAME}"
 
-    PHP_URL="https://www.php.net/distributions/php-${VERSION}.tar.gz"
+    PHP_URL="https://www.php.net/distributions/php-${PHP_VERSION}.tar.gz"
 
     PHP_INI_DIR="${PHP_INSTALL_DIR}/ini"
     CONF_DIR="${PHP_INI_DIR}/conf.d"
@@ -160,7 +168,7 @@ install_php() {
     # PHP 7.4+, the pecl/pear installers are officially deprecated and are removed in PHP 8+
     # Thus, requiring an explicit "--with-pear"
     IFS="."
-    read -a versions <<< "${VERSION}"
+    read -a versions <<< "${PHP_VERSION}"
     PHP_MAJOR_VERSION=${versions[0]}
     PHP_MINOR_VERSION=${versions[1]}
 
@@ -210,7 +218,7 @@ install_php() {
     updaterc "if [[ \"\${PATH}\" != *\"${CURRENT_DIR}\"* ]]; then export PATH=\"${CURRENT_DIR}/bin:\${PATH}\"; fi"
 }
 
-install_php "${VERSION}"
+install_php "${PHP_VERSION}"
 
 # Additional php versions to be installed but not be set as default.
 if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then

From c546f4bf8c462247c954ee3b549e63db2fc687dd Mon Sep 17 00:00:00 2001
From: Marko Bausch <60338487+mrkbac@users.noreply.github.com>
Date: Thu, 5 Jan 2023 18:27:12 +0100
Subject: [PATCH 066/478] desktop-lite: fixed qemu container (#370)

* desktop-lite: fixed qemu container

* bump version for desktop-lite
---
 src/desktop-lite/devcontainer-feature.json |  2 +-
 src/desktop-lite/install.sh                | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json
index e0333867f..84c99db93 100644
--- a/src/desktop-lite/devcontainer-feature.json
+++ b/src/desktop-lite/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "desktop-lite",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "name": "Light-weight Desktop",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
     "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh
index 60bec121b..ffd39d50b 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -299,9 +299,9 @@ startInBackgroundIfNotRunning()
 {
     log "Starting \$1."
     echo -e "\n** \$(date) **" | sudoIf tee -a /tmp/\$1.log > /dev/null
-    if ! pidof \$1 > /dev/null; then
+    if ! pgrep -x \$1 > /dev/null; then
         keepRunningInBackground "\$@"
-        while ! pidof \$1 > /dev/null; do
+        while ! pgrep -x \$1 > /dev/null; do
             sleep 1
         done
         log "\$1 started."
@@ -347,16 +347,16 @@ log "** SCRIPT START **"
 
 # Start dbus.
 log 'Running "/etc/init.d/dbus start".'
-if [ -f "/var/run/dbus/pid" ] && ! pidof dbus-daemon  > /dev/null; then
+if [ -f "/var/run/dbus/pid" ] && ! pgrep -x dbus-daemon  > /dev/null; then
     sudoIf rm -f /var/run/dbus/pid
 fi
 sudoIf /etc/init.d/dbus start 2>&1 | sudoIf tee -a /tmp/dbus-daemon-system.log > /dev/null
-while ! pidof dbus-daemon > /dev/null; do
+while ! pgrep -x dbus-daemon > /dev/null; do
     sleep 1
 done
 
 # Startup tigervnc server and fluxbox
-sudo rm -rf /tmp/.X11-unix /tmp/.X*-lock
+sudoIf rm -rf /tmp/.X11-unix /tmp/.X*-lock
 mkdir -p /tmp/.X11-unix
 sudoIf chmod 1777 /tmp/.X11-unix
 sudoIf chown root:\${group_name} /tmp/.X11-unix

From a9a7a25d60585ce2145374ec6825cbdc7f16cb90 Mon Sep 17 00:00:00 2001
From: Mark Phippard <markphip@gmail.com>
Date: Thu, 5 Jan 2023 16:21:34 -0500
Subject: [PATCH 067/478] Install gawk RPM (#380)

* Install gawk RPM

This script requires awk and it may not be available on a
minimal distro like Mariner

* Bump version number
---
 src/common-utils/devcontainer-feature.json | 2 +-
 src/common-utils/main.sh                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 8d1ed8286..33cd19d92 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.0.3",
+    "version": "2.0.4",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index b6793d603..20214850e 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -146,6 +146,7 @@ install_debian_packages() {
 # RedHat / RockyLinux / CentOS / Fedora packages
 install_redhat_packages() {
     local package_list="\
+        gawk \
         openssh-clients \
         gnupg2 \
         iproute \

From 04143e31ff4ef64f44603492a4052fe7b03de7bd Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Mon, 9 Jan 2023 14:48:41 -0800
Subject: [PATCH 068/478] Options: Switch from 'enum' to 'proposals' (#382)

---
 src/git-lfs/devcontainer-feature.json     | 4 ++--
 src/nvidia-cuda/devcontainer-feature.json | 6 +++---
 src/python/devcontainer-feature.json      | 4 ++--
 src/sshd/devcontainer-feature.json        | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/git-lfs/devcontainer-feature.json b/src/git-lfs/devcontainer-feature.json
index 7916ea1c3..a301a64d6 100644
--- a/src/git-lfs/devcontainer-feature.json
+++ b/src/git-lfs/devcontainer-feature.json
@@ -1,13 +1,13 @@
 {
     "id": "git-lfs",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "name": "Git Large File Support (LFS)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git-lfs",
     "description": "Installs Git Large File Support (Git LFS) along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like git and curl.",
     "options": {
         "version": {
             "type": "string",
-            "enum": [
+            "proposals": [
                 "latest",
                 "none"
             ],
diff --git a/src/nvidia-cuda/devcontainer-feature.json b/src/nvidia-cuda/devcontainer-feature.json
index 7611b7ef1..dd5c13d8c 100644
--- a/src/nvidia-cuda/devcontainer-feature.json
+++ b/src/nvidia-cuda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "nvidia-cuda",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "name": "NVIDIA CUDA",
   "description": "Installs shared libraries for NVIDIA CUDA.",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nvidia-cuda",
@@ -17,7 +17,7 @@
     },
     "cudaVersion": {
       "type": "string",
-      "enum": [
+      "proposals": [
         "11.8",
         "11.7",
         "11.6",
@@ -31,7 +31,7 @@
     },
     "cudnnVersion": {
       "type": "string",
-      "enum": [
+      "proposals": [
         "8.6.0.163",
         "8.5.0.96",
         "8.4.1.50",
diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index fa5932035..1d5812149 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,13 +1,13 @@
 {
   "id": "python",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
   "options": {
     "version": {
       "type": "string",
-      "enum": [
+      "proposals": [
         "latest",
         "os-provided",
         "none",
diff --git a/src/sshd/devcontainer-feature.json b/src/sshd/devcontainer-feature.json
index b8b7badaf..696a23ba7 100644
--- a/src/sshd/devcontainer-feature.json
+++ b/src/sshd/devcontainer-feature.json
@@ -1,13 +1,13 @@
 {
     "id": "sshd",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "name": "SSH server",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/sshd",
     "description": "Adds a SSH server into a container so that you can use an external terminal, sftp, or SSHFS to interact with it.",
     "options": {
         "version": {
             "type": "string",
-            "enum": [
+            "proposals": [
                 "latest"
             ],
             "default": "latest",

From 59fa3e3c21fd2c896da2d3272604509ea9a55a91 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Mon, 9 Jan 2023 14:49:43 -0800
Subject: [PATCH 069/478] Conda: Update 'certifi' due to CVE-2022-23491 (#383)

---
 src/conda/devcontainer-feature.json |  2 +-
 src/conda/install.sh                | 17 +++++++++++++++++
 test/conda/test.sh                  | 20 ++++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/conda/devcontainer-feature.json b/src/conda/devcontainer-feature.json
index 8ff6499dd..488de41ff 100644
--- a/src/conda/devcontainer-feature.json
+++ b/src/conda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "conda",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "name": "Conda",
     "description": "A cross-platform, language-agnostic binary package manager",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
diff --git a/src/conda/install.sh b/src/conda/install.sh
index 6e9088221..55b280c40 100644
--- a/src/conda/install.sh
+++ b/src/conda/install.sh
@@ -61,6 +61,20 @@ check_packages() {
     fi
 }
 
+sudo_if() {
+    COMMAND="$*"
+    if [ "$(id -u)" -eq 0 ] && [ "$USERNAME" != "root" ]; then
+        su - "$USERNAME" -c "$COMMAND"
+    else
+        $COMMAND
+    fi
+}
+
+install_user_package() {
+    PACKAGE="$1"
+    sudo_if "${CONDA_DIR}/bin/python3" -m pip install --user --upgrade "$PACKAGE"
+}
+
 # Install Conda if it's missing
 if ! conda --version &> /dev/null ; then
     if ! cat /etc/group | grep -e "^conda:" > /dev/null 2>&1; then
@@ -99,6 +113,9 @@ if ! conda --version &> /dev/null ; then
     chmod -R g+r+w "${CONDA_DIR}"
     
     find "${CONDA_DIR}" -type d -print0 | xargs -n 1 -0 chmod g+s
+
+    # Temporary due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-23491
+    install_user_package certifi
 fi
 
 # Display a notice on conda when not running in GitHub Codespaces
diff --git a/test/conda/test.sh b/test/conda/test.sh
index f3002176e..8a88511ca 100755
--- a/test/conda/test.sh
+++ b/test/conda/test.sh
@@ -12,5 +12,25 @@ check "if conda-notice.txt exists" cat /usr/local/etc/vscode-dev-containers/cond
 # Check env
 check "CONDA_SCRIPT is set correctly" echo $CONDA_SCRIPT | grep "/opt/conda/etc/profile.d/conda.sh"
 
+check-version-ge() {
+    LABEL=$1
+    CURRENT_VERSION=$2
+    REQUIRED_VERSION=$3
+    shift
+    echo -e "\n🧪 Testing $LABEL: '$CURRENT_VERSION' is >= '$REQUIRED_VERSION'"
+    local GREATER_VERSION=$((echo ${CURRENT_VERSION}; echo ${REQUIRED_VERSION}) | sort -V | tail -1)
+    if [ "${CURRENT_VERSION}" == "${GREATER_VERSION}" ]; then
+        echo "✅  Passed!"
+        return 0
+    else
+        echoStderr "❌ $LABEL check failed."
+        FAILED+=("$LABEL")
+        return 1
+    fi
+}
+
+certifiVersion=$(python -c "import certifi; print(certifi.__version__)")
+check-version-ge "certifi" "${certifiVersion}" "2022.12.07"
+
 # Report result
 reportResults

From 7e32db56c00b79a2d35838ffa6f7081f517805b1 Mon Sep 17 00:00:00 2001
From: eitsupi <50911393+eitsupi@users.noreply.github.com>
Date: Wed, 11 Jan 2023 06:50:09 +0900
Subject: [PATCH 070/478] [common-utils] Fix permission of scripts in
 containers (#388)

* fix permission in containers

* add test

* bump version

* more tests

* update tests

* Update test/common-utils/devcontainer-info/Dockerfile

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

* Update test/common-utils/scenarios.json

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

* Update scenarios.json

* Update devcontainer-info.sh

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
---
 src/common-utils/devcontainer-feature.json    |  2 +-
 src/common-utils/main.sh                      |  6 ++---
 test/common-utils/devcontainer-info.sh        | 25 +++++++++++++++++++
 .../common-utils/devcontainer-info/Dockerfile |  3 +++
 test/common-utils/devcontainer-info/meta.env  |  8 ++++++
 test/common-utils/scenarios.json              | 15 +++++++++++
 6 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100755 test/common-utils/devcontainer-info.sh
 create mode 100644 test/common-utils/devcontainer-info/Dockerfile
 create mode 100644 test/common-utils/devcontainer-info/meta.env

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 33cd19d92..82623f9a0 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.0.4",
+    "version": "2.0.5",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 20214850e..7cc94090c 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -474,18 +474,18 @@ fi
 
 # code shim, it fallbacks to code-insiders if code is not available
 cp -f "${FEATURE_DIR}/bin/code" /usr/local/bin/
-chmod +x /usr/local/bin/code
+chmod +rx /usr/local/bin/code
 
 # systemctl shim for Debian/Ubuntu - tells people to use 'service' if systemd is not running
 if [ "${ADJUSTED_ID}" = "debian" ]; then
     cp -f "${FEATURE_DIR}/bin/systemctl" /usr/local/bin/systemctl
-    chmod +x /usr/local/bin/systemctl
+    chmod +rx /usr/local/bin/systemctl
 fi
 
 # Persist image metadata info, script if meta.env found in same directory
 if [ -f "/usr/local/etc/vscode-dev-containers/meta.env" ] || [ -f "/usr/local/etc/dev-containers/meta.env" ]; then
     cp -f "${FEATURE_DIR}/bin/devcontainer-info" /usr/local/bin/devcontainer-info
-    chmod +x /usr/local/bin/devcontainer-info
+    chmod +rx /usr/local/bin/devcontainer-info
 fi
 
 # Write marker file
diff --git a/test/common-utils/devcontainer-info.sh b/test/common-utils/devcontainer-info.sh
new file mode 100755
index 000000000..65a4a40fb
--- /dev/null
+++ b/test/common-utils/devcontainer-info.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check_info() {
+    local info=$1
+    check "devcontainer-info ${info}" sh -c "devcontainer-info | grep test-${info}"
+}
+
+# Definition specific tests
+check "user" bash -c "whoami | grep vscode"
+check_info "version"
+check_info "id"
+check_info "variant"
+check_info "repository"
+check_info "release"
+check_info "revision"
+check_info "time"
+check_info "url"
+
+# Report result
+reportResults
diff --git a/test/common-utils/devcontainer-info/Dockerfile b/test/common-utils/devcontainer-info/Dockerfile
new file mode 100644
index 000000000..28247d907
--- /dev/null
+++ b/test/common-utils/devcontainer-info/Dockerfile
@@ -0,0 +1,3 @@
+FROM ubuntu:focal
+
+COPY meta.env /usr/local/etc/dev-containers/meta.env
diff --git a/test/common-utils/devcontainer-info/meta.env b/test/common-utils/devcontainer-info/meta.env
new file mode 100644
index 000000000..dfc61d31c
--- /dev/null
+++ b/test/common-utils/devcontainer-info/meta.env
@@ -0,0 +1,8 @@
+VERSION='test-version'
+DEFINITION_ID='test-id'
+VARIANT='test-variant'
+GIT_REPOSITORY='test-repository'
+GIT_REPOSITORY_RELEASE='test-release'
+GIT_REPOSITORY_REVISION='test-revision'
+BUILD_TIMESTAMP='test-time'
+CONTENTS_URL='test-url'
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index bc1c784bf..dbf9cdc73 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -114,5 +114,20 @@
                 "configureZshAsDefaultShell": true
             }
         }
+    },
+    "devcontainer-info": {
+        "build": {
+            "dockerfile": "Dockerfile"
+        },
+        "features": {
+            "common-utils": {
+                "username": "vscode",
+                "userUid": "1000",
+                "userGid": "1000",
+                "upgradePackages": true,
+                "installZsh": true
+            }
+        },
+        "remoteUser": "vscode"
     }
 }

From c8f5c3cbee6893b7e7bb970adfa96c54dea8e626 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 13:59:07 -0800
Subject: [PATCH 071/478] Automated documentation update (#394)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/anaconda/README.md                 | 1 -
 src/aws-cli/README.md                  | 1 -
 src/azure-cli/README.md                | 1 -
 src/common-utils/README.md             | 1 -
 src/conda/README.md                    | 1 -
 src/desktop-lite/README.md             | 1 -
 src/docker-in-docker/README.md         | 1 -
 src/docker-outside-of-docker/README.md | 1 -
 src/dotnet/README.md                   | 1 -
 src/git-lfs/README.md                  | 1 -
 src/git/README.md                      | 1 -
 src/github-cli/README.md               | 1 -
 src/go/README.md                       | 1 -
 src/hugo/README.md                     | 1 -
 src/java/README.md                     | 1 -
 src/kubectl-helm-minikube/README.md    | 1 -
 src/nix/README.md                      | 1 -
 src/node/README.md                     | 1 -
 src/nvidia-cuda/README.md              | 1 -
 src/oryx/README.md                     | 1 -
 src/php/README.md                      | 1 -
 src/powershell/README.md               | 1 -
 src/python/README.md                   | 1 -
 src/ruby/README.md                     | 1 -
 src/rust/README.md                     | 1 -
 src/sshd/README.md                     | 1 -
 src/terraform/README.md                | 1 -
 27 files changed, 27 deletions(-)

diff --git a/src/anaconda/README.md b/src/anaconda/README.md
index ae91026d3..3346823b4 100644
--- a/src/anaconda/README.md
+++ b/src/anaconda/README.md
@@ -1,5 +1,4 @@
 
-
 # Anaconda (anaconda)
 
 
diff --git a/src/aws-cli/README.md b/src/aws-cli/README.md
index 6cac4bc91..40cc4ae98 100644
--- a/src/aws-cli/README.md
+++ b/src/aws-cli/README.md
@@ -1,5 +1,4 @@
 
-
 # AWS CLI (aws-cli)
 
 Installs the AWS CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.
diff --git a/src/azure-cli/README.md b/src/azure-cli/README.md
index 63404beaf..cb792d120 100644
--- a/src/azure-cli/README.md
+++ b/src/azure-cli/README.md
@@ -1,5 +1,4 @@
 
-
 # Azure CLI (azure-cli)
 
 Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.
diff --git a/src/common-utils/README.md b/src/common-utils/README.md
index f127698ff..9102c950b 100644
--- a/src/common-utils/README.md
+++ b/src/common-utils/README.md
@@ -1,5 +1,4 @@
 
-
 # Common Utilities (common-utils)
 
 Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.
diff --git a/src/conda/README.md b/src/conda/README.md
index 8bd788d2b..2e123f2c7 100644
--- a/src/conda/README.md
+++ b/src/conda/README.md
@@ -1,5 +1,4 @@
 
-
 # Conda (conda)
 
 A cross-platform, language-agnostic binary package manager
diff --git a/src/desktop-lite/README.md b/src/desktop-lite/README.md
index 27ca32390..ad05e4ff2 100644
--- a/src/desktop-lite/README.md
+++ b/src/desktop-lite/README.md
@@ -1,5 +1,4 @@
 
-
 # Light-weight Desktop (desktop-lite)
 
 Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.
diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index cd9ff1a99..4196892b0 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -1,5 +1,4 @@
 
-
 # Docker (Docker-in-Docker) (docker-in-docker)
 
 Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.
diff --git a/src/docker-outside-of-docker/README.md b/src/docker-outside-of-docker/README.md
index cbd2d63e9..74011a06d 100644
--- a/src/docker-outside-of-docker/README.md
+++ b/src/docker-outside-of-docker/README.md
@@ -1,4 +1,3 @@
-
 ### **IMPORTANT NOTE**
 - **Ids used to publish this Feature in the past - 'docker-from-docker'**
 
diff --git a/src/dotnet/README.md b/src/dotnet/README.md
index edd38214a..c13c998fd 100644
--- a/src/dotnet/README.md
+++ b/src/dotnet/README.md
@@ -1,5 +1,4 @@
 
-
 # Dotnet CLI (dotnet)
 
 Installs the .NET CLI. Provides option of installing sdk or runtime, and option of versions to install. Uses latest version of .NET sdk as defaults to install.
diff --git a/src/git-lfs/README.md b/src/git-lfs/README.md
index 7a6802c84..9fc3281fe 100644
--- a/src/git-lfs/README.md
+++ b/src/git-lfs/README.md
@@ -1,5 +1,4 @@
 
-
 # Git Large File Support (LFS) (git-lfs)
 
 Installs Git Large File Support (Git LFS) along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like git and curl.
diff --git a/src/git/README.md b/src/git/README.md
index 2f88d80d6..a9e54fa18 100644
--- a/src/git/README.md
+++ b/src/git/README.md
@@ -1,5 +1,4 @@
 
-
 # Git (from source) (git)
 
 Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.
diff --git a/src/github-cli/README.md b/src/github-cli/README.md
index 761ba0852..07945081a 100644
--- a/src/github-cli/README.md
+++ b/src/github-cli/README.md
@@ -1,5 +1,4 @@
 
-
 # GitHub CLI (github-cli)
 
 Installs the GitHub CLI. Auto-detects latest version and installs needed dependencies.
diff --git a/src/go/README.md b/src/go/README.md
index 4ab962b6b..e7a692443 100644
--- a/src/go/README.md
+++ b/src/go/README.md
@@ -1,5 +1,4 @@
 
-
 # Go (go)
 
 Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.
diff --git a/src/hugo/README.md b/src/hugo/README.md
index 405273635..3d346c39b 100644
--- a/src/hugo/README.md
+++ b/src/hugo/README.md
@@ -1,5 +1,4 @@
 
-
 # Hugo (hugo)
 
 
diff --git a/src/java/README.md b/src/java/README.md
index 117575c65..f3e35e38a 100644
--- a/src/java/README.md
+++ b/src/java/README.md
@@ -1,5 +1,4 @@
 
-
 # Java (via SDKMAN!) (java)
 
 Installs Java, SDKMAN! (if not installed), and needed dependencies.
diff --git a/src/kubectl-helm-minikube/README.md b/src/kubectl-helm-minikube/README.md
index 0af0f5db7..81ce8c574 100644
--- a/src/kubectl-helm-minikube/README.md
+++ b/src/kubectl-helm-minikube/README.md
@@ -1,5 +1,4 @@
 
-
 # Kubectl, Helm, and Minikube (kubectl-helm-minikube)
 
 Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.
diff --git a/src/nix/README.md b/src/nix/README.md
index d29b50ffd..3ab9b0017 100644
--- a/src/nix/README.md
+++ b/src/nix/README.md
@@ -1,5 +1,4 @@
 
-
 # Nix Package Manager (nix)
 
 Installs the Nix package manager and optionally a set of packages.
diff --git a/src/node/README.md b/src/node/README.md
index fb00c42da..2e5dba386 100644
--- a/src/node/README.md
+++ b/src/node/README.md
@@ -1,5 +1,4 @@
 
-
 # Node.js (via nvm) and yarn (node)
 
 Installs Node.js, nvm, yarn, and needed dependencies.
diff --git a/src/nvidia-cuda/README.md b/src/nvidia-cuda/README.md
index 097afd47b..38a989a04 100644
--- a/src/nvidia-cuda/README.md
+++ b/src/nvidia-cuda/README.md
@@ -1,5 +1,4 @@
 
-
 # NVIDIA CUDA (nvidia-cuda)
 
 Installs shared libraries for NVIDIA CUDA.
diff --git a/src/oryx/README.md b/src/oryx/README.md
index 1ee6d790c..7d3d3d11a 100644
--- a/src/oryx/README.md
+++ b/src/oryx/README.md
@@ -1,5 +1,4 @@
 
-
 # Oryx (oryx)
 
 Installs the oryx CLI
diff --git a/src/php/README.md b/src/php/README.md
index 9921721b2..3a9be7a98 100644
--- a/src/php/README.md
+++ b/src/php/README.md
@@ -1,5 +1,4 @@
 
-
 # PHP (php)
 
 
diff --git a/src/powershell/README.md b/src/powershell/README.md
index e80f43dc8..ba300d5cd 100644
--- a/src/powershell/README.md
+++ b/src/powershell/README.md
@@ -1,5 +1,4 @@
 
-
 # PowerShell (powershell)
 
 Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.
diff --git a/src/python/README.md b/src/python/README.md
index 8ab50effb..05742910a 100644
--- a/src/python/README.md
+++ b/src/python/README.md
@@ -1,5 +1,4 @@
 
-
 # Python (python)
 
 Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.
diff --git a/src/ruby/README.md b/src/ruby/README.md
index 3e09336e6..8a0ff877d 100644
--- a/src/ruby/README.md
+++ b/src/ruby/README.md
@@ -1,5 +1,4 @@
 
-
 # Ruby (via rvm) (ruby)
 
 Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.
diff --git a/src/rust/README.md b/src/rust/README.md
index 57c72821b..372b56f97 100644
--- a/src/rust/README.md
+++ b/src/rust/README.md
@@ -1,5 +1,4 @@
 
-
 # Rust (rust)
 
 Installs Rust, common Rust utilities, and their required dependencies
diff --git a/src/sshd/README.md b/src/sshd/README.md
index 7f447fa89..6e9382c04 100644
--- a/src/sshd/README.md
+++ b/src/sshd/README.md
@@ -1,5 +1,4 @@
 
-
 # SSH server (sshd)
 
 Adds a SSH server into a container so that you can use an external terminal, sftp, or SSHFS to interact with it.
diff --git a/src/terraform/README.md b/src/terraform/README.md
index 4209c7a8f..ee87d069d 100644
--- a/src/terraform/README.md
+++ b/src/terraform/README.md
@@ -1,5 +1,4 @@
 
-
 # Terraform, tflint, and TFGrunt (terraform)
 
 Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.

From e67f4dc0fd053d7bac56a8c802b3a1af68da5bf6 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 10 Jan 2023 15:09:56 -0800
Subject: [PATCH 072/478] Common-utils: Fix build failures for alpine 3.14 &
 3.15 (#393)

* Common-utils: Fix build failures for alpine 3.14 & 3.15

* version bump
---
 src/common-utils/devcontainer-feature.json |  2 +-
 src/common-utils/main.sh                   |  2 ++
 test/common-utils/alpine-3-14.sh           | 15 +++++++++++++++
 test/common-utils/alpine-3-15.sh           | 15 +++++++++++++++
 test/common-utils/scenarios.json           | 14 ++++++++++++++
 5 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100755 test/common-utils/alpine-3-14.sh
 create mode 100755 test/common-utils/alpine-3-15.sh

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 82623f9a0..36c87bc7c 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.0.5",
+    "version": "2.0.6",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 7cc94090c..ff2c54ca9 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -407,6 +407,8 @@ if [ "${RC_SNIPPET_ALREADY_ADDED}" != "true" ]; then
             ;;
         "alpine")
             global_rc_path="/etc/bash/bashrc"
+            # /etc/bash/bashrc does not exist in alpine 3.14 & 3.15
+            mkdir -p /etc/bash
             ;;
     esac
     cat "${FEATURE_DIR}/scripts/rc_snippet.sh" >> ${global_rc_path}
diff --git a/test/common-utils/alpine-3-14.sh b/test/common-utils/alpine-3-14.sh
new file mode 100755
index 000000000..5ed334c61
--- /dev/null
+++ b/test/common-utils/alpine-3-14.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${ID}" = "alpine"
+check "bashrc" ls /etc/bash/bashrc
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/alpine-3-15.sh b/test/common-utils/alpine-3-15.sh
new file mode 100755
index 000000000..5ed334c61
--- /dev/null
+++ b/test/common-utils/alpine-3-15.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${ID}" = "alpine"
+check "bashrc" ls /etc/bash/bashrc
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index dbf9cdc73..43d11c9a1 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -115,6 +115,20 @@
             }
         }
     },
+    "alpine-3-14": {
+        "image": "alpine:3.14",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "alpine-3-15": {
+        "image": "alpine:3.15",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
     "devcontainer-info": {
         "build": {
             "dockerfile": "Dockerfile"

From 74dd2710dc77b85d6ad72c4534f4c7d7f67b86b2 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 11 Jan 2023 11:02:28 -0800
Subject: [PATCH 073/478] Git: Use sysconfdir=/etc for git built from source
 (#395)

* Git: Adds a new 'addGitConfigSymlink' option

* Use sysconfdir
---
 src/git/devcontainer-feature.json | 2 +-
 src/git/install.sh                | 2 +-
 test/git/install_git_from_src.sh  | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
index ea35c4bbe..4123aed6b 100644
--- a/src/git/devcontainer-feature.json
+++ b/src/git/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.1.3",
+    "version": "1.1.4",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
diff --git a/src/git/install.sh b/src/git/install.sh
index 52081f17c..679e4975c 100755
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -144,7 +144,7 @@ echo "Downloading source for ${GIT_VERSION}..."
 curl -sL https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz | tar -xzC /tmp 2>&1
 echo "Building..."
 cd /tmp/git-${GIT_VERSION}
-make -s USE_LIBPCRE=YesPlease prefix=/usr/local all && make -s USE_LIBPCRE=YesPlease prefix=/usr/local install 2>&1
+make -s USE_LIBPCRE=YesPlease prefix=/usr/local sysconfdir=/etc all && make -s USE_LIBPCRE=YesPlease prefix=/usr/local sysconfdir=/etc install 2>&1
 rm -rf /tmp/git-${GIT_VERSION}
 rm -rf /var/lib/apt/lists/*
 echo "Done!"
diff --git a/test/git/install_git_from_src.sh b/test/git/install_git_from_src.sh
index 4bdcf3066..c3552240d 100644
--- a/test/git/install_git_from_src.sh
+++ b/test/git/install_git_from_src.sh
@@ -12,5 +12,13 @@ cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
 cd feature-starter
 check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
 
+check "git-location" bash -c "which git | grep /usr/local/bin/git"
+
+check "set-git-config-user-name" bash -c "git config --system user.name devcontainers"
+check "gitconfig-file-location" bash -c "ls /etc/gitconfig"
+check "gitconfig-contains-name" bash -c "cat /etc/gitconfig | grep 'name = devcontainers'"
+
+check "usr-local-etc-config-does-not-exist" test ! -f "/usr/local/etc/gitconfig"
+
 # Report result
 reportResults

From 1726222515e9d03c05f48bb4a03895afd09525a7 Mon Sep 17 00:00:00 2001
From: "Stephen A. Imhoff" <clockwork-muse@outlook.com>
Date: Fri, 13 Jan 2023 11:05:53 -0800
Subject: [PATCH 074/478] CommonUtils - ensure home directory exists. (#398)

* CommonUtils - ensure home directory exists.

* Only create non-root home directory

Root directory will always exist.

* Bump version
---
 src/common-utils/devcontainer-feature.json | 2 +-
 src/common-utils/main.sh                   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 36c87bc7c..03b2fe37f 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.0.6",
+    "version": "2.0.7",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index ff2c54ca9..893f53aa5 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -383,6 +383,10 @@ if [ "${USERNAME}" = "root" ]; then
     user_rc_path="/root"
 else
     user_rc_path="/home/${USERNAME}"
+    if [ ! -d "${user_rc_path}" ]; then
+        mkdir -p "${user_rc_path}"
+        chown ${USERNAME}:${group_name} "${user_rc_path}"
+    fi
 fi
 
 # Restore user .bashrc / .profile / .zshrc defaults from skeleton file if it doesn't exist or is empty

From 79588ef3da9abb2b536583130653b05030e8e5a6 Mon Sep 17 00:00:00 2001
From: Stephan <34886888+steled@users.noreply.github.com>
Date: Tue, 17 Jan 2023 18:18:13 +0100
Subject: [PATCH 075/478] checkout action update (#404)

- updated the action checkout from v2 to 3 as required by action warning
---
 .github/workflows/linter-automated.yaml    | 2 +-
 .github/workflows/linter-manual.yaml       | 2 +-
 .github/workflows/release.yaml             | 2 +-
 .github/workflows/test-all.yaml            | 6 +++---
 .github/workflows/test-manual.yaml         | 2 +-
 .github/workflows/test-pr.yaml             | 4 ++--
 .github/workflows/update-documentation.yml | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/linter-automated.yaml b/.github/workflows/linter-automated.yaml
index 0c3420a62..98921bf68 100644
--- a/.github/workflows/linter-automated.yaml
+++ b/.github/workflows/linter-automated.yaml
@@ -9,7 +9,7 @@ jobs:
   shellchecker:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Shell Linter
       uses: azohra/shell-linter@v0.6.0
diff --git a/.github/workflows/linter-manual.yaml b/.github/workflows/linter-manual.yaml
index 1a808939a..ec2e5f0a7 100644
--- a/.github/workflows/linter-manual.yaml
+++ b/.github/workflows/linter-manual.yaml
@@ -15,7 +15,7 @@ jobs:
   shellchecker:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Shell Linter
       uses: azohra/shell-linter@v0.6.0
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index f8dfc7210..485096b5f 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -10,7 +10,7 @@ jobs:
     if: ${{ github.ref == 'refs/heads/main' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       
       - name: "Publish"
         uses: devcontainers/action@v1
diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml
index d2238a707..ab51a737c 100644
--- a/.github/workflows/test-all.yaml
+++ b/.github/workflows/test-all.yaml
@@ -51,7 +51,7 @@ jobs:
             "mcr.microsoft.com/devcontainers/base:debian",
           ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
@@ -94,7 +94,7 @@ jobs:
             "nix",
         ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
@@ -106,7 +106,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
diff --git a/.github/workflows/test-manual.yaml b/.github/workflows/test-manual.yaml
index 333dbb801..f163eb8ea 100644
--- a/.github/workflows/test-manual.yaml
+++ b/.github/workflows/test-manual.yaml
@@ -19,7 +19,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index 69b39423b..fb586fb8b 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -58,7 +58,7 @@ jobs:
             "mcr.microsoft.com/devcontainers/base:debian",
           ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
@@ -74,7 +74,7 @@ jobs:
       matrix:
         features: ${{ fromJSON(needs.detect-changes.outputs.features) }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - 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
index 711c49256..6d7bb5cbb 100644
--- a/.github/workflows/update-documentation.yml
+++ b/.github/workflows/update-documentation.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     if: "github.ref == 'refs/heads/main'"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Generate Documentation
         uses: devcontainers/action@v1

From 58b8fe093da506595118076cedbdeee4aa6d20b0 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 17 Jan 2023 09:34:53 -0800
Subject: [PATCH 076/478] Fix typos in comments / *.md (#396)

---
 src/common-utils/main.sh                | 2 +-
 src/desktop-lite/install.sh             | 4 ++--
 src/docker-in-docker/install.sh         | 4 ++--
 src/docker-outside-of-docker/install.sh | 6 +++---
 src/dotnet/install.sh                   | 4 ++--
 src/git-lfs/install.sh                  | 2 +-
 src/git/install.sh                      | 2 +-
 src/github-cli/install.sh               | 2 +-
 src/go/install.sh                       | 2 +-
 src/nix/install.sh                      | 2 +-
 src/nix/nix-entrypoint.sh               | 2 +-
 src/nix/utils.sh                        | 2 +-
 src/python/install.sh                   | 2 +-
 src/ruby/install.sh                     | 2 +-
 src/sshd/NOTES.md                       | 2 +-
 src/terraform/install.sh                | 2 +-
 16 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 893f53aa5..c8541cd51 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -292,7 +292,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Bring in ID, ID_LIKE, VERSION_ID, VERSION_CODENAME
 . /etc/os-release
-# Get an adjusted ID independant of distro variants
+# Get an adjusted ID independent of distro variants
 if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
     ADJUSTED_ID="debian"
 elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh
index ffd39d50b..df4390eca 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -176,7 +176,7 @@ export DEBIAN_FRONTEND=noninteractive
 
 apt_get_update
 
-# On older Ubuntu, Tilix is in a PPA. on Debian strech its in backports.
+# On older Ubuntu, Tilix is in a PPA. on Debian stretch its in backports.
 if [[ -z $(apt-cache --names-only search ^tilix$) ]]; then
     . /etc/os-release
     if [ "${ID}" = "ubuntu" ]; then
@@ -365,7 +365,7 @@ screen_geometry="\${VNC_RESOLUTION%*x*}"
 screen_depth="\${VNC_RESOLUTION##*x}"
 startInBackgroundIfNotRunning "Xtigervnc" sudoUserIf "tigervncserver \${DISPLAY} -geometry \${screen_geometry} -depth \${screen_depth} -rfbport ${VNC_PORT} -dpi \${VNC_DPI:-96} -localhost -desktop fluxbox -fg -passwd /usr/local/etc/vscode-dev-containers/vnc-passwd"
 
-# Spin up noVNC if installed and not runnning.
+# Spin up noVNC if installed and not running.
 if [ -d "/usr/local/novnc" ] && [ "\$(ps -ef | grep /usr/local/novnc/noVNC*/utils/launch.sh | grep -v grep)" = "" ]; then
     keepRunningInBackground "noVNC" sudoIf "/usr/local/novnc/noVNC*/utils/launch.sh --listen ${NOVNC_PORT} --vnc localhost:${VNC_PORT}"
     log "noVNC started."
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index d35112143..dff11393f 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -137,7 +137,7 @@ export DEBIAN_FRONTEND=noninteractive
 # Fetch host/container arch.
 architecture="$(dpkg --print-architecture)"
 
-# Check if distro is suppported
+# Check if distro is supported
 if [ "${USE_MOBY}" = "true" ]; then
     # 'get_common_setting' allows attribute to be updated remotely
     get_common_setting DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES
@@ -305,7 +305,7 @@ if [ -f "/usr/local/share/docker-init.sh" ]; then
     rm -rf /var/lib/apt/lists/*
     exit 0
 fi
-echo "docker-init doesnt exist, adding..."
+echo "docker-init doesn't exist, adding..."
 
 # Add user to the docker group
 if [ "${ENABLE_NONROOT_DOCKER}" = "true" ]; then
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 1307bfc91..dc5a9034b 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -126,7 +126,7 @@ fi
 # Fetch host/container arch.
 architecture="$(dpkg --print-architecture)"
 
-# Check if distro is suppported
+# Check if distro is supported
 if [ "${USE_MOBY}" = "true" ]; then
     # 'get_common_setting' allows attribute to be updated remotely
     get_common_setting DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES
@@ -209,7 +209,7 @@ else
         TARGET_COMPOSE_ARCH="x86_64"
     fi
     if [ "${TARGET_COMPOSE_ARCH}" != "x86_64" ]; then
-        # Use pip to get a version that runns on this architecture
+        # Use pip to get a version that runs on this architecture
         check_packages python3-minimal python3-pip libffi-dev python3-venv
         export PIPX_HOME=/usr/local/pipx
         mkdir -p ${PIPX_HOME}
@@ -260,7 +260,7 @@ if [ -f "/usr/local/share/docker-init.sh" ]; then
     rm -rf /var/lib/apt/lists/*
     exit 0
 fi
-echo "docker-init doesnt exist, adding..."
+echo "docker-init doesn't exist, adding..."
 
 # By default, make the source and target sockets the same
 if [ "${SOURCE_SOCKET}" != "${TARGET_SOCKET}" ]; then
diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh
index 13285abbd..1c7430aa0 100644
--- a/src/dotnet/install.sh
+++ b/src/dotnet/install.sh
@@ -316,8 +316,8 @@ install_using_dotnet_releases_url() {
     local sdk_or_runtime="$1"
     local version="$2"
 
-    # Check listed package dependecies and install them if they are not already installed. 
-    # NOTE: icu-devtools is a small package with similar dependecies to .NET. 
+    # Check listed package dependencies and install them if they are not already installed. 
+    # NOTE: icu-devtools is a small package with similar dependencies to .NET. 
     #       It will install the appropriate dependencies based on the OS:
     #         - libgcc-s1 OR libgcc1 depending on OS
     #         - the latest libicuXX depending on OS (eg libicu57 for stretch)
diff --git a/src/git-lfs/install.sh b/src/git-lfs/install.sh
index f0ce9ff7e..d6f914f81 100755
--- a/src/git-lfs/install.sh
+++ b/src/git-lfs/install.sh
@@ -65,7 +65,7 @@ find_version_from_git_tags() {
 receive_gpg_keys() {
     local keys=${!1}
 
-    # Use a temporary locaiton for gpg keys to avoid polluting image
+    # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
     chmod 700 ${GNUPGHOME}
diff --git a/src/git/install.sh b/src/git/install.sh
index 679e4975c..7bfa490e7 100755
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -34,7 +34,7 @@ receive_gpg_keys() {
         keyring_args="--no-default-keyring --keyring $2"
     fi
 
-    # Use a temporary locaiton for gpg keys to avoid polluting image
+    # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
     chmod 700 ${GNUPGHOME}
diff --git a/src/github-cli/install.sh b/src/github-cli/install.sh
index 1856115c5..c1dd6924e 100755
--- a/src/github-cli/install.sh
+++ b/src/github-cli/install.sh
@@ -34,7 +34,7 @@ receive_gpg_keys() {
         keyring_args="--no-default-keyring --keyring $2"
     fi
 
-    # Use a temporary locaiton for gpg keys to avoid polluting image
+    # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
     chmod 700 ${GNUPGHOME}
diff --git a/src/go/install.sh b/src/go/install.sh
index 1b65e50ce..365421e4a 100755
--- a/src/go/install.sh
+++ b/src/go/install.sh
@@ -144,7 +144,7 @@ usermod -a -G golang "${USERNAME}"
 mkdir -p "${TARGET_GOROOT}" "${TARGET_GOPATH}"
 
 if [[ "${TARGET_GO_VERSION}" != "none" ]] && [[ "$(go version)" != *"${TARGET_GO_VERSION}"* ]]; then
-    # Use a temporary locaiton for gpg keys to avoid polluting image
+    # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
     chmod 700 ${GNUPGHOME}
diff --git a/src/nix/install.sh b/src/nix/install.sh
index dcddcfdb4..80f9ace0d 100755
--- a/src/nix/install.sh
+++ b/src/nix/install.sh
@@ -12,7 +12,7 @@ FLAKEURI="${FLAKEURI:-""}"
 EXTRANIXCONFIG="${EXTRANIXCONFIG:-""}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 
-# Nix keys for securly verifying installer download signature per https://nixos.org/download.html#nix-verify-installation
+# Nix keys for securely verifying installer download signature per https://nixos.org/download.html#nix-verify-installation
 NIX_GPG_KEYS="B541D55301270E0BCF15CA5D8170B4726D7198DE"
 GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
 keyserver hkps://keys.openpgp.org
diff --git a/src/nix/nix-entrypoint.sh b/src/nix/nix-entrypoint.sh
index cac3e63b0..0ec7188db 100755
--- a/src/nix/nix-entrypoint.sh
+++ b/src/nix/nix-entrypoint.sh
@@ -15,7 +15,7 @@ if ! pidof nix-daemon > /dev/null 2>&1; then
         fi
     fi
     if [ "${start_ok}" = "false" ]; then
-            echo -e 'Failed to start nix-daemon as root. Set multiUser to false in your feature configuraiton if you would\nprefer to run the container as a non-root. You may also start the daemon manually if you have sudo\ninstalled and configured for your user by running "sudo -c nix-daemon &"'
+            echo -e 'Failed to start nix-daemon as root. Set multiUser to false in your feature configuration if you would\nprefer to run the container as a non-root. You may also start the daemon manually if you have sudo\ninstalled and configured for your user by running "sudo -c nix-daemon &"'
     fi
 fi
 exec "$@"
diff --git a/src/nix/utils.sh b/src/nix/utils.sh
index 5753e5a02..7cb55f218 100755
--- a/src/nix/utils.sh
+++ b/src/nix/utils.sh
@@ -91,7 +91,7 @@ receive_gpg_keys() {
         keyring_args="--no-default-keyring --keyring $2"
     fi
 
-    # Use a temporary locaiton for gpg keys to avoid polluting image
+    # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
     chmod 700 ${GNUPGHOME}
diff --git a/src/python/install.sh b/src/python/install.sh
index 92b8368f1..3f6b4d9ac 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -85,7 +85,7 @@ receive_gpg_keys() {
         keyring_args="--no-default-keyring --keyring $2"
     fi
 
-    # Use a temporary locaiton for gpg keys to avoid polluting image
+    # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
     chmod 700 ${GNUPGHOME}
diff --git a/src/ruby/install.sh b/src/ruby/install.sh
index c879dec7e..daae7faa1 100755
--- a/src/ruby/install.sh
+++ b/src/ruby/install.sh
@@ -78,7 +78,7 @@ receive_gpg_keys() {
         keyring_args="--no-default-keyring --keyring \"$2\""
     fi
 
-    # Use a temporary locaiton for gpg keys to avoid polluting image
+    # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
     chmod 700 ${GNUPGHOME}
diff --git a/src/sshd/NOTES.md b/src/sshd/NOTES.md
index e0e7acc82..c2ca8c8ad 100644
--- a/src/sshd/NOTES.md
+++ b/src/sshd/NOTES.md
@@ -57,7 +57,7 @@ While the some services automates SSH setup (e.g., when using the GitHub CLI for
         ```
         \\sshfs.r\vscode@localhost!2222\workspaces
         ```
-        ...where `vscode` above is the user you are running as in the container and `2222` after the `!` is the same local port you used in the `ssh` command in the previous seciton.
+        ...where `vscode` above is the user you are running as in the container and `2222` after the `!` is the same local port you used in the `ssh` command in the previous section.
 
 4. Your dev container's filesystem should now be available in the `~/sshfs/devcontainer` folder on macOS or Linux or in a new explorer window on Windows.
 
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index b324eb644..1fec7563f 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -52,7 +52,7 @@ receive_gpg_keys() {
         keyring_args="--no-default-keyring --keyring $2"
     fi
 
-    # Use a temporary locaiton for gpg keys to avoid polluting image
+    # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
     chmod 700 ${GNUPGHOME}

From f7314671e1654cd47263a09b134ddd0286f9eccc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 17 Jan 2023 09:46:27 -0800
Subject: [PATCH 077/478] Automated documentation update (#405)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/sshd/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sshd/README.md b/src/sshd/README.md
index 6e9382c04..7314e16af 100644
--- a/src/sshd/README.md
+++ b/src/sshd/README.md
@@ -76,7 +76,7 @@ While the some services automates SSH setup (e.g., when using the GitHub CLI for
         ```
         \\sshfs.r\vscode@localhost!2222\workspaces
         ```
-        ...where `vscode` above is the user you are running as in the container and `2222` after the `!` is the same local port you used in the `ssh` command in the previous seciton.
+        ...where `vscode` above is the user you are running as in the container and `2222` after the `!` is the same local port you used in the `ssh` command in the previous section.
 
 4. Your dev container's filesystem should now be available in the `~/sshfs/devcontainer` folder on macOS or Linux or in a new explorer window on Windows.
 

From d78a1534925e7e424355d214c683e946cbb97d05 Mon Sep 17 00:00:00 2001
From: Tobias Gesellchen <tobias@gesellix.de>
Date: Wed, 18 Jan 2023 22:24:10 +0100
Subject: [PATCH 078/478] Java: add Apache Ant (#409)

* Java: add Apache Ant

* Update src/java/devcontainer-feature.json

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

* revert the changes in README.md

* Add tests for Java/Ant

* Fix Java feature version

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
---
 src/java/devcontainer-feature.json            | 19 +++++++++++++++++--
 src/java/install.sh                           |  7 +++++++
 ...sh => install_ant_and_gradle_and_maven.sh} |  9 ++++++++-
 ...tall_ant_and_gradle_and_maven_for_user.sh} |  9 ++++++++-
 ...gradle_and_maven_with_specific_version.sh} |  9 ++++++++-
 test/java/scenarios.json                      | 10 +++++++---
 6 files changed, 55 insertions(+), 8 deletions(-)
 rename test/java/{install_gradle_and_maven.sh => install_ant_and_gradle_and_maven.sh} (75%)
 rename test/java/{install_gradle_and_maven_for_user.sh => install_ant_and_gradle_and_maven_for_user.sh} (76%)
 rename test/java/{install_gradle_and_maven_with_specific_version.sh => install_ant_and_gradle_and_maven_with_specific_version.sh} (73%)

diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index 113c75d7b..f55276aa3 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "name": "Java (via SDKMAN!)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
@@ -59,6 +59,21 @@
       ],
       "default": "latest",
       "description": "Select or enter a Maven version"
+    },
+    "installAnt": {
+      "type": "boolean",
+      "default": false,
+      "description": "Install Ant, a software tool for automating software build processes"
+    },
+    "antVersion": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "1.10.12",
+        "1.9.15"
+      ],
+      "default": "latest",
+      "description": "Select or enter an Ant version"
     }
   },
   "customizations": {
@@ -74,7 +89,7 @@
   "containerEnv": {
     "SDKMAN_DIR": "/usr/local/sdkman",
     "JAVA_HOME": "/usr/local/sdkman/candidates/java/current",
-    "PATH": "/usr/local/sdkman/bin:/usr/local/sdkman/candidates/java/current/bin:/usr/local/sdkman/candidates/gradle/current/bin:/usr/local/sdkman/candidates/maven/current/bin:${PATH}"
+    "PATH": "/usr/local/sdkman/bin:/usr/local/sdkman/candidates/java/current/bin:/usr/local/sdkman/candidates/gradle/current/bin:/usr/local/sdkman/candidates/maven/current/bin:/usr/local/sdkman/candidates/ant/current/bin:${PATH}"
   },
   "installsAfter": [
       "ghcr.io/devcontainers/features/common-utils"
diff --git a/src/java/install.sh b/src/java/install.sh
index bf9496304..ea43dd3e9 100644
--- a/src/java/install.sh
+++ b/src/java/install.sh
@@ -14,6 +14,8 @@ INSTALL_GRADLE="${INSTALLGRADLE:-"false"}"
 GRADLE_VERSION="${GRADLEVERSION:-"latest"}"
 INSTALL_MAVEN="${INSTALLMAVEN:-"false"}"
 MAVEN_VERSION="${MAVENVERSION:-"latest"}"
+INSTALL_ANT="${INSTALLANT:-"false"}"
+ANT_VERSION="${ANTVERSION:-"latest"}"
 JDK_DISTRO="${JDKDISTRO}"
 
 export SDKMAN_DIR="${SDKMAN_DIR:-"/usr/local/sdkman"}"
@@ -173,6 +175,11 @@ if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
     su ${USERNAME} -c ". ${SDKMAN_DIR}/bin/sdkman-init.sh && sdk default java ${JAVA_VERSION}"
 fi
 
+# Install Ant
+if [[ "${INSTALL_ANT}" = "true" ]] && ! ant -version > /dev/null; then
+    sdk_install ant ${ANT_VERSION}
+fi
+
 # Install Gradle
 if [[ "${INSTALL_GRADLE}" = "true" ]] && ! gradle --version > /dev/null; then
     sdk_install gradle ${GRADLE_VERSION}
diff --git a/test/java/install_gradle_and_maven.sh b/test/java/install_ant_and_gradle_and_maven.sh
similarity index 75%
rename from test/java/install_gradle_and_maven.sh
rename to test/java/install_ant_and_gradle_and_maven.sh
index 636fd92a0..599f8d9d5 100644
--- a/test/java/install_gradle_and_maven.sh
+++ b/test/java/install_ant_and_gradle_and_maven.sh
@@ -8,8 +8,15 @@ source dev-container-features-test-lib
 check "user is root" grep root <(whoami)
 
 check "java" java --version
-check "gradle" gradle --version
 
+check "ant" ant -version
+cat << EOF > /tmp/build.xml
+<project><target name="init"><mkdir dir="ant-src"/></target></project>
+EOF
+cd /tmp && ant init
+check "ant-src exists" grep "ant-src" <(ls -la /tmp)
+
+check "gradle" gradle --version
 cd /tmp && gradle init --type basic --dsl groovy --incubating --project-name test
 check "GRADLE_USER_HOME exists" grep ".gradle" <(ls -la /root)
 
diff --git a/test/java/install_gradle_and_maven_for_user.sh b/test/java/install_ant_and_gradle_and_maven_for_user.sh
similarity index 76%
rename from test/java/install_gradle_and_maven_for_user.sh
rename to test/java/install_ant_and_gradle_and_maven_for_user.sh
index b6ea4266b..4e8b43134 100644
--- a/test/java/install_gradle_and_maven_for_user.sh
+++ b/test/java/install_ant_and_gradle_and_maven_for_user.sh
@@ -8,8 +8,15 @@ source dev-container-features-test-lib
 check "user is vscode" grep vscode <(whoami)
 
 check "java" java --version
-check "gradle" gradle --version
 
+check "ant" ant -version
+cat << EOF > /tmp/build.xml
+<project><target name="init"><mkdir dir="ant-src"/></target></project>
+EOF
+cd /tmp && ant init
+check "ant-src exists" grep "ant-src" <(ls -la /tmp)
+
+check "gradle" gradle --version
 cd /tmp && gradle init --type basic --dsl groovy --incubating --project-name test
 check "GRADLE_USER_HOME exists" grep ".gradle" <(ls -la /home/vscode)
 
diff --git a/test/java/install_gradle_and_maven_with_specific_version.sh b/test/java/install_ant_and_gradle_and_maven_with_specific_version.sh
similarity index 73%
rename from test/java/install_gradle_and_maven_with_specific_version.sh
rename to test/java/install_ant_and_gradle_and_maven_with_specific_version.sh
index c6ae6160c..7727f51b6 100644
--- a/test/java/install_gradle_and_maven_with_specific_version.sh
+++ b/test/java/install_ant_and_gradle_and_maven_with_specific_version.sh
@@ -8,8 +8,15 @@ source dev-container-features-test-lib
 check "user is root" grep root <(whoami)
 
 check "java" java --version
-check "gradle version" grep "Gradle 6.8.3" <(gradle --version)
 
+check "ant version" grep "Ant(TM) version 1.10.12" <(ant -version)
+cat << EOF > /tmp/build.xml
+<project><target name="init"><mkdir dir="ant-src"/></target></project>
+EOF
+cd /tmp && ant init
+check "ant-src exists" grep "ant-src" <(ls -la /tmp)
+
+check "gradle version" grep "Gradle 6.8.3" <(gradle --version)
 cd /tmp && gradle init --type basic --dsl groovy --project-name test
 check "GRADLE_USER_HOME exists" grep ".gradle" <(ls -la /root)
 
diff --git a/test/java/scenarios.json b/test/java/scenarios.json
index 479ee4703..11fb7ba33 100644
--- a/test/java/scenarios.json
+++ b/test/java/scenarios.json
@@ -17,7 +17,7 @@
             }
         }
     },
-    "install_gradle_and_maven_for_user": {
+    "install_ant_and_gradle_and_maven_for_user": {
         "image": "ubuntu:focal",
         "remoteUser": "vscode",
         "features": {
@@ -26,26 +26,30 @@
             },
             "java": {
                 "version": "latest",
+                "installAnt": true,
                 "installGradle": true,
                 "installMaven": true
             }
         }
     },
-    "install_gradle_and_maven": {
+    "install_ant_and_gradle_and_maven": {
         "image": "ubuntu:focal",
         "features": {
             "java": {
                 "version": "latest",
+                "installAnt": true,
                 "installGradle": true,
                 "installMaven": true
             }
         }
     },
-    "install_gradle_and_maven_with_specific_version": {
+    "install_ant_and_gradle_and_maven_with_specific_version": {
         "image": "ubuntu:focal",
         "features": {
             "java": {
                 "version": "latest",
+                "installAnt": "true",
+                "antVersion": "1.10.12",
                 "installGradle": "true",
                 "gradleVersion": "6.8.3",
                 "installMaven": "true",

From 24b33c5f79a38684a4433fcb1310db256b264c00 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 18 Jan 2023 13:42:35 -0800
Subject: [PATCH 079/478] Automated documentation update (#410)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/java/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/java/README.md b/src/java/README.md
index f3e35e38a..e74cd5a10 100644
--- a/src/java/README.md
+++ b/src/java/README.md
@@ -21,6 +21,8 @@ Installs Java, SDKMAN! (if not installed), and needed dependencies.
 | gradleVersion | Select or enter a Gradle version | string | latest |
 | installMaven | Install Maven, a management tool for Java | boolean | false |
 | mavenVersion | Select or enter a Maven version | string | latest |
+| installAnt | Install Ant, a software tool for automating software build processes | boolean | false |
+| antVersion | Select or enter an Ant version | string | latest |
 
 ## License
 

From 7a3a9c5fcaa59cf4d7dbbcece47094a6d642a9b0 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Fri, 20 Jan 2023 09:22:39 -0800
Subject: [PATCH 080/478] Php: Auto configure if a three part version is not
 provided (#406)

* Php: Auto configure if a three part version is not provided

* fix test

* update checks

* Bump version
---
 src/php/devcontainer-feature.json |  6 ++--
 src/php/install.sh                | 49 ++++++++++++++++++++++---------
 test/php/install_php_8.sh         | 11 +++++++
 test/php/install_php_8_2.sh       | 11 +++++++
 test/php/scenarios.json           | 18 +++++++++++-
 5 files changed, 78 insertions(+), 17 deletions(-)
 create mode 100644 test/php/install_php_8.sh
 create mode 100644 test/php/install_php_8_2.sh

diff --git a/src/php/devcontainer-feature.json b/src/php/devcontainer-feature.json
index 2ea56d2ba..201fe481c 100644
--- a/src/php/devcontainer-feature.json
+++ b/src/php/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "php",
-    "version": "1.0.11",
+    "version": "1.1.0",
     "name": "PHP",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/php",
     "options": {
@@ -8,7 +8,9 @@
             "type": "string",
             "proposals": [
                 "latest",
-                "8.0.16"
+                "8",
+                "8.2",
+                "8.2.0"
             ],
             "default": "latest",
             "description": "Select or enter a PHP version"
diff --git a/src/php/install.sh b/src/php/install.sh
index c0bcb0426..0c577b165 100755
--- a/src/php/install.sh
+++ b/src/php/install.sh
@@ -84,15 +84,41 @@ check_packages() {
     fi
 }
 
-# Figure out correct version of PHP
+# Figure out correct version of a three part version number is not passed
 find_version_from_git_tags() {
-    local repository="https://github.com/php/php-src"
-    local separator="."
-    local escaped_separator=${separator//./\\.}
-    local last_part="${escaped_separator}[0-9]+"
-    local regex="\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
-    local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
-    PHP_VERSION="$(echo "${version_list}" | head -n 1)"
+    local variable_name=$1
+    local requested_version=${!variable_name}
+    if [ "${requested_version}" = "none" ]; then return; fi
+    local repository=$2
+    local prefix=${3:-"tags/v"}
+    local separator=${4:-"."}
+    local last_part_optional=${5:-"false"}    
+    echo "${!variable_name}"
+    echo "$(echo "${requested_version}" | grep -o "." | wc -l)"
+    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
+        local escaped_separator=${separator//./\\.}
+        local last_part
+        if [ "${last_part_optional}" = "true" ]; then
+            last_part="(${escaped_separator}[0-9]+)?"
+        else
+            last_part="${escaped_separator}[0-9]+"
+        fi
+        local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
+        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
+            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+        else
+            set +e
+            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            set -e
+        fi
+    fi
+    echo "${!variable_name}"
+    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
+        echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
+        exit 1
+    fi
+    echo "${variable_name}=${!variable_name}"
 }
 
 # Install PHP Composer
@@ -131,12 +157,6 @@ check_packages $RUNTIME_DEPS $PHP_DEPS $PHPIZE_DEPS
 
 install_php() {
     PHP_VERSION="$1"
-
-    # Fetch latest version of PHP if needed
-    if [ "${PHP_VERSION}" = "latest" ] || [ "${PHP_VERSION}" = "lts" ]; then
-        find_version_from_git_tags
-    fi
-
     PHP_INSTALL_DIR="${PHP_DIR}/${PHP_VERSION}"
     if [ -d "${PHP_INSTALL_DIR}" ]; then
         echo "(!) PHP version ${PHP_VERSION} already exists."
@@ -218,6 +238,7 @@ install_php() {
     updaterc "if [[ \"\${PATH}\" != *\"${CURRENT_DIR}\"* ]]; then export PATH=\"${CURRENT_DIR}/bin:\${PATH}\"; fi"
 }
 
+find_version_from_git_tags PHP_VERSION https://github.com/php/php-src "tags/php-"
 install_php "${PHP_VERSION}"
 
 # Additional php versions to be installed but not be set as default.
diff --git a/test/php/install_php_8.sh b/test/php/install_php_8.sh
new file mode 100644
index 000000000..a510525f6
--- /dev/null
+++ b/test/php/install_php_8.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "php-version-8-is-installed" bash -c "php --version | grep '8.'"
+
+# Report result
+reportResults
diff --git a/test/php/install_php_8_2.sh b/test/php/install_php_8_2.sh
new file mode 100644
index 000000000..9320268ef
--- /dev/null
+++ b/test/php/install_php_8_2.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "php-version-8.2-is-installed" bash -c "php --version | grep '8.2'"
+
+# Report result
+reportResults
diff --git a/test/php/scenarios.json b/test/php/scenarios.json
index f24753b11..dac799875 100644
--- a/test/php/scenarios.json
+++ b/test/php/scenarios.json
@@ -7,5 +7,21 @@
                 "additionalVersions": "8.0.17,8.0.3"
             }
         }
+    },
+    "install_php_8": {
+        "image": "ubuntu:focal",
+        "features": {
+            "php": {
+                "version": "8"
+            }
+        }
+    },
+    "install_php_8_2": {
+        "image": "ubuntu:focal",
+        "features": {
+            "php": {
+                "version": "8.2"
+            }
+        }
     }
-}
\ No newline at end of file
+}

From bebf87e33cc792d448cfc34ccac64097b18243b6 Mon Sep 17 00:00:00 2001
From: Pamela Fox <pamela.fox@gmail.com>
Date: Mon, 23 Jan 2023 15:18:50 -0800
Subject: [PATCH 081/478] Add more detail to note about architecture (#416)

* Add more detail to note about architecture

* Update src/docker-in-docker/NOTES.md

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

* Update src/docker-in-docker/NOTES.md

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
---
 src/docker-in-docker/NOTES.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/docker-in-docker/NOTES.md b/src/docker-in-docker/NOTES.md
index a22e61c51..b8156f8b6 100644
--- a/src/docker-in-docker/NOTES.md
+++ b/src/docker-in-docker/NOTES.md
@@ -2,8 +2,11 @@
 
 This docker-in-docker Dev Container Feature is roughly based on the [official docker-in-docker wrapper script](https://github.com/moby/moby/blob/master/hack/dind) that is part of the [Moby project](https://mobyproject.org/). With this in mind:
 * As the name implies, the Feature is expected to work when the host is running Docker (or the OSS Moby container engine it is built on). It may be possible to get running in other container engines, but it has not been tested with them.
-* The host and the container must be running on the same chip architecture. You will not be able to use it with an emulated x86 image with Docker Desktop on an Apple Silicon Mac, for example.
-
+* The host and the container must be running on the same chip architecture. You will not be able to use it with an emulated x86 image with Docker Desktop on an Apple Silicon Mac, like in this example:
+  ```
+  FROM --platform=linux/amd64 mcr.microsoft.com/devcontainers/typescript-node:16
+  ```
+  See [Issue #219](https://github.com/devcontainers/features/issues/219) for more details.
 
 
 ## OS Support

From 3a579894a02c7eb76184cf7305d67fe3f69b789f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 23 Jan 2023 15:21:02 -0800
Subject: [PATCH 082/478] Automated documentation update (#417)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/docker-in-docker/README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index 4196892b0..d74639bb1 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -25,8 +25,11 @@ Create child containers *inside* a container, independent from the host's docker
 
 This docker-in-docker Dev Container Feature is roughly based on the [official docker-in-docker wrapper script](https://github.com/moby/moby/blob/master/hack/dind) that is part of the [Moby project](https://mobyproject.org/). With this in mind:
 * As the name implies, the Feature is expected to work when the host is running Docker (or the OSS Moby container engine it is built on). It may be possible to get running in other container engines, but it has not been tested with them.
-* The host and the container must be running on the same chip architecture. You will not be able to use it with an emulated x86 image with Docker Desktop on an Apple Silicon Mac, for example.
-
+* The host and the container must be running on the same chip architecture. You will not be able to use it with an emulated x86 image with Docker Desktop on an Apple Silicon Mac, like in this example:
+  ```
+  FROM --platform=linux/amd64 mcr.microsoft.com/devcontainers/typescript-node:16
+  ```
+  See [Issue #219](https://github.com/devcontainers/features/issues/219) for more details.
 
 
 ## OS Support

From 676e824e92c7b2abe45f46c89580c96f99a8d43f Mon Sep 17 00:00:00 2001
From: "dylhack.dev" <followmelikethunder@pm.me>
Date: Tue, 24 Jan 2023 12:28:54 -0600
Subject: [PATCH 083/478] features/nix: remove PGP check (#414)

* nix: remove PGP check

* fix issues
---
 src/nix/devcontainer-feature.json |  2 +-
 src/nix/install.sh                | 10 ---------
 src/nix/utils.sh                  | 35 -------------------------------
 3 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/src/nix/devcontainer-feature.json b/src/nix/devcontainer-feature.json
index b112040d3..664f68c91 100644
--- a/src/nix/devcontainer-feature.json
+++ b/src/nix/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "nix",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "name": "Nix Package Manager",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nix",
     "description": "Installs the Nix package manager and optionally a set of packages.",  
diff --git a/src/nix/install.sh b/src/nix/install.sh
index 80f9ace0d..ed048fe8d 100755
--- a/src/nix/install.sh
+++ b/src/nix/install.sh
@@ -12,12 +12,6 @@ FLAKEURI="${FLAKEURI:-""}"
 EXTRANIXCONFIG="${EXTRANIXCONFIG:-""}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 
-# Nix keys for securely verifying installer download signature per https://nixos.org/download.html#nix-verify-installation
-NIX_GPG_KEYS="B541D55301270E0BCF15CA5D8170B4726D7198DE"
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
-keyserver hkps://keys.openpgp.org
-keyserver hkp://keyserver.pgp.com"
-
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
     exit 1
@@ -61,10 +55,6 @@ else
         find_prev_version_from_git_tags VERSION https://github.com/NixOS/nix "tags/"
         curl -sSLf -o "${tmpdir}/install-nix" https://releases.nixos.org/nix/nix-${VERSION}/install
     fi
-    curl -sSLf -o "${tmpdir}/install-nix.asc" https://releases.nixos.org/nix/nix-${VERSION}/install.asc
-    cd "${tmpdir}"
-    receive_gpg_keys NIX_GPG_KEYS
-    gpg2 --verify ./install-nix.asc
     cd "${FEATURE_DIR}"
 
     # Do a multi or single-user setup based on feature config
diff --git a/src/nix/utils.sh b/src/nix/utils.sh
index 7cb55f218..f94fd3d4e 100755
--- a/src/nix/utils.sh
+++ b/src/nix/utils.sh
@@ -82,41 +82,6 @@ detect_user() {
     fi
 }
 
-# Import the specified key in a variable name passed in as 
-receive_gpg_keys() {
-    local keys=${!1}
-    local keyring_args=""
-    if [ ! -z "$2" ]; then
-        mkdir -p "$(dirname \"$2\")"
-        keyring_args="--no-default-keyring --keyring $2"
-    fi
-
-    # Use a temporary location for gpg keys to avoid polluting image
-    export GNUPGHOME="/tmp/tmp-gnupg"
-    mkdir -p ${GNUPGHOME}
-    chmod 700 ${GNUPGHOME}
-    echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" > ${GNUPGHOME}/dirmngr.conf
-    # GPG key download sometimes fails for some reason and retrying fixes it.
-    local retry_count=0
-    local gpg_ok="false"
-    set +e
-    until [ "${gpg_ok}" = "true" ] || [ "${retry_count}" -eq "5" ]; 
-    do
-        echo "(*) Downloading GPG key..."
-        ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys) 2>&1 && gpg_ok="true"
-        if [ "${gpg_ok}" != "true" ]; then
-            echo "(*) Failed getting key, retring in 10s..."
-            (( retry_count++ ))
-            sleep 10s
-        fi
-    done
-    set -e
-    if [ "${gpg_ok}" = "false" ]; then
-        echo "(!) Failed to get gpg key."
-        exit 1
-    fi
-}
-
 # Figure out correct version of a three part version number is not passed
 find_version_from_git_tags() {
     local variable_name=$1

From 258d5029a58e35d62c9d39400c92b41ed90825ee Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Wed, 25 Jan 2023 10:24:25 -0800
Subject: [PATCH 084/478] Republish all Features to add repo tags (#422)

republish all features to add repo tags
---
 src/anaconda/devcontainer-feature.json                 | 2 +-
 src/aws-cli/devcontainer-feature.json                  | 2 +-
 src/azure-cli/devcontainer-feature.json                | 2 +-
 src/common-utils/devcontainer-feature.json             | 2 +-
 src/conda/devcontainer-feature.json                    | 2 +-
 src/desktop-lite/devcontainer-feature.json             | 2 +-
 src/docker-in-docker/devcontainer-feature.json         | 2 +-
 src/docker-outside-of-docker/devcontainer-feature.json | 2 +-
 src/dotnet/devcontainer-feature.json                   | 2 +-
 src/git-lfs/devcontainer-feature.json                  | 2 +-
 src/git/devcontainer-feature.json                      | 2 +-
 src/github-cli/devcontainer-feature.json               | 2 +-
 src/go/devcontainer-feature.json                       | 2 +-
 src/hugo/devcontainer-feature.json                     | 2 +-
 src/java/devcontainer-feature.json                     | 2 +-
 src/kubectl-helm-minikube/devcontainer-feature.json    | 2 +-
 src/nix/devcontainer-feature.json                      | 2 +-
 src/node/devcontainer-feature.json                     | 2 +-
 src/nvidia-cuda/devcontainer-feature.json              | 2 +-
 src/oryx/devcontainer-feature.json                     | 2 +-
 src/php/devcontainer-feature.json                      | 2 +-
 src/powershell/devcontainer-feature.json               | 2 +-
 src/python/devcontainer-feature.json                   | 2 +-
 src/ruby/devcontainer-feature.json                     | 2 +-
 src/rust/devcontainer-feature.json                     | 2 +-
 src/sshd/devcontainer-feature.json                     | 2 +-
 src/terraform/devcontainer-feature.json                | 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/anaconda/devcontainer-feature.json b/src/anaconda/devcontainer-feature.json
index cdf1fbf7e..e0d013d86 100644
--- a/src/anaconda/devcontainer-feature.json
+++ b/src/anaconda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "anaconda",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "name": "Anaconda",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/anaconda",
     "options": {
diff --git a/src/aws-cli/devcontainer-feature.json b/src/aws-cli/devcontainer-feature.json
index 2e09d771b..8de431868 100644
--- a/src/aws-cli/devcontainer-feature.json
+++ b/src/aws-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "aws-cli",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "name": "AWS CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/aws-cli",
     "description": "Installs the AWS CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/azure-cli/devcontainer-feature.json b/src/azure-cli/devcontainer-feature.json
index a2ba45221..9ab2cc39b 100644
--- a/src/azure-cli/devcontainer-feature.json
+++ b/src/azure-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "azure-cli",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "name": "Azure CLI",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/azure-cli",
   "description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 03b2fe37f..71b6e6687 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.0.7",
+    "version": "2.0.8",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/conda/devcontainer-feature.json b/src/conda/devcontainer-feature.json
index 488de41ff..8e1a5fccb 100644
--- a/src/conda/devcontainer-feature.json
+++ b/src/conda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "conda",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "name": "Conda",
     "description": "A cross-platform, language-agnostic binary package manager",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json
index 84c99db93..5387138b5 100644
--- a/src/desktop-lite/devcontainer-feature.json
+++ b/src/desktop-lite/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "desktop-lite",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "name": "Light-weight Desktop",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
     "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 0ac565e7b..58c2d1400 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 69aa2f49a..1f3ff4e9a 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.0.9",
+    "version": "1.0.10",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index e66550e76..4aa264c13 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "Installs the .NET CLI. Provides option of installing sdk or runtime, and option of versions to install. Uses latest version of .NET sdk as defaults to install.",
diff --git a/src/git-lfs/devcontainer-feature.json b/src/git-lfs/devcontainer-feature.json
index a301a64d6..021746997 100644
--- a/src/git-lfs/devcontainer-feature.json
+++ b/src/git-lfs/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git-lfs",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "name": "Git Large File Support (LFS)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git-lfs",
     "description": "Installs Git Large File Support (Git LFS) along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like git and curl.",
diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
index 4123aed6b..23e1c04f4 100644
--- a/src/git/devcontainer-feature.json
+++ b/src/git/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.1.4",
+    "version": "1.1.5",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
diff --git a/src/github-cli/devcontainer-feature.json b/src/github-cli/devcontainer-feature.json
index 0e68a6028..24ef9802f 100644
--- a/src/github-cli/devcontainer-feature.json
+++ b/src/github-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "github-cli",
-    "version": "1.0.9",
+    "version": "1.0.10",
     "name": "GitHub CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/github-cli",
     "description": "Installs the GitHub CLI. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/go/devcontainer-feature.json b/src/go/devcontainer-feature.json
index f63d93ec1..92ed59154 100644
--- a/src/go/devcontainer-feature.json
+++ b/src/go/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "go",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "name": "Go",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/go",
     "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/hugo/devcontainer-feature.json b/src/hugo/devcontainer-feature.json
index ffc1a3bdb..d6358d703 100644
--- a/src/hugo/devcontainer-feature.json
+++ b/src/hugo/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "hugo",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "name": "Hugo",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/hugo",
   "options": {
diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index f55276aa3..7bdec6ab0 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "name": "Java (via SDKMAN!)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
diff --git a/src/kubectl-helm-minikube/devcontainer-feature.json b/src/kubectl-helm-minikube/devcontainer-feature.json
index 076af3912..78e90d9b7 100644
--- a/src/kubectl-helm-minikube/devcontainer-feature.json
+++ b/src/kubectl-helm-minikube/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "kubectl-helm-minikube",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "name": "Kubectl, Helm, and Minikube",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
     "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
diff --git a/src/nix/devcontainer-feature.json b/src/nix/devcontainer-feature.json
index 664f68c91..96a75016b 100644
--- a/src/nix/devcontainer-feature.json
+++ b/src/nix/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "nix",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "name": "Nix Package Manager",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nix",
     "description": "Installs the Nix package manager and optionally a set of packages.",  
diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index 216f29b80..6450ce422 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.1.4",
+    "version": "1.1.5",
     "name": "Node.js (via nvm) and yarn",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, and needed dependencies.",
diff --git a/src/nvidia-cuda/devcontainer-feature.json b/src/nvidia-cuda/devcontainer-feature.json
index dd5c13d8c..81e1dff8d 100644
--- a/src/nvidia-cuda/devcontainer-feature.json
+++ b/src/nvidia-cuda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "nvidia-cuda",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "name": "NVIDIA CUDA",
   "description": "Installs shared libraries for NVIDIA CUDA.",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nvidia-cuda",
diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index 5c643445b..9a6bd25c2 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "oryx",
-    "version": "1.0.12",
+    "version": "1.0.13",
     "name": "Oryx",
     "description": "Installs the oryx CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
diff --git a/src/php/devcontainer-feature.json b/src/php/devcontainer-feature.json
index 201fe481c..ae270d0e5 100644
--- a/src/php/devcontainer-feature.json
+++ b/src/php/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "php",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "name": "PHP",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/php",
     "options": {
diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json
index 84c39feb6..ef967a6a5 100644
--- a/src/powershell/devcontainer-feature.json
+++ b/src/powershell/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "powershell",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "name": "PowerShell",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
     "description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 1d5812149..361270b2a 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json
index 68951d899..8d2a4e31f 100644
--- a/src/ruby/devcontainer-feature.json
+++ b/src/ruby/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "name": "Ruby (via rvm)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
     "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index 8a7f5b432..e1b2052c4 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "rust",
-    "version": "1.0.9",
+    "version": "1.0.10",
     "name": "Rust",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
     "description": "Installs Rust, common Rust utilities, and their required dependencies",
diff --git a/src/sshd/devcontainer-feature.json b/src/sshd/devcontainer-feature.json
index 696a23ba7..da1f8a9d8 100644
--- a/src/sshd/devcontainer-feature.json
+++ b/src/sshd/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "sshd",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "name": "SSH server",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/sshd",
     "description": "Adds a SSH server into a container so that you can use an external terminal, sftp, or SSHFS to interact with it.",
diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index 490a05b2d..99c052be9 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",

From fbdc4556d519512736a8e2abfb3e03fcb2c9e0c7 Mon Sep 17 00:00:00 2001
From: Levin Winter <33220502+levinwinter@users.noreply.github.com>
Date: Thu, 26 Jan 2023 00:57:31 +0100
Subject: [PATCH 085/478] [common-utils] Fix nonempty .bashrc being restored
 (#421)

* [common-utils] Fix nonempty .bashrc being restored
The user's dotfiles shall only be restored to their defaults if they do
not exist or are empty. A missing negation caused the files to be
overwritten even when they were nonempty.

* [common-utils] Bump patch version after fix
Go from 2.0.7 to 2.0.8 because of backwards-compatible fix.
---
 src/common-utils/main.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index c8541cd51..2a8cd282e 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -393,7 +393,7 @@ fi
 possible_rc_files=( ".bashrc" ".profile" ".zshrc" )
 for rc_file in "${possible_rc_files[@]}"; do
     if [ -f "/etc/skel/${rc_file}" ]; then
-        if [ ! -e "${user_rc_path}/${rc_file}" ] || [ -s "${user_rc_path}/${rc_file}" ]; then
+        if [ ! -e "${user_rc_path}/${rc_file}" ] || [ ! -s "${user_rc_path}/${rc_file}" ]; then
             cp "/etc/skel/${rc_file}" "${user_rc_path}/${rc_file}"
             chown ${USERNAME}:${group_name} "${user_rc_path}/${rc_file}"
         fi

From 7763e0b7db6a16f2efececb6ffa9bd917a9eb5de Mon Sep 17 00:00:00 2001
From: Ross Smith <ross-p-smith@users.noreply.github.com>
Date: Mon, 30 Jan 2023 19:29:13 +0000
Subject: [PATCH 086/478] Install PowerShell Modules (#427)

* InstallBicep

* Add test for InstallBicep

* Install pwsh Modules

* Script rename

* Add -Command to test

* Check version

* Install the module for all users

* Adding terminating lines to scripts

* Update src/powershell/install.sh

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

* Update src/powershell/install.sh

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

* Removed comments in Readme

* Remove Bicep from PowerShell install

* Increased version number

* Update Minor version rather than patch

---------

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
---
 src/powershell/devcontainer-feature.json | 11 ++++++++---
 src/powershell/install.sh                | 12 ++++++++++++
 test/powershell/install_modules.sh       | 13 +++++++++++++
 test/powershell/scenarios.json           | 10 ++++++++++
 4 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 test/powershell/install_modules.sh
 create mode 100644 test/powershell/scenarios.json

diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json
index ef967a6a5..dce05755e 100644
--- a/src/powershell/devcontainer-feature.json
+++ b/src/powershell/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "powershell",
-    "version": "1.0.6",
+    "version": "1.1.0",
     "name": "PowerShell",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
     "description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -14,8 +14,13 @@
             ],
             "default": "latest",
             "description": "Select or enter a version of PowerShell."
-        }
-    },
+        },
+        "modules": {
+            "type": "string",
+            "default": "",
+            "description": "Optional comma separated list of PowerShell modules to install."
+          }
+        },
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
diff --git a/src/powershell/install.sh b/src/powershell/install.sh
index 3f19f47ea..b220c3acf 100755
--- a/src/powershell/install.sh
+++ b/src/powershell/install.sh
@@ -13,6 +13,7 @@ set -e
 rm -rf /var/lib/apt/lists/*
 
 POWERSHELL_VERSION=${VERSION:-"latest"}
+POWERSHELL_MODULES="${MODULES}"
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 POWERSHELL_ARCHIVE_ARCHITECTURES="amd64"
@@ -149,6 +150,17 @@ if [ "${use_github}" = "true" ]; then
     install_using_github
 fi
 
+# If PowerShell modules are requested, loop through and install 
+if [ ${#POWERSHELL_MODULES[@]} -gt 0 ]; then
+    echo "Installing PowerShell Modules: ${POWERSHELL_MODULES}"
+    modules=(`echo ${POWERSHELL_MODULES} | tr ',' ' '`)
+    for i in "${modules[@]}"
+    do
+        echo "Installing ${i}"
+        pwsh -Command "Install-Module -Name ${i} -AllowClobber -Force -Scope AllUsers" || continue
+    done
+fi
+
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
diff --git a/test/powershell/install_modules.sh b/test/powershell/install_modules.sh
new file mode 100644
index 000000000..0bb0172e6
--- /dev/null
+++ b/test/powershell/install_modules.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Extension-specific tests
+check "az.resources" pwsh -Command "(Get-Module -ListAvailable -Name Az.Resources).Version.ToString()"
+check "az.storage" pwsh -Command "(Get-Module -ListAvailable -Name Az.Storage).Version.ToString()"
+
+# Report result
+reportResults
diff --git a/test/powershell/scenarios.json b/test/powershell/scenarios.json
new file mode 100644
index 000000000..8ced96498
--- /dev/null
+++ b/test/powershell/scenarios.json
@@ -0,0 +1,10 @@
+{
+  "install_modules": {
+    "image": "mcr.microsoft.com/devcontainers/base:jammy",
+    "features": {
+      "powershell": {
+        "modules": "az.resources, az.storage"
+      }
+    }
+  }
+}

From 6bf4a7dbeccc63c20220fce08a02d0893d75b83a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 30 Jan 2023 11:42:51 -0800
Subject: [PATCH 087/478] Automated documentation update (#431)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/powershell/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/powershell/README.md b/src/powershell/README.md
index ba300d5cd..ccc62f7fe 100644
--- a/src/powershell/README.md
+++ b/src/powershell/README.md
@@ -16,6 +16,7 @@ Installs PowerShell along with needed dependencies. Useful for base Dockerfiles
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
 | version | Select or enter a version of PowerShell. | string | latest |
+| modules | Optional comma separated list of PowerShell modules to install. | string | - |
 
 
 

From c997f9af697c6f09143d4b0f5305332e7adb71f5 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Fri, 3 Feb 2023 09:27:17 -0800
Subject: [PATCH 088/478] Rust - Clean up unwanted settings (#434)

* Rust - Clean up unwanted settings

* address comments
---
 src/rust/devcontainer-feature.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index e1b2052c4..fd5d02612 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "rust",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "name": "Rust",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
     "description": "Installs Rust, common Rust utilities, and their required dependencies",
@@ -38,11 +38,9 @@
                 "serayuzgur.crates"
             ],
             "settings": {
-                "lldb.executable": "/usr/bin/lldb",
                 "files.watcherExclude": {
                     "**/target/**": true
-                },
-                "rust-analyzer.checkOnSave.command": "clippy"
+                }
             }
         }
     },

From 36d7664ebab393f0033bbc25394c67e3aed3efb1 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 7 Feb 2023 09:52:33 -0800
Subject: [PATCH 089/478] PHP: Allow 'version:none' (#439)

* PHP: Allow 'version:none'

* fix tests
---
 src/php/devcontainer-feature.json  |   5 +-
 src/php/install.sh                 | 110 ++++++++++++++++-------------
 test/php/install_additional_php.sh |   2 +
 test/php/install_only_composer.sh  |  10 +++
 test/php/install_php_8.sh          |   1 +
 test/php/install_php_8_2.sh        |   1 +
 test/php/scenarios.json            |   9 +++
 test/php/test.sh                   |   2 +-
 8 files changed, 87 insertions(+), 53 deletions(-)
 create mode 100644 test/php/install_only_composer.sh

diff --git a/src/php/devcontainer-feature.json b/src/php/devcontainer-feature.json
index ae270d0e5..77fcf9812 100644
--- a/src/php/devcontainer-feature.json
+++ b/src/php/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "php",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "name": "PHP",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/php",
     "options": {
@@ -10,7 +10,8 @@
                 "latest",
                 "8",
                 "8.2",
-                "8.2.0"
+                "8.2.0",
+                "none"
             ],
             "default": "latest",
             "description": "Select or enter a PHP version"
diff --git a/src/php/install.sh b/src/php/install.sh
index 0c577b165..48140e1b3 100755
--- a/src/php/install.sh
+++ b/src/php/install.sh
@@ -123,38 +123,13 @@ find_version_from_git_tags() {
 
 # Install PHP Composer
 addcomposer() {
-    "${PHP_INSTALL_DIR}/bin/php" -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+    "${PHP_SRC}" -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
     HASH="$(wget -q -O - https://composer.github.io/installer.sig)"
-    "${PHP_INSTALL_DIR}/bin/php" -r "if (hash_file('sha384', 'composer-setup.php') === '$HASH') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
-    "${PHP_INSTALL_DIR}/bin/php" composer-setup.php
-    "${PHP_INSTALL_DIR}/bin/php" -r "unlink('composer-setup.php');"
-
-    mv composer.phar "${PHP_INSTALL_DIR}/bin/composer"
+    "${PHP_SRC}" -r "if (hash_file('sha384', 'composer-setup.php') === '$HASH') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+    "${PHP_SRC}" composer-setup.php --install-dir="/usr/local/bin" --filename=composer
+    "${PHP_SRC}" -r "unlink('composer-setup.php');"
 }
 
-# Install PHP if it's missing
-
-
-# Persistent / runtime dependencies
-RUNTIME_DEPS="wget ca-certificates git build-essential xz-utils"
-
-# PHP dependencies
-PHP_DEPS="libssl-dev libcurl4-openssl-dev libedit-dev libsqlite3-dev libxml2-dev zlib1g-dev libsodium-dev libonig-dev"
-
-. /etc/os-release
-
-if [ "${VERSION_CODENAME}" = "bionic" ]; then
-    PHP_DEPS="${PHP_DEPS} libargon2-0-dev"
-else
-    PHP_DEPS="${PHP_DEPS} libargon2-dev"
-fi
-
-# Dependencies required for running "phpize"
-PHPIZE_DEPS="autoconf dpkg-dev file g++ gcc libc-dev make pkg-config re2c"
-
-# Install dependencies
-check_packages $RUNTIME_DEPS $PHP_DEPS $PHPIZE_DEPS
-
 install_php() {
     PHP_VERSION="$1"
     PHP_INSTALL_DIR="${PHP_DIR}/${PHP_VERSION}"
@@ -216,30 +191,48 @@ install_php() {
     echo "xdebug.mode = debug" >> "${XDEBUG_INI}"
     echo "xdebug.start_with_request = yes" >> "${XDEBUG_INI}"
     echo "xdebug.client_port = 9003" >> "${XDEBUG_INI}"
+}
 
-    # Install PHP Composer if needed
-    if [[ "${INSTALL_COMPOSER}" = "true" ]] || [[ $(composer --version) = "" ]]; then
-        addcomposer
-    fi
+if [ "${PHP_VERSION}" != "none" ]; then
+    # Persistent / runtime dependencies
+    RUNTIME_DEPS="wget ca-certificates git build-essential xz-utils"
 
-    CURRENT_DIR="${PHP_DIR}/current"
-    if [[ ! -d "${CURRENT_DIR}" ]]; then
-        ln -s -r "${PHP_INSTALL_DIR}" ${CURRENT_DIR}
-    fi
+    # PHP dependencies
+    PHP_DEPS="libssl-dev libcurl4-openssl-dev libedit-dev libsqlite3-dev libxml2-dev zlib1g-dev libsodium-dev libonig-dev"
 
-    if [ "${OVERRIDE_DEFAULT_VERSION}" = "true" ]; then
-        if [[ $(ls -l ${CURRENT_DIR}) != *"-> ${PHP_INSTALL_DIR}"* ]] ; then
-            rm "${CURRENT_DIR}"
-            ln -s -r "${PHP_INSTALL_DIR}" "${CURRENT_DIR}"
-        fi
+    . /etc/os-release
+
+    if [ "${VERSION_CODENAME}" = "bionic" ]; then
+        PHP_DEPS="${PHP_DEPS} libargon2-0-dev"
+    else
+        PHP_DEPS="${PHP_DEPS} libargon2-dev"
     fi
 
-    rm -rf "${PHP_SRC_DIR}"
-    updaterc "if [[ \"\${PATH}\" != *\"${CURRENT_DIR}\"* ]]; then export PATH=\"${CURRENT_DIR}/bin:\${PATH}\"; fi"
-}
+    # Dependencies required for running "phpize"
+    PHPIZE_DEPS="autoconf dpkg-dev file g++ gcc libc-dev make pkg-config re2c"
 
-find_version_from_git_tags PHP_VERSION https://github.com/php/php-src "tags/php-"
-install_php "${PHP_VERSION}"
+    # Install dependencies
+    check_packages $RUNTIME_DEPS $PHP_DEPS $PHPIZE_DEPS
+
+    find_version_from_git_tags PHP_VERSION https://github.com/php/php-src "tags/php-"
+    install_php "${PHP_VERSION}"
+
+    PHP_SRC="${PHP_INSTALL_DIR}/bin/php"
+else
+    set +e
+        PHP_SRC=$(which php)
+    set -e
+fi
+
+# Install PHP Composer if needed
+if [[ "${INSTALL_COMPOSER}" = "true" ]]; then
+    if [ -z "${PHP_SRC}" ]; then
+        echo "(!) Could not install Composer. PHP not found."
+        exit 1
+    fi
+
+    addcomposer
+fi
 
 # Additional php versions to be installed but not be set as default.
 if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
@@ -253,9 +246,26 @@ if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
     IFS=$OLDIFS
 fi
 
-chown -R "${USERNAME}:php" "${PHP_DIR}"
-chmod -R g+r+w "${PHP_DIR}"
-find "${PHP_DIR}" -type d -print0 | xargs -n 1 -0 chmod g+s
+if [ "${PHP_VERSION}" != "none" ]; then
+    CURRENT_DIR="${PHP_DIR}/current"
+    if [[ ! -d "${CURRENT_DIR}" ]]; then
+        ln -s -r "${PHP_INSTALL_DIR}" ${CURRENT_DIR}
+    fi
+
+    if [ "${OVERRIDE_DEFAULT_VERSION}" = "true" ]; then
+        if [[ $(ls -l ${CURRENT_DIR}) != *"-> ${PHP_INSTALL_DIR}"* ]] ; then
+            rm "${CURRENT_DIR}"
+            ln -s -r "${PHP_INSTALL_DIR}" "${CURRENT_DIR}"
+        fi
+    fi
+
+    rm -rf "${PHP_SRC_DIR}"
+    updaterc "if [[ \"\${PATH}\" != *\"${CURRENT_DIR}\"* ]]; then export PATH=\"${CURRENT_DIR}/bin:\${PATH}\"; fi"
+
+    chown -R "${USERNAME}:php" "${PHP_DIR}"
+    chmod -R g+r+w "${PHP_DIR}"
+    find "${PHP_DIR}" -type d -print0 | xargs -n 1 -0 chmod g+s
+fi
 
 # Clean up
 rm -rf /var/lib/apt/lists/*
diff --git a/test/php/install_additional_php.sh b/test/php/install_additional_php.sh
index 590187a76..f22315a61 100644
--- a/test/php/install_additional_php.sh
+++ b/test/php/install_additional_php.sh
@@ -9,5 +9,7 @@ check "php version 8.1.4 installed as default" php --version | grep 8.1.4
 check "php version 8.0.17 installed"   ls -l /usr/local/php | grep 8.0.17
 check "php version 8.0.3 installed"  ls -l /usr/local/php | grep 8.0.3
 
+check "composer-version" composer --version
+
 # Report result
 reportResults
diff --git a/test/php/install_only_composer.sh b/test/php/install_only_composer.sh
new file mode 100644
index 000000000..c940ece01
--- /dev/null
+++ b/test/php/install_only_composer.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "composer-version" composer --version
+
+# Report result
+reportResults
diff --git a/test/php/install_php_8.sh b/test/php/install_php_8.sh
index a510525f6..0b79533a9 100644
--- a/test/php/install_php_8.sh
+++ b/test/php/install_php_8.sh
@@ -6,6 +6,7 @@ set -e
 source dev-container-features-test-lib
 
 check "php-version-8-is-installed" bash -c "php --version | grep '8.'"
+check "composer-version" composer --version
 
 # Report result
 reportResults
diff --git a/test/php/install_php_8_2.sh b/test/php/install_php_8_2.sh
index 9320268ef..7427229ef 100644
--- a/test/php/install_php_8_2.sh
+++ b/test/php/install_php_8_2.sh
@@ -6,6 +6,7 @@ set -e
 source dev-container-features-test-lib
 
 check "php-version-8.2-is-installed" bash -c "php --version | grep '8.2'"
+check "composer-version" composer --version
 
 # Report result
 reportResults
diff --git a/test/php/scenarios.json b/test/php/scenarios.json
index dac799875..1e4df063d 100644
--- a/test/php/scenarios.json
+++ b/test/php/scenarios.json
@@ -23,5 +23,14 @@
                 "version": "8.2"
             }
         }
+    },
+    "install_only_composer": {
+        "image": "mcr.microsoft.com/devcontainers/php:latest",
+        "features": {
+            "php": {
+                "version": "none",
+                "installComposer": true
+            }
+        }
     }
 }
diff --git a/test/php/test.sh b/test/php/test.sh
index 0f49c1a18..c75f7ea96 100755
--- a/test/php/test.sh
+++ b/test/php/test.sh
@@ -7,7 +7,7 @@ source dev-container-features-test-lib
 
 check "PHP version" php --version
 check "Mbstring loaded" php -r "extension_loaded('mbstring') || throw new Error('Extension Mbstring is not loaded');"
-check "Composer version" composer --version
+check "composer-version" composer --version
 
 # Report result
 reportResults
\ No newline at end of file

From 4a9929f96485061e3778b35848e21d7c3c193480 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 7 Feb 2023 11:45:48 -0800
Subject: [PATCH 090/478] kubectl-helm-minikube: Allow none (#442)

---
 .../devcontainer-feature.json                 |  11 +-
 src/kubectl-helm-minikube/install.sh          | 134 +++++++++---------
 .../install_only_kubectl.sh                   |  22 +++
 test/kubectl-helm-minikube/scenarios.json     |  12 ++
 test/kubectl-helm-minikube/test.sh            |   1 +
 5 files changed, 112 insertions(+), 68 deletions(-)
 create mode 100644 test/kubectl-helm-minikube/install_only_kubectl.sh
 create mode 100644 test/kubectl-helm-minikube/scenarios.json

diff --git a/src/kubectl-helm-minikube/devcontainer-feature.json b/src/kubectl-helm-minikube/devcontainer-feature.json
index 78e90d9b7..9229a96e6 100644
--- a/src/kubectl-helm-minikube/devcontainer-feature.json
+++ b/src/kubectl-helm-minikube/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "kubectl-helm-minikube",
-    "version": "1.1.3",
+    "version": "1.1.4",
     "name": "Kubectl, Helm, and Minikube",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
     "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
@@ -12,7 +12,8 @@
                 "none",
                 "1.23",
                 "1.22",
-                "1.21"
+                "1.21",
+                "none"
             ],
             "default": "latest",
             "description": "Select or enter a Kubernetes version to install"
@@ -20,7 +21,8 @@
         "helm": {
             "type": "string",
             "proposals": [
-                "latest"
+                "latest",
+                "none"
             ],
             "default": "latest",
             "description": "Select or enter a Helm version to install"
@@ -28,7 +30,8 @@
         "minikube": {
             "type": "string",
             "proposals": [
-                "latest"
+                "latest",
+                "none"
             ],
             "default": "latest",
             "description": "Select or enter a Minikube version to install"
diff --git a/src/kubectl-helm-minikube/install.sh b/src/kubectl-helm-minikube/install.sh
index af8b0ae50..d2d11364e 100755
--- a/src/kubectl-helm-minikube/install.sh
+++ b/src/kubectl-helm-minikube/install.sh
@@ -14,7 +14,7 @@ rm -rf /var/lib/apt/lists/*
 
 KUBECTL_VERSION="${VERSION:-"latest"}"
 HELM_VERSION="${HELM:-"latest"}"
-MINIKUBE_VERSION="${MINIKUBE:-"none"}" # latest is also valid
+MINIKUBE_VERSION="${MINIKUBE:-"latest"}" # latest is also valid
 
 KUBECTL_SHA256="${KUBECTL_SHA256:-"automatic"}"
 HELM_SHA256="${HELM_SHA256:-"automatic"}"
@@ -121,77 +121,83 @@ case $architecture in
     *) echo "(!) Architecture $architecture unsupported"; exit 1 ;;
 esac
 
-# Install the kubectl, verify checksum
-echo "Downloading kubectl..."
-if [ "${KUBECTL_VERSION}" = "latest" ] || [ "${KUBECTL_VERSION}" = "lts" ] || [ "${KUBECTL_VERSION}" = "current" ] || [ "${KUBECTL_VERSION}" = "stable" ]; then
-    KUBECTL_VERSION="$(curl -sSL https://dl.k8s.io/release/stable.txt)"
-else
-    find_version_from_git_tags KUBECTL_VERSION https://github.com/kubernetes/kubernetes
-fi
-if [ "${KUBECTL_VERSION::1}" != 'v' ]; then
-    KUBECTL_VERSION="v${KUBECTL_VERSION}"
-fi
-curl -sSL -o /usr/local/bin/kubectl "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/${architecture}/kubectl"
-chmod 0755 /usr/local/bin/kubectl
-if [ "$KUBECTL_SHA256" = "automatic" ]; then
-    KUBECTL_SHA256="$(curl -sSL "https://dl.k8s.io/${KUBECTL_VERSION}/bin/linux/${architecture}/kubectl.sha256")"
-fi
-([ "${KUBECTL_SHA256}" = "dev-mode" ] || (echo "${KUBECTL_SHA256} */usr/local/bin/kubectl" | sha256sum -c -))
-if ! type kubectl > /dev/null 2>&1; then
-    echo '(!) kubectl installation failed!'
-    exit 1
-fi
+if [ ${KUBECTL_VERSION} != "none" ]; then
+    # Install the kubectl, verify checksum
+    echo "Downloading kubectl..."
+    if [ "${KUBECTL_VERSION}" = "latest" ] || [ "${KUBECTL_VERSION}" = "lts" ] || [ "${KUBECTL_VERSION}" = "current" ] || [ "${KUBECTL_VERSION}" = "stable" ]; then
+        KUBECTL_VERSION="$(curl -sSL https://dl.k8s.io/release/stable.txt)"
+    else
+        find_version_from_git_tags KUBECTL_VERSION https://github.com/kubernetes/kubernetes
+    fi
+    if [ "${KUBECTL_VERSION::1}" != 'v' ]; then
+        KUBECTL_VERSION="v${KUBECTL_VERSION}"
+    fi
+    curl -sSL -o /usr/local/bin/kubectl "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/${architecture}/kubectl"
+    chmod 0755 /usr/local/bin/kubectl
+    if [ "$KUBECTL_SHA256" = "automatic" ]; then
+        KUBECTL_SHA256="$(curl -sSL "https://dl.k8s.io/${KUBECTL_VERSION}/bin/linux/${architecture}/kubectl.sha256")"
+    fi
+    ([ "${KUBECTL_SHA256}" = "dev-mode" ] || (echo "${KUBECTL_SHA256} */usr/local/bin/kubectl" | sha256sum -c -))
+    if ! type kubectl > /dev/null 2>&1; then
+        echo '(!) kubectl installation failed!'
+        exit 1
+    fi
 
-# kubectl bash completion
-kubectl completion bash > /etc/bash_completion.d/kubectl
+    # kubectl bash completion
+    kubectl completion bash > /etc/bash_completion.d/kubectl
 
-# kubectl zsh completion
-if [ -e "${USERHOME}}/.oh-my-zsh" ]; then
-    mkdir -p "${USERHOME}/.oh-my-zsh/completions"
-    kubectl completion zsh > "${USERHOME}/.oh-my-zsh/completions/_kubectl"
-    chown -R "${USERNAME}" "${USERHOME}/.oh-my-zsh"
+    # kubectl zsh completion
+    if [ -e "${USERHOME}}/.oh-my-zsh" ]; then
+        mkdir -p "${USERHOME}/.oh-my-zsh/completions"
+        kubectl completion zsh > "${USERHOME}/.oh-my-zsh/completions/_kubectl"
+        chown -R "${USERNAME}" "${USERHOME}/.oh-my-zsh"
+    fi
 fi
 
-# Install Helm, verify signature and checksum
-echo "Downloading Helm..."
-find_version_from_git_tags HELM_VERSION "https://github.com/helm/helm"
-if [ "${HELM_VERSION::1}" != 'v' ]; then
-    HELM_VERSION="v${HELM_VERSION}"
-fi
-mkdir -p /tmp/helm
-helm_filename="helm-${HELM_VERSION}-linux-${architecture}.tar.gz"
-tmp_helm_filename="/tmp/helm/${helm_filename}"
-curl -sSL "https://get.helm.sh/${helm_filename}" -o "${tmp_helm_filename}"
-curl -sSL "https://github.com/helm/helm/releases/download/${HELM_VERSION}/${helm_filename}.asc" -o "${tmp_helm_filename}.asc"
-export GNUPGHOME="/tmp/helm/gnupg"
-mkdir -p "${GNUPGHOME}"
-chmod 700 ${GNUPGHOME}
-curl -sSL "${HELM_GPG_KEYS_URI}" -o /tmp/helm/KEYS
-echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" > ${GNUPGHOME}/dirmngr.conf
-gpg -q --import "/tmp/helm/KEYS"
-if ! gpg --verify "${tmp_helm_filename}.asc" > ${GNUPGHOME}/verify.log 2>&1; then
-    echo "Verification failed!"
-    cat /tmp/helm/gnupg/verify.log
-    exit 1
-fi
-if [ "${HELM_SHA256}" = "automatic" ]; then
-    curl -sSL "https://get.helm.sh/${helm_filename}.sha256" -o "${tmp_helm_filename}.sha256"
-    curl -sSL "https://github.com/helm/helm/releases/download/${HELM_VERSION}/${helm_filename}.sha256.asc" -o "${tmp_helm_filename}.sha256.asc"
-    if ! gpg --verify "${tmp_helm_filename}.sha256.asc" > /tmp/helm/gnupg/verify.log 2>&1; then
+if [ ${HELM_VERSION} != "none" ]; then
+    # Install Helm, verify signature and checksum
+    echo "Downloading Helm..."
+    find_version_from_git_tags HELM_VERSION "https://github.com/helm/helm"
+    if [ "${HELM_VERSION::1}" != 'v' ]; then
+        HELM_VERSION="v${HELM_VERSION}"
+    fi
+    mkdir -p /tmp/helm
+    helm_filename="helm-${HELM_VERSION}-linux-${architecture}.tar.gz"
+    tmp_helm_filename="/tmp/helm/${helm_filename}"
+    curl -sSL "https://get.helm.sh/${helm_filename}" -o "${tmp_helm_filename}"
+    curl -sSL "https://github.com/helm/helm/releases/download/${HELM_VERSION}/${helm_filename}.asc" -o "${tmp_helm_filename}.asc"
+    export GNUPGHOME="/tmp/helm/gnupg"
+    mkdir -p "${GNUPGHOME}"
+    chmod 700 ${GNUPGHOME}
+    curl -sSL "${HELM_GPG_KEYS_URI}" -o /tmp/helm/KEYS
+    echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" > ${GNUPGHOME}/dirmngr.conf
+    gpg -q --import "/tmp/helm/KEYS"
+    if ! gpg --verify "${tmp_helm_filename}.asc" > ${GNUPGHOME}/verify.log 2>&1; then
         echo "Verification failed!"
         cat /tmp/helm/gnupg/verify.log
         exit 1
     fi
-    HELM_SHA256="$(cat "${tmp_helm_filename}.sha256")"
-fi
-([ "${HELM_SHA256}" = "dev-mode" ] || (echo "${HELM_SHA256} *${tmp_helm_filename}" | sha256sum -c -))
-tar xf "${tmp_helm_filename}" -C /tmp/helm
-mv -f "/tmp/helm/linux-${architecture}/helm" /usr/local/bin/
-chmod 0755 /usr/local/bin/helm
-rm -rf /tmp/helm
-if ! type helm > /dev/null 2>&1; then
-    echo '(!) Helm installation failed!'
-    exit 1
+
+    if [ "${HELM_SHA256}" = "automatic" ]; then
+        curl -sSL "https://get.helm.sh/${helm_filename}.sha256" -o "${tmp_helm_filename}.sha256"
+        curl -sSL "https://github.com/helm/helm/releases/download/${HELM_VERSION}/${helm_filename}.sha256.asc" -o "${tmp_helm_filename}.sha256.asc"
+        if ! gpg --verify "${tmp_helm_filename}.sha256.asc" > /tmp/helm/gnupg/verify.log 2>&1; then
+            echo "Verification failed!"
+            cat /tmp/helm/gnupg/verify.log
+            exit 1
+        fi
+        HELM_SHA256="$(cat "${tmp_helm_filename}.sha256")"
+    fi
+
+    ([ "${HELM_SHA256}" = "dev-mode" ] || (echo "${HELM_SHA256} *${tmp_helm_filename}" | sha256sum -c -))
+    tar xf "${tmp_helm_filename}" -C /tmp/helm
+    mv -f "/tmp/helm/linux-${architecture}/helm" /usr/local/bin/
+    chmod 0755 /usr/local/bin/helm
+    rm -rf /tmp/helm
+    if ! type helm > /dev/null 2>&1; then
+        echo '(!) Helm installation failed!'
+        exit 1
+    fi
 fi
 
 # Install Minikube, verify checksum
diff --git a/test/kubectl-helm-minikube/install_only_kubectl.sh b/test/kubectl-helm-minikube/install_only_kubectl.sh
new file mode 100644
index 000000000..442ef6477
--- /dev/null
+++ b/test/kubectl-helm-minikube/install_only_kubectl.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+set +e
+    kubectl
+    exit_code=$?
+    check "kubectl-is-not-installed" bash -c "echo ${exit_code} | grep 127"
+
+    helm version
+    exit_code=$?
+    check "helm-is-not-installed" bash -c "echo ${exit_code} | grep 127"
+
+    minikube version
+    exit_code=$?
+    check "minikube is-not-installed" bash -c "echo ${exit_code} | grep 127"
+set -e
+
+# Report result
+reportResults
diff --git a/test/kubectl-helm-minikube/scenarios.json b/test/kubectl-helm-minikube/scenarios.json
new file mode 100644
index 000000000..08ff8cc79
--- /dev/null
+++ b/test/kubectl-helm-minikube/scenarios.json
@@ -0,0 +1,12 @@
+{
+    "install_only_kubectl": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "features": {
+            "kubectl-helm-minikube": {
+                "version": "none",
+                "helm": "none",
+                "minikube": "none"
+            }
+        }
+    }
+}
diff --git a/test/kubectl-helm-minikube/test.sh b/test/kubectl-helm-minikube/test.sh
index 94a024abb..9dc41417a 100755
--- a/test/kubectl-helm-minikube/test.sh
+++ b/test/kubectl-helm-minikube/test.sh
@@ -8,6 +8,7 @@ source dev-container-features-test-lib
 # Definition specific tests
 check "kube" kubectl
 check "helm" helm version
+check "minikune" minikube version
 
 # Report result
 reportResults
\ No newline at end of file

From 900cbfc1f98ca13f99055cf3197e688e21bb0022 Mon Sep 17 00:00:00 2001
From: Stefan Drzazga <stefan.drzazga@gmail.com>
Date: Wed, 15 Feb 2023 14:59:31 -0500
Subject: [PATCH 091/478] Add sentinel to terraform feature (#452)

* Introducing Sentinel installation

* Modifying docs for sentinel

* Modifying tests for sentinel

* Revert "Modifying docs for sentinel"

This reverts commit 818894b22fe022d29d59d3748ddd6103616773a6.

* Modifying docs for sentinel

* Fixing duplication issue for sentinel url

* Update src/terraform/install.sh

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

* Increase minor version

---------

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
---
 src/terraform/devcontainer-feature.json |  7 +++-
 src/terraform/install.sh                | 51 +++++++++++++++++++++++++
 test/terraform/install_sentinel.sh      | 15 ++++++++
 test/terraform/scenarios.json           |  8 ++++
 4 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 test/terraform/install_sentinel.sh

diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index 99c052be9..bd6f1cc7a 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.1.2",
+    "version": "1.2.0",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
@@ -33,6 +33,11 @@
             "default": "latest",
             "description": "Terragrunt version"
         },
+        "installSentinel": {
+            "type": "boolean",
+            "default": false,
+            "description": "Install sentinel, a language and framework for policy built to be embedded in existing software to enable fine-grained, logic-based policy decisions"
+        },
         "installTFsec": {
             "type": "boolean",
             "default": false,
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index 1fec7563f..67426cd53 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -15,12 +15,14 @@ rm -rf /var/lib/apt/lists/*
 TERRAFORM_VERSION="${VERSION:-"latest"}"
 TFLINT_VERSION="${TFLINT:-"latest"}"
 TERRAGRUNT_VERSION="${TERRAGRUNT:-"latest"}"
+INSTALL_SENTINEL=${INSTALLSENTINEL:-false}
 INSTALL_TFSEC=${INSTALLTFSEC:-false}
 INSTALL_TERRAFORM_DOCS=${INSTALLTERRAFORMDOCS:-false}
 
 TERRAFORM_SHA256="${TERRAFORM_SHA256:-"automatic"}"
 TFLINT_SHA256="${TFLINT_SHA256:-"automatic"}"
 TERRAGRUNT_SHA256="${TERRAGRUNT_SHA256:-"automatic"}"
+SENTINEL_SHA256="${SENTINEL_SHA256:-"automatic"}"
 TFSEC_SHA256="${TFSEC_SHA256:-"automatic"}"
 TERRAFORM_DOCS_SHA256="${TERRAFORM_DOCS_SHA256:-"automatic"}"
 
@@ -112,6 +114,30 @@ find_version_from_git_tags() {
     echo "${variable_name}=${!variable_name}"
 }
 
+find_sentinel_version_from_url() {
+    local variable_name=$1
+    local requested_version=${!variable_name}
+    if [ "${requested_version}" = "none" ]; then return; fi
+    local repository=$2
+    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
+        local prefix='sentinel_'
+        local regex="${prefix}\d.\d{2}.\d(?:-\w*)?"
+        local version_list="$(wget -q $2 -O - | grep -oP ${regex} | tr -d ${prefix} | sort -rV)"
+        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
+            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+        else
+            set +e
+            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            set -e
+        fi
+    fi
+    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" >/dev/null 2>&1; then
+        echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
+        exit 1
+    fi
+    echo "${variable_name}=${!variable_name}"
+}
+
 apt_get_update()
 {
     if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
@@ -198,6 +224,31 @@ if [ "${TERRAGRUNT_VERSION}" != "none" ]; then
     mv -f /tmp/tf-downloads/${terragrunt_filename} /usr/local/bin/terragrunt
 fi
 
+if [ "${INSTALL_SENTINEL}" = "true" ]; then
+    SENTINEL_VERSION="latest"
+    sentinel_releases_url='https://releases.hashicorp.com/sentinel'
+    find_sentinel_version_from_url SENTINEL_VERSION ${sentinel_releases_url}
+    sentinel_filename="sentinel_${SENTINEL_VERSION}_linux_${architecture}.zip"
+    echo "(*) Downloading Sentinel... ${sentinel_filename}"
+    curl -sSL -o /tmp/tf-downloads/${sentinel_filename} ${sentinel_releases_url}/${SENTINEL_VERSION}/${sentinel_filename}
+    if [ "${SENTINEL_SHA256}" != "dev-mode" ]; then
+        if [ "${SENTINEL_SHA256}" = "automatic" ]; then
+            receive_gpg_keys TERRAFORM_GPG_KEY
+            curl -sSL -o sentinel_checksums.txt ${sentinel_releases_url}/${SENTINEL_VERSION}/sentinel_${SENTINEL_VERSION}_SHA256SUMS
+            curl -sSL -o sentinel_checksums.txt.sig ${sentinel_releases_url}/${SENTINEL_VERSION}/sentinel_${SENTINEL_VERSION}_SHA256SUMS.${TERRAFORM_GPG_KEY}.sig
+            gpg --verify sentinel_checksums.txt.sig sentinel_checksums.txt
+            # Verify the SHASUM matches the archive
+            shasum -a 256 --ignore-missing -c sentinel_checksums.txt
+        else
+            echo "${SENTINEL_SHA256} *${SENTINEL_FILENAME}" >sentinel_checksums.txt
+        fi
+        sha256sum --ignore-missing -c sentinel_checksums.txt
+    fi
+    unzip /tmp/tf-downloads/${sentinel_filename}
+    chmod a+x /tmp/tf-downloads/sentinel
+    mv -f /tmp/tf-downloads/sentinel /usr/local/bin/sentinel
+fi
+
 if [ "${INSTALL_TFSEC}" = "true" ]; then
     TFSEC_VERSION="latest"
     find_version_from_git_tags TFSEC_VERSION 'https://github.com/aquasecurity/tfsec'
diff --git a/test/terraform/install_sentinel.sh b/test/terraform/install_sentinel.sh
new file mode 100644
index 000000000..e26ec33d7
--- /dev/null
+++ b/test/terraform/install_sentinel.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+# Sentinel specific tests
+check "sentinel" sentinel --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/terraform/scenarios.json b/test/terraform/scenarios.json
index 2365643b6..897763518 100644
--- a/test/terraform/scenarios.json
+++ b/test/terraform/scenarios.json
@@ -1,4 +1,12 @@
 {
+    "install_sentinel": {
+        "image": "mcr.microsoft.com/devcontainers/base:jammy",
+        "features": {
+            "terraform": {
+                "installSentinel": true
+            }
+        }
+    },
     "install_tfsec": {
         "image": "mcr.microsoft.com/devcontainers/base:jammy",
         "features": {

From 8d3685e09f18dd8b0a6bce50abe3e868dac27a69 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 15 Feb 2023 12:01:23 -0800
Subject: [PATCH 092/478] Automated documentation update (#455)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/terraform/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/terraform/README.md b/src/terraform/README.md
index ee87d069d..9c474ab5c 100644
--- a/src/terraform/README.md
+++ b/src/terraform/README.md
@@ -18,6 +18,7 @@ Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects la
 | version | Terraform version | string | latest |
 | tflint | Tflint version | string | latest |
 | terragrunt | Terragrunt version | string | latest |
+| installSentinel | Install sentinel, a language and framework for policy built to be embedded in existing software to enable fine-grained, logic-based policy decisions | boolean | false |
 | installTFsec | Install tfsec, a tool to spot potential misconfigurations for your terraform code | boolean | false |
 | installTerraformDocs | Install terraform-docs, a utility to generate documentation from Terraform modules | boolean | false |
 

From d84e46be47867e596fdd2f2efaefb63f67597a07 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 22 Feb 2023 12:23:22 -0800
Subject: [PATCH 093/478] "Update Documentation" workflow - use gh api to
 create a documentation PR (#459)

---
 .github/workflows/update-documentation.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/update-documentation.yml b/.github/workflows/update-documentation.yml
index 6d7bb5cbb..6976e62ea 100644
--- a/.github/workflows/update-documentation.yml
+++ b/.github/workflows/update-documentation.yml
@@ -8,6 +8,7 @@ on:
 jobs:
   generate:
     runs-on: ubuntu-latest
+    environment: documentation
     if: "github.ref == 'refs/heads/main'"
     steps:
       - uses: actions/checkout@v3
@@ -18,10 +19,10 @@ jobs:
           generate-docs: "true"
           base-path-to-features: "./src"
 
-      - name: Add and Commit Documentation
+      - name: Create a PR for Documentation
         id: push_image_info
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.PAT }}
         run: |
           set -e
           echo "Start."
@@ -42,5 +43,12 @@ jobs:
           # Push
           if [ "$NO_UPDATES" != "true" ] ; then
               git push origin "$branch"
-              gh pr create --title "$message" --body "$message"
+              gh api \
+                --method POST \
+                -H "Accept: application/vnd.github+json" \
+                /repos/${GITHUB_REPOSITORY}/pulls \
+                -f title="$message" \
+              -f body="$message" \
+              -f head="$branch" \
+              -f base='main'
           fi

From 83c6103db23ce383a23097832bdf15d71f775665 Mon Sep 17 00:00:00 2001
From: Akihiro Nagai <77012577+akihironagai@users.noreply.github.com>
Date: Tue, 28 Feb 2023 02:12:21 +0900
Subject: [PATCH 094/478] Add pnpm in Node (#450)

* Add pnpm in Node

* pnpm from npm

* Restore README.md

* Update install.sh

* Update tests
---
 src/node/devcontainer-feature.json           |  6 +++---
 src/node/install.sh                          | 11 +++++++++++
 test/node/install_additional_node.sh         |  1 +
 test/node/install_node_16_on_bionic.sh       |  1 +
 test/node/install_node_on_universal_image.sh |  1 +
 test/node/non_root_user.sh                   |  1 +
 test/node/test.sh                            |  1 +
 7 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index 6450ce422..9bf90b67f 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,9 +1,9 @@
 {
     "id": "node",
-    "version": "1.1.5",
-    "name": "Node.js (via nvm) and yarn",
+    "version": "1.2.0",
+    "name": "Node.js (via nvm), yarn and pnpm",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
-    "description": "Installs Node.js, nvm, yarn, and needed dependencies.",
+    "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
     "options": {
         "version": {
             "type": "string",
diff --git a/src/node/install.sh b/src/node/install.sh
index 4c02c9514..9048ac22e 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -183,6 +183,17 @@ if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
     IFS=$OLDIFS
 fi
 
+# Install pnpm
+if type pnpm > /dev/null 2>&1; then
+    echo "pnpm already installed."
+else
+    if type npm > /dev/null 2>&1; then
+        npm install -g pnpm
+    else
+        echo "Skip installing pnpm because npm is missing"
+    fi
+fi
+
 # If enabled, verify "python3", "make", "gcc", "g++" commands are available so node-gyp works - https://github.com/nodejs/node-gyp
 if [ "${INSTALL_TOOLS_FOR_NODE_GYP}" = "true" ]; then
     echo "Verifying node-gyp OS requirements..."
diff --git a/test/node/install_additional_node.sh b/test/node/install_additional_node.sh
index 1a1abca4c..f47f928c0 100644
--- a/test/node/install_additional_node.sh
+++ b/test/node/install_additional_node.sh
@@ -7,6 +7,7 @@ source dev-container-features-test-lib
 
 # 'lts' is some version of node 18 for a while.
 check "version_on_path"  node -v | grep 18
+check "pnpm" pnpm -v
 
 check "v18_installed" ls -1 /usr/local/share/nvm/versions/node | grep 18
 check "v14_installed" ls -1 /usr/local/share/nvm/versions/node | grep 14.19.3
diff --git a/test/node/install_node_16_on_bionic.sh b/test/node/install_node_16_on_bionic.sh
index 1b301d34c..500e0070e 100755
--- a/test/node/install_node_16_on_bionic.sh
+++ b/test/node/install_node_16_on_bionic.sh
@@ -7,6 +7,7 @@ source dev-container-features-test-lib
 
 # Definition specific tests
 check "version" bash -c "node --version | grep 16"
+check "pnpm" pnpm -v
 check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
 
 # Report result
diff --git a/test/node/install_node_on_universal_image.sh b/test/node/install_node_on_universal_image.sh
index faca1ebef..33a9d41c3 100644
--- a/test/node/install_node_on_universal_image.sh
+++ b/test/node/install_node_on_universal_image.sh
@@ -6,6 +6,7 @@ set -e
 source dev-container-features-test-lib
 
 check "version_on_path" bash -c "node -v | grep 'v19.1.0'"
+check "pnpm" pnpm -v
 
 # Report result
 reportResults
diff --git a/test/node/non_root_user.sh b/test/node/non_root_user.sh
index 6b6804d0b..499dbe68a 100755
--- a/test/node/non_root_user.sh
+++ b/test/node/non_root_user.sh
@@ -7,6 +7,7 @@ source dev-container-features-test-lib
 
 # Definition specific tests
 check "version" node  --version
+check "pnpm" pnpm -v
 check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
 
 # Report result
diff --git a/test/node/test.sh b/test/node/test.sh
index 6b6804d0b..499dbe68a 100755
--- a/test/node/test.sh
+++ b/test/node/test.sh
@@ -7,6 +7,7 @@ source dev-container-features-test-lib
 
 # Definition specific tests
 check "version" node  --version
+check "pnpm" pnpm -v
 check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
 
 # Report result

From 4b7efebea1c19b69a345728bab8cd3f58335c428 Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Wed, 1 Mar 2023 15:29:11 -0800
Subject: [PATCH 095/478] Turn off linting by default in VS Code for Python
 (#449)

* Turn off linting by default in VS Code for Python
Linting is on by default if you specify the paths to any linters, so the previous settings would turn on **all** linters.

Also drop linters that don't see much use.

* Fix tests

* Revert all changes

* Remove paths to under-utilized tools and turn off all linting by default

* Bump the version number
---
 src/python/devcontainer-feature.json | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 361270b2a..c5f0d76f9 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
@@ -63,13 +63,12 @@
         "python.defaultInterpreterPath": "/usr/local/python/current/bin/python",
         "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
         "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-        "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-        "python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
         "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
+        "python.linting.flake8Enabled": false,
         "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
-        "python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
-        "python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
-        "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint"
+        "python.linting.mypyEnabled": false,
+        "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint",
+        "python.linting.pylintEnabled": false
       }
     }
   },

From 3cc059ea8abf3a909468fafabca481f82b6f8924 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 1 Mar 2023 15:54:58 -0800
Subject: [PATCH 096/478] Automated documentation update (#462)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/node/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/node/README.md b/src/node/README.md
index 2e5dba386..877ea5877 100644
--- a/src/node/README.md
+++ b/src/node/README.md
@@ -1,7 +1,7 @@
 
-# Node.js (via nvm) and yarn (node)
+# Node.js (via nvm), yarn and pnpm (node)
 
-Installs Node.js, nvm, yarn, and needed dependencies.
+Installs Node.js, nvm, yarn, pnpm, and needed dependencies.
 
 ## Example Usage
 

From 3e6ee966baed62e195091bb4ea7fb11cd8668868 Mon Sep 17 00:00:00 2001
From: ksaito1125 <ksaito11@gmail.com>
Date: Tue, 7 Mar 2023 01:51:35 +0900
Subject: [PATCH 097/478] Terraform: Add proxy setting (#435) (#451)

* Terraform: Add proxy setting (#435)

* Terraform: Remove unused variable GPG_OPTS (#435)

* Terraform: Increment minor version (#435)

* Update src/terraform/install.sh

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

* Add feature option

* Update src/terraform/devcontainer-feature.json

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

* Update src/terraform/devcontainer-feature.json

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

* Update src/terraform/devcontainer-feature.json

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

* Terraform: Change environment variables to upper case (#435)

* Terraform: Use HTTP_PROXY as the default for connecting to keyservers (#435)

* Update src/terraform/install.sh

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

---------

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/terraform/devcontainer-feature.json | 7 ++++++-
 src/terraform/install.sh                | 8 ++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index bd6f1cc7a..7ea73eea9 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
@@ -47,6 +47,11 @@
             "type": "boolean",
             "default": false,
             "description": "Install terraform-docs, a utility to generate documentation from Terraform modules"
+        },
+        "httpProxy": {
+            "type": "string",
+            "default": "",
+            "description": "Connect to a keyserver using a proxy by configuring this option"
         }
     },
     "customizations": {
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index 67426cd53..75653c392 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -28,9 +28,10 @@ TERRAFORM_DOCS_SHA256="${TERRAFORM_DOCS_SHA256:-"automatic"}"
 
 TERRAFORM_GPG_KEY="72D7468F"
 TFLINT_GPG_KEY_URI="https://raw.githubusercontent.com/terraform-linters/tflint/master/8CE69160EB3F2FE9.key"
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
+GPG_KEY_SERVERS="keyserver hkps://keyserver.ubuntu.com
 keyserver hkps://keys.openpgp.org
-keyserver hkp://keyserver.pgp.com"
+keyserver hkps://keyserver.pgp.com"
+KEYSERVER_PROXY="${HTTPPROXY:-"${HTTP_PROXY:-""}"}"
 
 architecture="$(uname -m)"
 case ${architecture} in
@@ -53,6 +54,9 @@ receive_gpg_keys() {
     if [ ! -z "$2" ]; then
         keyring_args="--no-default-keyring --keyring $2"
     fi
+    if [ ! -z "${KEYSERVER_PROXY}" ]; then
+	keyring_args="${keyring_args} --keyserver-options http-proxy=${KEYSERVER_PROXY}"
+    fi
 
     # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"

From fe449253f138f3c028627d3e9cc3d500d650b159 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 7 Mar 2023 11:43:06 -0800
Subject: [PATCH 098/478] Automated documentation update (#475)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/terraform/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/terraform/README.md b/src/terraform/README.md
index 9c474ab5c..e75da9b20 100644
--- a/src/terraform/README.md
+++ b/src/terraform/README.md
@@ -21,6 +21,7 @@ Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects la
 | installSentinel | Install sentinel, a language and framework for policy built to be embedded in existing software to enable fine-grained, logic-based policy decisions | boolean | false |
 | installTFsec | Install tfsec, a tool to spot potential misconfigurations for your terraform code | boolean | false |
 | installTerraformDocs | Install terraform-docs, a utility to generate documentation from Terraform modules | boolean | false |
+| httpProxy | Connect to a keyserver using a proxy by configuring this option | string | - |
 
 
 

From de1e634a6755e10b27e52ad4e0aa44f025540074 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 8 Mar 2023 15:30:59 -0800
Subject: [PATCH 099/478] Docker fix - BuildKit is enabled but the buildx
 component is missing or broken (#478)

* Docker fix - BuildKit is enabled but the buildx component is missing or broken

* nit

* fix test
---
 .../devcontainer-feature.json                 |  7 +++-
 src/docker-in-docker/install.sh               | 32 +++++++++++------
 .../devcontainer-feature.json                 |  7 +++-
 src/docker-outside-of-docker/install.sh       | 31 ++++++++++++----
 test/docker-in-docker/Dockerfile              |  1 +
 test/docker-in-docker/docker_build.sh         | 13 +++++++
 test/docker-in-docker/docker_build_2.sh       | 13 +++++++
 test/docker-in-docker/docker_build_older.sh   | 13 +++++++
 test/docker-in-docker/scenarios.json          | 35 ++++++++++++++++++-
 test/docker-outside-of-docker/Dockerfile      |  1 +
 test/docker-outside-of-docker/docker_build.sh | 13 +++++++
 .../docker_build_2.sh                         | 13 +++++++
 .../docker_build_older.sh                     | 13 +++++++
 test/docker-outside-of-docker/scenarios.json  | 33 +++++++++++++++++
 14 files changed, 206 insertions(+), 19 deletions(-)
 create mode 100644 test/docker-in-docker/Dockerfile
 create mode 100644 test/docker-in-docker/docker_build.sh
 create mode 100644 test/docker-in-docker/docker_build_2.sh
 create mode 100644 test/docker-in-docker/docker_build_older.sh
 create mode 100644 test/docker-outside-of-docker/Dockerfile
 create mode 100644 test/docker-outside-of-docker/docker_build.sh
 create mode 100644 test/docker-outside-of-docker/docker_build_2.sh
 create mode 100644 test/docker-outside-of-docker/docker_build_older.sh

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 58c2d1400..798b8e87a 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.0.1",
+    "version": "2.1.0",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
@@ -39,6 +39,11 @@
             "default": "",
             "proposals": [],
             "description": "Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24"
+        },
+        "installDockerBuildx": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install Docker Buildx"
         }
     },
     "entrypoint": "/usr/local/share/docker-init.sh",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index dff11393f..770519902 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -13,10 +13,8 @@ USE_MOBY="${MOBY:-"true"}"
 DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2
 AZURE_DNS_AUTO_DETECTION="${AZUREDNSAUTODETECTION:-"true"}"
 DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL}"
-
-ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
-
+INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy"
 DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal hirsute impish jammy"
@@ -158,7 +156,7 @@ else
 fi
 
 # Install dependencies
-check_packages apt-transport-https curl ca-certificates pigz iptables gnupg2 dirmngr
+check_packages apt-transport-https curl ca-certificates pigz iptables gnupg2 dirmngr wget
 if ! type git > /dev/null 2>&1; then
     check_packages git
 fi
@@ -307,13 +305,27 @@ if [ -f "/usr/local/share/docker-init.sh" ]; then
 fi
 echo "docker-init doesn't exist, adding..."
 
-# Add user to the docker group
-if [ "${ENABLE_NONROOT_DOCKER}" = "true" ]; then
-    if ! getent group docker > /dev/null 2>&1; then
-        groupadd docker
-    fi
+if ! cat /etc/group | grep -e "^docker:" > /dev/null 2>&1; then
+        groupadd -r docker
+fi
+
+usermod -aG docker ${USERNAME}
+
+if [ "${INSTALL_DOCKER_BUILDX}" = "true" ]; then
+    buildx_version="latest"
+    find_version_from_git_tags buildx_version "https://github.com/docker/buildx" "refs/tags/v"
+
+    echo "(*) Installing buildx ${buildx_version}..."
+    buildx_file_name="buildx-v${buildx_version}.linux-${architecture}"
+    cd /tmp && wget "https://github.com/docker/buildx/releases/download/v${buildx_version}/${buildx_file_name}"
+
+    mkdir -p ${_REMOTE_USER_HOME}/.docker/cli-plugins
+    mv ${buildx_file_name} ${_REMOTE_USER_HOME}/.docker/cli-plugins/docker-buildx
+    chmod +x ${_REMOTE_USER_HOME}/.docker/cli-plugins/docker-buildx
 
-    usermod -aG docker ${USERNAME}
+    chown -R "${USERNAME}:docker" "${_REMOTE_USER_HOME}/.docker"
+    chmod -R g+r+w "${_REMOTE_USER_HOME}/.docker"
+    find "${_REMOTE_USER_HOME}/.docker" -type d -print0 | xargs -n 1 -0 chmod g+s
 fi
 
 tee /usr/local/share/docker-init.sh > /dev/null \
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 1f3ff4e9a..79bc9febc 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.0.10",
+    "version": "1.1.0",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
@@ -28,6 +28,11 @@
             ],
             "default": "v1",
             "description": "Compose version to use for docker-compose (v1 or v2)"
+        },
+        "installDockerBuildx": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install Docker Buildx"
         }
     },
     "entrypoint": "/usr/local/share/docker-init.sh",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index dc5a9034b..63524101b 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -15,6 +15,7 @@ ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"
 SOURCE_SOCKET="${SOURCE_SOCKET:-"/var/run/docker-host.sock"}"
 TARGET_SOCKET="${TARGET_SOCKET:-"/var/run/docker.sock"}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy"
@@ -116,7 +117,7 @@ find_version_from_git_tags() {
 export DEBIAN_FRONTEND=noninteractive
 
 # Install dependencies
-check_packages apt-transport-https curl ca-certificates gnupg2 dirmngr
+check_packages apt-transport-https curl ca-certificates gnupg2 dirmngr wget
 if ! type git > /dev/null 2>&1; then
     check_packages git
 fi
@@ -254,6 +255,29 @@ else
     update-alternatives --set docker-compose /usr/local/bin/compose-switch
 fi
 
+# Setup a docker group in the event the docker socket's group is not root
+if ! grep -qE '^docker:' /etc/group; then
+    groupadd --system docker
+fi
+usermod -aG docker "${USERNAME}"
+
+if [ "${INSTALL_DOCKER_BUILDX}" = "true" ]; then
+    buildx_version="latest"
+    find_version_from_git_tags buildx_version "https://github.com/docker/buildx" "refs/tags/v"
+
+    echo "(*) Installing buildx ${buildx_version}..."
+    buildx_file_name="buildx-v${buildx_version}.linux-${architecture}"
+    cd /tmp && wget "https://github.com/docker/buildx/releases/download/v${buildx_version}/${buildx_file_name}"
+
+    mkdir -p ${_REMOTE_USER_HOME}/.docker/cli-plugins
+    mv ${buildx_file_name} ${_REMOTE_USER_HOME}/.docker/cli-plugins/docker-buildx
+    chmod +x ${_REMOTE_USER_HOME}/.docker/cli-plugins/docker-buildx
+
+    chown -R "${USERNAME}:docker" "${_REMOTE_USER_HOME}/.docker"
+    chmod -R g+r+w "${_REMOTE_USER_HOME}/.docker"
+    find "${_REMOTE_USER_HOME}/.docker" -type d -print0 | xargs -n 1 -0 chmod g+s
+fi
+
 # If init file already exists, exit
 if [ -f "/usr/local/share/docker-init.sh" ]; then
     # Clean up
@@ -277,11 +301,6 @@ if [ "${ENABLE_NONROOT_DOCKER}" = "false" ] || [ "${USERNAME}" = "root" ]; then
     exit 0
 fi
 
-# Setup a docker group in the event the docker socket's group is not root
-if ! grep -qE '^docker:' /etc/group; then
-    groupadd --system docker
-fi
-usermod -aG docker "${USERNAME}"
 DOCKER_GID="$(grep -oP '^docker:x:\K[^:]+' /etc/group)"
 
 # If enabling non-root access and specified user is found, setup socat and add script
diff --git a/test/docker-in-docker/Dockerfile b/test/docker-in-docker/Dockerfile
new file mode 100644
index 000000000..9cc9f1a39
--- /dev/null
+++ b/test/docker-in-docker/Dockerfile
@@ -0,0 +1 @@
+FROM ubuntu:focal
diff --git a/test/docker-in-docker/docker_build.sh b/test/docker-in-docker/docker_build.sh
new file mode 100644
index 000000000..742b222fb
--- /dev/null
+++ b/test/docker-in-docker/docker_build.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+
+# Report result
+reportResults
diff --git a/test/docker-in-docker/docker_build_2.sh b/test/docker-in-docker/docker_build_2.sh
new file mode 100644
index 000000000..742b222fb
--- /dev/null
+++ b/test/docker-in-docker/docker_build_2.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+
+# Report result
+reportResults
diff --git a/test/docker-in-docker/docker_build_older.sh b/test/docker-in-docker/docker_build_older.sh
new file mode 100644
index 000000000..742b222fb
--- /dev/null
+++ b/test/docker-in-docker/docker_build_older.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+
+# Report result
+reportResults
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index d37053ae5..5123d0916 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -25,5 +25,38 @@
                 "azureDnsAutoDetection": false
             }
         }
+    },
+    "docker_build": {
+        "image": "mcr.microsoft.com/devcontainers/javascript-node:0-18",
+        "features": {
+            "docker-in-docker": {
+                "version": "latest",
+                "moby": "false",
+                "dockerDashComposeVersion": "v2"
+            }
+        },
+        "remoteUser": "node"
+    },
+    "docker_build_2": {
+        "image": "ubuntu:focal",
+        "features": {
+            "docker-in-docker": {
+                "version": "latest",
+                "installDockerBuildx": true,
+                "moby": "false",
+                "dockerDashComposeVersion": "v2"
+            }
+        }
+    },
+    "docker_build_older": {
+        "image": "mcr.microsoft.com/devcontainers/javascript-node:0-18",
+        "features": {
+            "docker-in-docker": {
+                "version": "20",
+                "moby": "false",
+                "dockerDashComposeVersion": "v2"
+            }
+        },
+        "remoteUser": "node"
     }
-}
\ No newline at end of file
+}
diff --git a/test/docker-outside-of-docker/Dockerfile b/test/docker-outside-of-docker/Dockerfile
new file mode 100644
index 000000000..61217d945
--- /dev/null
+++ b/test/docker-outside-of-docker/Dockerfile
@@ -0,0 +1 @@
+FROM ubuntu:jammy
diff --git a/test/docker-outside-of-docker/docker_build.sh b/test/docker-outside-of-docker/docker_build.sh
new file mode 100644
index 000000000..742b222fb
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_build.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+
+# Report result
+reportResults
diff --git a/test/docker-outside-of-docker/docker_build_2.sh b/test/docker-outside-of-docker/docker_build_2.sh
new file mode 100644
index 000000000..742b222fb
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_build_2.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+
+# Report result
+reportResults
diff --git a/test/docker-outside-of-docker/docker_build_older.sh b/test/docker-outside-of-docker/docker_build_older.sh
new file mode 100644
index 000000000..742b222fb
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_build_older.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+
+# Report result
+reportResults
diff --git a/test/docker-outside-of-docker/scenarios.json b/test/docker-outside-of-docker/scenarios.json
index 804b52242..ad9b07248 100644
--- a/test/docker-outside-of-docker/scenarios.json
+++ b/test/docker-outside-of-docker/scenarios.json
@@ -7,5 +7,38 @@
                 "version": "latest"
             }
         }
+    },
+    "docker_build": {
+        "image": "mcr.microsoft.com/devcontainers/javascript-node:0-18",
+        "features": {
+            "docker-outside-of-docker": {
+                "version": "latest",
+                "installDockerBuildx": true,
+                "moby": "false",
+                "dockerDashComposeVersion": "v2"
+            }
+        },
+        "remoteUser": "node"
+    },
+    "docker_build_2": {
+        "image": "ubuntu:focal",
+        "features": {
+            "docker-outside-of-docker": {
+                "version": "latest",
+                "moby": "false",
+                "dockerDashComposeVersion": "v2"
+            }
+        }
+    },
+    "docker_build_older": {
+        "image": "mcr.microsoft.com/devcontainers/javascript-node:0-18",
+        "features": {
+            "docker-outside-of-docker": {
+                "version": "20",
+                "moby": "false",
+                "dockerDashComposeVersion": "v2"
+            }
+        },
+        "remoteUser": "node"
     }
 }

From 5d6f1ae9b93ca3e2ddb9c71c642e4e9204426e3c Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 8 Mar 2023 15:40:30 -0800
Subject: [PATCH 100/478] Automated documentation update (#479)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/docker-in-docker/README.md         | 1 +
 src/docker-outside-of-docker/README.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index d74639bb1..9a22c2c4e 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -20,6 +20,7 @@ Create child containers *inside* a container, independent from the host's docker
 | dockerDashComposeVersion | Default version of Docker Compose (v1 or v2) | string | v1 |
 | azureDnsAutoDetection | Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure | boolean | true |
 | dockerDefaultAddressPool | Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24 | string | - |
+| installDockerBuildx | Install Docker Buildx | boolean | true |
 
 ## Limitations
 
diff --git a/src/docker-outside-of-docker/README.md b/src/docker-outside-of-docker/README.md
index 74011a06d..793d5d0ba 100644
--- a/src/docker-outside-of-docker/README.md
+++ b/src/docker-outside-of-docker/README.md
@@ -20,6 +20,7 @@ Re-use the host docker socket, adding the Docker CLI to a container. Feature inv
 | version | Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.) | string | latest |
 | moby | Install OSS Moby build instead of Docker CE | boolean | true |
 | dockerDashComposeVersion | Compose version to use for docker-compose (v1 or v2) | string | v1 |
+| installDockerBuildx | Install Docker Buildx | boolean | true |
 
 ## Limitations
 

From adf7240a7cfbaecfb84597359843212a870f6682 Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Fri, 10 Mar 2023 08:50:32 -0800
Subject: [PATCH 101/478] oryx-supported-platforms (#482)

---
 src/oryx/NOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/oryx/NOTES.md b/src/oryx/NOTES.md
index 19fe92f31..ec69ec059 100644
--- a/src/oryx/NOTES.md
+++ b/src/oryx/NOTES.md
@@ -2,6 +2,6 @@
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+See [supportedPlatformVersions.md](https://github.com/microsoft/Oryx/blob/main/doc/supportedPlatformVersions.md) on the Oryx repository for supported platforms.  Notably, `oryx` does not support Debian "jammy".
 
 `bash` is required to execute the `install.sh` script.

From 1449f416a0d5c65fbd7e7bfac041eb43f1ecd98d Mon Sep 17 00:00:00 2001
From: Eljo George <eljog@github.com>
Date: Fri, 10 Mar 2023 12:27:28 -0800
Subject: [PATCH 102/478] Remove duplicate env var sourcing for codespaces
 (#481)

* Remove duplicate env var sourcing for codespaces
---
 src/sshd/devcontainer-feature.json |  2 +-
 src/sshd/install.sh                | 39 ------------------------------
 2 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/src/sshd/devcontainer-feature.json b/src/sshd/devcontainer-feature.json
index da1f8a9d8..a5d464f69 100644
--- a/src/sshd/devcontainer-feature.json
+++ b/src/sshd/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "sshd",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "name": "SSH server",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/sshd",
     "description": "Adds a SSH server into a container so that you can use an external terminal, sftp, or SSHFS to interact with it.",
diff --git a/src/sshd/install.sh b/src/sshd/install.sh
index 634f16301..146040896 100755
--- a/src/sshd/install.sh
+++ b/src/sshd/install.sh
@@ -13,7 +13,6 @@ SSHD_PORT="${SSHD_PORT:-"2222"}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 START_SSHD="${START_SSHD:-"false"}"
 NEW_PASSWORD="${NEW_PASSWORD:-"skip"}"
-FIX_ENVIRONMENT="${FIX_ENVIRONMENT:-"true"}"
 
 set -e
 
@@ -93,35 +92,6 @@ sed -i -E "s/#*\s*Port\s+.+/Port ${SSHD_PORT}/g" /etc/ssh/sshd_config
 # Need to UsePAM so /etc/environment is processed
 sed -i -E "s/#?\s*UsePAM\s+.+/UsePAM yes/g" /etc/ssh/sshd_config
 
-# Script to store variables that exist at the time the ENTRYPOINT is fired
-store_env_script="$(cat << 'EOF'
-# Wire in codespaces secret processing to zsh if present (since may have been added to image after script was run)
-if [ -f  /etc/zsh/zlogin ] && ! grep '/etc/profile.d/00-restore-secrets.sh' /etc/zsh/zlogin > /dev/null 2>&1; then
-    echo -e "if [ -f /etc/profile.d/00-restore-secrets.sh ]; then . /etc/profile.d/00-restore-secrets.sh; fi\n$(cat /etc/zsh/zlogin 2>/dev/null || echo '')" | sudoIf tee /etc/zsh/zlogin > /dev/null
-fi
-EOF
-)"
-
-# Script to ensure login shells get the latest Codespaces secrets
-restore_secrets_script="$(cat << 'EOF'
-#!/bin/sh
-if [ "${CODESPACES}" != "true" ] || [ "${VSCDC_FIXED_SECRETS}" = "true" ] || [ ! -z "${GITHUB_CODESPACES_TOKEN}" ]; then
-    # Not codespaces, already run, or secrets already in environment, so return
-    return
-fi
-if [ -f /workspaces/.codespaces/shared/.env-secrets ]; then
-    while read line
-    do
-        key=$(echo $line | sed "s/=.*//")
-        value=$(echo $line | sed "s/$key=//1")
-        decodedValue=$(echo $value | base64 -d)
-        export $key="$decodedValue"
-    done < /workspaces/.codespaces/shared/.env-secrets
-fi
-export VSCDC_FIXED_SECRETS=true
-EOF
-)"
-
 # Write out a scripts that can be referenced as an ENTRYPOINT to auto-start sshd and fix login environments
 tee /usr/local/share/ssh-init.sh > /dev/null \
 << 'EOF'
@@ -141,15 +111,6 @@ sudoIf()
 }
 
 EOF
-if [ "${FIX_ENVIRONMENT}" = "true" ]; then
-    echo "${store_env_script}" >> /usr/local/share/ssh-init.sh
-    echo "${restore_secrets_script}" > /etc/profile.d/00-restore-secrets.sh
-    chmod +x /etc/profile.d/00-restore-secrets.sh
-    # Wire in zsh if present
-    if type zsh > /dev/null 2>&1; then
-        echo -e "if [ -f /etc/profile.d/00-restore-secrets.sh ]; then . /etc/profile.d/00-restore-secrets.sh; fi\n$(cat /etc/zsh/zlogin 2>/dev/null || echo '')" > /etc/zsh/zlogin
-    fi
-fi
 tee -a /usr/local/share/ssh-init.sh > /dev/null \
 << 'EOF'
 

From d4c3fefc4a792193428d9ae91125696c5ac2fa2f Mon Sep 17 00:00:00 2001
From: Daniel Ciborowski <dciborow@microsoft.com>
Date: Tue, 14 Mar 2023 11:23:28 -0400
Subject: [PATCH 103/478] Add pytest to Python Feature (#487)

* Update install.sh

* Update install_additional_python.sh

* Update install_os_provided_python.sh

* Update install_via_oryx.sh

* Update test.sh

* Update devcontainer-feature.json
---
 src/python/devcontainer-feature.json      | 2 +-
 src/python/install.sh                     | 2 +-
 test/python/install_additional_python.sh  | 2 ++
 test/python/install_os_provided_python.sh | 4 +++-
 test/python/install_via_oryx.sh           | 4 +++-
 test/python/test.sh                       | 2 ++
 6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index c5f0d76f9..a954c3511 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/python/install.sh b/src/python/install.sh
index 3f6b4d9ac..053a72aff 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -26,7 +26,7 @@ CONFIGURE_JUPYTERLAB_ALLOW_ORIGIN="${CONFIGUREJUPYTERLABALLOWORIGIN:-""}"
 # alongside PYTHON_VERSION, but not set as default.
 ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 
-DEFAULT_UTILS=("pylint" "flake8" "autopep8" "black" "yapf" "mypy" "pydocstyle" "pycodestyle" "bandit" "pipenv" "virtualenv")
+DEFAULT_UTILS=("pylint" "flake8" "autopep8" "black" "yapf" "mypy" "pydocstyle" "pycodestyle" "bandit" "pipenv" "virtualenv" "pytest")
 PYTHON_SOURCE_GPG_KEYS="64E628F8D684696D B26995E310250568 2D347EA6AA65421D FB9921286F5E1540 3A5CA953F73C700D 04C367C218ADD4FF 0EDDC5F26A45C816 6AF053F07D9DC8D2 C9BE28DEE6DF025C 126EB563A74B06BF D9866941EA5BBD71 ED9D77D5"
 GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
 keyserver hkps://keys.openpgp.org
diff --git a/test/python/install_additional_python.sh b/test/python/install_additional_python.sh
index caf2a19d1..d584f4be9 100755
--- a/test/python/install_additional_python.sh
+++ b/test/python/install_additional_python.sh
@@ -21,6 +21,7 @@ check "mypy" mypy --version
 check "pycodestyle" pycodestyle --version
 check "pydocstyle" pydocstyle --version
 check "pylint" pylint --version
+check "pytest" pytest --version
 
 # Check paths in settings
 check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
@@ -34,6 +35,7 @@ check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
 check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
 check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
 check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
 
 # Report result
 reportResults
diff --git a/test/python/install_os_provided_python.sh b/test/python/install_os_provided_python.sh
index 3eb014ccb..e39b51412 100755
--- a/test/python/install_os_provided_python.sh
+++ b/test/python/install_os_provided_python.sh
@@ -20,6 +20,7 @@ check "mypy" mypy --version
 check "pycodestyle" pycodestyle --version
 check "pydocstyle" pydocstyle --version
 check "pylint" pylint --version
+check "pytest" pytest --version
 
 # Check paths in settings
 check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
@@ -33,6 +34,7 @@ check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
 check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
 check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
 check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
 
 # Report result
-reportResults
\ No newline at end of file
+reportResults
diff --git a/test/python/install_via_oryx.sh b/test/python/install_via_oryx.sh
index 3eb014ccb..e39b51412 100755
--- a/test/python/install_via_oryx.sh
+++ b/test/python/install_via_oryx.sh
@@ -20,6 +20,7 @@ check "mypy" mypy --version
 check "pycodestyle" pycodestyle --version
 check "pydocstyle" pydocstyle --version
 check "pylint" pylint --version
+check "pytest" pytest --version
 
 # Check paths in settings
 check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
@@ -33,6 +34,7 @@ check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
 check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
 check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
 check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
 
 # Report result
-reportResults
\ No newline at end of file
+reportResults
diff --git a/test/python/test.sh b/test/python/test.sh
index 832763d9d..038826d5c 100755
--- a/test/python/test.sh
+++ b/test/python/test.sh
@@ -20,6 +20,7 @@ check "mypy" mypy --version
 check "pycodestyle" pycodestyle --version
 check "pydocstyle" pydocstyle --version
 check "pylint" pylint --version
+check "pytest" pytest --version
 
 # Check paths in settings
 check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
@@ -33,6 +34,7 @@ check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
 check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
 check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
 check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
 
 # Report result
 reportResults

From e7e4aa8a98cb4eac856d40ea6bf733aa16f33c92 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 14 Mar 2023 09:17:38 -0700
Subject: [PATCH 104/478] Automated documentation update (#490)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/oryx/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/oryx/README.md b/src/oryx/README.md
index 7d3d3d11a..7f9e62269 100644
--- a/src/oryx/README.md
+++ b/src/oryx/README.md
@@ -17,7 +17,7 @@ Installs the oryx CLI
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+See [supportedPlatformVersions.md](https://github.com/microsoft/Oryx/blob/main/doc/supportedPlatformVersions.md) on the Oryx repository for supported platforms.  Notably, `oryx` does not support Debian "jammy".
 
 `bash` is required to execute the `install.sh` script.
 

From 0e079baaf7c67c7df9521d1dd5059a293702c5d5 Mon Sep 17 00:00:00 2001
From: Jacob Hummer <jcbhmr@outlook.com>
Date: Thu, 23 Mar 2023 18:07:08 -0500
Subject: [PATCH 105/478] Add contributing document (#488)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Create CONTRIBUTING.md

* Direct questions to slack channel

Co-authored-by: Brigit Murtaugh <brigit.murtaugh@microsoft.com>

* Use "dev containers" and "Features"

Apparently devcontainers is two words, and apparently features is a proper noun? I guess 🤷‍♂️

* Prettier formatting

I used https://prettier.io/playground/ since I was editing in the GitHub web editor

* Clarify to "only accept improvements and bug fixes"

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Be more explicit about custom features

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Add link to CLI test docs

* Add semver step in guide

* More specificity in link text

https://github.com/devcontainers/features/pull/488#discussion_r1137819187

* Add CONTRIBUTING.md link in readme

---------

Co-authored-by: Brigit Murtaugh <brigit.murtaugh@microsoft.com>
Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 CONTRIBUTING.md | 60 +++++++++++++++++++++++++++++++++++++++++++++++++
 README.md       |  4 ++++
 2 files changed, 64 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..f6c7e3ab0
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,60 @@
+**Thanks for taking the time to contribute! ❤️**
+
+All types of contributions are encouraged and valued, no matter if it's a bug
+report 🐛, a feature request 💡, or a Pull Request 🚀.
+
+- **❓ I have a question:** Ask in [our dev container community Slack channel]
+- **🐛 I found a bug:** [Open an Issue]
+- **💡 I have an idea:** [Open an Issue]
+- **💻 I want to code:** See below
+
+If you like the project, but just don't have time to contribute, that's OK too!
+You can also star the project ⭐, rave about it online 💬, or add a link to us
+🔗 in your project's readme.
+
+⚠️ You must never report security 🔒 related issues, vulnerabilities or bugs
+including sensitive information to the issue tracker, or elsewhere in public.
+Instead, please [report them to the Microsoft Security Response Center]. You can
+read more about our security policy in [`SECURITY.md`].
+
+## Contributing code
+
+👨‍💼 This repository is a collection of dev container Features managed by dev
+container spec maintainers. This repository will **only accept improvements and
+bug fixes** for the [current set of maintained Features].
+
+🚀 If you're looking to create a new Feature, then we encourage adding it to a
+separate repository of your control. The [devcontainers/feature-starter]
+repository has more guidance on self authoring Features.
+
+💡 Once you've self authored the Features and if you'd like to share them with
+the community, then we'd recommend [adding it to the index].
+
+👷‍ If you've identified an issue and you want to fix it, here's how you can get
+started:
+
+1. 🔀 Fork the repo
+2. 💻 Open the repo in your editor
+3. 👨‍💻 Add your changes to your workspace
+4. ✨ [Test your changes using `devcontainer features test`] to make sure
+   everything still works
+5. 🆚 Bump the version of the feature you changed according to [semver]
+6. 🔖 Commit & push your changes
+7. 🔁 Open a PR to get your changes merged
+8. 🚀 Profit!
+
+👩‍⚖️ When contributing code to this project, you may be asked to agree to our
+[Contributor License Agreement].
+
+<!-- prettier-ignore-start -->
+[our dev container community Slack channel]: https://aka.ms/devcontainer_community
+[open an issue]: https://github.com/devcontainers/features/issues/new
+[current set of maintained Features]: https://github.com/devcontainers/features/tree/main/src
+[devcontainers/feature-starter]: https://github.com/devcontainers/feature-starter#readme
+[adding it to the index]: https://github.com/devcontainers/feature-starter#adding-features-to-the-index
+[report them to the Microsoft Security Response Center]: https://msrc.microsoft.com/create-report
+[`SECURITY.md`]: https://github.com/devcontainers/spec/blob/main/SECURITY.md
+[contributor license agreement]: https://opensource.microsoft.com/cla/
+[Test your changes using `devcontainer features test`]: https://github.com/devcontainers/cli/blob/main/docs/features/test.md
+[semver]: https://semver.org/
+<!-- prettier-ignore-end -->
diff --git a/README.md b/README.md
index b887c00d9..bfe35baaa 100644
--- a/README.md
+++ b/README.md
@@ -109,3 +109,7 @@ We are eager to hear your feedback on self-authoring!  Please provide comments a
 
 This repository will accept improvement and bug fix contributions related to the
 [current set of maintained Features](./src).
+
+🤝 You can read more about how to contribute in [`CONTRIBUTING.md`]. ❤️
+
+[`CONTRIBUTING.md`]: CONTRIBUTING.md

From 1118b992d970b53d92b3379a5b05de7738f3dc8b Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 28 Mar 2023 16:05:17 -0700
Subject: [PATCH 106/478] Ruby: Fix failures - omit "ruby-debug-ide" (#505)

* Ruby: Fix failures on debian image due to ruby-debug-ide

* omit
---
 src/ruby/devcontainer-feature.json   |  2 +-
 src/ruby/install.sh                  |  3 ++-
 test/ruby/install_additional_ruby.sh |  1 +
 test/ruby/ruby_debian.sh             | 12 ++++++++++++
 test/ruby/scenarios.json             |  6 ++++++
 5 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 test/ruby/ruby_debian.sh

diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json
index 8d2a4e31f..e9fafeefd 100644
--- a/src/ruby/devcontainer-feature.json
+++ b/src/ruby/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "1.0.9",
+    "version": "1.0.10",
     "name": "Ruby (via rvm)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
     "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
diff --git a/src/ruby/install.sh b/src/ruby/install.sh
index daae7faa1..087108520 100755
--- a/src/ruby/install.sh
+++ b/src/ruby/install.sh
@@ -19,7 +19,8 @@ ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 
 # Note: ruby-debug-ide will install the right version of debase if missing and
 # installing debase directly fails on Ruby 3.1.0 as of 1/7/2022, so omitting.
-DEFAULT_GEMS="rake ruby-debug-ide"
+# installing ruby-debug-ide on debian fails, so omitting.
+DEFAULT_GEMS="rake"
 
 RVM_GPG_KEYS="409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"
 GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
diff --git a/test/ruby/install_additional_ruby.sh b/test/ruby/install_additional_ruby.sh
index e5a651c5b..4fa844475 100644
--- a/test/ruby/install_additional_ruby.sh
+++ b/test/ruby/install_additional_ruby.sh
@@ -10,6 +10,7 @@ check "ruby version 2.5.9 installed"  rvm list | grep 2.5.9
 check "ruby version 3.0.4 installed"  rvm list | grep 3.0.4
 
 check "rbenv" bash -c 'eval "$(rbenv init -)" && rbenv --version'
+check "rake" bash -c "gem list | grep rake"
 
 # Report result
 reportResults
diff --git a/test/ruby/ruby_debian.sh b/test/ruby/ruby_debian.sh
new file mode 100644
index 000000000..bc5e6554d
--- /dev/null
+++ b/test/ruby/ruby_debian.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "ruby" ruby -v
+check "rake" bash -c "gem list | grep rake"
+
+# Report result
+reportResults
diff --git a/test/ruby/scenarios.json b/test/ruby/scenarios.json
index 9f88d9e45..04cac73f5 100644
--- a/test/ruby/scenarios.json
+++ b/test/ruby/scenarios.json
@@ -7,5 +7,11 @@
                 "additionalVersions": "2.5,3.0.4"
             }
         }
+    },
+    "ruby_debian": {
+        "image": "mcr.microsoft.com/devcontainers/base:bullseye",
+        "features": {
+            "ruby": {}
+        }
     }
 }
\ No newline at end of file

From 2952d87f1db5681330db025e17ab4357a1bdc275 Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Tue, 4 Apr 2023 06:47:04 -0700
Subject: [PATCH 107/478] add a postCreateCommand to `git-lfs` Feature (#511)

* add a postCreateCommand to git-lfs Feature

* debug passing locally but not in CI

* update scenario

* add GIT_LFS_SKIP_SMUDGE=1 to prevent fetching lfs arifacts in github actions

* arguments should be booleans

* move example repo to devcontainers org

* place script literally anywhere other than /tmp
---
 src/git-lfs/devcontainer-feature.json |  8 ++++++-
 src/git-lfs/install.sh                | 32 +++++++++++++++++++++++++++
 test/git-lfs/autoPullDisabled.sh      | 11 +++++++++
 test/git-lfs/autoPullEnabled.sh       | 11 +++++++++
 test/git-lfs/scenarios.json           | 22 ++++++++++++++++++
 5 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 test/git-lfs/autoPullDisabled.sh
 create mode 100644 test/git-lfs/autoPullEnabled.sh
 create mode 100644 test/git-lfs/scenarios.json

diff --git a/src/git-lfs/devcontainer-feature.json b/src/git-lfs/devcontainer-feature.json
index 021746997..dc61dead9 100644
--- a/src/git-lfs/devcontainer-feature.json
+++ b/src/git-lfs/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git-lfs",
-    "version": "1.0.7",
+    "version": "1.1.0",
     "name": "Git Large File Support (LFS)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git-lfs",
     "description": "Installs Git Large File Support (Git LFS) along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like git and curl.",
@@ -13,8 +13,14 @@
             ],
             "default": "latest",
             "description": "Select version of Git LFS to install"
+        },
+        "autoPull": {
+            "type": "boolean",
+            "default": true,
+            "description": "Automatically pull LFS files when creating the container.  When false, running 'git lfs pull' in the container will have the same effect."
         }
     },
+    "postCreateCommand": "/usr/local/share/pull-git-lfs-artifacts.sh",
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
diff --git a/src/git-lfs/install.sh b/src/git-lfs/install.sh
index d6f914f81..393109995 100755
--- a/src/git-lfs/install.sh
+++ b/src/git-lfs/install.sh
@@ -8,6 +8,7 @@
 # Maintainer: The VS Code and Codespaces Teams
 
 GIT_LFS_VERSION=${VERSION:-"latest"}
+AUTO_PULL=${AUTOPULL:="true"}
 
 GIT_LFS_ARCHIVE_GPG_KEY_URI="https://packagecloud.io/github/git-lfs/gpgkey"
 GIT_LFS_ARCHIVE_ARCHITECTURES="amd64 arm64"
@@ -185,6 +186,37 @@ if [ "${use_github}" = "true" ]; then
     install_using_github
 fi
 
+# --- Generate a 'pull-git-lfs-artifacts.sh' script to be executed by the 'postCreateCommand' lifecycle hook
+PULL_GIT_LFS_SCRIPT_PATH="/usr/local/share/pull-git-lfs-artifacts.sh"
+
+tee "$PULL_GIT_LFS_SCRIPT_PATH" > /dev/null \
+<< EOF
+#!/bin/sh
+set -e
+AUTO_PULL=${AUTO_PULL}
+EOF
+
+tee -a "$PULL_GIT_LFS_SCRIPT_PATH" > /dev/null \
+<< 'EOF'
+
+echo "Fetching git lfs artifacts..."
+
+if [ "${AUTO_PULL}" != "true" ]; then
+    echo "(!) Skipping 'git lfs pull' because 'autoPull' is not set to 'true'"
+    exit 0
+fi
+
+# Check if repo is a git lfs repo.
+if ! git lfs ls-files > /dev/null 2>&1; then
+    echo "(!) Skipping automatic 'git lfs pull' because no git lfs files were detected"
+    exit 0
+fi
+
+git lfs pull
+EOF
+
+chmod 755 "$PULL_GIT_LFS_SCRIPT_PATH"
+
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
diff --git a/test/git-lfs/autoPullDisabled.sh b/test/git-lfs/autoPullDisabled.sh
new file mode 100644
index 000000000..787781c9c
--- /dev/null
+++ b/test/git-lfs/autoPullDisabled.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "target file exists" cat big-file-1.txt
+check "lfs file has not been expanded" cat "big-file-1.txt" | grep "git-lfs\.github\.com"
+
+reportResults
\ No newline at end of file
diff --git a/test/git-lfs/autoPullEnabled.sh b/test/git-lfs/autoPullEnabled.sh
new file mode 100644
index 000000000..8cdce3f91
--- /dev/null
+++ b/test/git-lfs/autoPullEnabled.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "target file exists" cat big-file-1.txt
+check "lfs file has been expanded" cat "big-file-1.txt" | grep "this is test file 1"
+
+reportResults
\ No newline at end of file
diff --git a/test/git-lfs/scenarios.json b/test/git-lfs/scenarios.json
new file mode 100644
index 000000000..6cc3c24a5
--- /dev/null
+++ b/test/git-lfs/scenarios.json
@@ -0,0 +1,22 @@
+{
+    "autoPullEnabled": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "initializeCommand": "(GIT_LFS_SKIP_SMUDGE=1 git clone https://github.com/devcontainers/git-lfs-example /tmp/testRepo-1 || true) && (cp -r /tmp/testRepo-1/.git* . && cp -r /tmp/testRepo-1/* .)",
+        "remoteUser": "vscode",
+        "features": {
+            "git-lfs": {
+                "autoPull": true
+            }
+        }
+    },
+    "autoPullDisabled": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "initializeCommand": "(GIT_LFS_SKIP_SMUDGE=1 git clone https://github.com/devcontainers/git-lfs-example /tmp/testRepo-2 || true) && (cp -r /tmp/testRepo-2/.git* . && cp -r /tmp/testRepo-2/* .)",
+        "remoteUser": "vscode",
+        "features": {
+            "git-lfs": {
+                "autoPull": false
+            }
+        }
+    }
+}
\ No newline at end of file

From f0dd470ba898bb62eb0fa425aa81e86072454167 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 4 Apr 2023 10:05:12 -0700
Subject: [PATCH 108/478] Automated documentation update (#512)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/git-lfs/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/git-lfs/README.md b/src/git-lfs/README.md
index 9fc3281fe..9a9a06659 100644
--- a/src/git-lfs/README.md
+++ b/src/git-lfs/README.md
@@ -16,6 +16,7 @@ Installs Git Large File Support (Git LFS) along with needed dependencies. Useful
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
 | version | Select version of Git LFS to install | string | latest |
+| autoPull | Automatically pull LFS files when creating the container.  When false, running 'git lfs pull' in the container will have the same effect. | boolean | true |
 
 
 

From 7f605b9452ac43316a0b81d78118c5dbe00ee26e Mon Sep 17 00:00:00 2001
From: Felipe Santos <felipecassiors@gmail.com>
Date: Wed, 5 Apr 2023 15:21:36 -0300
Subject: [PATCH 109/478] Fix several issues with docker-outside-of-docker
 (#443)

* Fix several issues with docker-outside-of-docker

* Add initial tests and bump version

* Add two tests

* Fix docker buildx conflict

* Fix possible test issue

* Add tests for moby

* Add buildx test to init

* Fix inconsistency

* Many fixes and improvements

* Make dockeDashCompose v2 by default
---
 .../devcontainer-feature.json                 |   7 +-
 src/docker-outside-of-docker/install.sh       |  85 ++++++-------
 .../docker_build_moby.sh                      |   1 +
 ...r_build_2.sh => docker_build_no_buildx.sh} |   2 +-
 .../docker_build_no_buildx_moby.sh            |   1 +
 .../docker_build_older.sh                     |  13 --
 .../docker_dash_compose_v1.sh                 |  13 ++
 .../docker_dash_compose_v1_moby.sh            |   1 +
 .../docker_dash_compose_v2.sh                 |  13 ++
 .../docker_dash_compose_v2_moby.sh            |   1 +
 test/docker-outside-of-docker/docker_init.sh  |   6 +-
 .../docker_init_debian.sh                     |   1 +
 .../docker_init_moby.sh                       |   1 +
 .../docker_init_ubuntu_22.sh                  |   1 +
 test/docker-outside-of-docker/scenarios.json  | 113 +++++++++++++++---
 test/docker-outside-of-docker/test.sh         |   9 +-
 16 files changed, 178 insertions(+), 90 deletions(-)
 create mode 120000 test/docker-outside-of-docker/docker_build_moby.sh
 rename test/docker-outside-of-docker/{docker_build_2.sh => docker_build_no_buildx.sh} (68%)
 create mode 120000 test/docker-outside-of-docker/docker_build_no_buildx_moby.sh
 delete mode 100644 test/docker-outside-of-docker/docker_build_older.sh
 create mode 100755 test/docker-outside-of-docker/docker_dash_compose_v1.sh
 create mode 120000 test/docker-outside-of-docker/docker_dash_compose_v1_moby.sh
 create mode 100755 test/docker-outside-of-docker/docker_dash_compose_v2.sh
 create mode 120000 test/docker-outside-of-docker/docker_dash_compose_v2_moby.sh
 create mode 120000 test/docker-outside-of-docker/docker_init_debian.sh
 create mode 120000 test/docker-outside-of-docker/docker_init_moby.sh
 create mode 120000 test/docker-outside-of-docker/docker_init_ubuntu_22.sh
 mode change 100755 => 100644 test/docker-outside-of-docker/test.sh

diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 79bc9febc..841bb6265 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
@@ -26,7 +26,7 @@
                 "v1",
                 "v2"
             ],
-            "default": "v1",
+            "default": "v2",
             "description": "Compose version to use for docker-compose (v1 or v2)"
         },
         "installDockerBuildx": {
@@ -36,9 +36,6 @@
         }
     },
     "entrypoint": "/usr/local/share/docker-init.sh",
-    "containerEnv": {
-        "DOCKER_BUILDKIT": "1"
-    },
     "customizations": {
         "vscode": {
             "extensions": [
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 63524101b..9d8433aed 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -9,7 +9,7 @@
 
 DOCKER_VERSION="${VERSION:-"latest"}"
 USE_MOBY="${MOBY:-"true"}"
-DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2
+DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v2"}" # v1 or v2
 
 ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"
 SOURCE_SOCKET="${SOURCE_SOCKET:-"/var/run/docker-host.sock"}"
@@ -87,7 +87,7 @@ find_version_from_git_tags() {
     local repository=$2
     local prefix=${3:-"tags/v"}
     local separator=${4:-"."}
-    local last_part_optional=${5:-"false"}    
+    local last_part_optional=${5:-"false"}
     if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
         local escaped_separator=${separator//./\\.}
         local last_part
@@ -172,7 +172,7 @@ apt-get update
 if [ "${DOCKER_VERSION}" = "latest" ] || [ "${DOCKER_VERSION}" = "lts" ] || [ "${DOCKER_VERSION}" = "stable" ]; then
     # Empty, meaning grab whatever "latest" is in apt repo
     cli_version_suffix=""
-else    
+else
     # Fetch a valid version from the apt-cache (eg: the Microsoft repo appends +azure, breakfix, etc...)
     docker_version_dot_escaped="${DOCKER_VERSION//./\\.}"
     docker_version_dot_plus_escaped="${docker_version_dot_escaped//+/\\+}"
@@ -194,17 +194,32 @@ if type docker > /dev/null 2>&1; then
     echo "Docker / Moby CLI already installed."
 else
     if [ "${USE_MOBY}" = "true" ]; then
-        apt-get -y install --no-install-recommends moby-cli${cli_version_suffix} moby-buildx
+        buildx=()
+        if [ "${INSTALL_DOCKER_BUILDX}" = "true" ]; then
+            buildx=(moby-buildx)
+        fi
+        apt-get -y install --no-install-recommends ${cli_package_name}${cli_version_suffix} "${buildx[@]}"
         apt-get -y install --no-install-recommends moby-compose || echo "(*) Package moby-compose (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
     else
-        apt-get -y install --no-install-recommends docker-ce-cli${cli_version_suffix}
+        buildx=()
+        if [ "${INSTALL_DOCKER_BUILDX}" = "true" ]; then
+            buildx=(docker-buildx-plugin)
+        fi
+        apt-get -y install --no-install-recommends ${cli_package_name}${cli_version_suffix} "${buildx[@]}" docker-compose-plugin
+        buildx_path="/usr/libexec/docker/cli-plugins/docker-buildx"
+        # Older versions of Docker CE installs buildx as part of the CLI package
+        if [ "${INSTALL_DOCKER_BUILDX}" = "false" ] && [ -f "${buildx_path}" ]; then
+            echo "(*) Removing docker-buildx installed from docker-ce-cli since installDockerBuildx is disabled..."
+            rm -f "${buildx_path}"
+        fi
     fi
+    unset buildx buildx_path
 fi
 
 # Install Docker Compose if not already installed  and is on a supported architecture
 if type docker-compose > /dev/null 2>&1; then
     echo "Docker Compose already installed."
-else
+elif [ "${DOCKER_DASH_COMPOSE_VERSION}" = "v1" ]; then
     TARGET_COMPOSE_ARCH="$(uname -m)"
     if [ "${TARGET_COMPOSE_ARCH}" = "amd64" ]; then
         TARGET_COMPOSE_ARCH="x86_64"
@@ -224,60 +239,36 @@ else
         fi
         ${pipx_bin} install --pip-args '--no-cache-dir --force-reinstall' docker-compose
         rm -rf /tmp/pip-tmp
-    else 
+    else
         compose_v1_version="1"
         find_version_from_git_tags compose_v1_version "https://github.com/docker/compose" "tags/"
         echo "(*) Installing docker-compose ${compose_v1_version}..."
         curl -fsSL "https://github.com/docker/compose/releases/download/${compose_v1_version}/docker-compose-Linux-x86_64" -o /usr/local/bin/docker-compose
         chmod +x /usr/local/bin/docker-compose
     fi
-fi
-
-# Install docker-compose switch if not already installed - https://github.com/docker/compose-switch#manual-installation
-current_v1_compose_path="$(which docker-compose)"
-target_v1_compose_path="$(dirname "${current_v1_compose_path}")/docker-compose-v1"
-if ! type compose-switch > /dev/null 2>&1; then
-    echo "(*) Installing compose-switch..."
+else
+    echo "(*) Installing compose-switch as docker-compose..."
     compose_switch_version="latest"
     find_version_from_git_tags compose_switch_version "https://github.com/docker/compose-switch"
-    curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/compose-switch
-    chmod +x /usr/local/bin/compose-switch
+    curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/docker-compose
+    chmod +x /usr/local/bin/docker-compose
     # TODO: Verify checksum once available: https://github.com/docker/compose-switch/issues/11
-
-    # Setup v1 CLI as alternative in addition to compose-switch (which maps to v2)
-    mv "${current_v1_compose_path}" "${target_v1_compose_path}"
-    update-alternatives --install /usr/local/bin/docker-compose docker-compose /usr/local/bin/compose-switch 99
-    update-alternatives --install /usr/local/bin/docker-compose docker-compose "${target_v1_compose_path}" 1
-fi
-if [ "${DOCKER_DASH_COMPOSE_VERSION}" = "v1" ]; then
-    update-alternatives --set docker-compose "${target_v1_compose_path}"
-else
-    update-alternatives --set docker-compose /usr/local/bin/compose-switch
 fi
 
 # Setup a docker group in the event the docker socket's group is not root
 if ! grep -qE '^docker:' /etc/group; then
+    echo "(*) Creating missing docker group..."
     groupadd --system docker
 fi
-usermod -aG docker "${USERNAME}"
-
-if [ "${INSTALL_DOCKER_BUILDX}" = "true" ]; then
-    buildx_version="latest"
-    find_version_from_git_tags buildx_version "https://github.com/docker/buildx" "refs/tags/v"
 
-    echo "(*) Installing buildx ${buildx_version}..."
-    buildx_file_name="buildx-v${buildx_version}.linux-${architecture}"
-    cd /tmp && wget "https://github.com/docker/buildx/releases/download/v${buildx_version}/${buildx_file_name}"
-
-    mkdir -p ${_REMOTE_USER_HOME}/.docker/cli-plugins
-    mv ${buildx_file_name} ${_REMOTE_USER_HOME}/.docker/cli-plugins/docker-buildx
-    chmod +x ${_REMOTE_USER_HOME}/.docker/cli-plugins/docker-buildx
-
-    chown -R "${USERNAME}:docker" "${_REMOTE_USER_HOME}/.docker"
-    chmod -R g+r+w "${_REMOTE_USER_HOME}/.docker"
-    find "${_REMOTE_USER_HOME}/.docker" -type d -print0 | xargs -n 1 -0 chmod g+s
+# Ensure docker group gid is 999
+if [ "$(getent group docker | cut -d: -f3)" != "999" ]; then
+    echo "(*) Updating docker group gid to 999..."
+    groupmod -g 999 docker
 fi
 
+usermod -aG docker "${USERNAME}"
+
 # If init file already exists, exit
 if [ -f "/usr/local/share/docker-init.sh" ]; then
     # Clean up
@@ -304,10 +295,10 @@ fi
 DOCKER_GID="$(grep -oP '^docker:x:\K[^:]+' /etc/group)"
 
 # If enabling non-root access and specified user is found, setup socat and add script
-chown -h "${USERNAME}":root "${TARGET_SOCKET}"        
+chown -h "${USERNAME}":root "${TARGET_SOCKET}"
 check_packages socat
 tee /usr/local/share/docker-init.sh > /dev/null \
-<< EOF 
+<< EOF
 #!/usr/bin/env bash
 #-------------------------------------------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
@@ -339,8 +330,8 @@ log()
 echo -e "\n** \$(date) **" | sudoIf tee -a \${SOCAT_LOG} > /dev/null
 log "Ensuring ${USERNAME} has access to ${SOURCE_SOCKET} via ${TARGET_SOCKET}"
 
-# If enabled, try to update the docker group with the right GID. If the group is root, 
-# fall back on using socat to forward the docker socket to another unix socket so 
+# If enabled, try to update the docker group with the right GID. If the group is root,
+# fall back on using socat to forward the docker socket to another unix socket so
 # that we can set permissions on it without affecting the host.
 if [ "${ENABLE_NONROOT_DOCKER}" = "true" ] && [ "${SOURCE_SOCKET}" != "${TARGET_SOCKET}" ] && [ "${USERNAME}" != "root" ] && [ "${USERNAME}" != "0" ]; then
     SOCKET_GID=\$(stat -c '%g' ${SOURCE_SOCKET})
@@ -360,7 +351,7 @@ if [ "${ENABLE_NONROOT_DOCKER}" = "true" ] && [ "${SOURCE_SOCKET}" != "${TARGET_
     log "Success"
 fi
 
-# Execute whatever commands were passed in (if any). This allows us 
+# Execute whatever commands were passed in (if any). This allows us
 # to set this script to ENTRYPOINT while still executing the default CMD.
 set +e
 exec "\$@"
diff --git a/test/docker-outside-of-docker/docker_build_moby.sh b/test/docker-outside-of-docker/docker_build_moby.sh
new file mode 120000
index 000000000..0b420dbf4
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_build_moby.sh
@@ -0,0 +1 @@
+./docker_build.sh
\ No newline at end of file
diff --git a/test/docker-outside-of-docker/docker_build_2.sh b/test/docker-outside-of-docker/docker_build_no_buildx.sh
similarity index 68%
rename from test/docker-outside-of-docker/docker_build_2.sh
rename to test/docker-outside-of-docker/docker_build_no_buildx.sh
index 742b222fb..7b3870d3b 100644
--- a/test/docker-outside-of-docker/docker_build_2.sh
+++ b/test/docker-outside-of-docker/docker_build_no_buildx.sh
@@ -6,7 +6,7 @@ set -e
 source dev-container-features-test-lib
 
 # Definition specific tests
-check "docker-buildx" docker buildx version
+check "no buildx" bash -c "docker buildx version 2>&1 | grep 'not a docker command'"
 check "docker-build" docker build ./
 
 # Report result
diff --git a/test/docker-outside-of-docker/docker_build_no_buildx_moby.sh b/test/docker-outside-of-docker/docker_build_no_buildx_moby.sh
new file mode 120000
index 000000000..00b72a39d
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_build_no_buildx_moby.sh
@@ -0,0 +1 @@
+./docker_build_no_buildx.sh
\ No newline at end of file
diff --git a/test/docker-outside-of-docker/docker_build_older.sh b/test/docker-outside-of-docker/docker_build_older.sh
deleted file mode 100644
index 742b222fb..000000000
--- a/test/docker-outside-of-docker/docker_build_older.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-# Definition specific tests
-check "docker-buildx" docker buildx version
-check "docker-build" docker build ./
-
-# Report result
-reportResults
diff --git a/test/docker-outside-of-docker/docker_dash_compose_v1.sh b/test/docker-outside-of-docker/docker_dash_compose_v1.sh
new file mode 100755
index 000000000..d95f3cf73
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_dash_compose_v1.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker compose" bash -c "docker compose version | grep -E '2.[0-9]+.[0-9]+'"
+check "docker-compose" bash -c "docker-compose --version | grep -E '1.[0-9]+.[0-9]+'"
+
+# Report result
+reportResults
diff --git a/test/docker-outside-of-docker/docker_dash_compose_v1_moby.sh b/test/docker-outside-of-docker/docker_dash_compose_v1_moby.sh
new file mode 120000
index 000000000..51dc7d26b
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_dash_compose_v1_moby.sh
@@ -0,0 +1 @@
+./docker_dash_compose_v1.sh
\ No newline at end of file
diff --git a/test/docker-outside-of-docker/docker_dash_compose_v2.sh b/test/docker-outside-of-docker/docker_dash_compose_v2.sh
new file mode 100755
index 000000000..8f2a104f5
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_dash_compose_v2.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker compose" bash -c "docker compose version | grep -E '2.[0-9]+.[0-9]+'"
+check "docker-compose" bash -c "docker-compose --version | grep -E '2.[0-9]+.[0-9]+'"
+
+# Report result
+reportResults
diff --git a/test/docker-outside-of-docker/docker_dash_compose_v2_moby.sh b/test/docker-outside-of-docker/docker_dash_compose_v2_moby.sh
new file mode 120000
index 000000000..78ae9bc70
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_dash_compose_v2_moby.sh
@@ -0,0 +1 @@
+./docker_dash_compose_v2.sh
\ No newline at end of file
diff --git a/test/docker-outside-of-docker/docker_init.sh b/test/docker-outside-of-docker/docker_init.sh
index 216492129..b47285ead 100644
--- a/test/docker-outside-of-docker/docker_init.sh
+++ b/test/docker-outside-of-docker/docker_init.sh
@@ -5,11 +5,15 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+check "docker buildx" bash -c "docker buildx version"
+check "docker compose" bash -c "docker compose version"
+check "docker-compose" bash -c "docker-compose --version"
+
 check "docker-init-exists" bash -c "ls /usr/local/share/docker-init.sh"
 check "log-exists" bash -c "ls /tmp/vscr-docker-from-docker.log"
 check "log-contents-for-success" bash -c "cat /tmp/vscr-docker-from-docker.log | grep 'Success'"
 check "log-contents" bash -c "cat /tmp/vscr-docker-from-docker.log | grep 'Proxying /var/run/docker-host.sock to /var/run/docker.sock for vscode'"
-check "docker-ps" bash -c "docker ps"
+check "docker-ps" bash -c "docker ps >/dev/null"
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/docker-outside-of-docker/docker_init_debian.sh b/test/docker-outside-of-docker/docker_init_debian.sh
new file mode 120000
index 000000000..7458cc9b7
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_init_debian.sh
@@ -0,0 +1 @@
+./docker_init.sh
\ No newline at end of file
diff --git a/test/docker-outside-of-docker/docker_init_moby.sh b/test/docker-outside-of-docker/docker_init_moby.sh
new file mode 120000
index 000000000..7458cc9b7
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_init_moby.sh
@@ -0,0 +1 @@
+./docker_init.sh
\ No newline at end of file
diff --git a/test/docker-outside-of-docker/docker_init_ubuntu_22.sh b/test/docker-outside-of-docker/docker_init_ubuntu_22.sh
new file mode 120000
index 000000000..7458cc9b7
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_init_ubuntu_22.sh
@@ -0,0 +1 @@
+./docker_init.sh
\ No newline at end of file
diff --git a/test/docker-outside-of-docker/scenarios.json b/test/docker-outside-of-docker/scenarios.json
index ad9b07248..be63470c5 100644
--- a/test/docker-outside-of-docker/scenarios.json
+++ b/test/docker-outside-of-docker/scenarios.json
@@ -1,44 +1,119 @@
 {
+    "docker_init_moby": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "features": {
+            "docker-outside-of-docker": {
+                "moby": true
+            }
+        },
+        "containerUser": "vscode"
+    },
     "docker_init": {
-        "image": "mcr.microsoft.com/devcontainers/base",
-        "remoteUser": "vscode",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "features": {
+            "docker-outside-of-docker": {
+                "moby": false
+            }
+        },
+        "containerUser": "vscode"
+    },
+    "docker_init_ubuntu_22": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-22.04",
         "features": {
             "docker-outside-of-docker": {
-                "version": "latest"
+                "moby": false
             }
-        }
+        },
+        "containerUser": "vscode"
+    },
+    "docker_init_debian": {
+        "image": "mcr.microsoft.com/devcontainers/base:debian",
+        "features": {
+            "docker-outside-of-docker": {
+                "moby": false
+            }
+        },
+        "containerUser": "vscode"
     },
     "docker_build": {
-        "image": "mcr.microsoft.com/devcontainers/javascript-node:0-18",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
         "features": {
             "docker-outside-of-docker": {
-                "version": "latest",
-                "installDockerBuildx": true,
-                "moby": "false",
+                "moby": false,
                 "dockerDashComposeVersion": "v2"
             }
         },
-        "remoteUser": "node"
+        "containerUser": "vscode"
     },
-    "docker_build_2": {
-        "image": "ubuntu:focal",
+    "docker_build_moby": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
         "features": {
             "docker-outside-of-docker": {
-                "version": "latest",
-                "moby": "false",
-                "dockerDashComposeVersion": "v2"
+                "moby": true
             }
-        }
+        },
+        "containerUser": "vscode"
     },
-    "docker_build_older": {
-        "image": "mcr.microsoft.com/devcontainers/javascript-node:0-18",
+    "docker_build_no_buildx": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
         "features": {
             "docker-outside-of-docker": {
                 "version": "20",
-                "moby": "false",
+                "moby": false,
+                "installDockerBuildx": false
+            }
+        },
+        "containerUser": "vscode"
+    },
+    "docker_build_no_buildx_moby": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "features": {
+            "docker-outside-of-docker": {
+                "version": "20",
+                "moby": true,
+                "installDockerBuildx": false
+            }
+        },
+        "containerUser": "vscode"
+    },
+    "docker_dash_compose_v1": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "features": {
+            "docker-outside-of-docker": {
+                "moby": false,
+                "dockerDashComposeVersion": "v1"
+            }
+        },
+        "containerUser": "vscode"
+    },
+    "docker_dash_compose_v1_moby": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "features": {
+            "docker-outside-of-docker": {
+                "moby": true,
+                "dockerDashComposeVersion": "v1"
+            }
+        },
+        "containerUser": "vscode"
+    },
+    "docker_dash_compose_v2": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "features": {
+            "docker-outside-of-docker": {
+                "moby": false,
+                "dockerDashComposeVersion": "v2"
+            }
+        },
+        "containerUser": "vscode"
+    },
+    "docker_dash_compose_v2_moby": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "features": {
+            "docker-outside-of-docker": {
+                "moby": true,
                 "dockerDashComposeVersion": "v2"
             }
         },
-        "remoteUser": "node"
+        "containerUser": "vscode"
     }
 }
diff --git a/test/docker-outside-of-docker/test.sh b/test/docker-outside-of-docker/test.sh
old mode 100755
new mode 100644
index 517737ada..fe9098e10
--- a/test/docker-outside-of-docker/test.sh
+++ b/test/docker-outside-of-docker/test.sh
@@ -5,10 +5,11 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-# Definition specific tests
-check "version" docker  --version
-check "docker-init-exists" bash -c "ls /usr/local/share/docker-init.sh"
-check "docker-ps" bash -c "docker ps"
+check "docker buildx" bash -c "docker buildx version"
+check "docker compose" bash -c "docker compose version"
+check "docker-compose" bash -c "docker-compose --version"
+
+check "docker-ps" bash -c "docker ps >/dev/null"
 
 # Report result
 reportResults
\ No newline at end of file

From 585ee2a42c8c4185d058a324fe1b996b809e52d7 Mon Sep 17 00:00:00 2001
From: Ryan Campbell <89273172+bigtallcampbell@users.noreply.github.com>
Date: Wed, 5 Apr 2023 14:33:00 -0500
Subject: [PATCH 110/478] Removing forced gid 999 for docker (#515)

* Removing forced gid 999 for docker

* version bump

---------

Co-authored-by: Ryan Campbell <rycampbe@microsoft.com>
Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/docker-outside-of-docker/devcontainer-feature.json |  2 +-
 src/docker-outside-of-docker/install.sh                | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 841bb6265..2b75aa4f3 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 9d8433aed..f32db2f4a 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -261,11 +261,13 @@ if ! grep -qE '^docker:' /etc/group; then
     groupadd --system docker
 fi
 
+# Remarking this out to restore functionality in Azure VMs.  ID 999 is a reserved group ID
 # Ensure docker group gid is 999
-if [ "$(getent group docker | cut -d: -f3)" != "999" ]; then
-    echo "(*) Updating docker group gid to 999..."
-    groupmod -g 999 docker
-fi
+# if [ "$(getent group docker | cut -d: -f3)" != "999" ]; then
+#     echo "(*) Updating docker group gid to 999..."
+#     groupmod -g 999 docker
+# fi
+
 
 usermod -aG docker "${USERNAME}"
 

From 74959ec14975fe1c95133dc6d3ad5677e4cf66e1 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 5 Apr 2023 16:06:27 -0700
Subject: [PATCH 111/478] Automated documentation update (#517)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/docker-outside-of-docker/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docker-outside-of-docker/README.md b/src/docker-outside-of-docker/README.md
index 793d5d0ba..f7f411a72 100644
--- a/src/docker-outside-of-docker/README.md
+++ b/src/docker-outside-of-docker/README.md
@@ -19,7 +19,7 @@ Re-use the host docker socket, adding the Docker CLI to a container. Feature inv
 |-----|-----|-----|-----|
 | version | Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.) | string | latest |
 | moby | Install OSS Moby build instead of Docker CE | boolean | true |
-| dockerDashComposeVersion | Compose version to use for docker-compose (v1 or v2) | string | v1 |
+| dockerDashComposeVersion | Compose version to use for docker-compose (v1 or v2) | string | v2 |
 | installDockerBuildx | Install Docker Buildx | boolean | true |
 
 ## Limitations

From 8d3e9aca9d352a3c4459e321de5d0a0b12062112 Mon Sep 17 00:00:00 2001
From: Alexander Smolyakov <v-asmoliakov@microsoft.com>
Date: Thu, 6 Apr 2023 21:02:49 +0400
Subject: [PATCH 112/478] [features/conda] Address CVE-2023-0286,
 CVE-2023-23931, and CVE-2022-40897 vulnerabilities (#518)

* [features/conda] Address CVE-2023-0286, CVE-2023-23931, and CVE-2022-40897 vulnerabilities

- Update `install.sh` to install updates for `cryptography` and `setuptools`  packages
- Add tests to verify `cryptography` and `setuptools`  packages version

* Bump feature version
---
 src/conda/devcontainer-feature.json | 2 +-
 src/conda/install.sh                | 7 ++++++-
 test/conda/test.sh                  | 6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/conda/devcontainer-feature.json b/src/conda/devcontainer-feature.json
index 8e1a5fccb..9a2365253 100644
--- a/src/conda/devcontainer-feature.json
+++ b/src/conda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "conda",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "name": "Conda",
     "description": "A cross-platform, language-agnostic binary package manager",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
diff --git a/src/conda/install.sh b/src/conda/install.sh
index 55b280c40..43ab82f54 100644
--- a/src/conda/install.sh
+++ b/src/conda/install.sh
@@ -114,8 +114,13 @@ if ! conda --version &> /dev/null ; then
     
     find "${CONDA_DIR}" -type d -print0 | xargs -n 1 -0 chmod g+s
 
-    # Temporary due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-23491
+    # Temporary fixes
+    # Due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-23491
     install_user_package certifi
+    # Due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-0286 and https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-23931
+    install_user_package cryptography
+    # Due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-40897
+    install_user_package setuptools
 fi
 
 # Display a notice on conda when not running in GitHub Codespaces
diff --git a/test/conda/test.sh b/test/conda/test.sh
index 8a88511ca..fcb9d7ef8 100755
--- a/test/conda/test.sh
+++ b/test/conda/test.sh
@@ -32,5 +32,11 @@ check-version-ge() {
 certifiVersion=$(python -c "import certifi; print(certifi.__version__)")
 check-version-ge "certifi" "${certifiVersion}" "2022.12.07"
 
+cryptographyVersion=$(python -c "import cryptography; print(cryptography.__version__)")
+check-version-ge "cryptography" "${cryptographyVersion}" "39.0.1"
+
+setuptoolsVersion=$(python -c "import setuptools; print(setuptools.__version__)")
+check-version-ge "setuptools" "${setuptoolsVersion}" "65.5.1"
+
 # Report result
 reportResults

From 2237731474ace274b1756e63937a958131cf719e Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Fri, 14 Apr 2023 13:48:25 -0700
Subject: [PATCH 113/478] Automated documentation update (#521)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/aws-cli/README.md                  |  6 ++++++
 src/azure-cli/README.md                |  6 ++++++
 src/docker-in-docker/README.md         |  6 ++++++
 src/docker-outside-of-docker/README.md |  6 ++++++
 src/dotnet/README.md                   |  6 ++++++
 src/go/README.md                       |  6 ++++++
 src/java/README.md                     |  6 ++++++
 src/node/README.md                     |  6 ++++++
 src/php/README.md                      |  9 +++++++++
 src/python/README.md                   |  7 +++++++
 src/ruby/README.md                     |  6 ++++++
 src/rust/README.md                     | 10 ++++++++++
 src/terraform/README.md                |  7 +++++++
 13 files changed, 87 insertions(+)

diff --git a/src/aws-cli/README.md b/src/aws-cli/README.md
index 40cc4ae98..e45cb3f4c 100644
--- a/src/aws-cli/README.md
+++ b/src/aws-cli/README.md
@@ -17,6 +17,12 @@ Installs the AWS CLI along with needed dependencies. Useful for base Dockerfiles
 |-----|-----|-----|-----|
 | version | Select or enter an AWS CLI version. | string | latest |
 
+## Customizations
+
+### VS Code Extensions
+
+- `AmazonWebServices.aws-toolkit-vscode`
+
 Available versions of the AWS CLI can be found here: https://github.com/aws/aws-cli/blob/v2/CHANGELOG.rst.
 
 ## OS Support
diff --git a/src/azure-cli/README.md b/src/azure-cli/README.md
index cb792d120..4a9de7b96 100644
--- a/src/azure-cli/README.md
+++ b/src/azure-cli/README.md
@@ -19,6 +19,12 @@ Installs the Azure CLI along with needed dependencies. Useful for base Dockerfil
 | extensions | Optional comma separated list of Azure CLI extensions to install in profile. | string | - |
 | installBicep | Optionally install Azure Bicep | boolean | false |
 
+## Customizations
+
+### VS Code Extensions
+
+- `ms-vscode.azurecli`
+
 
 
 ## OS Support
diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index 9a22c2c4e..d519a48fb 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -22,6 +22,12 @@ Create child containers *inside* a container, independent from the host's docker
 | dockerDefaultAddressPool | Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24 | string | - |
 | installDockerBuildx | Install Docker Buildx | boolean | true |
 
+## Customizations
+
+### VS Code Extensions
+
+- `ms-azuretools.vscode-docker`
+
 ## Limitations
 
 This docker-in-docker Dev Container Feature is roughly based on the [official docker-in-docker wrapper script](https://github.com/moby/moby/blob/master/hack/dind) that is part of the [Moby project](https://mobyproject.org/). With this in mind:
diff --git a/src/docker-outside-of-docker/README.md b/src/docker-outside-of-docker/README.md
index f7f411a72..7b558a971 100644
--- a/src/docker-outside-of-docker/README.md
+++ b/src/docker-outside-of-docker/README.md
@@ -22,6 +22,12 @@ Re-use the host docker socket, adding the Docker CLI to a container. Feature inv
 | dockerDashComposeVersion | Compose version to use for docker-compose (v1 or v2) | string | v2 |
 | installDockerBuildx | Install Docker Buildx | boolean | true |
 
+## Customizations
+
+### VS Code Extensions
+
+- `ms-azuretools.vscode-docker`
+
 ## Limitations
 
 - As the name implies, the Feature is expected to work when the host is running Docker (or the OSS Moby container engine it is built on). It may be possible to get running in other container engines, but it has not been tested with them.
diff --git a/src/dotnet/README.md b/src/dotnet/README.md
index c13c998fd..83c42494f 100644
--- a/src/dotnet/README.md
+++ b/src/dotnet/README.md
@@ -19,6 +19,12 @@ Installs the .NET CLI. Provides option of installing sdk or runtime, and option
 | runtimeOnly | Install just the dotnet runtime if true, and sdk if false. | boolean | false |
 | installUsingApt | If true, it installs using apt instead of the release URL | boolean | true |
 
+## Customizations
+
+### VS Code Extensions
+
+- `ms-dotnettools.csharp`
+
 
 
 ## OS Support
diff --git a/src/go/README.md b/src/go/README.md
index e7a692443..be035ee85 100644
--- a/src/go/README.md
+++ b/src/go/README.md
@@ -18,6 +18,12 @@ Installs Go and common Go utilities. Auto-detects latest version and installs ne
 | version | Select or enter a Go version to install | string | latest |
 | golangciLintVersion | Version of golangci-lint to install | string | latest |
 
+## Customizations
+
+### VS Code Extensions
+
+- `golang.Go`
+
 
 
 ## OS Support
diff --git a/src/java/README.md b/src/java/README.md
index e74cd5a10..1ffd6188b 100644
--- a/src/java/README.md
+++ b/src/java/README.md
@@ -24,6 +24,12 @@ Installs Java, SDKMAN! (if not installed), and needed dependencies.
 | installAnt | Install Ant, a software tool for automating software build processes | boolean | false |
 | antVersion | Select or enter an Ant version | string | latest |
 
+## Customizations
+
+### VS Code Extensions
+
+- `vscjava.vscode-java-pack`
+
 ## License
 
 For the Java Feature from this repository, see [NOTICE.txt](https://github.com/devcontainers/features/tree/main/src/java/NOTICE.txt) for licensing information on JDK distributions.
diff --git a/src/node/README.md b/src/node/README.md
index 877ea5877..7a4909600 100644
--- a/src/node/README.md
+++ b/src/node/README.md
@@ -20,6 +20,12 @@ Installs Node.js, nvm, yarn, pnpm, and needed dependencies.
 | nvmInstallPath | The path where NVM will be installed. | string | /usr/local/share/nvm |
 | nvmVersion | Version of NVM to install. | string | 0.39.2 |
 
+## Customizations
+
+### VS Code Extensions
+
+- `dbaeumer.vscode-eslint`
+
 ## Using nvm from postCreateCommand or another lifecycle command
 
 Certain operations like `postCreateCommand` run non-interactive, non-login shells. Unfortunately, `nvm` is really particular that it needs to be "sourced" before it is used, which can only happen automatically with interactive and/or login shells. Fortunately, this is easy to work around:
diff --git a/src/php/README.md b/src/php/README.md
index 3a9be7a98..14f4a1797 100644
--- a/src/php/README.md
+++ b/src/php/README.md
@@ -18,6 +18,15 @@
 | version | Select or enter a PHP version | string | latest |
 | installComposer | Install PHP Composer? | boolean | true |
 
+## Customizations
+
+### VS Code Extensions
+
+- `xdebug.php-debug`
+- `bmewburn.vscode-intelephense-client`
+- `xdebug.php-pack`
+- `devsense.phptools-vscode`
+
 
 
 ## OS Support
diff --git a/src/python/README.md b/src/python/README.md
index 05742910a..807d89eb1 100644
--- a/src/python/README.md
+++ b/src/python/README.md
@@ -22,6 +22,13 @@ Installs the provided version of Python, as well as PIPX, and other common Pytho
 | installJupyterlab | Install JupyterLab, a web-based interactive development environment for notebooks | boolean | false |
 | configureJupyterlabAllowOrigin | Configure JupyterLab to accept HTTP requests from the specified origin | string | - |
 
+## Customizations
+
+### VS Code Extensions
+
+- `ms-python.python`
+- `ms-python.vscode-pylance`
+
 
 
 ## OS Support
diff --git a/src/ruby/README.md b/src/ruby/README.md
index 8a0ff877d..8e8ebe2c3 100644
--- a/src/ruby/README.md
+++ b/src/ruby/README.md
@@ -17,6 +17,12 @@ Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.
 |-----|-----|-----|-----|
 | version | Select or enter a Ruby version to install | string | latest |
 
+## Customizations
+
+### VS Code Extensions
+
+- `rebornix.Ruby`
+
 
 
 ## OS Support
diff --git a/src/rust/README.md b/src/rust/README.md
index 372b56f97..f72b56f82 100644
--- a/src/rust/README.md
+++ b/src/rust/README.md
@@ -18,6 +18,16 @@ Installs Rust, common Rust utilities, and their required dependencies
 | version | Select or enter a version of Rust to install. | string | latest |
 | profile | Select a rustup install profile. | string | minimal |
 
+## Customizations
+
+### VS Code Extensions
+
+- `vadimcn.vscode-lldb`
+- `mutantdino.resourcemonitor`
+- `rust-lang.rust-analyzer`
+- `tamasfe.even-better-toml`
+- `serayuzgur.crates`
+
 
 
 ## OS Support
diff --git a/src/terraform/README.md b/src/terraform/README.md
index e75da9b20..e93058718 100644
--- a/src/terraform/README.md
+++ b/src/terraform/README.md
@@ -23,6 +23,13 @@ Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects la
 | installTerraformDocs | Install terraform-docs, a utility to generate documentation from Terraform modules | boolean | false |
 | httpProxy | Connect to a keyserver using a proxy by configuring this option | string | - |
 
+## Customizations
+
+### VS Code Extensions
+
+- `HashiCorp.terraform`
+- `ms-azuretools.vscode-azureterraform`
+
 
 
 ## OS Support

From fad03b19d48466bb0eec41ccbf4cc456a5c4dea7 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 18 Apr 2023 14:37:51 -0700
Subject: [PATCH 114/478] Oryx - Switch to .NET 7 (#522)

* Oryx - Switch to .NET 7

* fix test ; add test

* fix test - back compat
---
 src/oryx/devcontainer-feature.json        |  5 ++-
 src/oryx/install.sh                       | 16 +++++---
 test/oryx/install_prev_dotnet_and_oryx.sh | 47 +++++++++++++++++++++++
 test/oryx/scenarios.json                  | 10 +++++
 4 files changed, 70 insertions(+), 8 deletions(-)
 create mode 100644 test/oryx/install_prev_dotnet_and_oryx.sh

diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index 9a6bd25c2..66a528ec5 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "oryx",
-    "version": "1.0.13",
+    "version": "1.1.0",
     "name": "Oryx",
     "description": "Installs the oryx CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
@@ -14,6 +14,7 @@
         "PATH": "/usr/local/oryx:${PATH}"
     },
     "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
+        "ghcr.io/devcontainers/features/common-utils",
+        "ghcr.io/devcontainers/features/dotnet"
     ]
 }
diff --git a/src/oryx/install.sh b/src/oryx/install.sh
index a1b64d3e9..cb2e1b6b7 100755
--- a/src/oryx/install.sh
+++ b/src/oryx/install.sh
@@ -74,7 +74,7 @@ install_dotnet_using_apt() {
     echo "Attempting to auto-install dotnet..."
     install_from_microsoft_feed=false
     apt_get_update
-    DOTNET_INSTALLATION_PACKAGE="dotnet6"
+    DOTNET_INSTALLATION_PACKAGE="dotnet7"
     apt-get -yq install $DOTNET_INSTALLATION_PACKAGE || install_from_microsoft_feed="true"
 
     if [ "${install_from_microsoft_feed}" = "true" ]; then
@@ -82,7 +82,7 @@ install_dotnet_using_apt() {
         curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
         echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
         apt-get update -y
-        DOTNET_INSTALLATION_PACKAGE="dotnet-sdk-6.0"
+        DOTNET_INSTALLATION_PACKAGE="dotnet-sdk-7.0"
         DOTNET_SKIP_FIRST_TIME_EXPERIENCE="true" apt-get install -yq $DOTNET_INSTALLATION_PACKAGE
     fi
 
@@ -132,9 +132,9 @@ if dotnet --version > /dev/null ; then
     DOTNET_BINARY=$(which dotnet)
 fi
 
-# Oryx needs to be built with .NET 6
-if [[ "${DOTNET_BINARY}" = "" ]] || [[ "$(dotnet --version)" != *"6"* ]] ; then
-    echo "'dotnet 6' was not detected. Attempting to install .NET 6 to build oryx."
+# Oryx needs to be built with .NET 7
+if [[ "${DOTNET_BINARY}" = "" ]] || [[ "$(dotnet --version)" != *"7"* ]] ; then
+    echo "'dotnet 7' was not detected. Attempting to install .NET 7 to build oryx."
     install_dotnet_using_apt
 
     if ! dotnet --version > /dev/null ; then
@@ -154,7 +154,11 @@ mkdir -p ${ORYX}
 
 git clone --depth=1 https://github.com/microsoft/Oryx $GIT_ORYX
 
-$GIT_ORYX/build/buildSln.sh
+SOLUTION_FILE_NAME="Oryx.sln"
+echo "Building solution '$SOLUTION_FILE_NAME'..."
+
+cd $GIT_ORYX
+${DOTNET_BINARY} build "$SOLUTION_FILE_NAME" -c Debug
 
 ${DOTNET_BINARY} publish -property:ValidateExecutableReferencesMatchSelfContained=false -r linux-x64 -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildScriptGeneratorCli/BuildScriptGeneratorCli.csproj
 ${DOTNET_BINARY} publish -r linux-x64 -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildServer/BuildServer.csproj
diff --git a/test/oryx/install_prev_dotnet_and_oryx.sh b/test/oryx/install_prev_dotnet_and_oryx.sh
new file mode 100644
index 000000000..175482847
--- /dev/null
+++ b/test/oryx/install_prev_dotnet_and_oryx.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "Oryx version" oryx --version
+check "Dotnet is not removed if it is not installed by the Oryx Feature" dotnet --version
+
+# Install platforms with oryx build tool
+check "oryx-install-dotnet-2.1" oryx prep --skip-detection --platforms-and-versions dotnet=2.1.30
+check "dotnet-2-installed-by-oryx" ls /opt/dotnet/ | grep 2.1
+
+check "oryx-install-nodejs-12.22.11" oryx prep --skip-detection --platforms-and-versions nodejs=12.22.11
+check "nodejs-12.22.11-installed-by-oryx" ls /opt/nodejs/ | grep 12.22.11
+
+check "oryx-install-php-7.3.25" oryx prep --skip-detection --platforms-and-versions php=7.3.25
+check "php-7.3.25-installed-by-oryx" ls /opt/php/ | grep 7.3.25
+
+check "oryx-install-java-12.0.2" oryx prep --skip-detection --platforms-and-versions java=12.0.2
+check "java-12.0.2-installed-by-oryx" ls /opt/java/ | grep 12.0.2
+
+# Replicates Oryx's behavior for universal image
+mkdir -p /opt/oryx
+echo "vso-focal" >> /opt/oryx/.imagetype
+
+mkdir -p /opt/dotnet/lts
+cp -R /usr/local/dotnet/current/dotnet /opt/dotnet/lts
+cp -R /usr/local/dotnet/current/LICENSE.txt /opt/dotnet/lts
+cp -R /usr/local/dotnet/current/ThirdPartyNotices.txt /opt/dotnet/lts
+
+# Install platforms with oryx build tool
+check "oryx-install-dotnet-2.1-universal" oryx prep --skip-detection --platforms-and-versions dotnet=2.1.30
+check "dotnet-2-installed-by-oryx-universal" ls /opt/dotnet/ | grep 2.1
+
+check "oryx-install-nodejs-12.22.11-universal" oryx prep --skip-detection --platforms-and-versions nodejs=12.22.11
+check "nodejs-12.22.11-installed-by-oryx-universal" ls /opt/nodejs/ | grep 12.22.11
+
+check "oryx-install-php-7.3.25-universal" oryx prep --skip-detection --platforms-and-versions php=7.3.25
+check "php-7.3.25-installed-by-oryx-universal" ls /opt/php/ | grep 7.3.25
+
+check "oryx-install-java-12.0.2-universal" oryx prep --skip-detection --platforms-and-versions java=12.0.2
+check "java-12.0.2-installed-by-oryx-universal" ls /opt/java/ | grep 12.0.2
+
+# Report result
+reportResults
diff --git a/test/oryx/scenarios.json b/test/oryx/scenarios.json
index bbfc277a9..c61483eb4 100644
--- a/test/oryx/scenarios.json
+++ b/test/oryx/scenarios.json
@@ -1,5 +1,15 @@
 {
     "install_dotnet_and_oryx": {
+        "image": "ubuntu:focal",
+        "features": {
+            "dotnet": {
+                "version": "7",
+                "installUsingApt": "false"
+            },
+            "oryx": {}
+        }
+    },
+    "install_prev_dotnet_and_oryx": {
         "image": "ubuntu:focal",
         "features": {
             "dotnet": {

From f52ff611c55a4e0708edd9c93076603b2704e581 Mon Sep 17 00:00:00 2001
From: Felix Altenberg <felix@altenberg.dev>
Date: Fri, 28 Apr 2023 21:38:25 +0100
Subject: [PATCH 115/478] Adds httpProxy option to Python Feature (#532)

* Adds httpProxy option to Python Feature
This option allows GPG to use a HTTP proxy to fetch keys from remote keyservers

* Updating minor version

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Fixes minor formatting error

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/python/devcontainer-feature.json | 7 ++++++-
 src/python/install.sh                | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index a954c3511..b4aa21e25 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.0.22",
+  "version": "1.1.0",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
@@ -45,6 +45,11 @@
       "type": "string",
       "default": "",
       "description": "Configure JupyterLab to accept HTTP requests from the specified origin"
+    },
+    "httpProxy": {
+      "type": "string",
+      "default": "",
+      "description": "Connect to GPG keyservers using a proxy for fetching source code signatures by configuring this option"
     }
   },
   "containerEnv": {
diff --git a/src/python/install.sh b/src/python/install.sh
index 053a72aff..0e2b1253c 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -32,6 +32,8 @@ GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
 
+KEYSERVER_PROXY="${HTTPPROXY:-"${HTTP_PROXY:-""}"}"
+
 set -e
 
 # Clean up
@@ -84,6 +86,9 @@ receive_gpg_keys() {
         mkdir -p "$(dirname \"$2\")"
         keyring_args="--no-default-keyring --keyring $2"
     fi
+    if [ ! -z "${KEYSERVER_PROXY}" ]; then
+        keyring_args="${keyring_args} --keyserver-options http-proxy=${KEYSERVER_PROXY}"
+    fi
 
     # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"

From e2b3b48bc52be49b4e0063012e9ccdf0bf7672f4 Mon Sep 17 00:00:00 2001
From: Raymond <44623277+raymond-chetty@users.noreply.github.com>
Date: Mon, 1 May 2023 08:37:43 -0700
Subject: [PATCH 116/478] Update devcontainer-feature.json (#535)

#531 Modify proposed UID & GID so as not to conflict with base image.
---
 src/common-utils/devcontainer-feature.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 71b6e6687..8a532559f 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -40,7 +40,7 @@
         "userUid": {
             "type": "string",
             "proposals": [
-                "1000",
+                "1001",
                 "automatic"
             ],
             "default": "automatic",
@@ -49,7 +49,7 @@
         "userGid": {
             "type": "string",
             "proposals": [
-                "1000",
+                "1001",
                 "automatic"
             ],
             "default": "automatic",

From b16ff1efb7b092c73ab1e13c3d016d1ab7a9e4b6 Mon Sep 17 00:00:00 2001
From: Raymond <44623277+raymond-chetty@users.noreply.github.com>
Date: Mon, 1 May 2023 08:38:01 -0700
Subject: [PATCH 117/478] Update devcontainer-feature.json (#539)

#535 update the patch version to 2.0.9
---
 src/common-utils/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 8a532559f..9ae905b62 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.0.8",
+    "version": "2.0.9",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",

From 4312340798680a2b148847b124fcf737e5839c2e Mon Sep 17 00:00:00 2001
From: "M. R" <2947595+m-roberts@users.noreply.github.com>
Date: Tue, 2 May 2023 20:00:45 +0100
Subject: [PATCH 118/478] Add support for skipping `docker-compose` v1
 operations during Docker feature install script (#533)

* Add support for skipping docker-compose operations

* Move changes from auto-generated files to templates and bump version

* Add test

* Add test conditions

* Add test conditions for docker-outside-of-docker

* install.sh set -x for debugging

* set -x

* Move compose-switch check in docker-outside-of-docker test

* Put into correct test

* Test for correct path
---
 .../devcontainer-feature.json                 |   5 +-
 src/docker-in-docker/install.sh               | 103 +++++++++---------
 .../devcontainer-feature.json                 |   5 +-
 src/docker-outside-of-docker/install.sh       |  71 ++++++------
 test/docker-in-docker/docker_build.sh         |   3 +
 .../docker_build_no_compose.sh                |  16 +++
 test/docker-in-docker/scenarios.json          |  10 ++
 test/docker-outside-of-docker/docker_build.sh |   2 +
 .../docker_build_no_compose.sh                |  15 +++
 .../docker_dash_compose_v2.sh                 |   2 +
 test/docker-outside-of-docker/scenarios.json  |   9 ++
 11 files changed, 153 insertions(+), 88 deletions(-)
 mode change 100644 => 100755 test/docker-in-docker/docker_build.sh
 create mode 100755 test/docker-in-docker/docker_build_no_compose.sh
 mode change 100644 => 100755 test/docker-outside-of-docker/docker_build.sh
 create mode 100755 test/docker-outside-of-docker/docker_build_no_compose.sh

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 798b8e87a..1555cd6e7 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
@@ -23,11 +23,12 @@
         "dockerDashComposeVersion": {
             "type": "string",
             "enum": [
+                "none",
                 "v1",
                 "v2"
             ],
             "default": "v1",
-            "description": "Default version of Docker Compose (v1 or v2)"
+            "description": "Default version of Docker Compose (v1 or v2 or none)"
         },
         "azureDnsAutoDetection": {
             "type": "boolean",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 770519902..9ad807e3c 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -10,7 +10,7 @@
 
 DOCKER_VERSION="${VERSION:-"latest"}" # The Docker/Moby Engine + CLI should match in version
 USE_MOBY="${MOBY:-"true"}"
-DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2
+DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2 or none
 AZURE_DNS_AUTO_DETECTION="${AZUREDNSAUTODETECTION:-"true"}"
 DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
@@ -242,58 +242,61 @@ fi
 
 echo "Finished installing docker / moby!"
 
-# Install Docker Compose if not already installed and is on a supported architecture
-if type docker-compose > /dev/null 2>&1; then
-    echo "Docker Compose v1 already installed."
-else
-    target_compose_arch="${architecture}"
-    if [ "${target_compose_arch}" = "amd64" ]; then
-        target_compose_arch="x86_64"
-    fi
-    if [ "${target_compose_arch}" != "x86_64" ]; then
-        # Use pip to get a version that runs on this architecture
-        check_packages python3-minimal python3-pip libffi-dev python3-venv
-        export PIPX_HOME=/usr/local/pipx
-        mkdir -p ${PIPX_HOME}
-        export PIPX_BIN_DIR=/usr/local/bin
-        export PYTHONUSERBASE=/tmp/pip-tmp
-        export PIP_CACHE_DIR=/tmp/pip-tmp/cache
-        pipx_bin=pipx
-        if ! type pipx > /dev/null 2>&1; then
-            pip3 install --disable-pip-version-check --no-cache-dir --user pipx
-            pipx_bin=/tmp/pip-tmp/bin/pipx
-        fi
-        ${pipx_bin} install --pip-args '--no-cache-dir --force-reinstall' docker-compose
-        rm -rf /tmp/pip-tmp
+# If 'docker-compose' command is to be included
+if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
+    # Install Docker Compose if not already installed and is on a supported architecture
+    if type docker-compose > /dev/null 2>&1; then
+        echo "Docker Compose v1 already installed."
     else
-        compose_v1_version="1"
-        find_version_from_git_tags compose_v1_version "https://github.com/docker/compose" "tags/"
-        echo "(*) Installing docker-compose ${compose_v1_version}..."
-        curl -fsSL "https://github.com/docker/compose/releases/download/${compose_v1_version}/docker-compose-Linux-x86_64" -o /usr/local/bin/docker-compose
-        chmod +x /usr/local/bin/docker-compose
+        target_compose_arch="${architecture}"
+        if [ "${target_compose_arch}" = "amd64" ]; then
+            target_compose_arch="x86_64"
+        fi
+        if [ "${target_compose_arch}" != "x86_64" ]; then
+            # Use pip to get a version that runs on this architecture
+            check_packages python3-minimal python3-pip libffi-dev python3-venv
+            export PIPX_HOME=/usr/local/pipx
+            mkdir -p ${PIPX_HOME}
+            export PIPX_BIN_DIR=/usr/local/bin
+            export PYTHONUSERBASE=/tmp/pip-tmp
+            export PIP_CACHE_DIR=/tmp/pip-tmp/cache
+            pipx_bin=pipx
+            if ! type pipx > /dev/null 2>&1; then
+                pip3 install --disable-pip-version-check --no-cache-dir --user pipx
+                pipx_bin=/tmp/pip-tmp/bin/pipx
+            fi
+            ${pipx_bin} install --pip-args '--no-cache-dir --force-reinstall' docker-compose
+            rm -rf /tmp/pip-tmp
+        else
+            compose_v1_version="1"
+            find_version_from_git_tags compose_v1_version "https://github.com/docker/compose" "tags/"
+            echo "(*) Installing docker-compose ${compose_v1_version}..."
+            curl -fsSL "https://github.com/docker/compose/releases/download/${compose_v1_version}/docker-compose-Linux-x86_64" -o /usr/local/bin/docker-compose
+            chmod +x /usr/local/bin/docker-compose
+        fi
     fi
-fi
 
-# Install docker-compose switch if not already installed - https://github.com/docker/compose-switch#manual-installation
-current_v1_compose_path="$(which docker-compose)"
-target_v1_compose_path="$(dirname "${current_v1_compose_path}")/docker-compose-v1"
-if ! type compose-switch > /dev/null 2>&1; then
-    echo "(*) Installing compose-switch..."
-    compose_switch_version="latest"
-    find_version_from_git_tags compose_switch_version "https://github.com/docker/compose-switch"
-    curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/compose-switch
-    chmod +x /usr/local/bin/compose-switch
-    # TODO: Verify checksum once available: https://github.com/docker/compose-switch/issues/11
-
-    # Setup v1 CLI as alternative in addition to compose-switch (which maps to v2)
-    mv "${current_v1_compose_path}" "${target_v1_compose_path}"
-    update-alternatives --install /usr/local/bin/docker-compose docker-compose /usr/local/bin/compose-switch 99
-    update-alternatives --install /usr/local/bin/docker-compose docker-compose "${target_v1_compose_path}" 1
-fi
-if [ "${DOCKER_DASH_COMPOSE_VERSION}" = "v1" ]; then
-    update-alternatives --set docker-compose "${target_v1_compose_path}"
-else
-    update-alternatives --set docker-compose /usr/local/bin/compose-switch
+    # Install docker-compose switch if not already installed - https://github.com/docker/compose-switch#manual-installation
+    current_v1_compose_path="$(which docker-compose)"
+    target_v1_compose_path="$(dirname "${current_v1_compose_path}")/docker-compose-v1"
+    if ! type compose-switch > /dev/null 2>&1; then
+        echo "(*) Installing compose-switch..."
+        compose_switch_version="latest"
+        find_version_from_git_tags compose_switch_version "https://github.com/docker/compose-switch"
+        curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/compose-switch
+        chmod +x /usr/local/bin/compose-switch
+        # TODO: Verify checksum once available: https://github.com/docker/compose-switch/issues/11
+
+        # Setup v1 CLI as alternative in addition to compose-switch (which maps to v2)
+        mv "${current_v1_compose_path}" "${target_v1_compose_path}"
+        update-alternatives --install /usr/local/bin/docker-compose docker-compose /usr/local/bin/compose-switch 99
+        update-alternatives --install /usr/local/bin/docker-compose docker-compose "${target_v1_compose_path}" 1
+    fi
+    if [ "${DOCKER_DASH_COMPOSE_VERSION}" = "v1" ]; then
+        update-alternatives --set docker-compose "${target_v1_compose_path}"
+    else
+        update-alternatives --set docker-compose /usr/local/bin/compose-switch
+    fi
 fi
 
 # If init file already exists, exit
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 2b75aa4f3..d3123fabe 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.2.1",
+    "version": "1.3.0",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
@@ -23,11 +23,12 @@
         "dockerDashComposeVersion": {
             "type": "string",
             "enum": [
+                "none",
                 "v1",
                 "v2"
             ],
             "default": "v2",
-            "description": "Compose version to use for docker-compose (v1 or v2)"
+            "description": "Compose version to use for docker-compose (v1 or v2 or none)"
         },
         "installDockerBuildx": {
             "type": "boolean",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index f32db2f4a..7bf2138b4 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -9,7 +9,7 @@
 
 DOCKER_VERSION="${VERSION:-"latest"}"
 USE_MOBY="${MOBY:-"true"}"
-DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v2"}" # v1 or v2
+DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2 or none
 
 ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"
 SOURCE_SOCKET="${SOURCE_SOCKET:-"/var/run/docker-host.sock"}"
@@ -216,43 +216,46 @@ else
     unset buildx buildx_path
 fi
 
-# Install Docker Compose if not already installed  and is on a supported architecture
-if type docker-compose > /dev/null 2>&1; then
-    echo "Docker Compose already installed."
-elif [ "${DOCKER_DASH_COMPOSE_VERSION}" = "v1" ]; then
-    TARGET_COMPOSE_ARCH="$(uname -m)"
-    if [ "${TARGET_COMPOSE_ARCH}" = "amd64" ]; then
-        TARGET_COMPOSE_ARCH="x86_64"
-    fi
-    if [ "${TARGET_COMPOSE_ARCH}" != "x86_64" ]; then
-        # Use pip to get a version that runs on this architecture
-        check_packages python3-minimal python3-pip libffi-dev python3-venv
-        export PIPX_HOME=/usr/local/pipx
-        mkdir -p ${PIPX_HOME}
-        export PIPX_BIN_DIR=/usr/local/bin
-        export PYTHONUSERBASE=/tmp/pip-tmp
-        export PIP_CACHE_DIR=/tmp/pip-tmp/cache
-        pipx_bin=pipx
-        if ! type pipx > /dev/null 2>&1; then
-            pip3 install --disable-pip-version-check --no-cache-dir --user pipx
-            pipx_bin=/tmp/pip-tmp/bin/pipx
+# If 'docker-compose' command is to be included
+if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
+    # Install Docker Compose if not already installed  and is on a supported architecture
+    if type docker-compose > /dev/null 2>&1; then
+        echo "Docker Compose already installed."
+    elif [ "${DOCKER_DASH_COMPOSE_VERSION}" = "v1" ]; then
+        TARGET_COMPOSE_ARCH="$(uname -m)"
+        if [ "${TARGET_COMPOSE_ARCH}" = "amd64" ]; then
+            TARGET_COMPOSE_ARCH="x86_64"
+        fi
+        if [ "${TARGET_COMPOSE_ARCH}" != "x86_64" ]; then
+            # Use pip to get a version that runs on this architecture
+            check_packages python3-minimal python3-pip libffi-dev python3-venv
+            export PIPX_HOME=/usr/local/pipx
+            mkdir -p ${PIPX_HOME}
+            export PIPX_BIN_DIR=/usr/local/bin
+            export PYTHONUSERBASE=/tmp/pip-tmp
+            export PIP_CACHE_DIR=/tmp/pip-tmp/cache
+            pipx_bin=pipx
+            if ! type pipx > /dev/null 2>&1; then
+                pip3 install --disable-pip-version-check --no-cache-dir --user pipx
+                pipx_bin=/tmp/pip-tmp/bin/pipx
+            fi
+            ${pipx_bin} install --pip-args '--no-cache-dir --force-reinstall' docker-compose
+            rm -rf /tmp/pip-tmp
+        else
+            compose_v1_version="1"
+            find_version_from_git_tags compose_v1_version "https://github.com/docker/compose" "tags/"
+            echo "(*) Installing docker-compose ${compose_v1_version}..."
+            curl -fsSL "https://github.com/docker/compose/releases/download/${compose_v1_version}/docker-compose-Linux-x86_64" -o /usr/local/bin/docker-compose
+            chmod +x /usr/local/bin/docker-compose
         fi
-        ${pipx_bin} install --pip-args '--no-cache-dir --force-reinstall' docker-compose
-        rm -rf /tmp/pip-tmp
     else
-        compose_v1_version="1"
-        find_version_from_git_tags compose_v1_version "https://github.com/docker/compose" "tags/"
-        echo "(*) Installing docker-compose ${compose_v1_version}..."
-        curl -fsSL "https://github.com/docker/compose/releases/download/${compose_v1_version}/docker-compose-Linux-x86_64" -o /usr/local/bin/docker-compose
+        echo "(*) Installing compose-switch as docker-compose..."
+        compose_switch_version="latest"
+        find_version_from_git_tags compose_switch_version "https://github.com/docker/compose-switch"
+        curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/docker-compose
         chmod +x /usr/local/bin/docker-compose
+        # TODO: Verify checksum once available: https://github.com/docker/compose-switch/issues/11
     fi
-else
-    echo "(*) Installing compose-switch as docker-compose..."
-    compose_switch_version="latest"
-    find_version_from_git_tags compose_switch_version "https://github.com/docker/compose-switch"
-    curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/docker-compose
-    chmod +x /usr/local/bin/docker-compose
-    # TODO: Verify checksum once available: https://github.com/docker/compose-switch/issues/11
 fi
 
 # Setup a docker group in the event the docker socket's group is not root
diff --git a/test/docker-in-docker/docker_build.sh b/test/docker-in-docker/docker_build.sh
old mode 100644
new mode 100755
index 742b222fb..d51e7d644
--- a/test/docker-in-docker/docker_build.sh
+++ b/test/docker-in-docker/docker_build.sh
@@ -9,5 +9,8 @@ source dev-container-features-test-lib
 check "docker-buildx" docker buildx version
 check "docker-build" docker build ./
 
+check "installs docker-compose v1 install" bash -c "type docker-compose"
+check "installs compose-switch" bash -c "[[ -f /usr/local/bin/compose-switch ]]"
+
 # Report result
 reportResults
diff --git a/test/docker-in-docker/docker_build_no_compose.sh b/test/docker-in-docker/docker_build_no_compose.sh
new file mode 100755
index 000000000..e913be321
--- /dev/null
+++ b/test/docker-in-docker/docker_build_no_compose.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+
+check "not installing compose skips docker-compose v1 install" bash -c "! type docker-compose"
+check "not installing compose skips compose-switch" bash -c "[[ ! -f /usr/local/bin/compose-switch ]]"
+
+# Report result
+reportResults
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index 5123d0916..9c44478f1 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -58,5 +58,15 @@
             }
         },
         "remoteUser": "node"
+    },
+    "docker_build_no_compose": {
+        "image": "mcr.microsoft.com/devcontainers/javascript-node:0-18",
+        "features": {
+            "docker-in-docker": {
+                "dockerDashComposeVersion": "none"
+            }
+        },
+        "remoteUser": "node"
     }
+
 }
diff --git a/test/docker-outside-of-docker/docker_build.sh b/test/docker-outside-of-docker/docker_build.sh
old mode 100644
new mode 100755
index 742b222fb..056a76425
--- a/test/docker-outside-of-docker/docker_build.sh
+++ b/test/docker-outside-of-docker/docker_build.sh
@@ -9,5 +9,7 @@ source dev-container-features-test-lib
 check "docker-buildx" docker buildx version
 check "docker-build" docker build ./
 
+check "installs docker-compose v1 install" bash -c "type docker-compose"
+
 # Report result
 reportResults
diff --git a/test/docker-outside-of-docker/docker_build_no_compose.sh b/test/docker-outside-of-docker/docker_build_no_compose.sh
new file mode 100755
index 000000000..477bf2149
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_build_no_compose.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+
+check "not installing compose skips docker-compose v1 install" bash -c "! type docker-compose"
+
+# Report result
+reportResults
diff --git a/test/docker-outside-of-docker/docker_dash_compose_v2.sh b/test/docker-outside-of-docker/docker_dash_compose_v2.sh
index 8f2a104f5..b24238f0d 100755
--- a/test/docker-outside-of-docker/docker_dash_compose_v2.sh
+++ b/test/docker-outside-of-docker/docker_dash_compose_v2.sh
@@ -9,5 +9,7 @@ source dev-container-features-test-lib
 check "docker compose" bash -c "docker compose version | grep -E '2.[0-9]+.[0-9]+'"
 check "docker-compose" bash -c "docker-compose --version | grep -E '2.[0-9]+.[0-9]+'"
 
+check "installs compose-switch as docker-compose" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
+
 # Report result
 reportResults
diff --git a/test/docker-outside-of-docker/scenarios.json b/test/docker-outside-of-docker/scenarios.json
index be63470c5..3b82c6cc5 100644
--- a/test/docker-outside-of-docker/scenarios.json
+++ b/test/docker-outside-of-docker/scenarios.json
@@ -115,5 +115,14 @@
             }
         },
         "containerUser": "vscode"
+    },
+    "docker_build_no_compose": {
+        "image": "mcr.microsoft.com/devcontainers/javascript-node:0-18",
+        "features": {
+            "docker-in-docker": {
+                "dockerDashComposeVersion": "none"
+            }
+        },
+        "remoteUser": "node"
     }
 }

From 4420cd5d27a551abbaa622bcde71dedb39617283 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 9 May 2023 13:52:06 -0700
Subject: [PATCH 119/478] Automated documentation update (#543)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/docker-in-docker/README.md         | 2 +-
 src/docker-outside-of-docker/README.md | 2 +-
 src/python/README.md                   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index d519a48fb..bfca77357 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -17,7 +17,7 @@ Create child containers *inside* a container, independent from the host's docker
 |-----|-----|-----|-----|
 | version | Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.) | string | latest |
 | moby | Install OSS Moby build instead of Docker CE | boolean | true |
-| dockerDashComposeVersion | Default version of Docker Compose (v1 or v2) | string | v1 |
+| dockerDashComposeVersion | Default version of Docker Compose (v1 or v2 or none) | string | v1 |
 | azureDnsAutoDetection | Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure | boolean | true |
 | dockerDefaultAddressPool | Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24 | string | - |
 | installDockerBuildx | Install Docker Buildx | boolean | true |
diff --git a/src/docker-outside-of-docker/README.md b/src/docker-outside-of-docker/README.md
index 7b558a971..94c891564 100644
--- a/src/docker-outside-of-docker/README.md
+++ b/src/docker-outside-of-docker/README.md
@@ -19,7 +19,7 @@ Re-use the host docker socket, adding the Docker CLI to a container. Feature inv
 |-----|-----|-----|-----|
 | version | Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.) | string | latest |
 | moby | Install OSS Moby build instead of Docker CE | boolean | true |
-| dockerDashComposeVersion | Compose version to use for docker-compose (v1 or v2) | string | v2 |
+| dockerDashComposeVersion | Compose version to use for docker-compose (v1 or v2 or none) | string | v2 |
 | installDockerBuildx | Install Docker Buildx | boolean | true |
 
 ## Customizations
diff --git a/src/python/README.md b/src/python/README.md
index 807d89eb1..2dd092ae7 100644
--- a/src/python/README.md
+++ b/src/python/README.md
@@ -21,6 +21,7 @@ Installs the provided version of Python, as well as PIPX, and other common Pytho
 | installPath | The path where python will be installed. | string | /usr/local/python |
 | installJupyterlab | Install JupyterLab, a web-based interactive development environment for notebooks | boolean | false |
 | configureJupyterlabAllowOrigin | Configure JupyterLab to accept HTTP requests from the specified origin | string | - |
+| httpProxy | Connect to GPG keyservers using a proxy for fetching source code signatures by configuring this option | string | - |
 
 ## Customizations
 

From 1869e5931cfe0517f75d58cb70863a6b4874c487 Mon Sep 17 00:00:00 2001
From: "Stephen A. Imhoff" <clockwork-muse@outlook.com>
Date: Wed, 10 May 2023 10:04:16 -0700
Subject: [PATCH 120/478] Create .config directory in common-utils (#547)

* Add test case for mounted subdirectory.

* Correct some trailing whitespace.

* Correct variable name to better reflect status as user home path.

* Add config directory creation.

* Remove extra debug line.

* Bump feature version.

* Mount host user home directory as "subdirectory"

* Correct test naming, run test in explicit bash shell.
---
 src/common-utils/devcontainer-feature.json |  2 +-
 src/common-utils/main.sh                   | 53 +++++++++++++---------
 test/common-utils/config-subdirectory.sh   | 13 ++++++
 test/common-utils/scenarios.json           | 10 ++++
 4 files changed, 55 insertions(+), 23 deletions(-)
 create mode 100755 test/common-utils/config-subdirectory.sh

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 9ae905b62..aadc1bc27 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.0.9",
+    "version": "2.0.10",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 2a8cd282e..144478ee1 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -68,7 +68,7 @@ install_debian_packages() {
         manpages \
         manpages-dev \
         init-system-helpers"
-        
+
     # Needed for adding manpages-posix and manpages-posix-dev which are non-free packages in Debian
     if [ "${ADD_NON_FREE_PACKAGES}" = "true" ]; then
         # Bring in variables from /etc/os-release like VERSION_CODENAME
@@ -78,7 +78,7 @@ install_debian_packages() {
         sed -i -E "s/deb-src http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME}-updates main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME}-updates main contrib non-free/" /etc/apt/sources.list
         sed -i "s/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main contrib non-free/" /etc/apt/sources.list
         sed -i "s/deb-src http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main contrib non-free/" /etc/apt/sources.list
-        sed -i "s/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main contrib non-free/" /etc/apt/sources.list 
+        sed -i "s/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main contrib non-free/" /etc/apt/sources.list
         sed -i "s/deb-src http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main contrib non-free/" /etc/apt/sources.list
         # Handle bullseye location for security https://www.debian.org/releases/bullseye/amd64/release-notes/ch-information.en.html
         sed -i "s/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main contrib non-free/" /etc/apt/sources.list
@@ -133,13 +133,13 @@ install_debian_packages() {
 
     # Ensure at least the en_US.UTF-8 UTF-8 locale is available = common need for both applications and things like the agnoster ZSH theme.
     if [ "${LOCALE_ALREADY_SET}" != "true" ] && ! grep -o -E '^\s*en_US.UTF-8\s+UTF-8' /etc/locale.gen > /dev/null; then
-        echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen 
+        echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
         locale-gen
         LOCALE_ALREADY_SET="true"
     fi
 
     # Clean up
-    apt-get -y clean 
+    apt-get -y clean
     rm -rf /var/lib/apt/lists/*
 }
 
@@ -254,7 +254,7 @@ install_alpine_packages() {
     # Install man pages - package name varies between 3.12 and earlier versions
     if apk info man > /dev/null 2>&1; then
         apk add --no-cache man man-pages
-    else 
+    else
         apk add --no-cache mandoc man-pages
     fi
 
@@ -324,7 +324,7 @@ fi
 if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
     if [ "${_REMOTE_USER}" != "root" ]; then
         USERNAME="${_REMOTE_USER}"
-    else 
+    else
         USERNAME=""
         POSSIBLE_USERS=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
         for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
@@ -346,12 +346,12 @@ fi
 group_name="${USERNAME}"
 if id -u ${USERNAME} > /dev/null 2>&1; then
     # User exists, update if needed
-    if [ "${USER_GID}" != "automatic" ] && [ "$USER_GID" != "$(id -g $USERNAME)" ]; then 
+    if [ "${USER_GID}" != "automatic" ] && [ "$USER_GID" != "$(id -g $USERNAME)" ]; then
         group_name="$(id -gn $USERNAME)"
         groupmod --gid $USER_GID ${group_name}
         usermod --gid $USER_GID $USERNAME
     fi
-    if [ "${USER_UID}" != "automatic" ] && [ "$USER_UID" != "$(id -u $USERNAME)" ]; then 
+    if [ "${USER_UID}" != "automatic" ] && [ "$USER_UID" != "$(id -u $USERNAME)" ]; then
         usermod --uid $USER_UID $USERNAME
     fi
 else
@@ -361,7 +361,7 @@ else
     else
         groupadd --gid $USER_GID $USERNAME
     fi
-    if [ "${USER_UID}" = "automatic" ]; then 
+    if [ "${USER_UID}" = "automatic" ]; then
         useradd -s /bin/bash --gid $USERNAME -m $USERNAME
     else
         useradd -s /bin/bash --uid $USER_UID --gid $USERNAME -m $USERNAME
@@ -379,13 +379,13 @@ fi
 # ** Shell customization section **
 # *********************************
 
-if [ "${USERNAME}" = "root" ]; then 
-    user_rc_path="/root"
+if [ "${USERNAME}" = "root" ]; then
+    user_home="/root"
 else
-    user_rc_path="/home/${USERNAME}"
-    if [ ! -d "${user_rc_path}" ]; then
-        mkdir -p "${user_rc_path}"
-        chown ${USERNAME}:${group_name} "${user_rc_path}"
+    user_home="/home/${USERNAME}"
+    if [ ! -d "${user_home}" ]; then
+        mkdir -p "${user_home}"
+        chown ${USERNAME}:${group_name} "${user_home}"
     fi
 fi
 
@@ -393,9 +393,9 @@ fi
 possible_rc_files=( ".bashrc" ".profile" ".zshrc" )
 for rc_file in "${possible_rc_files[@]}"; do
     if [ -f "/etc/skel/${rc_file}" ]; then
-        if [ ! -e "${user_rc_path}/${rc_file}" ] || [ ! -s "${user_rc_path}/${rc_file}" ]; then
-            cp "/etc/skel/${rc_file}" "${user_rc_path}/${rc_file}"
-            chown ${USERNAME}:${group_name} "${user_rc_path}/${rc_file}"
+        if [ ! -e "${user_home}/${rc_file}" ] || [ ! -s "${user_home}/${rc_file}" ]; then
+            cp "/etc/skel/${rc_file}" "${user_home}/${rc_file}"
+            chown ${USERNAME}:${group_name} "${user_home}/${rc_file}"
         fi
     fi
 done
@@ -416,10 +416,10 @@ if [ "${RC_SNIPPET_ALREADY_ADDED}" != "true" ]; then
             ;;
     esac
     cat "${FEATURE_DIR}/scripts/rc_snippet.sh" >> ${global_rc_path}
-    cat "${FEATURE_DIR}/scripts/bash_theme_snippet.sh" >> "${user_rc_path}/.bashrc"
+    cat "${FEATURE_DIR}/scripts/bash_theme_snippet.sh" >> "${user_home}/.bashrc"
     if [ "${USERNAME}" != "root" ]; then
         cat "${FEATURE_DIR}/scripts/bash_theme_snippet.sh" >> "/root/.bashrc"
-        chown ${USERNAME}:${group_name} "${user_rc_path}/.bashrc"
+        chown ${USERNAME}:${group_name} "${user_home}/.bashrc"
     fi
     RC_SNIPPET_ALREADY_ADDED="true"
 fi
@@ -442,10 +442,10 @@ if [ "${INSTALL_ZSH}" = "true" ]; then
 
     # Adapted, simplified inline Oh My Zsh! install steps that adds, defaults to a codespaces theme.
     # See https://github.com/ohmyzsh/ohmyzsh/blob/master/tools/install.sh for official script.
-    oh_my_install_dir="${user_rc_path}/.oh-my-zsh"
+    oh_my_install_dir="${user_home}/.oh-my-zsh"
     if [ ! -d "${oh_my_install_dir}" ] && [ "${INSTALL_OH_MY_ZSH}" = "true" ]; then
         template_path="${oh_my_install_dir}/templates/zshrc.zsh-template"
-        user_rc_file="${user_rc_path}/.zshrc"
+        user_rc_file="${user_home}/.zshrc"
         umask g-w,o-w
         mkdir -p ${oh_my_install_dir}
         git clone --depth=1 \
@@ -474,6 +474,15 @@ if [ "${INSTALL_ZSH}" = "true" ]; then
     fi
 fi
 
+# *********************************
+# ** Ensure config directory **
+# *********************************
+user_config_dir="${user_home}/.config"
+if [ ! -d "${user_config_dir}" ]; then
+    mkdir -p "${user_config_dir}"
+    chown ${USERNAME}:${group_name} "${user_config_dir}"
+fi
+
 # ****************************
 # ** Utilities and commands **
 # ****************************
diff --git a/test/common-utils/config-subdirectory.sh b/test/common-utils/config-subdirectory.sh
new file mode 100755
index 000000000..ba67fb68f
--- /dev/null
+++ b/test/common-utils/config-subdirectory.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "owned-config-sub-directory" bash -c "ls -ld ~/.config/subdirectory | awk '{print $3}' | grep 'devcontainer'"
+check "owned-config-directory" bash -c "ls -ld ~/.config | awk '{print $3}' | grep 'devcontainer'"
+
+# Report result
+reportResults
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index 43d11c9a1..21cb9408a 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -115,6 +115,16 @@
             }
         }
     },
+    "config-subdirectory": {
+        "image": "alpine",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        },
+        "mounts": [
+            "source=${localEnv:HOME},target=/home/devcontainer/.config/subdirectory,type=bind,readonly"
+        ]
+    },
     "alpine-3-14": {
         "image": "alpine:3.14",
         "remoteUser": "devcontainer",

From b48d8700ffe5c0b363c9e8706ba2c1601a2bb94f Mon Sep 17 00:00:00 2001
From: Raymond <44623277+raymond-chetty@users.noreply.github.com>
Date: Mon, 22 May 2023 12:23:23 -0700
Subject: [PATCH 121/478] Update NOTES.md (#534)

* Update NOTES.md

#531: Quick document update about UID & GID using 1000 in devcontainer base images.

* Update src/common-utils/NOTES.md

@samruddhikhandale The common-utils Feature is used by most of the dev container images, along with the base image. Can we update the text?

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Update src/common-utils/NOTES.md

@samruddhikhandale

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/common-utils/NOTES.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/common-utils/NOTES.md b/src/common-utils/NOTES.md
index e9b27131e..f2c7aa72e 100644
--- a/src/common-utils/NOTES.md
+++ b/src/common-utils/NOTES.md
@@ -2,6 +2,11 @@
 
 This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, RockyLinux, and Alpine Linux.
 
+## Using with dev container images
+
+This Feature is used in many of the [dev container images](https://github.com/search?q=repo%3Adevcontainers%2Fimages+%22ghcr.io%2Fdevcontainers%2Ffeatures%2Fcommon-utils%22&type=code), as a result
+these images have already allocated UID & GID 1000. Attempting to add this Feature with  UID 1000 and/or GID 1000 on top of such a dev container image will result in an error when building the dev container.
+
 ## Customizing the command prompt
 
 By default, this script provides a custom command prompt that includes information about the git repository for the current folder. However, with certain large repositories, this can result in a slow command prompt due to the performance of needed git operations.

From cfae3b0f0d016f36229060b0e2abf5d55c9304e3 Mon Sep 17 00:00:00 2001
From: Shunya Hayashi <70781900+devshun@users.noreply.github.com>
Date: Thu, 1 Jun 2023 00:53:50 +0900
Subject: [PATCH 122/478] update go tools (#559)

* update go tools

* update link

* add unit tests for confirm installation

* fix path install gotests

* fix bump the minor version
---
 src/go/devcontainer-feature.json |  2 +-
 src/go/install.sh                | 11 +++++++----
 test/go/test.sh                  | 15 +++++++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/go/devcontainer-feature.json b/src/go/devcontainer-feature.json
index 92ed59154..963dc8948 100644
--- a/src/go/devcontainer-feature.json
+++ b/src/go/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "go",
-    "version": "1.1.3",
+    "version": "1.2.0",
     "name": "Go",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/go",
     "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/go/install.sh b/src/go/install.sh
index 365421e4a..f79fc6f3d 100755
--- a/src/go/install.sh
+++ b/src/go/install.sh
@@ -191,15 +191,18 @@ else
 fi
 
 # Install Go tools that are isImportant && !replacedByGopls based on
-# https://github.com/golang/vscode-go/blob/v0.31.1/src/goToolsInformation.ts
+# https://github.com/golang/vscode-go/blob/v0.38.0/src/goToolsInformation.ts
 GO_TOOLS="\
     golang.org/x/tools/gopls@latest \
     honnef.co/go/tools/cmd/staticcheck@latest \
     golang.org/x/lint/golint@latest \
     github.com/mgechev/revive@latest \
-    github.com/uudashr/gopkgs/v2/cmd/gopkgs@latest \
-    github.com/ramya-rao-a/go-outline@latest \
-    github.com/go-delve/delve/cmd/dlv@latest"
+    github.com/go-delve/delve/cmd/dlv@latest \
+    github.com/fatih/gomodifytags@latest \
+    github.com/haya14busa/goplay/cmd/goplay@latest \
+    github.com/cweill/gotests/gotests@latest \ 
+    github.com/josharian/impl@latest"
+
 if [ "${INSTALL_GO_TOOLS}" = "true" ]; then
     echo "Installing common Go tools..."
     export PATH=${TARGET_GOROOT}/bin:${PATH}
diff --git a/test/go/test.sh b/test/go/test.sh
index ccae6da84..0a9e04573 100755
--- a/test/go/test.sh
+++ b/test/go/test.sh
@@ -5,9 +5,24 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# go
 check "version" go version
+
+# revive
 check "revive version" revive --version
 check "revive is installed at correct path" bash -c "which revive | grep /go/bin/revive"
 
+# gomodifytags
+check "gomodifytags is installed at correct path" bash -c "which gomodifytags | grep /go/bin/gomodifytags"
+
+# goplay
+check "goplay is installed at correct path" bash -c "which goplay | grep /go/bin/goplay"
+
+# gotests
+check "gotests is installed at correct path" bash -c "which gotests | grep /go/bin/gotests"
+
+# impl
+check "impl is installed at correct path" bash -c "which impl | grep /go/bin/impl"
+
 # Report result
 reportResults
\ No newline at end of file

From 852f1f0567280b465913b487d5f8c773122c36ab Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 31 May 2023 11:55:51 -0700
Subject: [PATCH 123/478] Automated documentation update (#563)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/common-utils/README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/common-utils/README.md b/src/common-utils/README.md
index 9102c950b..1eddcbcc3 100644
--- a/src/common-utils/README.md
+++ b/src/common-utils/README.md
@@ -28,6 +28,11 @@ Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-r
 
 This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, RockyLinux, and Alpine Linux.
 
+## Using with dev container images
+
+This Feature is used in many of the [dev container images](https://github.com/search?q=repo%3Adevcontainers%2Fimages+%22ghcr.io%2Fdevcontainers%2Ffeatures%2Fcommon-utils%22&type=code), as a result
+these images have already allocated UID & GID 1000. Attempting to add this Feature with  UID 1000 and/or GID 1000 on top of such a dev container image will result in an error when building the dev container.
+
 ## Customizing the command prompt
 
 By default, this script provides a custom command prompt that includes information about the git repository for the current folder. However, with certain large repositories, this can result in a slow command prompt due to the performance of needed git operations.

From 367308c73606c03fa1a68e884d6ec37320a46b4f Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Fri, 16 Jun 2023 14:31:40 -0700
Subject: [PATCH 124/478] Add Debian Bookworm as a test base image (#575)

test against debian bookworm
---
 .github/workflows/test-all.yaml | 4 ++--
 .github/workflows/test-pr.yaml  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml
index ab51a737c..8dc206d86 100644
--- a/.github/workflows/test-all.yaml
+++ b/.github/workflows/test-all.yaml
@@ -42,11 +42,11 @@ jobs:
         ]
         baseImage:
           [
+            "ubuntu:bionic",
             "ubuntu:focal",
             "ubuntu:jammy",
-            "ubuntu:bionic",
             "debian:11",
-            "debian:10",
+            "debian:12",
             "mcr.microsoft.com/devcontainers/base:ubuntu",
             "mcr.microsoft.com/devcontainers/base:debian",
           ]
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index fb586fb8b..6b91b612d 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -49,11 +49,11 @@ jobs:
         features: ${{ fromJSON(needs.detect-changes.outputs.features) }}
         baseImage:
           [
+            "ubuntu:bionic",
             "ubuntu:focal",
             "ubuntu:jammy",
-            "ubuntu:bionic",
             "debian:11",
-            "debian:10",
+            "debian:12",
             "mcr.microsoft.com/devcontainers/base:ubuntu",
             "mcr.microsoft.com/devcontainers/base:debian",
           ]

From ee9f0bfbf09d60c242f2bd96d168ab0ab8c4f5c5 Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Mon, 19 Jun 2023 11:23:49 -0700
Subject: [PATCH 125/478] Temporaily pin TFLint to 0.46.1 (#583)

temporaily pin TFLint to 0.46.1

https://github.com/devcontainers/features/issues/581
---
 src/terraform/devcontainer-feature.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index 7ea73eea9..100bb02a8 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -20,10 +20,12 @@
         "tflint": {
             "type": "string",
             "proposals": [
-                "latest"
+                "latest",
+                "0.47.0",
+                "0.46.1"
             ],
-            "default": "latest",
-            "description": "Tflint version"
+            "default": "0.46.1",
+            "description": "Tflint version (Default value temporarily pinned to version 0.46.1: https://github.com/devcontainers/features/issues/581)"
         },
         "terragrunt": {
             "type": "string",

From 931262d20cb505880f44d8572e45cfbb393ae2fb Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Mon, 19 Jun 2023 18:24:44 +0000
Subject: [PATCH 126/478] release terraform

---
 src/terraform/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index 100bb02a8..523858382 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",

From 2fb386db11231e054012c85b0e1b3c2e879aef34 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Mon, 19 Jun 2023 11:33:35 -0700
Subject: [PATCH 127/478] Automated documentation update (#585)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/terraform/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/terraform/README.md b/src/terraform/README.md
index e93058718..6236e4382 100644
--- a/src/terraform/README.md
+++ b/src/terraform/README.md
@@ -16,7 +16,7 @@ Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects la
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
 | version | Terraform version | string | latest |
-| tflint | Tflint version | string | latest |
+| tflint | Tflint version (Default value temporarily pinned to version 0.46.1: https://github.com/devcontainers/features/issues/581) | string | 0.46.1 |
 | terragrunt | Terragrunt version | string | latest |
 | installSentinel | Install sentinel, a language and framework for policy built to be embedded in existing software to enable fine-grained, logic-based policy decisions | boolean | false |
 | installTFsec | Install tfsec, a tool to spot potential misconfigurations for your terraform code | boolean | false |

From 2258fcb040d74de01dbfc9df7d8800d90a13d56c Mon Sep 17 00:00:00 2001
From: Imamuzzaki Abu Salam <imamuzzaki@gmail.com>
Date: Wed, 21 Jun 2023 00:34:07 +0700
Subject: [PATCH 128/478] feat(rust): add up to version 1.70 options (#579)

---
 src/rust/devcontainer-feature.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index fd5d02612..bc9044c60 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "rust",
-    "version": "1.0.11",
+    "version": "1.0.12",
     "name": "Rust",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
     "description": "Installs Rust, common Rust utilities, and their required dependencies",
@@ -10,6 +10,13 @@
             "proposals": [
                 "latest",
                 "none",
+                "1.70",
+                "1.69",
+                "1.68",
+                "1.67",
+                "1.66",
+                "1.65",
+                "1.64",
                 "1.63",
                 "1.62",
                 "1.61"

From d934503a050ba84e6b42a006aacd891c4088eb62 Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Wed, 21 Jun 2023 11:13:46 -0700
Subject: [PATCH 129/478] Terraform: Add cosign integrity check for TFLint
 (#586)

* add cosign integrity check for tflint

* fallback to gpg verification
---
 src/terraform/devcontainer-feature.json |  6 +--
 src/terraform/install.sh                | 61 +++++++++++++++++++++----
 test/terraform/older_tflint.sh          | 13 ++++++
 test/terraform/scenarios.json           |  8 ++++
 4 files changed, 77 insertions(+), 11 deletions(-)
 create mode 100644 test/terraform/older_tflint.sh

diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index 523858382..00f6ba478 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
@@ -24,8 +24,8 @@
                 "0.47.0",
                 "0.46.1"
             ],
-            "default": "0.46.1",
-            "description": "Tflint version (Default value temporarily pinned to version 0.46.1: https://github.com/devcontainers/features/issues/581)"
+            "default": "latest",
+            "description": "Tflint version (https://github.com/terraform-linters/tflint/releases)"
         },
         "terragrunt": {
             "type": "string",
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index 75653c392..81682e80e 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -158,6 +158,26 @@ check_packages() {
     fi
 }
 
+# Install 'cosign' for validating signatures
+# https://docs.sigstore.dev/cosign/overview/
+ensure_cosign() {
+    check_packages curl ca-certificates gnupg2
+
+    if ! type cosign > /dev/null 2>&1; then
+        echo "Installing cosign..."
+        local LATEST_COSIGN_VERSION=$(curl https://api.github.com/repos/sigstore/cosign/releases/latest | grep tag_name | cut -d : -f2 | tr -d "v\", ")
+        curl -L "https://github.com/sigstore/cosign/releases/latest/download/cosign_${LATEST_COSIGN_VERSION}_${architecture}.deb" -o /tmp/cosign_${LATEST_COSIGN_VERSION}_${architecture}.deb
+        
+        dpkg -i /tmp/cosign_${LATEST_COSIGN_VERSION}_${architecture}.deb
+        rm /tmp/cosign_${LATEST_COSIGN_VERSION}_${architecture}.deb
+    fi
+    if ! type cosign > /dev/null 2>&1; then
+        echo "(!) Failed to install cosign."
+        exit 1
+    fi
+    cosign version
+}
+
 # Ensure apt is in non-interactive to avoid prompts
 export DEBIAN_FRONTEND=noninteractive
 
@@ -198,17 +218,42 @@ if [ "${TFLINT_VERSION}" != "none" ]; then
     TFLINT_FILENAME="tflint_linux_${architecture}.zip"
     curl -sSL -o /tmp/tf-downloads/${TFLINT_FILENAME} https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/${TFLINT_FILENAME}
     if [ "${TFLINT_SHA256}" != "dev-mode" ]; then
-        if [ "${TFLINT_SHA256}" = "automatic" ]; then
-            curl -sSL -o tflint_key "${TFLINT_GPG_KEY_URI}"
-            gpg -q --import tflint_key
-            curl -sSL -o tflint_checksums.txt https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt
-            curl -sSL -o tflint_checksums.txt.sig https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.sig
-            gpg --verify tflint_checksums.txt.sig tflint_checksums.txt
-        else
+
+        if [ "${TFLINT_SHA256}" != "automatic" ]; then
             echo "${TFLINT_SHA256} *${TFLINT_FILENAME}" > tflint_checksums.txt
+            sha256sum --ignore-missing -c tflint_checksums.txt
+        else
+            curl -sSL -o tflint_checksums.txt https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt
+
+            set +e
+            curl -sSL -o checksums.txt.keyless.sig https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.keyless.sig
+            set -e
+
+            # Check that checksums.txt.keyless.sig exists and is not empty
+            if [ -s checksums.txt.keyless.sig ]; then
+                # Validate checksums with cosign
+                curl -sSL -o checksums.txt.pem https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.pem
+                ensure_cosign
+                cosign verify-blob \
+                    --certificate=/tmp/tf-downloads/checksums.txt.pem \
+                    --signature=/tmp/tf-downloads/checksums.txt.keyless.sig \
+                    --certificate-identity-regexp="^https://github.com/terraform-linters/tflint"  \
+                    --certificate-oidc-issuer=https://token.actions.githubusercontent.com \
+                    /tmp/tf-downloads/tflint_checksums.txt
+                # Ensure that checksums.txt has $TFLINT_FILENAME
+                grep ${TFLINT_FILENAME} /tmp/tf-downloads/tflint_checksums.txt
+                # Validate downloaded file
+                sha256sum --ignore-missing -c tflint_checksums.txt
+            else
+                # Fallback to older, GPG-based verification (pre-0.47.0 of tflint)
+                curl -sSL -o tflint_checksums.txt.sig https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.sig
+                curl -sSL -o tflint_key "${TFLINT_GPG_KEY_URI}"
+                gpg -q --import tflint_key
+                gpg --verify tflint_checksums.txt.sig tflint_checksums.txt
+            fi
         fi
-        sha256sum --ignore-missing -c tflint_checksums.txt
     fi
+
     unzip /tmp/tf-downloads/${TFLINT_FILENAME}
     mv -f tflint /usr/local/bin/
 fi
diff --git a/test/terraform/older_tflint.sh b/test/terraform/older_tflint.sh
new file mode 100644
index 000000000..20009c995
--- /dev/null
+++ b/test/terraform/older_tflint.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "terraform" terraform -version
+
+check "tflint" tflint --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/terraform/scenarios.json b/test/terraform/scenarios.json
index 897763518..0a4d8956c 100644
--- a/test/terraform/scenarios.json
+++ b/test/terraform/scenarios.json
@@ -22,5 +22,13 @@
                 "installTerraformDocs": true
             }
         }
+    },
+    "older_tflint": {
+        "image": "mcr.microsoft.com/devcontainers/base:jammy",
+        "features": {
+            "terraform": {
+                "tflint": "0.40.0"
+            }
+        }
     }
 }
\ No newline at end of file

From de40074875b7add6b1a0d2ed3496ad05699a02c2 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Fri, 23 Jun 2023 16:16:30 -0700
Subject: [PATCH 130/478] Automated documentation update (#587)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/terraform/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/terraform/README.md b/src/terraform/README.md
index 6236e4382..2201c8db8 100644
--- a/src/terraform/README.md
+++ b/src/terraform/README.md
@@ -16,7 +16,7 @@ Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects la
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
 | version | Terraform version | string | latest |
-| tflint | Tflint version (Default value temporarily pinned to version 0.46.1: https://github.com/devcontainers/features/issues/581) | string | 0.46.1 |
+| tflint | Tflint version (https://github.com/terraform-linters/tflint/releases) | string | latest |
 | terragrunt | Terragrunt version | string | latest |
 | installSentinel | Install sentinel, a language and framework for policy built to be embedded in existing software to enable fine-grained, logic-based policy decisions | boolean | false |
 | installTFsec | Install tfsec, a tool to spot potential misconfigurations for your terraform code | boolean | false |

From ccce957d7e4bc1357559b361d4b219872ba57739 Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Tue, 27 Jun 2023 14:31:18 -0700
Subject: [PATCH 131/478] Azure CLI: Compatibility with Debian `bookworm`
 (#578)

* add flag

* try to install via apt version of pipx (will only work on bookworm)

* _REMOTE_USER aware

* dont change more than you need to,josh

* increment azure-cli minor version (v1.1.0)

* install globally

* make sure env variables are in scope
---
 src/azure-cli/devcontainer-feature.json       |  2 +-
 src/azure-cli/install.sh                      | 56 +++++++++++++++----
 test/azure-cli/install_bicep.sh               |  2 +
 test/azure-cli/install_extensions.sh          |  2 +
 test/azure-cli/install_extensions_bookworm.sh |  8 +++
 test/azure-cli/scenarios.json                 | 10 ++++
 6 files changed, 67 insertions(+), 13 deletions(-)
 create mode 100644 test/azure-cli/install_extensions_bookworm.sh

diff --git a/src/azure-cli/devcontainer-feature.json b/src/azure-cli/devcontainer-feature.json
index 9ab2cc39b..901ba4fc1 100644
--- a/src/azure-cli/devcontainer-feature.json
+++ b/src/azure-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "azure-cli",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "name": "Azure CLI",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/azure-cli",
   "description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/azure-cli/install.sh b/src/azure-cli/install.sh
index 31bc6d864..181d62f05 100755
--- a/src/azure-cli/install.sh
+++ b/src/azure-cli/install.sh
@@ -25,6 +25,13 @@ if [ "$(id -u)" -ne 0 ]; then
     exit 1
 fi
 
+if [ -z "${_REMOTE_USER}" ]; then
+    echo -e 'Feature script must be executed by a tool that implements the dev container specification. See https://containers.dev/ for more information.'
+    exit 1
+fi
+
+echo "Effective REMOTE_USER: ${_REMOTE_USER}"
+
 # Get central common setting
 get_common_setting() {
     if [ "${common_settings_file_loaded}" != "true" ]; then
@@ -57,8 +64,6 @@ check_packages() {
     fi
 }
 
-export DEBIAN_FRONTEND=noninteractive
-
 # Soft version matching that resolves a version for a given package in the *current apt-cache*
 # Return value is stored in first argument (the unprocessed version)
 apt_cache_version_soft_match() {
@@ -127,7 +132,39 @@ install_using_apt() {
     fi
 }
 
-install_using_pip() {
+install_using_pip_strategy() {
+    local ver=""
+    if [ "${AZ_VERSION}" = "latest" ] || [ "${AZ_VERSION}" = "lts" ] || [ "${AZ_VERSION}" = "stable" ]; then
+        # Empty, meaning grab the "latest" in the apt repo
+        ver=""
+    else
+        ver="==${AZ_VERSION}"
+    fi
+
+    install_with_pipx "${ver}" || install_with_complete_python_installation "${ver}" || return 1
+}
+
+install_with_pipx() {
+    echo "(*) Attempting to install globally with pipx..."
+    local ver="$1"
+    export 
+    local 
+
+    if ! type pipx > /dev/null 2>&1; then
+        echo "(*) Installing pipx..."
+        check_packages pipx
+        pipx ensurepath # Ensures PIPX_BIN_DIR is on the PATH
+    fi
+
+    PIPX_HOME="/usr/local/pipx" \
+    PIPX_BIN_DIR=/usr/local/bin \
+    pipx install azure-cli${ver}
+
+    echo "(*) Finished installing globally with pipx."
+}
+
+install_with_complete_python_installation() {
+    local ver="$1"
     echo "(*) No pre-built binaries available in apt-cache. Installing via pip3."
     if ! dpkg -s python3-minimal python3-pip libffi-dev python3-venv > /dev/null 2>&1; then
         apt_get_update
@@ -144,25 +181,20 @@ install_using_pip() {
         pipx_bin=/tmp/pip-tmp/bin/pipx
     fi
 
-    if [ "${AZ_VERSION}" = "latest" ] || [ "${AZ_VERSION}" = "lts" ] || [ "${AZ_VERSION}" = "stable" ]; then
-        # Empty, meaning grab the "latest" in the apt repo
-        ver=""
-    else
-        ver="==${AZ_VERSION}"
-    fi
-
     set +e
         ${pipx_bin} install --pip-args '--no-cache-dir --force-reinstall' -f azure-cli${ver}
 
         # Fail gracefully
         if [ "$?" != 0 ]; then
-            echo "Could not install azure-cli${ver} via pip"
+            echo "Could not install azure-cli${ver} via pip3"
             rm -rf /tmp/pip-tmp
             return 1
         fi
     set -e
 }
 
+export DEBIAN_FRONTEND=noninteractive
+
 # See if we're on x86_64 and if so, install via apt-get, otherwise use pip3
 echo "(*) Installing Azure CLI..."
 . /etc/os-release
@@ -176,7 +208,7 @@ fi
 
 if [ "${use_pip}" = "true" ]; then
     AZ_VERSION=${CACHED_AZURE_VERSION}
-    install_using_pip
+    install_using_pip_strategy
 
     if [ "$?" != 0 ]; then
         echo "Please provide a valid version for your distribution ${ID} ${VERSION_CODENAME} (${architecture})."
diff --git a/test/azure-cli/install_bicep.sh b/test/azure-cli/install_bicep.sh
index 955507fda..0430c64da 100644
--- a/test/azure-cli/install_bicep.sh
+++ b/test/azure-cli/install_bicep.sh
@@ -8,6 +8,8 @@ source dev-container-features-test-lib
 # Check to make sure the user is vscode
 check "user is vscode" whoami | grep vscode
 
+check "version" az  --version
+
 # Bicep-specific tests
 check "bicep" bicep --version
 check "az bicep" az bicep version
diff --git a/test/azure-cli/install_extensions.sh b/test/azure-cli/install_extensions.sh
index 1e66e2633..58d1cfff2 100644
--- a/test/azure-cli/install_extensions.sh
+++ b/test/azure-cli/install_extensions.sh
@@ -8,6 +8,8 @@ source dev-container-features-test-lib
 # Check to make sure the user is vscode
 check "user is vscode" whoami | grep vscode
 
+check "version" az  --version
+
 # Extension-specific tests
 check "aks-preview" az extension show --name aks-preview
 check "amg" az extension show --name amg
diff --git a/test/azure-cli/install_extensions_bookworm.sh b/test/azure-cli/install_extensions_bookworm.sh
new file mode 100644
index 000000000..3c281e685
--- /dev/null
+++ b/test/azure-cli/install_extensions_bookworm.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+./install_extensions.sh
\ No newline at end of file
diff --git a/test/azure-cli/scenarios.json b/test/azure-cli/scenarios.json
index cc1fd7512..231345225 100644
--- a/test/azure-cli/scenarios.json
+++ b/test/azure-cli/scenarios.json
@@ -9,6 +9,16 @@
       }
     }
   },
+  "install_extensions_bookworm": {
+    "image": "mcr.microsoft.com/devcontainers/base:bookworm",
+    "user": "vscode",
+    "features": {
+      "azure-cli": {
+        "version": "latest",
+        "extensions": "aks-preview,amg,containerapp"
+      }
+    }
+  },
   "install_bicep": {
     "image": "mcr.microsoft.com/devcontainers/base:jammy",
     "user": "vscode",

From 972fdffa717bad7d5db8d3f8e88a65d7953a34cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Melissa=20Weber=20Mendon=C3=A7a?= <melissawm@gmail.com>
Date: Wed, 28 Jun 2023 13:17:04 -0300
Subject: [PATCH 132/478] Add instructions to set up port forwarding on
 devcontainer.json file (#593)

---
 src/desktop-lite/NOTES.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/desktop-lite/NOTES.md b/src/desktop-lite/NOTES.md
index 891ce6c4a..9080c4335 100644
--- a/src/desktop-lite/NOTES.md
+++ b/src/desktop-lite/NOTES.md
@@ -6,6 +6,16 @@ This feature provides two ways of connecting to the desktop environment it adds.
 1. Open the ports view in your tool, select the noVNC port, and click the Globe icon.
 1. In the browser that appears, click the **Connect** button and enter the desktop password (`vscode` by default).
 
+To set up the `6080` port from your `devcontainer.json` file, include the following:
+```json
+  "forwardPorts": [6080],
+  "portsAttributes": {
+    "6080": {
+      "label": "desktop"
+    }
+  }
+```
+
 You can also connect to the desktop using a [VNC viewer](https://www.realvnc.com/en/connect/download/viewer/). To do so:
 
 1. Connect to the environment from a desktop tool that supports the dev container spec (e.g., VS Code client).

From 610286c369717c64610133e9b898a84c9dbecea3 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 28 Jun 2023 14:17:06 -0700
Subject: [PATCH 133/478] Automated documentation update (#596)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/desktop-lite/README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/desktop-lite/README.md b/src/desktop-lite/README.md
index ad05e4ff2..48397929b 100644
--- a/src/desktop-lite/README.md
+++ b/src/desktop-lite/README.md
@@ -29,6 +29,16 @@ This feature provides two ways of connecting to the desktop environment it adds.
 1. Open the ports view in your tool, select the noVNC port, and click the Globe icon.
 1. In the browser that appears, click the **Connect** button and enter the desktop password (`vscode` by default).
 
+To set up the `6080` port from your `devcontainer.json` file, include the following:
+```json
+  "forwardPorts": [6080],
+  "portsAttributes": {
+    "6080": {
+      "label": "desktop"
+    }
+  }
+```
+
 You can also connect to the desktop using a [VNC viewer](https://www.realvnc.com/en/connect/download/viewer/). To do so:
 
 1. Connect to the environment from a desktop tool that supports the dev container spec (e.g., VS Code client).

From b6dbe7051cb3c0491749409351804eef942b4160 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 16:16:30 -0700
Subject: [PATCH 134/478] Bump mpmath from 1.2.1 to 1.3.0 in
 /test/oryx/sample-python (#554)

Bumps [mpmath](https://github.com/fredrik-johansson/mpmath) from 1.2.1 to 1.3.0.
- [Release notes](https://github.com/fredrik-johansson/mpmath/releases)
- [Changelog](https://github.com/mpmath/mpmath/blob/master/CHANGES)
- [Commits](https://github.com/fredrik-johansson/mpmath/compare/1.2.1...1.3.0)

---
updated-dependencies:
- dependency-name: mpmath
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/oryx/sample-python/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/oryx/sample-python/requirements.txt b/test/oryx/sample-python/requirements.txt
index c8a04f68a..0f34acb42 100644
--- a/test/oryx/sample-python/requirements.txt
+++ b/test/oryx/sample-python/requirements.txt
@@ -1,2 +1,2 @@
-mpmath==1.2.1
+mpmath==1.3.0
 sympy==1.11.1

From ef76ff97b60f43c7dcff6691427d9fc54e9b2503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= <rafael@franca.dev>
Date: Thu, 29 Jun 2023 18:00:56 -0400
Subject: [PATCH 135/478] Change Ruby extension to ruby-lsp (#566)

This is the extension that is recommended in the VSCode documentation now.

https://code.visualstudio.com/docs/languages/ruby
---
 src/ruby/devcontainer-feature.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json
index e9fafeefd..fdf8b26b3 100644
--- a/src/ruby/devcontainer-feature.json
+++ b/src/ruby/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "1.0.10",
+    "version": "1.1.0",
     "name": "Ruby (via rvm)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
     "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
@@ -21,7 +21,8 @@
     "customizations": {
         "vscode": {
             "extensions": [
-                "rebornix.Ruby"
+                "rebornix.Ruby",
+                "shopify.ruby-lsp"
             ]
         }
     },

From 8a51aa906676280364df60010575b7dad3162f37 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Thu, 29 Jun 2023 15:08:34 -0700
Subject: [PATCH 136/478] Automated documentation update (#602)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/ruby/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ruby/README.md b/src/ruby/README.md
index 8e8ebe2c3..8184036c6 100644
--- a/src/ruby/README.md
+++ b/src/ruby/README.md
@@ -22,6 +22,7 @@ Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.
 ### VS Code Extensions
 
 - `rebornix.Ruby`
+- `shopify.ruby-lsp`
 
 
 

From 300814be97eaa5b7780886bd2eb37e96b523b3e7 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Thu, 29 Jun 2023 15:14:11 -0700
Subject: [PATCH 137/478] Dotnet: Fix Feature failures on ubuntu:jammy (when
 installing using apt) (#590)

* fix several bugs

* fix test: .NET is now installed from ubuntu feeds

* add comment ; use dev containers image

* address comments

* revert debugging cmd

* fix test for bookworm
---
 src/dotnet/devcontainer-feature.json  |  2 +-
 src/dotnet/install.sh                 | 32 +++++++++++++++++++++++----
 test/dotnet/install_dotnet_6_jammy.sh | 17 ++++++++++++++
 test/dotnet/install_dotnet_7_jammy.sh |  2 +-
 test/dotnet/install_dotnet_latest.sh  |  2 +-
 test/dotnet/scenarios.json            |  8 +++++++
 test/dotnet/test.sh                   |  2 +-
 7 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 test/dotnet/install_dotnet_6_jammy.sh

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index 4aa264c13..4f484ccba 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "1.1.3",
+    "version": "1.1.4",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "Installs the .NET CLI. Provides option of installing sdk or runtime, and option of versions to install. Uses latest version of .NET sdk as defaults to install.",
diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh
index 1c7430aa0..178994d71 100644
--- a/src/dotnet/install.sh
+++ b/src/dotnet/install.sh
@@ -33,6 +33,16 @@ DOTNET_VERSION_CODENAMES_REQUIRE_OLDER_LIBSSL_1="buster bullseye bionic focal hi
 # alongside DOTNET_VERSION, but not set as default.
 ADDITIONAL_VERSIONS=${ADDITIONALVERSIONS:-""}
 
+APT_PREFERENCES_CONTENT="$(cat << 'EOF'
+Package: *
+Pin: origin "packages.microsoft.com"
+Pin-Priority: 1001
+EOF
+)"
+
+APT_PREFERENCES_FILE_ADDED="false"
+APT_PREFERENCES_UPDATED="false"
+
 set -e
 
 # Clean up
@@ -147,9 +157,9 @@ apt_cache_package_and_version_soft_match() {
     . /etc/os-release
     local architecture="$(dpkg --print-architecture)"
 
+    apt-get update -y
     major_minor_version="$(echo "${requested_version}" | cut -d "." --field=1,2)"
-    package_name="$(apt-cache search "${partial_package_name}-[0-9].[0-9]" | awk -F" - " '{print $1}' | grep -m 1 "${partial_package_name}-${major_minor_version}")"
-    
+    package_name="$(apt-cache search "${partial_package_name}-[0-9].[0-9]$" | awk -F" - " '{print $1}' | grep -m 1 "${partial_package_name}-${major_minor_version}")"
     dot_escaped="${requested_version//./\\.}"
     dot_plus_escaped="${dot_escaped//+/\\+}"
     # Regex needs to handle debian package version number format: https://www.systutorials.com/docs/linux/man/5-deb-version/
@@ -193,6 +203,12 @@ install_using_apt() {
         # Import key safely and import Microsoft apt repo
         curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
         echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
+
+        [ ! -f /etc/apt/preferences ] && APT_PREFERENCES_FILE_ADDED="true"
+        APT_PREFERENCES_UPDATED="true"
+
+        # See https://github.com/dotnet/core/issues/7699
+        echo "${APT_PREFERENCES_CONTENT}" >> /etc/apt/preferences
         apt-get update -y
     fi
 
@@ -233,8 +249,8 @@ install_using_apt() {
     mkdir -p "${TARGET_DOTNET_ROOT}"
     local dotnet_installed_version="$(dotnet --version)"
     # See if its the distro version
-    if [[ "$(dotnet --info)" == *"Base Path:   /usr/lib/dotnet/dotnet${dotnet_installed_version:0:1}-${dotnet_installed_version}"* ]]; then
-        ln -s "/usr/lib/dotnet/dotnet${dotnet_installed_version:0:1}" "${CURRENT_DIR}"
+    if [[ "$(dotnet --info)" == *"Base Path:   /usr/lib/dotnet/${DOTNET_SDK_OR_RUNTIME}/${dotnet_installed_version}"* ]]; then
+        ln -s "/usr/lib/dotnet" "${CURRENT_DIR}"
     else
         # Location used by MS repo versions
         ln -s "/usr/share/dotnet" "${CURRENT_DIR}" 
@@ -463,6 +479,14 @@ if [ "${CHANGE_OWNERSHIP}" = "true" ]; then
 fi
 
 # Clean up
+if [ "${APT_PREFERENCES_UPDATED}" = "true" ]; then
+    if [ "${APT_PREFERENCES_FILE_ADDED}" = "true" ]; then
+        rm -f /etc/apt/preferences
+    else
+        head -n -3 /etc/apt/preferences > /tmp/preferences-temp && mv /tmp/preferences-temp /etc/apt/preferences
+    fi
+fi
+
 rm -rf /var/lib/apt/lists/*
 
 echo "Done!"
diff --git a/test/dotnet/install_dotnet_6_jammy.sh b/test/dotnet/install_dotnet_6_jammy.sh
new file mode 100644
index 000000000..fd1063473
--- /dev/null
+++ b/test/dotnet/install_dotnet_6_jammy.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "dotnet sdks" dotnet --list-sdks
+check "some major version of dotnet 6 is installed" bash -c "dotnet --list-sdks |  grep '6\.[0-9]*\.[0-9]*'"
+check "dotnet version 6 installed"  bash -c "ls -l /usr/lib/dotnet/sdk | grep '6\.[0-9]*\.[0-9]*'"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
+
+# Report result
+reportResults
diff --git a/test/dotnet/install_dotnet_7_jammy.sh b/test/dotnet/install_dotnet_7_jammy.sh
index 2c015fc0e..139216885 100644
--- a/test/dotnet/install_dotnet_7_jammy.sh
+++ b/test/dotnet/install_dotnet_7_jammy.sh
@@ -7,7 +7,7 @@ source dev-container-features-test-lib
 
 check "dotnet sdks" dotnet --list-sdks
 check "some major version of dotnet 7 is installed" bash -c "dotnet --list-sdks |  grep '7\.[0-9]*\.[0-9]*'"
-check "dotnet version 7 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '7\.[0-9]*\.[0-9]*'"
+check "dotnet version 7 installed"  bash -c "ls -l /usr/lib/dotnet/sdk | grep '7\.[0-9]*\.[0-9]*'"
 
 # Verify current symlink exists and works
 check "current link dotnet" /usr/local/dotnet/current/dotnet --info
diff --git a/test/dotnet/install_dotnet_latest.sh b/test/dotnet/install_dotnet_latest.sh
index 2c015fc0e..139216885 100644
--- a/test/dotnet/install_dotnet_latest.sh
+++ b/test/dotnet/install_dotnet_latest.sh
@@ -7,7 +7,7 @@ source dev-container-features-test-lib
 
 check "dotnet sdks" dotnet --list-sdks
 check "some major version of dotnet 7 is installed" bash -c "dotnet --list-sdks |  grep '7\.[0-9]*\.[0-9]*'"
-check "dotnet version 7 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '7\.[0-9]*\.[0-9]*'"
+check "dotnet version 7 installed"  bash -c "ls -l /usr/lib/dotnet/sdk | grep '7\.[0-9]*\.[0-9]*'"
 
 # Verify current symlink exists and works
 check "current link dotnet" /usr/local/dotnet/current/dotnet --info
diff --git a/test/dotnet/scenarios.json b/test/dotnet/scenarios.json
index 37f83d5a9..afee26f84 100644
--- a/test/dotnet/scenarios.json
+++ b/test/dotnet/scenarios.json
@@ -48,6 +48,14 @@
             }
         }
     },
+    "install_dotnet_6_jammy": {
+        "image": "mcr.microsoft.com/devcontainers/base:jammy",
+        "features": {
+            "dotnet": {
+                "version": "6"
+            }
+        }
+    },
     "install_dotnet_latest": {
         "image": "ubuntu:jammy",
         "features": {
diff --git a/test/dotnet/test.sh b/test/dotnet/test.sh
index 7eb0cf6d5..f433654e6 100755
--- a/test/dotnet/test.sh
+++ b/test/dotnet/test.sh
@@ -11,7 +11,7 @@ check "sdks" dotnet --list-sdks
 check "version" dotnet --version
 
 echo "Validating expected version present..."
-check "some major version of dotnet 7 is installed" bash -c "dotnet --version |  grep '7\.[0-9]*\.[0-9]*'"
+check "some major version of dotnet (7/8) is installed" bash -c "dotnet --version |  grep '[7-8]\.[0-9]*\.[0-9]*'"
 
 # Verify current symlink exists and works
 check "current link dotnet" /usr/local/dotnet/current/dotnet --info

From c4ffeebdacc3c7c020ee7c286aae88959aa91671 Mon Sep 17 00:00:00 2001
From: Kazuma Watanabe <watassbass@gmail.com>
Date: Fri, 7 Jul 2023 02:23:36 +0900
Subject: [PATCH 138/478] Pin version of TFLint's GPG key URL (#605)

---
 src/terraform/devcontainer-feature.json | 4 ++--
 src/terraform/install.sh                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index 00f6ba478..b1e6df2c8 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
@@ -74,4 +74,4 @@
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
-}
\ No newline at end of file
+}
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index 81682e80e..82e3e8d51 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -27,7 +27,7 @@ TFSEC_SHA256="${TFSEC_SHA256:-"automatic"}"
 TERRAFORM_DOCS_SHA256="${TERRAFORM_DOCS_SHA256:-"automatic"}"
 
 TERRAFORM_GPG_KEY="72D7468F"
-TFLINT_GPG_KEY_URI="https://raw.githubusercontent.com/terraform-linters/tflint/master/8CE69160EB3F2FE9.key"
+TFLINT_GPG_KEY_URI="https://raw.githubusercontent.com/terraform-linters/tflint/v0.46.1/8CE69160EB3F2FE9.key"
 GPG_KEY_SERVERS="keyserver hkps://keyserver.ubuntu.com
 keyserver hkps://keys.openpgp.org
 keyserver hkps://keyserver.pgp.com"

From 07693965d74d289e9a4035907d2414d9683e0773 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 11 Jul 2023 11:16:23 -0700
Subject: [PATCH 139/478] Nvidia-cuda: Update notes regarding gpu enablement
 (#608)

* Nvidia-cuda: Update notes regarding gpu enablement

* use GPU hostRequirements instead

* nit

* use gpu:optional instead
---
 src/nvidia-cuda/NOTES.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/nvidia-cuda/NOTES.md b/src/nvidia-cuda/NOTES.md
index cab2bbec7..db2b843a2 100644
--- a/src/nvidia-cuda/NOTES.md
+++ b/src/nvidia-cuda/NOTES.md
@@ -10,14 +10,19 @@ Follow [NVIDIA's instructions to install the NVIDIA Container Toolkit](https://d
 
 ### Enable GPU passthrough
 
-Enable GPU passthrough to your devcontainer by adding `["--gpus", "all"]` to your devcontainer's `runArgs` property. Here's an example of a devcontainer with this property:
+Enable GPU passthrough to your devcontainer by using `hostRequirements`. Here's an example of a devcontainer with this property:
 
 ```json
 {
-  "runArgs": ["--gpus", "all"]
+  "hostRequirements": {
+    "gpu": "optional" 
+  }
 }
 ```
 
+> Note: Setting `gpu` property's value to `true` will work with GPU machine types, but fail with CPUs. Hence, setting it to `optional` works in both cases. See [schema](https://containers.dev/implementors/json_schema/#base-schema) for more configuration details.
+
+
 
 ## OS Support
 

From 0e8940abead5068668bd78632ec9b20757541c95 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 11 Jul 2023 12:50:29 -0700
Subject: [PATCH 140/478] Automated documentation update (#610)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/nvidia-cuda/README.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/nvidia-cuda/README.md b/src/nvidia-cuda/README.md
index 38a989a04..7a0343de4 100644
--- a/src/nvidia-cuda/README.md
+++ b/src/nvidia-cuda/README.md
@@ -32,14 +32,19 @@ Follow [NVIDIA's instructions to install the NVIDIA Container Toolkit](https://d
 
 ### Enable GPU passthrough
 
-Enable GPU passthrough to your devcontainer by adding `["--gpus", "all"]` to your devcontainer's `runArgs` property. Here's an example of a devcontainer with this property:
+Enable GPU passthrough to your devcontainer by using `hostRequirements`. Here's an example of a devcontainer with this property:
 
 ```json
 {
-  "runArgs": ["--gpus", "all"]
+  "hostRequirements": {
+    "gpu": "optional" 
+  }
 }
 ```
 
+> Note: Setting `gpu` property's value to `true` will work with GPU machine types, but fail with CPUs. Hence, setting it to `optional` works in both cases. See [schema](https://containers.dev/implementors/json_schema/#base-schema) for more configuration details.
+
+
 
 ## OS Support
 

From 7fcec6e7c9dd587b24096597367ef42e4a37465b Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 19 Jul 2023 08:50:22 -0700
Subject: [PATCH 141/478] Fix: Docker-in-docker for python - Arm64 (#618)

Fix: Docker-in-docker for python:3.11 - Arm64
---
 src/docker-in-docker/devcontainer-feature.json |  2 +-
 src/docker-in-docker/install.sh                | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 1555cd6e7..334982161 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 9ad807e3c..6c889f5ac 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -265,7 +265,21 @@ if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
                 pip3 install --disable-pip-version-check --no-cache-dir --user pipx
                 pipx_bin=/tmp/pip-tmp/bin/pipx
             fi
-            ${pipx_bin} install --pip-args '--no-cache-dir --force-reinstall' docker-compose
+
+            set +e
+                ${pipx_bin} install --pip-args '--no-cache-dir --force-reinstall' docker-compose
+                exit_code=$?
+            set -e
+
+            if [ ${exit_code} -ne 0 ]; then
+                # Temporary: https://github.com/devcontainers/features/issues/616
+                # See https://github.com/yaml/pyyaml/issues/601
+                echo "(*) Failed to install docker-compose via pipx. Trying via pip3..."
+
+                export PYTHONUSERBASE=/usr/local
+                pip3 install --disable-pip-version-check --no-cache-dir --user "Cython<3.0" pyyaml wheel docker-compose --no-build-isolation
+            fi
+
             rm -rf /tmp/pip-tmp
         else
             compose_v1_version="1"

From ea2d79070ec4e91361412a88ead2ec9b78266b92 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Fri, 21 Jul 2023 17:37:10 -0700
Subject: [PATCH 142/478] Azure-cli - Temporary quick fix for jammy (ARM)
 (#626)

---
 src/azure-cli/devcontainer-feature.json | 7 ++++++-
 src/azure-cli/install.sh                | 9 +++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/azure-cli/devcontainer-feature.json b/src/azure-cli/devcontainer-feature.json
index 901ba4fc1..09c295c21 100644
--- a/src/azure-cli/devcontainer-feature.json
+++ b/src/azure-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "azure-cli",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "name": "Azure CLI",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/azure-cli",
   "description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -22,6 +22,11 @@
       "type": "boolean",
       "description": "Optionally install Azure Bicep",
       "default": false
+    },
+    "installUsingPython": {
+      "type": "boolean",
+      "description": "Install Azure CLI using Python instead of pipx",
+      "default": true
     }
   },
   "customizations": {
diff --git a/src/azure-cli/install.sh b/src/azure-cli/install.sh
index 181d62f05..9b0d72db3 100755
--- a/src/azure-cli/install.sh
+++ b/src/azure-cli/install.sh
@@ -15,7 +15,7 @@ rm -rf /var/lib/apt/lists/*
 AZ_VERSION=${VERSION:-"latest"}
 AZ_EXTENSIONS=${EXTENSIONS}
 AZ_INSTALLBICEP=${INSTALLBICEP:-false}
-
+INSTALL_USING_PYTHON=${INSTALL_USING_PYTHON:-true}
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 AZCLI_ARCHIVE_ARCHITECTURES="amd64"
 AZCLI_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal jammy"
@@ -141,7 +141,12 @@ install_using_pip_strategy() {
         ver="==${AZ_VERSION}"
     fi
 
-    install_with_pipx "${ver}" || install_with_complete_python_installation "${ver}" || return 1
+    # Temprary quick fix for https://github.com/devcontainers/features/issues/624
+    if [ "${INSTALL_USING_PYTHON}" = "true" ]; then
+        install_with_complete_python_installation "${ver}" || install_with_pipx "${ver}" || return 1
+    else
+        install_with_pipx "${ver}" || install_with_complete_python_installation "${ver}" || return 1
+    fi
 }
 
 install_with_pipx() {

From 836ea1e9faea580509b59f7df1e3b29f19c00e17 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 26 Jul 2023 14:43:43 -0700
Subject: [PATCH 143/478] Automated documentation update (#627)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/azure-cli/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/azure-cli/README.md b/src/azure-cli/README.md
index 4a9de7b96..c3e23db8a 100644
--- a/src/azure-cli/README.md
+++ b/src/azure-cli/README.md
@@ -18,6 +18,7 @@ Installs the Azure CLI along with needed dependencies. Useful for base Dockerfil
 | version | Select or enter an Azure CLI version. (Available versions may vary by Linux distribution.) | string | latest |
 | extensions | Optional comma separated list of Azure CLI extensions to install in profile. | string | - |
 | installBicep | Optionally install Azure Bicep | boolean | false |
+| installUsingPython | Install Azure CLI using Python instead of pipx | boolean | true |
 
 ## Customizations
 

From 685fa2e0f151b4545b444135a5ef6877de20e851 Mon Sep 17 00:00:00 2001
From: Krikchai Pongtaveewould <krikchai.p@gmail.com>
Date: Thu, 3 Aug 2023 05:12:14 +0700
Subject: [PATCH 144/478] Fix: common-utils configureZshAsDefaultShell option
 not working on alpine linux image (#557)

* alpine defaultZsh fix

* common-utils: replace pam.d/chsh permission with `sufficient`

* common-utils: revert match auth sufficient

* common-utils: append auth string instead of replacing a whole file

* fix grep 2nd param

* fix: line checking condition
---
 src/common-utils/devcontainer-feature.json   |  2 +-
 src/common-utils/main.sh                     |  8 ++++++++
 test/common-utils/alpine-base-zsh-default.sh | 13 +++++++++++++
 test/common-utils/scenarios.json             | 13 +++++++++++--
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 test/common-utils/alpine-base-zsh-default.sh

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index aadc1bc27..a924aa77a 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.0.10",
+    "version": "2.0.11",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 144478ee1..6d5ac0719 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -437,6 +437,14 @@ if [ "${INSTALL_ZSH}" = "true" ]; then
     fi
 
     if [ "${CONFIGURE_ZSH_AS_DEFAULT_SHELL}" == "true" ]; then
+        # Fixing chsh always asking for a password on alpine linux
+        # ref: https://askubuntu.com/questions/812420/chsh-always-asking-a-password-and-get-pam-authentication-failure.
+        if [ ! -f "/etc/pam.d/chsh" ] || ! grep -Eq '^auth(.*)pam_rootok\.so$' /etc/pam.d/chsh; then
+            echo "auth sufficient pam_rootok.so" >> /etc/pam.d/chsh
+        elif [[ -n "$(awk '/^auth(.*)pam_rootok\.so$/ && !/^auth[[:blank:]]+sufficient[[:blank:]]+pam_rootok\.so$/' /etc/pam.d/chsh)" ]]; then
+            awk '/^auth(.*)pam_rootok\.so$/ { $2 = "sufficient" } { print }' /etc/pam.d/chsh > /tmp/chsh.tmp && mv /tmp/chsh.tmp /etc/pam.d/chsh
+        fi
+
         chsh --shell /bin/zsh ${USERNAME}
     fi
 
diff --git a/test/common-utils/alpine-base-zsh-default.sh b/test/common-utils/alpine-base-zsh-default.sh
new file mode 100644
index 000000000..9fc00a267
--- /dev/null
+++ b/test/common-utils/alpine-base-zsh-default.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "alpine default shell zsh" \
+  bash -c "getent passwd $(whoami) | awk -F : '{ print $7 }' | grep '/bin/zsh'"
+
+# Report result
+reportResults
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index 21cb9408a..9800242e9 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -143,6 +143,7 @@
         "build": {
             "dockerfile": "Dockerfile"
         },
+        "remoteUser": "vscode",
         "features": {
             "common-utils": {
                 "username": "vscode",
@@ -151,7 +152,15 @@
                 "upgradePackages": true,
                 "installZsh": true
             }
-        },
-        "remoteUser": "vscode"
+        }
+    },
+    "alpine-base-zsh-default": {
+        "image": "mcr.microsoft.com/devcontainers/base:alpine",
+        "remoteUser": "vscode",
+        "features": {
+            "common-utils": {
+                "configureZshAsDefaultShell": true
+            }
+        }
     }
 }

From 29859aff280dc187d6f508900f8600ebd04c56b7 Mon Sep 17 00:00:00 2001
From: Tom Palmer <remlapmot@hotmail.com>
Date: Mon, 7 Aug 2023 23:12:13 +0100
Subject: [PATCH 145/478] Fix 2 instances of a typo in the desktop-lite NOTES
 and README (#640)

* Amend 'is installed is' to 'installed is'.

* Undo typo fix from README

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/desktop-lite/NOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/desktop-lite/NOTES.md b/src/desktop-lite/NOTES.md
index 9080c4335..924ce9b6e 100644
--- a/src/desktop-lite/NOTES.md
+++ b/src/desktop-lite/NOTES.md
@@ -25,7 +25,7 @@ You can also connect to the desktop using a [VNC viewer](https://www.realvnc.com
 
 ## Customizing Fluxbox
 
-The window manager is installed is [Fluxbox](http://fluxbox.org/). **Right-click** to see the application menu. In addition, any UI-based commands you execute inside the dev container will automatically appear on the desktop.
+The window manager installed is [Fluxbox](http://fluxbox.org/). **Right-click** to see the application menu. In addition, any UI-based commands you execute inside the dev container will automatically appear on the desktop.
 
 You can customize the desktop using Fluxbox configuration files. The configuration files are located in the `.fluxbox` folder of the home directory of the user you using to connect to the dev container (`$HOME/.fluxbox`).
 

From bbb24d10d417452ef23a8c506fd0e2b141b71f15 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Mon, 7 Aug 2023 15:59:58 -0700
Subject: [PATCH 146/478] Docker-in-docker: Add retries to the docker-init
 script until docker daemon starts (#637)

* Docker-in-docker: Add retries until docker daemon starts

* address comments
---
 .../devcontainer-feature.json                 |  2 +-
 src/docker-in-docker/install.sh               | 30 +++++++++++++----
 test/docker-in-docker/docker_retry.sh         | 32 +++++++++++++++++++
 test/docker-in-docker/scenarios.json          |  7 +++-
 .../test-scripts/docker-test-init.sh          | 26 +++++++++++++++
 5 files changed, 88 insertions(+), 9 deletions(-)
 create mode 100644 test/docker-in-docker/docker_retry.sh
 create mode 100644 test/docker-in-docker/test-scripts/docker-test-init.sh

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 334982161..b5e0aeea6 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.2.1",
+    "version": "2.3.0",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 6c889f5ac..f7e5a7d52 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -5,7 +5,7 @@
 #-------------------------------------------------------------------------------------------------------------
 #
 # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker-in-docker.md
-# Maintainer: The VS Code and Codespaces Teams
+# Maintainer: The Dev Container spec maintainers
 
 
 DOCKER_VERSION="${VERSION:-"latest"}" # The Docker/Moby Engine + CLI should match in version
@@ -423,12 +423,28 @@ dockerd_start="AZURE_DNS_AUTO_DETECTION=${AZURE_DNS_AUTO_DETECTION} DOCKER_DEFAU
 INNEREOF
 )"
 
-# Start using sudo if not invoked as root
-if [ "$(id -u)" -ne 0 ]; then
-    sudo /bin/sh -c "${dockerd_start}"
-else
-    eval "${dockerd_start}"
-fi
+retry_count=0
+docker_ok="false"
+
+until [ "${docker_ok}" = "true"  ] || [ "${retry_count}" -eq "5" ];
+do 
+    # Start using sudo if not invoked as root
+    if [ "$(id -u)" -ne 0 ]; then
+        sudo /bin/sh -c "${dockerd_start}"
+    else
+        eval "${dockerd_start}"
+    fi
+
+    set +e
+        docker info > /dev/null 2>&1 && docker_ok="true"
+
+        if [ "${docker_ok}" != "true" ]; then
+            echo "(*) Failed to start docker, retrying in 5s..."
+            retry_count=`expr $retry_count + 1`
+            sleep 5s
+        fi
+    set -e
+done
 
 set +e
 
diff --git a/test/docker-in-docker/docker_retry.sh b/test/docker-in-docker/docker_retry.sh
new file mode 100644
index 000000000..cc35fbb04
--- /dev/null
+++ b/test/docker-in-docker/docker_retry.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker-buildx" docker buildx version
+check "docker-ps" docker ps
+
+sleep 5s
+
+# Stop docker
+pkill dockerd
+pkill containerd
+
+sleep 5s
+
+set +e
+    docker_ok_code="$(docker info > /dev/null 2>&1; echo $?)"
+set -e
+
+check "docker-not-running" bash -c "[[ ${docker_ok_code} == 1 ]]"
+
+#  Testing retry logic
+./test-scripts/docker-test-init.sh
+
+check "docker-started-after-retries" docker ps
+
+# Report result
+reportResults
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index 9c44478f1..525ce6930 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -67,6 +67,11 @@
             }
         },
         "remoteUser": "node"
+    },
+    "docker_retry": {
+        "image": "ubuntu:focal",
+        "features": {
+            "docker-in-docker": {}
+        }
     }
-
 }
diff --git a/test/docker-in-docker/test-scripts/docker-test-init.sh b/test/docker-in-docker/test-scripts/docker-test-init.sh
new file mode 100644
index 000000000..b213fb40c
--- /dev/null
+++ b/test/docker-in-docker/test-scripts/docker-test-init.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+
+retry_count=0
+docker_ok="false"
+
+until [ "${docker_ok}" = "true"  ] || [ "${retry_count}" -eq "5" ];
+do
+    if [ "${retry_count}" -eq "3" ]; then
+        echo "Starting docker after 3 retries..."
+        /usr/local/share/docker-init.sh
+    fi
+
+    set +e
+        docker info > /dev/null 2>&1 && docker_ok="true"
+
+        if [ "${docker_ok}" != "true" ]; then
+            echo "(*) Failed to start docker, retrying in 5s... Retry count: ${retry_count}"
+            retry_count=`expr $retry_count + 1`
+            sleep 1s
+        fi
+    set -e
+done
\ No newline at end of file

From f2594c5cc85e18450a31865f8387c8dc064006f2 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Mon, 7 Aug 2023 16:29:54 -0700
Subject: [PATCH 147/478] Automated documentation update (#642)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/desktop-lite/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/desktop-lite/README.md b/src/desktop-lite/README.md
index 48397929b..7094a2425 100644
--- a/src/desktop-lite/README.md
+++ b/src/desktop-lite/README.md
@@ -48,7 +48,7 @@ You can also connect to the desktop using a [VNC viewer](https://www.realvnc.com
 
 ## Customizing Fluxbox
 
-The window manager is installed is [Fluxbox](http://fluxbox.org/). **Right-click** to see the application menu. In addition, any UI-based commands you execute inside the dev container will automatically appear on the desktop.
+The window manager installed is [Fluxbox](http://fluxbox.org/). **Right-click** to see the application menu. In addition, any UI-based commands you execute inside the dev container will automatically appear on the desktop.
 
 You can customize the desktop using Fluxbox configuration files. The configuration files are located in the `.fluxbox` folder of the home directory of the user you using to connect to the dev container (`$HOME/.fluxbox`).
 

From 9e75db9a1dbcc245f94707c0917470143c17595b Mon Sep 17 00:00:00 2001
From: Shikanime Deva <shikalegend@gmail.com>
Date: Thu, 10 Aug 2023 01:20:27 +0200
Subject: [PATCH 148/478] Avoid unexpected shell expansion (#645)

* Avoid unexpected shell expansion

* Add install Node with ZSH as default test

* Fix LTS only work on >bionic

* Bump Node feature version

* Remove huge universal image on scenarios
---
 src/node/devcontainer-feature.json |  4 ++--
 src/node/install.sh                | 24 ++++++++++++------------
 test/node/scenarios.json           | 20 +++++++++++---------
 test/node/zsh_default.sh           | 12 ++++++++++++
 4 files changed, 37 insertions(+), 23 deletions(-)
 create mode 100755 test/node/zsh_default.sh

diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index 9bf90b67f..80bd91275 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "name": "Node.js (via nvm), yarn and pnpm",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
@@ -49,4 +49,4 @@
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
-}
+}
\ No newline at end of file
diff --git a/src/node/install.sh b/src/node/install.sh
index 9048ac22e..1ce8fee3f 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -9,7 +9,7 @@
 
 export NODE_VERSION="${VERSION:-"lts"}"
 export NVM_VERSION="${NVMVERSION:-"0.39.2"}"
-export NVM_DIR=${NVMINSTALLPATH:-"/usr/local/share/nvm"}
+export NVM_DIR="${NVMINSTALLPATH:-"/usr/local/share/nvm"}"
 INSTALL_TOOLS_FOR_NODE_GYP="${NODEGYPDEPENDENCIES:-true}"
 
 # Comma-separated list of node versions to be installed (with nvm)
@@ -118,10 +118,10 @@ set -e
 umask 0002
 # Do not update profile - we'll do this manually
 export PROFILE=/dev/null
-curl -so- https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh | bash 
-source ${NVM_DIR}/nvm.sh
+curl -so- "https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh" | bash
+source "${NVM_DIR}/nvm.sh"
 if [ "${NODE_VERSION}" != "" ]; then
-    nvm alias default ${NODE_VERSION}
+    nvm alias default "${NODE_VERSION}"
 fi
 EOF
 )"
@@ -149,9 +149,9 @@ usermod -a -G nvm ${USERNAME}
 umask 0002
 if [ ! -d "${NVM_DIR}" ]; then
     # Create nvm dir, and set sticky bit
-    mkdir -p ${NVM_DIR}
-    chown "${USERNAME}:nvm" ${NVM_DIR}
-    chmod g+rws ${NVM_DIR}
+    mkdir -p "${NVM_DIR}"
+    chown "${USERNAME}:nvm" "${NVM_DIR}"
+    chmod g+rws "${NVM_DIR}"
     su ${USERNAME} -c "${nvm_install_snippet}" 2>&1
     # Update rc files
     if [ "${UPDATE_RC}" = "true" ]; then
@@ -160,11 +160,11 @@ if [ ! -d "${NVM_DIR}" ]; then
 else
     echo "NVM already installed."
     if [ "${NODE_VERSION}" != "" ]; then
-        su ${USERNAME} -c "umask 0002 && . $NVM_DIR/nvm.sh && nvm install ${NODE_VERSION} && nvm alias default ${NODE_VERSION}"
+        su ${USERNAME} -c "umask 0002 && . '$NVM_DIR/nvm.sh' && nvm install '${NODE_VERSION}' && nvm alias default '${NODE_VERSION}'"
     fi
 fi
 
-# Additional node versions to be installed but not be set as 
+# Additional node versions to be installed but not be set as
 # default we can assume the nvm is the group owner of the nvm
 # directory and the sticky bit on directories so any installed
 # files will have will have the correct ownership (nvm)
@@ -173,12 +173,12 @@ if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
     IFS=","
         read -a additional_versions <<< "$ADDITIONAL_VERSIONS"
         for ver in "${additional_versions[@]}"; do
-            su ${USERNAME} -c "umask 0002 && . $NVM_DIR/nvm.sh && nvm install ${ver}"
+            su ${USERNAME} -c "umask 0002 && . '$NVM_DIR/nvm.sh' && nvm install '${ver}'"
         done
 
         # Ensure $NODE_VERSION is on the $PATH
         if [ "${NODE_VERSION}" != "" ]; then
-                su ${USERNAME} -c "umask 0002 && . $NVM_DIR/nvm.sh && nvm use default"
+                su ${USERNAME} -c "umask 0002 && . '$NVM_DIR/nvm.sh' && nvm use default"
         fi
     IFS=$OLDIFS
 fi
@@ -218,7 +218,7 @@ fi
 
 
 # Clean up
-su ${USERNAME} -c "umask 0002 && . $NVM_DIR/nvm.sh && nvm clear-cache"
+su ${USERNAME} -c "umask 0002 && . '$NVM_DIR/nvm.sh' && nvm clear-cache"
 rm -rf /var/lib/apt/lists/*
 
 # Ensure privs are correct for installed node versions. Unfortunately the
diff --git a/test/node/scenarios.json b/test/node/scenarios.json
index 6112a6ea4..5524f5c52 100644
--- a/test/node/scenarios.json
+++ b/test/node/scenarios.json
@@ -17,21 +17,23 @@
             }
         }
     },
-    "version_none": {
-        "image": "mcr.microsoft.com/devcontainers/base",
-        "remoteUser": "vscode",
+    "zsh_default": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
         "features": {
             "node": {
-                "version": "none"
+                "version": "lts"
+            },
+            "common-utils": {
+                "configureZshAsDefaultShell": true
             }
         }
     },
-    "install_node_on_universal_image": {
-        "image": "mcr.microsoft.com/devcontainers/universal",
-        "remoteUser": "codespace",
+    "version_none": {
+        "image": "mcr.microsoft.com/devcontainers/base",
+        "remoteUser": "vscode",
         "features": {
             "node": {
-                "version": "19.1.0"
+                "version": "none"
             }
         }
     },
@@ -43,4 +45,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/test/node/zsh_default.sh b/test/node/zsh_default.sh
new file mode 100755
index 000000000..c7c9e57f4
--- /dev/null
+++ b/test/node/zsh_default.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+
+# Report result
+reportResults

From be082b0ef5f0f3795708cd1a6c37a427d8c0bb73 Mon Sep 17 00:00:00 2001
From: naturedamends <120284608+naturedamends@users.noreply.github.com>
Date: Sat, 12 Aug 2023 00:01:57 +0100
Subject: [PATCH 149/478] Common utils: Add config to remove zsh rc files from
 (#614)

* Add config to remove zsh rc files from common-utils.

* Bump version and add config to install script.

* Checks preventing excess writing to .zshrc.

* Change devcontainer feature option name.

* Coding standards.

* Favour adding feature via config

and default to overriding .zshrc with dev-container default template.

* Update devcontainer-feature.json

* Update devcontainer-feature.json

* Update src/common-utils/devcontainer-feature.json

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Update src/common-utils/devcontainer-feature.json

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Testing for using devcontainer .zshrc template file.

* Coding standards.

* Coding standards.

* Update configure_zsh_as_default_shell_no_template.sh

* Grammar in configure_zsh_as_default_shell.sh

* Testing accounts for marked file cache  (#4)

* Account for mark file in testing.

* Remove some debugging and tests back

* Add back tests?

* Update configure_zsh_no_template.sh

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/common-utils/devcontainer-feature.json    |  7 ++-
 src/common-utils/install.sh                   |  1 +
 src/common-utils/main.sh                      | 51 +++++++++++--------
 .../configure_zsh_as_default_shell.sh         |  2 +
 .../common-utils/configure_zsh_no_template.sh | 15 ++++++
 test/common-utils/scenarios.json              | 11 ++++
 6 files changed, 66 insertions(+), 21 deletions(-)
 create mode 100644 test/common-utils/configure_zsh_no_template.sh

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index a924aa77a..d70848278 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.0.11",
+    "version": "2.1.0",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
@@ -20,6 +20,11 @@
             "default": true,
             "description": "Install Oh My Zsh!?"
         },
+        "installOhMyZshConfig": {
+            "type": "boolean",
+            "default": true,
+            "description": "Allow installing the default dev container .zshrc templates?"
+        },
         "upgradePackages": {
             "type": "boolean",
             "default": true,
diff --git a/src/common-utils/install.sh b/src/common-utils/install.sh
index d08a2f2c1..8f1ece4d7 100755
--- a/src/common-utils/install.sh
+++ b/src/common-utils/install.sh
@@ -12,6 +12,7 @@ set -e
 INSTALL_ZSH="${INSTALLZSH:-"true"}"
 CONFIGURE_ZSH_AS_DEFAULT_SHELL="${CONFIGUREZSHASDEFAULTSHELL:-"false"}"
 INSTALL_OH_MY_ZSH="${INSTALLOHMYZSH:-"true"}"
+INSTALL_OH_MY_ZSH_CONFIG="${INSTALLOHMYZSHCONFIG:-"true"}"
 UPGRADE_PACKAGES="${UPGRADEPACKAGES:-"true"}"
 USERNAME="${USERNAME:-"automatic"}"
 USER_UID="${UID:-"automatic"}"
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 6d5ac0719..d3f7ef267 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -12,6 +12,7 @@ set -e
 INSTALL_ZSH="${INSTALLZSH:-"true"}"
 CONFIGURE_ZSH_AS_DEFAULT_SHELL="${CONFIGUREZSHASDEFAULTSHELL:-"false"}"
 INSTALL_OH_MY_ZSH="${INSTALLOHMYZSH:-"true"}"
+INSTALL_OH_MY_ZSH_CONFIG="${INSTALLOHMYZSHCONFIG:-"true"}"
 UPGRADE_PACKAGES="${UPGRADEPACKAGES:-"true"}"
 USERNAME="${USERNAME:-"automatic"}"
 USER_UID="${USERUID:-"automatic"}"
@@ -390,7 +391,8 @@ else
 fi
 
 # Restore user .bashrc / .profile / .zshrc defaults from skeleton file if it doesn't exist or is empty
-possible_rc_files=( ".bashrc" ".profile" ".zshrc" )
+possible_rc_files=( ".bashrc" ".profile" )
+[ "$INSTALL_OH_MY_ZSH_CONFIG" == "true" ] && possible_rc_files+=('.zshrc')
 for rc_file in "${possible_rc_files[@]}"; do
     if [ -f "/etc/skel/${rc_file}" ]; then
         if [ ! -e "${user_home}/${rc_file}" ] || [ ! -s "${user_home}/${rc_file}" ]; then
@@ -450,33 +452,42 @@ if [ "${INSTALL_ZSH}" = "true" ]; then
 
     # Adapted, simplified inline Oh My Zsh! install steps that adds, defaults to a codespaces theme.
     # See https://github.com/ohmyzsh/ohmyzsh/blob/master/tools/install.sh for official script.
-    oh_my_install_dir="${user_home}/.oh-my-zsh"
-    if [ ! -d "${oh_my_install_dir}" ] && [ "${INSTALL_OH_MY_ZSH}" = "true" ]; then
-        template_path="${oh_my_install_dir}/templates/zshrc.zsh-template"
+    if [ "${INSTALL_OH_MY_ZSH}" = "true" ]; then
         user_rc_file="${user_home}/.zshrc"
-        umask g-w,o-w
-        mkdir -p ${oh_my_install_dir}
-        git clone --depth=1 \
-            -c core.eol=lf \
-            -c core.autocrlf=false \
-            -c fsck.zeroPaddedFilemode=ignore \
-            -c fetch.fsck.zeroPaddedFilemode=ignore \
-            -c receive.fsck.zeroPaddedFilemode=ignore \
-            "https://github.com/ohmyzsh/ohmyzsh" "${oh_my_install_dir}" 2>&1
-        echo -e "$(cat "${template_path}")\nDISABLE_AUTO_UPDATE=true\nDISABLE_UPDATE_PROMPT=true" > ${user_rc_file}
-        sed -i -e 's/ZSH_THEME=.*/ZSH_THEME="devcontainers"/g' ${user_rc_file}
+        oh_my_install_dir="${user_home}/.oh-my-zsh"
+        template_path="${oh_my_install_dir}/templates/zshrc.zsh-template"
+        if [ ! -d "${oh_my_install_dir}" ]; then
+            umask g-w,o-w
+            mkdir -p ${oh_my_install_dir}
+            git clone --depth=1 \
+                -c core.eol=lf \
+                -c core.autocrlf=false \
+                -c fsck.zeroPaddedFilemode=ignore \
+                -c fetch.fsck.zeroPaddedFilemode=ignore \
+                -c receive.fsck.zeroPaddedFilemode=ignore \
+                "https://github.com/ohmyzsh/ohmyzsh" "${oh_my_install_dir}" 2>&1
+
+            # Shrink git while still enabling updates
+            cd "${oh_my_install_dir}"
+            git repack -a -d -f --depth=1 --window=1
+        fi
 
         # Add Dev Containers theme
         mkdir -p ${oh_my_install_dir}/custom/themes
         cp -f "${FEATURE_DIR}/scripts/devcontainers.zsh-theme" "${oh_my_install_dir}/custom/themes/devcontainers.zsh-theme"
-        ln -s "${oh_my_install_dir}/custom/themes/devcontainers.zsh-theme" "${oh_my_install_dir}/custom/themes/codespaces.zsh-theme"
+        ln -sf "${oh_my_install_dir}/custom/themes/devcontainers.zsh-theme" "${oh_my_install_dir}/custom/themes/codespaces.zsh-theme"
+
+        # Add devcontainer .zshrc template
+        if [ "$INSTALL_OH_MY_ZSH_CONFIG" = "true" ]; then
+            echo -e "$(cat "${template_path}")\nDISABLE_AUTO_UPDATE=true\nDISABLE_UPDATE_PROMPT=true" > ${user_rc_file}
+            sed -i -e 's/ZSH_THEME=.*/ZSH_THEME="devcontainers"/g' ${user_rc_file}
+        fi
 
-        # Shrink git while still enabling updates
-        cd "${oh_my_install_dir}"
-        git repack -a -d -f --depth=1 --window=1
         # Copy to non-root user if one is specified
         if [ "${USERNAME}" != "root" ]; then
-            cp -rf "${user_rc_file}" "${oh_my_install_dir}" /root
+            copy_to_user_files=("${oh_my_install_dir}")
+            [ -f "$user_rc_file" ] && copy_to_user_files+=("$user_rc_file")
+            cp -rf "${copy_to_user_files[@]}" /root
             chown -R ${USERNAME}:${group_name} "${oh_my_install_dir}" "${user_rc_file}"
         fi
     fi
diff --git a/test/common-utils/configure_zsh_as_default_shell.sh b/test/common-utils/configure_zsh_as_default_shell.sh
index e5cc89e51..6a569a990 100644
--- a/test/common-utils/configure_zsh_as_default_shell.sh
+++ b/test/common-utils/configure_zsh_as_default_shell.sh
@@ -7,6 +7,8 @@ source dev-container-features-test-lib
 
 # Definition specific tests
 check "default-shell-is-zsh" bash -c "getent passwd $(whoami) | awk -F: '{ print $7 }' | grep '/bin/zsh'"
+# check it overrides the ~/.zshrc with default dev containers template
+check "default-zshrc-is-dev-container-template" bash -c "cat ~/.zshrc | grep ZSH_THEME | grep devcontainers"
 
 # Report result
 reportResults
diff --git a/test/common-utils/configure_zsh_no_template.sh b/test/common-utils/configure_zsh_no_template.sh
new file mode 100644
index 000000000..c62cae967
--- /dev/null
+++ b/test/common-utils/configure_zsh_no_template.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+function file_not_overridden() {
+    cat ~/.zshrc | grep 'alias fnomockalias=' | grep testingmock
+}
+check "default-zsh-with-no-zshrc" file_not_overridden
+
+# Report result
+reportResults
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index 9800242e9..904a47bac 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -115,6 +115,17 @@
             }
         }
     },
+    "configure_zsh_no_template": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "postCreateCommand": "echo alias fnomockalias=testingmock >> /root/.zshrc",
+        "remoteUser": "root",
+        "features": {
+            "common-utils": {
+                "installZsh": true,
+                "installOhMyZshConfig": false
+            }
+        }
+    },
     "config-subdirectory": {
         "image": "alpine",
         "remoteUser": "devcontainer",

From 8b6f08825643e2d5835ed3138dee5301a4db4ffa Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Fri, 11 Aug 2023 16:17:50 -0700
Subject: [PATCH 150/478] Automated documentation update (#650)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/common-utils/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/common-utils/README.md b/src/common-utils/README.md
index 1eddcbcc3..b8e37a8c8 100644
--- a/src/common-utils/README.md
+++ b/src/common-utils/README.md
@@ -18,6 +18,7 @@ Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-r
 | installZsh | Install ZSH? | boolean | true |
 | configureZshAsDefaultShell | Change default shell to ZSH? | boolean | false |
 | installOhMyZsh | Install Oh My Zsh!? | boolean | true |
+| installOhMyZshConfig | Allow installing the default dev container .zshrc templates? | boolean | true |
 | upgradePackages | Upgrade OS packages? | boolean | true |
 | username | Enter name of a non-root user to configure or none to skip | string | automatic |
 | userUid | Enter UID for non-root user | string | automatic |

From f90cb26c7f15659f3e2be8061295997df2bb76cc Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Mon, 14 Aug 2023 16:12:47 -0700
Subject: [PATCH 151/478] Common-utils: Fixes "No package jq available" errors
 for CentOS (#644)

* add checks for "jq"

* install epel-release if necessary

* clean up epel-release post installation of "jq"
---
 src/common-utils/devcontainer-feature.json |  2 +-
 src/common-utils/main.sh                   | 18 +++++++++++++++---
 test/common-utils/centos-7.sh              |  1 +
 test/common-utils/fedora.sh                |  1 +
 test/common-utils/mariner.sh               |  1 +
 test/common-utils/rocky-8.sh               |  1 +
 test/common-utils/rocky-9.sh               |  1 +
 7 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index d70848278..4eaef2128 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index d3f7ef267..3731994de 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -175,6 +175,11 @@ install_redhat_packages() {
         man-db \
         strace"
 
+    local install_cmd=dnf
+    if ! type dnf > /dev/null 2>&1; then
+        install_cmd=yum
+    fi
+
     # rockylinux:9 installs 'curl-minimal' which clashes with 'curl'
     # Install 'curl' for every OS except this rockylinux:9
     if [[ "${ID}" = "rocky" ]] && [[ "${VERSION}" != *"9."* ]]; then
@@ -201,16 +206,23 @@ install_redhat_packages() {
         package_list="${package_list} zsh"
     fi
 
-    local install_cmd=dnf
-    if ! type dnf > /dev/null 2>&1; then
-        install_cmd=yum
+    # Install EPEL repository if needed (required to install 'jq' for CentOS)
+    local remove_epel="false"
+    if ! ${install_cmd} -q list jq >/dev/null 2>&1; then
+        ${install_cmd} -y install epel-release
+        remove_epel="true"
     fi
+
     ${install_cmd} -y install ${package_list}
 
     # Get to latest versions of all packages
     if [ "${UPGRADE_PACKAGES}" = "true" ]; then
         ${install_cmd} upgrade -y
     fi
+
+    if [[ "${remove_epel}" = "true" ]]; then
+        ${install_cmd} -y remove epel-release
+    fi
 }
 
 # Alpine Linux packages
diff --git a/test/common-utils/centos-7.sh b/test/common-utils/centos-7.sh
index a81ae2f3e..69f01d1ed 100755
--- a/test/common-utils/centos-7.sh
+++ b/test/common-utils/centos-7.sh
@@ -9,6 +9,7 @@ source dev-container-features-test-lib
 . /etc/os-release
 check "non-root user" test "$(whoami)" = "devcontainer"
 check "distro" test "${VERSION_ID}" = "7"
+check "jq" jq  --version
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/common-utils/fedora.sh b/test/common-utils/fedora.sh
index b32a7f112..67706d49a 100755
--- a/test/common-utils/fedora.sh
+++ b/test/common-utils/fedora.sh
@@ -9,6 +9,7 @@ source dev-container-features-test-lib
 . /etc/os-release
 check "non-root user" test "$(whoami)" = "devcontainer"
 check "distro" test "${ID}" = "fedora"
+check "jq" jq  --version
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/common-utils/mariner.sh b/test/common-utils/mariner.sh
index ab6cb6e13..b0d2c91e4 100755
--- a/test/common-utils/mariner.sh
+++ b/test/common-utils/mariner.sh
@@ -9,6 +9,7 @@ source dev-container-features-test-lib
 . /etc/os-release
 check "non-root user" test "$(whoami)" = "devcontainer"
 check "distro" test "${ID}" = "mariner"
+check "jq" jq  --version
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/common-utils/rocky-8.sh b/test/common-utils/rocky-8.sh
index be1223b3c..d08731824 100755
--- a/test/common-utils/rocky-8.sh
+++ b/test/common-utils/rocky-8.sh
@@ -10,6 +10,7 @@ source dev-container-features-test-lib
 check "non-root user" test "$(whoami)" = "devcontainer"
 check "distro" test "${PLATFORM_ID}" = "platform:el8"
 check "curl" curl --version
+check "jq" jq  --version
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/common-utils/rocky-9.sh b/test/common-utils/rocky-9.sh
index 452c1935f..cb2b339e1 100755
--- a/test/common-utils/rocky-9.sh
+++ b/test/common-utils/rocky-9.sh
@@ -10,6 +10,7 @@ source dev-container-features-test-lib
 check "non-root user" test "$(whoami)" = "devcontainer"
 check "distro" test "${PLATFORM_ID}" = "platform:el9"
 check "curl" curl --version
+check "jq" jq  --version
 
 # Report result
 reportResults
\ No newline at end of file

From 1d1a23625dc714629ab863cbca7e890516d4283d Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 16 Aug 2023 11:38:35 -0700
Subject: [PATCH 152/478] Ruby Feature [bug fix] : Fails if the dev container
 has the same ruby version installed (#609)

* Ruby Feature [bug fix] : Fails if the dev container has the same ruby version installed

* add comment

* remove scenario
---
 src/ruby/devcontainer-feature.json |  2 +-
 src/ruby/install.sh                | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json
index fdf8b26b3..29591e6a6 100644
--- a/src/ruby/devcontainer-feature.json
+++ b/src/ruby/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "name": "Ruby (via rvm)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
     "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
diff --git a/src/ruby/install.sh b/src/ruby/install.sh
index 087108520..2b47d8a27 100755
--- a/src/ruby/install.sh
+++ b/src/ruby/install.sh
@@ -177,9 +177,11 @@ fi
 find_version_from_git_tags RUBY_VERSION "https://github.com/ruby/ruby" "tags/v" "_"
 
 # Just install Ruby if RVM already installed
-if [ $(rvm --version) != "" ]; then
+if rvm --version > /dev/null; then
     echo "Ruby Version Manager already exists."
-    if [ "${RUBY_VERSION}" != "none" ]; then
+    if [[ "$(ruby -v)" = *"${RUBY_VERSION}"* ]]; then
+        echo "(!) Ruby is already installed with version ${RUBY_VERSION}. Skipping..."
+    elif [ "${RUBY_VERSION}" != "none" ]; then
         echo "Installing specified Ruby version."
         su ${USERNAME} -c "rvm install ruby ${RUBY_VERSION}"
     fi
@@ -191,6 +193,9 @@ else
     # Determine appropriate settings for rvm installer
     if [ "${RUBY_VERSION}" = "none" ]; then
         RVM_INSTALL_ARGS=""
+    elif [[ "$(ruby -v)" = *"${RUBY_VERSION}"* ]]; then
+        echo "(!) Ruby is already installed with version ${RUBY_VERSION}. Skipping..."
+        RVM_INSTALL_ARGS=""
     else
         if [ "${RUBY_VERSION}" = "latest" ] || [ "${RUBY_VERSION}" = "current" ] || [ "${RUBY_VERSION}" = "lts" ]; then
             RVM_INSTALL_ARGS="--ruby"
@@ -273,8 +278,11 @@ if [ "${SKIP_RBENV_RBUILD}" != "true" ]; then
             ln -s /usr/local/share/ruby-build /home/${USERNAME}/.rbenv/plugins/ruby-build
         fi
 
-        ln -s /usr/local/rvm/rubies/default/bin/ruby /usr/local/rvm/gems/default/bin 
-        
+        # Oryx expects ruby to be installed in this specific path, else it breaks the oryx magic for ruby projects.
+        if [ ! -f /usr/local/rvm/gems/default/bin/ruby ]; then
+            ln -s /usr/local/rvm/rubies/default/bin/ruby /usr/local/rvm/gems/default/bin
+        fi
+
         chown -R "${USERNAME}:rvm" "/home/${USERNAME}/.rbenv/"
         chmod -R g+r+w "/home/${USERNAME}/.rbenv"
         find "/home/${USERNAME}/.rbenv" -type d | xargs -n 1 chmod g+s

From c58b614202d525b2530d0bbfc45a6a6bbc1a9569 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 16 Aug 2023 11:38:49 -0700
Subject: [PATCH 153/478] Azure-cli: Revert temporary fix which installed az
 with python (#629)

---
 src/azure-cli/devcontainer-feature.json |  4 ++--
 src/azure-cli/install.sh                |  1 -
 test/azure-cli/install_with_python.sh   | 14 ++++++++++++++
 test/azure-cli/scenarios.json           | 10 ++++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 test/azure-cli/install_with_python.sh

diff --git a/src/azure-cli/devcontainer-feature.json b/src/azure-cli/devcontainer-feature.json
index 09c295c21..3d1c0dfa3 100644
--- a/src/azure-cli/devcontainer-feature.json
+++ b/src/azure-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "azure-cli",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "name": "Azure CLI",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/azure-cli",
   "description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -26,7 +26,7 @@
     "installUsingPython": {
       "type": "boolean",
       "description": "Install Azure CLI using Python instead of pipx",
-      "default": true
+      "default": false
     }
   },
   "customizations": {
diff --git a/src/azure-cli/install.sh b/src/azure-cli/install.sh
index 9b0d72db3..51759488d 100755
--- a/src/azure-cli/install.sh
+++ b/src/azure-cli/install.sh
@@ -141,7 +141,6 @@ install_using_pip_strategy() {
         ver="==${AZ_VERSION}"
     fi
 
-    # Temprary quick fix for https://github.com/devcontainers/features/issues/624
     if [ "${INSTALL_USING_PYTHON}" = "true" ]; then
         install_with_complete_python_installation "${ver}" || install_with_pipx "${ver}" || return 1
     else
diff --git a/test/azure-cli/install_with_python.sh b/test/azure-cli/install_with_python.sh
new file mode 100644
index 000000000..4848ac55f
--- /dev/null
+++ b/test/azure-cli/install_with_python.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+check "version" az  --version
+
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/azure-cli/scenarios.json b/test/azure-cli/scenarios.json
index 231345225..b7a732395 100644
--- a/test/azure-cli/scenarios.json
+++ b/test/azure-cli/scenarios.json
@@ -28,5 +28,15 @@
         "installBicep": true
       }
     }
+  },
+  "install_with_python": {
+    "image": "mcr.microsoft.com/devcontainers/base:jammy",
+    "user": "vscode",
+    "features": {
+      "azure-cli": {
+        "version": "latest",
+        "installUsingPython": true
+      }
+    }
   }
 }
\ No newline at end of file

From 9fd5daf06b40794a067c4cdbb8e258d99eeefc24 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 16 Aug 2023 11:43:06 -0700
Subject: [PATCH 154/478] Automated documentation update (#656)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/azure-cli/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/azure-cli/README.md b/src/azure-cli/README.md
index c3e23db8a..2e7b6d39b 100644
--- a/src/azure-cli/README.md
+++ b/src/azure-cli/README.md
@@ -18,7 +18,7 @@ Installs the Azure CLI along with needed dependencies. Useful for base Dockerfil
 | version | Select or enter an Azure CLI version. (Available versions may vary by Linux distribution.) | string | latest |
 | extensions | Optional comma separated list of Azure CLI extensions to install in profile. | string | - |
 | installBicep | Optionally install Azure Bicep | boolean | false |
-| installUsingPython | Install Azure CLI using Python instead of pipx | boolean | true |
+| installUsingPython | Install Azure CLI using Python instead of pipx | boolean | false |
 
 ## Customizations
 

From a4b31f314fa1385950a9dbc81682d9acb2e2fba9 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Fri, 18 Aug 2023 16:01:50 -0700
Subject: [PATCH 155/478] [docker-in-docker] Reverts the retry logic (#659)

* Update install.sh

* [docker-in-docker] Update retry logic

* revert the retry logic!
---
 .../devcontainer-feature.json                 |  2 +-
 src/docker-in-docker/install.sh               | 30 ++++-------------
 test/docker-in-docker/docker_retry.sh         | 32 -------------------
 test/docker-in-docker/scenarios.json          |  6 ----
 .../test-scripts/docker-test-init.sh          | 26 ---------------
 5 files changed, 7 insertions(+), 89 deletions(-)
 delete mode 100644 test/docker-in-docker/docker_retry.sh
 delete mode 100644 test/docker-in-docker/test-scripts/docker-test-init.sh

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index b5e0aeea6..2afdd1142 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index f7e5a7d52..bdef12697 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -423,30 +423,12 @@ dockerd_start="AZURE_DNS_AUTO_DETECTION=${AZURE_DNS_AUTO_DETECTION} DOCKER_DEFAU
 INNEREOF
 )"
 
-retry_count=0
-docker_ok="false"
-
-until [ "${docker_ok}" = "true"  ] || [ "${retry_count}" -eq "5" ];
-do 
-    # Start using sudo if not invoked as root
-    if [ "$(id -u)" -ne 0 ]; then
-        sudo /bin/sh -c "${dockerd_start}"
-    else
-        eval "${dockerd_start}"
-    fi
-
-    set +e
-        docker info > /dev/null 2>&1 && docker_ok="true"
-
-        if [ "${docker_ok}" != "true" ]; then
-            echo "(*) Failed to start docker, retrying in 5s..."
-            retry_count=`expr $retry_count + 1`
-            sleep 5s
-        fi
-    set -e
-done
-
-set +e
+# Start using sudo if not invoked as root
+if [ "$(id -u)" -ne 0 ]; then
+    sudo /bin/sh -c "${dockerd_start}"
+else
+    eval "${dockerd_start}"
+fi
 
 # Execute whatever commands were passed in (if any). This allows us
 # to set this script to ENTRYPOINT while still executing the default CMD.
diff --git a/test/docker-in-docker/docker_retry.sh b/test/docker-in-docker/docker_retry.sh
deleted file mode 100644
index cc35fbb04..000000000
--- a/test/docker-in-docker/docker_retry.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-# Definition specific tests
-check "docker-buildx" docker buildx version
-check "docker-ps" docker ps
-
-sleep 5s
-
-# Stop docker
-pkill dockerd
-pkill containerd
-
-sleep 5s
-
-set +e
-    docker_ok_code="$(docker info > /dev/null 2>&1; echo $?)"
-set -e
-
-check "docker-not-running" bash -c "[[ ${docker_ok_code} == 1 ]]"
-
-#  Testing retry logic
-./test-scripts/docker-test-init.sh
-
-check "docker-started-after-retries" docker ps
-
-# Report result
-reportResults
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index 525ce6930..de4e7d6bc 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -67,11 +67,5 @@
             }
         },
         "remoteUser": "node"
-    },
-    "docker_retry": {
-        "image": "ubuntu:focal",
-        "features": {
-            "docker-in-docker": {}
-        }
     }
 }
diff --git a/test/docker-in-docker/test-scripts/docker-test-init.sh b/test/docker-in-docker/test-scripts/docker-test-init.sh
deleted file mode 100644
index b213fb40c..000000000
--- a/test/docker-in-docker/test-scripts/docker-test-init.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#-------------------------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
-#-------------------------------------------------------------------------------------------------------------
-
-retry_count=0
-docker_ok="false"
-
-until [ "${docker_ok}" = "true"  ] || [ "${retry_count}" -eq "5" ];
-do
-    if [ "${retry_count}" -eq "3" ]; then
-        echo "Starting docker after 3 retries..."
-        /usr/local/share/docker-init.sh
-    fi
-
-    set +e
-        docker info > /dev/null 2>&1 && docker_ok="true"
-
-        if [ "${docker_ok}" != "true" ]; then
-            echo "(*) Failed to start docker, retrying in 5s... Retry count: ${retry_count}"
-            retry_count=`expr $retry_count + 1`
-            sleep 1s
-        fi
-    set -e
-done
\ No newline at end of file

From 71ac2021e1350e673c0602b2ab6526d4353bc293 Mon Sep 17 00:00:00 2001
From: Bulat Khusnimardanov
 <61210700+bulat-khusnimardanov@users.noreply.github.com>
Date: Tue, 22 Aug 2023 02:31:20 +0200
Subject: [PATCH 156/478] Enhancing Terraform Feature Stability (#657)

* Added fallback method to retrieve cosign version

* Update src/terraform/install.sh

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Remove get_cosign_latest_version function

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/terraform/devcontainer-feature.json | 2 +-
 src/terraform/install.sh                | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index b1e6df2c8..119b4335e 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.3.3",
+    "version": "1.3.4",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index 82e3e8d51..1156f6d41 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -165,7 +165,8 @@ ensure_cosign() {
 
     if ! type cosign > /dev/null 2>&1; then
         echo "Installing cosign..."
-        local LATEST_COSIGN_VERSION=$(curl https://api.github.com/repos/sigstore/cosign/releases/latest | grep tag_name | cut -d : -f2 | tr -d "v\", ")
+        LATEST_COSIGN_VERSION="latest"
+        find_version_from_git_tags LATEST_COSIGN_VERSION 'https://github.com/sigstore/cosign'
         curl -L "https://github.com/sigstore/cosign/releases/latest/download/cosign_${LATEST_COSIGN_VERSION}_${architecture}.deb" -o /tmp/cosign_${LATEST_COSIGN_VERSION}_${architecture}.deb
         
         dpkg -i /tmp/cosign_${LATEST_COSIGN_VERSION}_${architecture}.deb

From a08434f2b18627f31107a4ef6ab4f578a92aeaec Mon Sep 17 00:00:00 2001
From: nyuyuyu <127820811+nyuyuyu@users.noreply.github.com>
Date: Fri, 25 Aug 2023 01:38:40 +0900
Subject: [PATCH 157/478] [Rust] Remove `mutantdino.resourcemonitor` extension
 (#665)

* Remove `mutantdino.resourcemonitor` extension

* Bump version

* Revert "Bump version"

This reverts commit e9c514911dd6de6b03e235536e8602f62cbe5b99.

* Bump version
---
 src/rust/devcontainer-feature.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index bc9044c60..70ed39eab 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "rust",
-    "version": "1.0.12",
+    "version": "1.1.0",
     "name": "Rust",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
     "description": "Installs Rust, common Rust utilities, and their required dependencies",
@@ -39,7 +39,6 @@
         "vscode": {
             "extensions": [
                 "vadimcn.vscode-lldb",
-                "mutantdino.resourcemonitor",
                 "rust-lang.rust-analyzer",
                 "tamasfe.even-better-toml",
                 "serayuzgur.crates"

From 0cf690ee14279d9e7ae5e1308950d6067d3aba81 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Thu, 24 Aug 2023 12:31:40 -0700
Subject: [PATCH 158/478] [docker in docker] Adds retries for docker daemon
 startup and cgroup nesting (#669)

* adds retry logic

* adds stress test workflow

* Adds cgroup retries

* update workflow

* move sleep cmd

* update test

* cleanup
---
 .../docker-in-docker-stress-test.yaml         |  37 +++++++
 .../devcontainer-feature.json                 |   2 +-
 src/docker-in-docker/install.sh               | 102 +++++++++++++-----
 .../docker_with_on_create_command.sh          |  18 ++++
 test/docker-in-docker/scenarios.json          |   9 ++
 test/docker-in-docker/test.sh                 |   2 +-
 6 files changed, 139 insertions(+), 31 deletions(-)
 create mode 100644 .github/workflows/docker-in-docker-stress-test.yaml
 create mode 100755 test/docker-in-docker/docker_with_on_create_command.sh

diff --git a/.github/workflows/docker-in-docker-stress-test.yaml b/.github/workflows/docker-in-docker-stress-test.yaml
new file mode 100644
index 000000000..569f94699
--- /dev/null
+++ b/.github/workflows/docker-in-docker-stress-test.yaml
@@ -0,0 +1,37 @@
+name: "Stress test - Docker in Docker"
+on:
+  pull_request:
+    paths:
+      - 'src/docker-in-docker/**'
+  workflow_dispatch:
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        test-pass: [ 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50 ]
+      fail-fast: false
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: "Install latest devcontainer CLI"
+        run: npm install -g @devcontainers/cli
+
+      - name: "Generating tests for 'docker-in-docker' which validates if docker daemon is running"
+        run: devcontainer features test --skip-scenarios -f docker-in-docker -i mcr.microsoft.com/devcontainers/base:ubuntu .
+
+  test-onCreate:
+    strategy:
+      matrix:
+        test-pass: [ 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50 ]
+      fail-fast: false
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: "Install latest devcontainer CLI"
+        run: npm install -g @devcontainers/cli
+
+      - name: "Generating tests for 'docker-in-docker' which validates if docker daemon is available within 'onCreateCommand'"
+        run: devcontainer features test -f docker-in-docker --skip-autogenerated --filter "docker_with_on_create_command"
\ No newline at end of file
diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 2afdd1142..edfaa1f09 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.3.1",
+    "version": "2.4.0",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index bdef12697..a0d4a943c 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -367,7 +367,7 @@ dockerd_start="AZURE_DNS_AUTO_DETECTION=${AZURE_DNS_AUTO_DETECTION} DOCKER_DEFAU
     find /run /var/run -iname 'docker*.pid' -delete || :
     find /run /var/run -iname 'container*.pid' -delete || :
 
-    ## Dind wrapper script from docker team, adapted to a function
+    # -- Start: dind wrapper script --
     # Maintained: https://github.com/moby/moby/blob/master/hack/dind
 
     export container=docker
@@ -384,31 +384,52 @@ dockerd_start="AZURE_DNS_AUTO_DETECTION=${AZURE_DNS_AUTO_DETECTION} DOCKER_DEFAU
         mount -t tmpfs none /tmp
     fi
 
-    # cgroup v2: enable nesting
-    if [ -f /sys/fs/cgroup/cgroup.controllers ]; then
-        # move the processes from the root group to the /init group,
-        # otherwise writing subtree_control fails with EBUSY.
-        # An error during moving non-existent process (i.e., "cat") is ignored.
-        mkdir -p /sys/fs/cgroup/init
-        xargs -rn1 < /sys/fs/cgroup/cgroup.procs > /sys/fs/cgroup/init/cgroup.procs || :
-        # enable controllers
-        sed -e 's/ / +/g' -e 's/^/+/' < /sys/fs/cgroup/cgroup.controllers \
-            > /sys/fs/cgroup/cgroup.subtree_control
-    fi
-    ## Dind wrapper over.
+    set_cgroup_nesting()
+    {
+        # cgroup v2: enable nesting
+        if [ -f /sys/fs/cgroup/cgroup.controllers ]; then
+            # move the processes from the root group to the /init group,
+            # otherwise writing subtree_control fails with EBUSY.
+            # An error during moving non-existent process (i.e., "cat") is ignored.
+            mkdir -p /sys/fs/cgroup/init
+            xargs -rn1 < /sys/fs/cgroup/cgroup.procs > /sys/fs/cgroup/init/cgroup.procs || :
+            # enable controllers
+            sed -e 's/ / +/g' -e 's/^/+/' < /sys/fs/cgroup/cgroup.controllers \
+                > /sys/fs/cgroup/cgroup.subtree_control
+        fi
+    }
+
+    # Set cgroup nesting, retrying if necessary
+    retry_cgroup_nesting=0
+
+    until [ "${retry_cgroup_nesting}" -eq "5" ];
+    do
+        set +e
+            set_cgroup_nesting
+
+            if [ $? -ne 0 ]; then
+                echo "(*) cgroup v2: Failed to enable nesting, retrying..."
+            else
+                break
+            fi
+
+            retry_cgroup_nesting=`expr $retry_cgroup_nesting + 1`
+        set -e
+    done 
+
+    # -- End: dind wrapper script --
 
     # Handle DNS
     set +e
-    cat /etc/resolv.conf | grep -i 'internal.cloudapp.net'
-    if [ $? -eq 0 ] && [ "${AZURE_DNS_AUTO_DETECTION}" = "true" ]
-    then
-        echo "Setting dockerd Azure DNS."
-        CUSTOMDNS="--dns 168.63.129.16"
-    else
-        echo "Not setting dockerd DNS manually."
-        CUSTOMDNS=""
-    fi
-
+        cat /etc/resolv.conf | grep -i 'internal.cloudapp.net' > /dev/null 2>&1
+        if [ $? -eq 0 ] && [ "${AZURE_DNS_AUTO_DETECTION}" = "true" ]
+        then
+            echo "Setting dockerd Azure DNS."
+            CUSTOMDNS="--dns 168.63.129.16"
+        else
+            echo "Not setting dockerd DNS manually."
+            CUSTOMDNS=""
+        fi
     set -e
 
     if [ -z "$DOCKER_DEFAULT_ADDRESS_POOL" ]
@@ -423,12 +444,35 @@ dockerd_start="AZURE_DNS_AUTO_DETECTION=${AZURE_DNS_AUTO_DETECTION} DOCKER_DEFAU
 INNEREOF
 )"
 
-# Start using sudo if not invoked as root
-if [ "$(id -u)" -ne 0 ]; then
-    sudo /bin/sh -c "${dockerd_start}"
-else
-    eval "${dockerd_start}"
-fi
+retry_docker_start_count=0
+docker_ok="false"
+
+until [ "${docker_ok}" = "true"  ] || [ "${retry_docker_start_count}" -eq "5" ];
+do 
+    # Start using sudo if not invoked as root
+    if [ "$(id -u)" -ne 0 ]; then
+        sudo /bin/sh -c "${dockerd_start}"
+    else
+        eval "${dockerd_start}"
+    fi
+
+    retry_count=0
+    until [ "${docker_ok}" = "true"  ] || [ "${retry_count}" -eq "5" ];
+    do
+        sleep 1s
+        set +e
+            docker info > /dev/null 2>&1 && docker_ok="true"
+        set -e
+
+        retry_count=`expr $retry_count + 1`
+    done
+    
+    if [ "${docker_ok}" != "true" ]; then
+        echo "(*) Failed to start docker, retrying..."
+    fi
+    
+    retry_docker_start_count=`expr $retry_docker_start_count + 1`
+done
 
 # Execute whatever commands were passed in (if any). This allows us
 # to set this script to ENTRYPOINT while still executing the default CMD.
diff --git a/test/docker-in-docker/docker_with_on_create_command.sh b/test/docker-in-docker/docker_with_on_create_command.sh
new file mode 100755
index 000000000..131304acb
--- /dev/null
+++ b/test/docker-in-docker/docker_with_on_create_command.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Feature specific tests
+check "version" docker  --version
+check "docker-ps" bash -c "docker ps"
+
+check "docker-init-exists" bash -c "ls /usr/local/share/docker-init.sh"
+check "log-exists" bash -c "ls /tmp/dockerd.log"
+check "log-for-completion" bash -c "cat /tmp/dockerd.log | grep 'Daemon has completed initialization'"
+check "log-contents" bash -c "cat /tmp/dockerd.log | grep 'API listen on /var/run/docker.sock'"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index de4e7d6bc..1274877b9 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -67,5 +67,14 @@
             }
         },
         "remoteUser": "node"
+    },
+    // DO NOT REMOVE: This scenario is used by the docker-in-docker-stress-test workflow
+    "docker_with_on_create_command": {
+        "image": "mcr.microsoft.com/devcontainers/base:debian",
+        "features": {
+            "docker-in-docker": {}
+        },
+        "remoteUser": "vscode",
+        "onCreateCommand": "docker ps && sleep 5s && docker ps"
     }
 }
diff --git a/test/docker-in-docker/test.sh b/test/docker-in-docker/test.sh
index 1eebfd243..e86a841c2 100755
--- a/test/docker-in-docker/test.sh
+++ b/test/docker-in-docker/test.sh
@@ -8,10 +8,10 @@ source dev-container-features-test-lib
 # Feature specific tests
 check "version" docker  --version
 check "docker-init-exists" bash -c "ls /usr/local/share/docker-init.sh"
+check "docker-ps" bash -c "docker ps"
 check "log-exists" bash -c "ls /tmp/dockerd.log"
 check "log-for-completion" bash -c "cat /tmp/dockerd.log | grep 'Daemon has completed initialization'"
 check "log-contents" bash -c "cat /tmp/dockerd.log | grep 'API listen on /var/run/docker.sock'"
-check "docker-ps" bash -c "docker ps"
 
 # Report result
 reportResults
\ No newline at end of file

From 0668db5edea56a0d57575db127b793f59b489e7b Mon Sep 17 00:00:00 2001
From: naturedamends <120284608+naturedamends@users.noreply.github.com>
Date: Sat, 26 Aug 2023 00:39:32 +0100
Subject: [PATCH 159/478] Commonutils: chown: cannot access
 '/home/vscode/.zshrc': No such file or directory (#662)

* Update main.sh

* Update devcontainer-feature.json

* Test install as non root user.

---------

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
---
 src/common-utils/devcontainer-feature.json       |  2 +-
 src/common-utils/main.sh                         |  2 +-
 .../configure_zsh_no_template_first_step.sh      | 12 ++++++++++++
 ... => configure_zsh_no_template_second_step.sh} |  5 ++---
 test/common-utils/scenarios.json                 | 16 +++++++++++++---
 5 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 test/common-utils/configure_zsh_no_template_first_step.sh
 rename test/common-utils/{configure_zsh_no_template.sh => configure_zsh_no_template_second_step.sh} (57%)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 4eaef2128..747be3074 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 3731994de..902f9e694 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -500,7 +500,7 @@ if [ "${INSTALL_ZSH}" = "true" ]; then
             copy_to_user_files=("${oh_my_install_dir}")
             [ -f "$user_rc_file" ] && copy_to_user_files+=("$user_rc_file")
             cp -rf "${copy_to_user_files[@]}" /root
-            chown -R ${USERNAME}:${group_name} "${oh_my_install_dir}" "${user_rc_file}"
+            chown -R ${USERNAME}:${group_name} "${copy_to_user_files[@]}"
         fi
     fi
 fi
diff --git a/test/common-utils/configure_zsh_no_template_first_step.sh b/test/common-utils/configure_zsh_no_template_first_step.sh
new file mode 100644
index 000000000..d26874d3a
--- /dev/null
+++ b/test/common-utils/configure_zsh_no_template_first_step.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "default-zsh-with-no-zshrc" bash -c "[ ! -e ~/.zshrc ]"
+
+# Report result
+reportResults
diff --git a/test/common-utils/configure_zsh_no_template.sh b/test/common-utils/configure_zsh_no_template_second_step.sh
similarity index 57%
rename from test/common-utils/configure_zsh_no_template.sh
rename to test/common-utils/configure_zsh_no_template_second_step.sh
index c62cae967..734fa66e9 100644
--- a/test/common-utils/configure_zsh_no_template.sh
+++ b/test/common-utils/configure_zsh_no_template_second_step.sh
@@ -4,12 +4,11 @@ set -e
 
 # Optional: Import test library
 source dev-container-features-test-lib
-
 # Definition specific tests
 function file_not_overridden() {
-    cat ~/.zshrc | grep 'alias fnomockalias=' | grep testingmock
+    cat $1 | grep 'alias fnomockalias=' | grep testingmock
 }
-check "default-zsh-with-no-zshrc" file_not_overridden
+check "default-zsh-with-no-zshrc" file_not_overridden /home/devcontainer/.zshrc
 
 # Report result
 reportResults
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index 904a47bac..d7b296d41 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -115,10 +115,20 @@
             }
         }
     },
-    "configure_zsh_no_template": {
+    "configure_zsh_no_template_second_step": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
-        "postCreateCommand": "echo alias fnomockalias=testingmock >> /root/.zshrc",
-        "remoteUser": "root",
+        "postCreateCommand": "echo alias fnomockalias=testingmock >> /home/devcontainer/.zshrc",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {
+                "installZsh": true,
+                "installOhMyZshConfig": false
+            }
+        }
+    },
+    "configure_zsh_no_template_first_step": {
+        "image": "debian:bullseye",
+        "remoteUser": "devcontainer",
         "features": {
             "common-utils": {
                 "installZsh": true,

From 95a169b9ef92c9dae454df5e87d4c26d56a863c9 Mon Sep 17 00:00:00 2001
From: eitsupi <50911393+eitsupi@users.noreply.github.com>
Date: Tue, 29 Aug 2023 06:26:30 +0900
Subject: [PATCH 160/478] [node] Install the latest version of nvm by default
 (#673)

feat(node): install the latest nvm by default
---
 src/node/devcontainer-feature.json | 10 ++++---
 src/node/install.sh                | 42 +++++++++++++++++++++++++++++-
 test/node/install_nvm_0.39.sh      | 14 ++++++++++
 test/node/scenarios.json           | 10 ++++++-
 4 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100755 test/node/install_nvm_0.39.sh

diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index 80bd91275..aee55a1f6 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.2.1",
+    "version": "1.3.0",
     "name": "Node.js (via nvm), yarn and pnpm",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
@@ -30,7 +30,11 @@
         },
         "nvmVersion": {
             "type": "string",
-            "default": "0.39.2",
+            "proposals": [
+                "latest",
+                "0.39"
+            ],
+            "default": "latest",
             "description": "Version of NVM to install."
         }
     },
@@ -49,4 +53,4 @@
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
-}
\ No newline at end of file
+}
diff --git a/src/node/install.sh b/src/node/install.sh
index 1ce8fee3f..809109413 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -8,7 +8,7 @@
 # Maintainer: The Dev Container spec maintainers
 
 export NODE_VERSION="${VERSION:-"lts"}"
-export NVM_VERSION="${NVMVERSION:-"0.39.2"}"
+export NVM_VERSION="${NVMVERSION:-"latest"}"
 export NVM_DIR="${NVMINSTALLPATH:-"/usr/local/share/nvm"}"
 INSTALL_TOOLS_FOR_NODE_GYP="${NODEGYPDEPENDENCIES:-true}"
 
@@ -78,6 +78,40 @@ check_packages() {
     fi
 }
 
+# Figure out correct version of a three part version number is not passed
+find_version_from_git_tags() {
+    local variable_name=$1
+    local requested_version=${!variable_name}
+    if [ "${requested_version}" = "none" ]; then return; fi
+    local repository=$2
+    local prefix=${3:-"tags/v"}
+    local separator=${4:-"."}
+    local last_part_optional=${5:-"false"}
+    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
+        local escaped_separator=${separator//./\\.}
+        local last_part
+        if [ "${last_part_optional}" = "true" ]; then
+            last_part="(${escaped_separator}[0-9]+)?"
+        else
+            last_part="${escaped_separator}[0-9]+"
+        fi
+        local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
+        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
+            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+        else
+            set +e
+            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            set -e
+        fi
+    fi
+    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
+        echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
+        exit 1
+    fi
+    echo "${variable_name}=${!variable_name}"
+}
+
 # Ensure apt is in non-interactive to avoid prompts
 export DEBIAN_FRONTEND=noninteractive
 
@@ -92,6 +126,10 @@ fi
 # Install dependencies
 check_packages apt-transport-https curl ca-certificates tar gnupg2 dirmngr
 
+if ! type git > /dev/null 2>&1; then
+    check_packages git
+fi
+
 # Install yarn
 if type yarn > /dev/null 2>&1; then
     echo "Yarn already installed."
@@ -112,6 +150,8 @@ elif [ "${NODE_VERSION}" = "latest" ]; then
     export NODE_VERSION="node"
 fi
 
+find_version_from_git_tags NVM_VERSION "https://github.com/nvm-sh/nvm"
+
 # Install snipppet that we will run as the user
 nvm_install_snippet="$(cat << EOF
 set -e
diff --git a/test/node/install_nvm_0.39.sh b/test/node/install_nvm_0.39.sh
new file mode 100755
index 000000000..6b96381b5
--- /dev/null
+++ b/test/node/install_nvm_0.39.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" bash -c "node --version"
+check "pnpm" pnpm -v
+check "nvm version" bash -c ". /usr/local/share/nvm/nvm.sh && nvm --version | grep 0.39"
+
+# Report result
+reportResults
diff --git a/test/node/scenarios.json b/test/node/scenarios.json
index 5524f5c52..a45620fbe 100644
--- a/test/node/scenarios.json
+++ b/test/node/scenarios.json
@@ -44,5 +44,13 @@
                 "version": "16"
             }
         }
+    },
+    "install_nvm_0.39": {
+        "image": "mcr.microsoft.com/devcontainers/base",
+        "features": {
+            "node": {
+                "nvmVersion": "0.39"
+            }
+        }
     }
-}
\ No newline at end of file
+}

From 96bff0097028001e6e4126c5528d37cb8c13e785 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Mon, 28 Aug 2023 15:15:43 -0700
Subject: [PATCH 161/478] Automated documentation update (#676)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/node/README.md | 2 +-
 src/rust/README.md | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/node/README.md b/src/node/README.md
index 7a4909600..b98391922 100644
--- a/src/node/README.md
+++ b/src/node/README.md
@@ -18,7 +18,7 @@ Installs Node.js, nvm, yarn, pnpm, and needed dependencies.
 | version | Select or enter a Node.js version to install | string | lts |
 | nodeGypDependencies | Install dependencies to compile native node modules (node-gyp)? | boolean | true |
 | nvmInstallPath | The path where NVM will be installed. | string | /usr/local/share/nvm |
-| nvmVersion | Version of NVM to install. | string | 0.39.2 |
+| nvmVersion | Version of NVM to install. | string | latest |
 
 ## Customizations
 
diff --git a/src/rust/README.md b/src/rust/README.md
index f72b56f82..974d78516 100644
--- a/src/rust/README.md
+++ b/src/rust/README.md
@@ -23,7 +23,6 @@ Installs Rust, common Rust utilities, and their required dependencies
 ### VS Code Extensions
 
 - `vadimcn.vscode-lldb`
-- `mutantdino.resourcemonitor`
 - `rust-lang.rust-analyzer`
 - `tamasfe.even-better-toml`
 - `serayuzgur.crates`

From 038bed3d58a84885da8a008b80905da17d57a543 Mon Sep 17 00:00:00 2001
From: eitsupi <50911393+eitsupi@users.noreply.github.com>
Date: Wed, 30 Aug 2023 01:32:46 +0900
Subject: [PATCH 162/478] ci: remove `ubuntu:bionic` from test matrixes (#677)

ci: remove ubuntu:bionic from test matrixes
---
 .github/workflows/test-all.yaml | 3 +--
 .github/workflows/test-pr.yaml  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml
index 8dc206d86..40f5efa75 100644
--- a/.github/workflows/test-all.yaml
+++ b/.github/workflows/test-all.yaml
@@ -42,7 +42,6 @@ jobs:
         ]
         baseImage:
           [
-            "ubuntu:bionic",
             "ubuntu:focal",
             "ubuntu:jammy",
             "debian:11",
@@ -112,4 +111,4 @@ jobs:
         run: npm install -g @devcontainers/cli
 
       - name: "Testing global scenarios"
-        run: devcontainer features test --global-scenarios-only .
\ No newline at end of file
+        run: devcontainer features test --global-scenarios-only .
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index 6b91b612d..d60733574 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -49,7 +49,6 @@ jobs:
         features: ${{ fromJSON(needs.detect-changes.outputs.features) }}
         baseImage:
           [
-            "ubuntu:bionic",
             "ubuntu:focal",
             "ubuntu:jammy",
             "debian:11",
@@ -80,4 +79,4 @@ jobs:
         run: npm install -g @devcontainers/cli
 
       - name: "Testing '${{ matrix.features }}' scenarios"
-        run: devcontainer features test -f ${{ matrix.features }} --skip-autogenerated  .
\ No newline at end of file
+        run: devcontainer features test -f ${{ matrix.features }} --skip-autogenerated  .

From 96c1eea40fc97b471ba0b33fcc79273c7ce586c7 Mon Sep 17 00:00:00 2001
From: Steven <steven.liekens@gmail.com>
Date: Mon, 11 Sep 2023 20:16:24 +0200
Subject: [PATCH 163/478] Use dotnet-install.sh in .NET feature (#628)

* Use dotnet-install.sh in .NET feature

* Use latest.version files

* Cleanup runtime args

* Use latest.version files in tests as well

* Improve tests, remove code duplication

* Add stderr helper

* Validate version inputs

* Use suggested description

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Shorter version description

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Shorter version description

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Clean up apt lists

* Verify 7.0 is latest

* Fix PATH, add test for .NET global tools

* Include a copy of dotnet-install.sh in the Feature

* Configure useful env variables

* Use stringly typed booleans

* Keep imperative writing style in option hints

* Update maintainers

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Move dotnet-install.sh into a vendor directory

* Refactor variables

* Amend

* Amend 2

* Use default options from devcontainer-feature.json

* Add back variables

* Fix shellchek warning in fetch_latest_sdk_version

* Inline install_version function

* Fix ShellCheck warnings

* Improve CSV parsing

* Default to latest when configuring an empty version

* Add support for runtime-only configurations

* Move 'none' check higher up

* Deduplicate helper functions, sort into files

* Address the user more directly in NOTES

* Remove unnecessary defaults

* Replace feature -> Feature

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Add update-dotnet-install-script workflow

* Apply suggestions from code review

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Don't skip ci for automated script update

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 .../update-dotnet-install-script.yml          |   48 +
 src/dotnet/NOTES.md                           |   67 +
 src/dotnet/devcontainer-feature.json          |   41 +-
 src/dotnet/install.sh                         |  506 +----
 src/dotnet/scripts/dotnet-helpers.sh          |  119 ++
 .../scripts/fetch-latest-dotnet-install.sh    |   16 +
 src/dotnet/scripts/string-helpers.sh          |   42 +
 src/dotnet/scripts/vendor/README.md           |   27 +
 src/dotnet/scripts/vendor/dotnet-install.sh   | 1746 +++++++++++++++++
 test/dotnet/dotnet_env.sh                     |    4 +
 test/dotnet/dotnet_helpers.sh                 |   71 +
 test/dotnet/install_additional_dotnet.sh      |   17 -
 .../dotnet/install_aspnetcore_runtime_only.sh |   27 +
 test/dotnet/install_dotnet_3.sh               |   17 -
 test/dotnet/install_dotnet_6_bullseye.sh      |   17 -
 test/dotnet/install_dotnet_6_focal.sh         |   17 -
 test/dotnet/install_dotnet_6_jammy.sh         |   17 -
 test/dotnet/install_dotnet_7_bullseye.sh      |   17 -
 test/dotnet/install_dotnet_7_jammy.sh         |   17 -
 test/dotnet/install_dotnet_exact_version.sh   |   24 +
 test/dotnet/install_dotnet_global_tool.sh     |   25 +
 test/dotnet/install_dotnet_latest.sh          |   17 -
 ...all_dotnet_latest_when_version_is_empty.sh |   30 +
 test/dotnet/install_dotnet_lts.sh             |   27 +-
 .../install_dotnet_multiple_versions.sh       |   30 +
 test/dotnet/install_dotnet_runtime_only.sh    |   27 +
 .../dotnet/install_dotnet_specific_release.sh |   26 +
 ...otnet_specific_release_and_feature_band.sh |   24 +
 test/dotnet/install_wo_apt.sh                 |   17 -
 test/dotnet/projects/.gitignore               |    2 +
 test/dotnet/projects/multitargeting/Class1.cs |    4 +
 .../multitargeting/example_classlib.csproj    |    9 +
 test/dotnet/projects/net5.0/Program.cs        |   32 +
 .../projects/net5.0/example_project.csproj    |   13 +
 test/dotnet/projects/net6.0/Program.cs        |   30 +
 .../projects/net6.0/example_project.csproj    |   14 +
 test/dotnet/projects/net7.0/Program.cs        |   30 +
 .../projects/net7.0/example_project.csproj    |   14 +
 test/dotnet/projects/net8.0/Program.cs        |   32 +
 .../projects/net8.0/example_project.csproj    |   14 +
 test/dotnet/projects/netcoreapp3.1/Program.cs |   39 +
 .../netcoreapp3.1/example_project.csproj      |   14 +
 test/dotnet/scenarios.json                    |   83 +-
 test/dotnet/test.sh                           |   31 +-
 44 files changed, 2771 insertions(+), 670 deletions(-)
 create mode 100644 .github/workflows/update-dotnet-install-script.yml
 create mode 100644 src/dotnet/scripts/dotnet-helpers.sh
 create mode 100755 src/dotnet/scripts/fetch-latest-dotnet-install.sh
 create mode 100644 src/dotnet/scripts/string-helpers.sh
 create mode 100644 src/dotnet/scripts/vendor/README.md
 create mode 100755 src/dotnet/scripts/vendor/dotnet-install.sh
 create mode 100644 test/dotnet/dotnet_env.sh
 create mode 100644 test/dotnet/dotnet_helpers.sh
 delete mode 100644 test/dotnet/install_additional_dotnet.sh
 create mode 100644 test/dotnet/install_aspnetcore_runtime_only.sh
 delete mode 100644 test/dotnet/install_dotnet_3.sh
 delete mode 100644 test/dotnet/install_dotnet_6_bullseye.sh
 delete mode 100644 test/dotnet/install_dotnet_6_focal.sh
 delete mode 100644 test/dotnet/install_dotnet_6_jammy.sh
 delete mode 100644 test/dotnet/install_dotnet_7_bullseye.sh
 delete mode 100644 test/dotnet/install_dotnet_7_jammy.sh
 create mode 100644 test/dotnet/install_dotnet_exact_version.sh
 create mode 100644 test/dotnet/install_dotnet_global_tool.sh
 delete mode 100644 test/dotnet/install_dotnet_latest.sh
 create mode 100644 test/dotnet/install_dotnet_latest_when_version_is_empty.sh
 create mode 100644 test/dotnet/install_dotnet_multiple_versions.sh
 create mode 100644 test/dotnet/install_dotnet_runtime_only.sh
 create mode 100644 test/dotnet/install_dotnet_specific_release.sh
 create mode 100644 test/dotnet/install_dotnet_specific_release_and_feature_band.sh
 delete mode 100644 test/dotnet/install_wo_apt.sh
 create mode 100644 test/dotnet/projects/.gitignore
 create mode 100644 test/dotnet/projects/multitargeting/Class1.cs
 create mode 100644 test/dotnet/projects/multitargeting/example_classlib.csproj
 create mode 100644 test/dotnet/projects/net5.0/Program.cs
 create mode 100644 test/dotnet/projects/net5.0/example_project.csproj
 create mode 100644 test/dotnet/projects/net6.0/Program.cs
 create mode 100644 test/dotnet/projects/net6.0/example_project.csproj
 create mode 100644 test/dotnet/projects/net7.0/Program.cs
 create mode 100644 test/dotnet/projects/net7.0/example_project.csproj
 create mode 100644 test/dotnet/projects/net8.0/Program.cs
 create mode 100644 test/dotnet/projects/net8.0/example_project.csproj
 create mode 100644 test/dotnet/projects/netcoreapp3.1/Program.cs
 create mode 100644 test/dotnet/projects/netcoreapp3.1/example_project.csproj
 mode change 100755 => 100644 test/dotnet/test.sh

diff --git a/.github/workflows/update-dotnet-install-script.yml b/.github/workflows/update-dotnet-install-script.yml
new file mode 100644
index 000000000..56adf854d
--- /dev/null
+++ b/.github/workflows/update-dotnet-install-script.yml
@@ -0,0 +1,48 @@
+name: "Updates vendor 'dotnet-install' script"
+on:
+  workflow_dispatch:
+  schedule:
+  - cron: '0 0 * * 0'  # Runs every Sunday at midnight UTC (adjust as needed)
+
+jobs:
+  fetch-latest-dotnet-install:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Run fetch-latest-dotnet-install.sh
+        run: src/dotnet/scripts/fetch-latest-dotnet-install.sh
+
+      - name: Create a PR for dotnet-install.sh
+        id: push_image_info
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+        run: |
+          set -e
+          echo "Start."
+
+          # Configure git and Push updates
+          git config --global user.email github-actions@github.com
+          git config --global user.name github-actions
+          git config pull.rebase false
+
+          branch=automated-script-update-$GITHUB_RUN_ID
+          git checkout -b $branch
+          message='[Updates] Automated vendor 'dotnet-install' script'
+
+          # Add / update and commit
+          git add src/dotnet/scripts/vendor/dotnet-install.sh
+          git commit -m 'Automated dotnet-install script update' || export NO_UPDATES=true
+
+          # Push
+          if [ "$NO_UPDATES" != "true" ] ; then
+              git push origin "$branch"
+              gh api \
+                --method POST \
+                -H "Accept: application/vnd.github+json" \
+                /repos/${GITHUB_REPOSITORY}/pulls \
+                -f title="$message" \
+              -f body="$message" \
+              -f head="$branch" \
+              -f base="$GITHUB_REF_NAME"
+          fi
diff --git a/src/dotnet/NOTES.md b/src/dotnet/NOTES.md
index 19fe92f31..578aceaf3 100644
--- a/src/dotnet/NOTES.md
+++ b/src/dotnet/NOTES.md
@@ -1,4 +1,71 @@
+## Configuration examples
 
+Installing only the latest .NET SDK version (the default).
+
+``` json
+{
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": "latest" // or "" or {}
+}
+```
+
+Installing an additional SDK version. Multiple versions can be specified as comma-separated values.
+
+``` json
+{
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+        "additionalVersions": "lts"
+    }
+}
+```
+
+Installing specific SDK versions.
+
+``` json
+{
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+        "version": "6.0",
+        "additionalVersions": "7.0, 8.0"
+    }
+}
+```
+
+Installing a specific SDK feature band.
+
+``` json
+{
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+        "version": "6.0.4xx",
+    }
+}
+```
+
+Installing a specific SDK patch version.
+
+``` json
+{
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+        "version": "6.0.412",
+    }
+}
+```
+
+Installing only the .NET Runtime or the ASP.NET Core Runtime. (The SDK includes all runtimes so this configuration is only useful if you need to run .NET apps without building them from source.)
+
+``` json
+{
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+        "version": "none",
+        "dotnetRuntimeVersions": "latest, lts",
+        "aspnetCoreRuntimeVersions": "latest, lts",
+    }
+}
+```
 
 ## OS Support
 
diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index 4f484ccba..f00e0d3ea 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,35 +1,44 @@
 {
     "id": "dotnet",
-    "version": "1.1.4",
+    "version": "2.0.0",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
-    "description": "Installs the .NET CLI. Provides option of installing sdk or runtime, and option of versions to install. Uses latest version of .NET sdk as defaults to install.",
+    "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
     "options": {
         "version": {
             "type": "string",
             "proposals": [
                 "latest",
-                "7",
-                "6",
-                "3.1"
+                "lts",
+                "none",
+                "8.0",
+                "7.0",
+                "6.0"
             ],
             "default": "latest",
-            "description": "Select or enter a dotnet CLI version. (Available versions may vary by Linux distribution.)"
+            "description": "Select or enter a .NET SDK version. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
         },
-        "runtimeOnly": {
-            "type": "boolean",
-            "default": false,
-            "description": "Install just the dotnet runtime if true, and sdk if false."
+        "additionalVersions": {
+            "type": "string",
+            "default": "",
+            "description": "Enter additional .NET SDK versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
+        },
+        "dotnetRuntimeVersions": {
+            "type": "string",
+            "default": "",
+            "description": "Enter additional .NET runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
         },
-        "installUsingApt": {
-            "type": "boolean",
-            "default": true,
-            "description": "If true, it installs using apt instead of the release URL"
+        "aspNetCoreRuntimeVersions": {
+            "type": "string",
+            "default": "",
+            "description": "Enter additional ASP.NET Core runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
         }
     },
     "containerEnv": {
-        "DOTNET_ROOT": "/usr/local/dotnet/current",
-        "PATH": "/usr/local/dotnet/current:${PATH}"
+        "DOTNET_ROOT": "/usr/share/dotnet",
+        "PATH": "$PATH:$DOTNET_ROOT:~/.dotnet/tools",
+        "DOTNET_RUNNING_IN_CONTAINER": "true",
+        "DOTNET_USE_POLLING_FILE_WATCHER": "true"
     },
     "customizations": {
         "vscode": {
diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh
index 178994d71..ff9244d3a 100644
--- a/src/dotnet/install.sh
+++ b/src/dotnet/install.sh
@@ -4,46 +4,20 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 #
-# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/dotnet.md
-# Maintainer: The VS Code and Codespaces Teams
-
+# Docs: https://github.com/devcontainers/features/tree/main/src/dotnet
+# Maintainer: The Dev Container spec maintainers
 DOTNET_VERSION="${VERSION:-"latest"}"
-DOTNET_RUNTIME_ONLY="${RUNTIMEONLY:-"false"}"
-OVERRIDE_DEFAULT_VERSION="${OVERRIDEDEFAULTVERSION:-"true"}"
-INSTALL_USING_APT="${INSTALLUSINGAPT:-"true"}"
-
-DOTNET_LATEST="7"
-DOTNET_LTS="6"
-
-USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
-UPDATE_RC="${UPDATE_RC:-"true"}"
-TARGET_DOTNET_ROOT="${TARGET_DOTNET_ROOT:-"/usr/local/dotnet"}"
-ACCESS_GROUP="${ACCESS_GROUP:-"dotnet"}"
-
-MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
-DOTNET_ARCHIVE_ARCHITECTURES="amd64"
-DOTNET_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal hirsute jammy"
-# Feed URI sourced from the official dotnet-install.sh
-# https://github.com/dotnet/install-scripts/blob/1b98b94a6f6d81cc4845eb88e0195fac67caa0a6/src/dotnet-install.sh#L1342-L1343
-DOTNET_CDN_FEED_URI="https://dotnetcli.azureedge.net"
-# Ubuntu 22.04 and on do not ship with libssl1.1, which is required for versions of .NET < 6.0
-DOTNET_VERSION_CODENAMES_REQUIRE_OLDER_LIBSSL_1="buster bullseye bionic focal hirsute"
+ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS}"
+DOTNET_RUNTIME_VERSIONS="${DOTNETRUNTIMEVERSIONS}"
+ASPNETCORE_RUNTIME_VERSIONS="${ASPNETCORERUNTIMEVERSIONS}"
 
-# Comma-separated list of dotnet versions to be installed
-# alongside DOTNET_VERSION, but not set as default.
-ADDITIONAL_VERSIONS=${ADDITIONALVERSIONS:-""}
-
-APT_PREFERENCES_CONTENT="$(cat << 'EOF'
-Package: *
-Pin: origin "packages.microsoft.com"
-Pin-Priority: 1001
-EOF
-)"
+set -e
 
-APT_PREFERENCES_FILE_ADDED="false"
-APT_PREFERENCES_UPDATED="false"
+# Import trim_whitespace and split_csv
+source "scripts/string-helpers.sh"
 
-set -e
+# Import install_sdk and install_runtime
+source "scripts/dotnet-helpers.sh"
 
 # Clean up
 rm -rf /var/lib/apt/lists/*
@@ -53,72 +27,14 @@ err() {
     echo "(!) $*" >&2
 }
 
-# Ensure the appropriate root user is running the script.
-if [ "$(id -u)" -ne 0 ]; then
-    err 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
-    exit 1
-fi
-
-# Ensure that login shells get the correct path if the user updated the PATH using ENV.
-rm -f /etc/profile.d/00-restore-env.sh
-echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
-chmod +x /etc/profile.d/00-restore-env.sh
-
-# Determine the appropriate non-root user.
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
-            USERNAME="${CURRENT_USER}"
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
-
-###################
-# Helper Functions
-###################
-
-# Cleanup temporary directory and associated files when exiting the script.
-cleanup() {
-    EXIT_CODE=$?
-    set +e
-    if [[ -n "${TMP_DIR}" ]]; then
-        echo "Executing cleanup of tmp files"
-        rm -Rf "${TMP_DIR}"
-    fi
-    exit $EXIT_CODE
-}
-trap cleanup EXIT
-
-# Add dotnet directory to PATH in bashrc/zshrc files if OVERRIDE_DEFAULT_VERSION=true.
-updaterc() {
-    if [ "${UPDATE_RC}" = "true" ]; then
-        echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
-        if [[ "$(cat /etc/bash.bashrc)" != *"$1"* ]]; then
-            echo -e "$1" >> /etc/bash.bashrc
-        fi
-        if [ -f "/etc/zsh/zshrc" ] && [[ "$(cat /etc/zsh/zshrc)" != *"$1"* ]]; then
-            echo -e "$1" >> /etc/zsh/zshrc
-        fi
-    fi
-}
-
-apt_get_update()
-{
+apt_get_update() {
     if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
         echo "Running apt-get update..."
         apt-get update -y
     fi
 }
 
-# Check if packages are installed and installs them if not.
+# Checks if packages are installed and installs them if not
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
         apt_get_update
@@ -126,367 +42,77 @@ check_packages() {
     fi
 }
 
-# Get appropriate architecture name for .NET binaries for the target OS
-get_architecture_name_for_target_os() {
-    local architecture
-    architecture="$(uname -m)"
-    case $architecture in
-        x86_64) architecture="x64";;
-        aarch64 | armv8*) architecture="arm64";;
-        *) err "Architecture ${architecture} unsupported"; exit 1 ;;
-    esac
-
-    echo "${architecture}"
-}
-
-# Soft version matching that resolves a version for a given package in the *current apt-cache*
-# Return value is stored in first argument (the unprocessed version)
-apt_cache_package_and_version_soft_match() {
-    # Version
-    local version_variable_name="$1"
-    local requested_version=${!version_variable_name}
-    # Package Name
-    local package_variable_name="$2"
-    local partial_package_name=${!package_variable_name}
-    local package_name
-    # Exit on no match?
-    local exit_on_no_match="${3:-true}"
-    local major_minor_version
-
-    # Ensure we've exported useful variables
-    . /etc/os-release
-    local architecture="$(dpkg --print-architecture)"
-
-    apt-get update -y
-    major_minor_version="$(echo "${requested_version}" | cut -d "." --field=1,2)"
-    package_name="$(apt-cache search "${partial_package_name}-[0-9].[0-9]$" | awk -F" - " '{print $1}' | grep -m 1 "${partial_package_name}-${major_minor_version}")"
-    dot_escaped="${requested_version//./\\.}"
-    dot_plus_escaped="${dot_escaped//+/\\+}"
-    # Regex needs to handle debian package version number format: https://www.systutorials.com/docs/linux/man/5-deb-version/
-    version_regex="^(.+:)?${dot_plus_escaped}([\\.\\+ ~:-]|$)"
-    set +e # Don't exit if finding version fails - handle gracefully
-        fuzzy_version="$(apt-cache madison ${package_name} | awk -F"|" '{print $2}' | sed -e 's/^[ \t]*//' | grep -E -m 1 "${version_regex}")"
-    set -e
-    if [ -z "${fuzzy_version}" ]; then
-        echo "(!) No full or partial for package \"${partial_package_name}\" (resolved: \"${package_name}\") match found in apt-cache for \"${requested_version}\" on OS ${ID} ${VERSION_CODENAME} (${architecture})."
-
-        if $exit_on_no_match; then
-            echo "Available versions:"
-            apt-cache madison ${package_name} | awk -F"|" '{print $2}' | grep -oP '^(.+:)?\K.+'
-            exit 1 # Fail entire script
-        else
-            echo "Continuing to fallback method if available"
-            return 1;
-        fi
-    fi
-
-    # Globally assign fuzzy_version to this value
-    # Use this value as the return value of this function
-    declare -g ${version_variable_name}="=${fuzzy_version}"
-    echo "${version_variable_name} ${!version_variable_name}"
-
-    # Globally assign package to this value
-    # Use this value as the return value of this function
-    declare -g ${package_variable_name}="${package_name}"
-    echo "${package_variable_name} ${!package_variable_name}"
-}
-
-# Install .NET CLI using apt-get package installer
-install_using_apt() {
-    local sdk_or_runtime="$1"
-    local target_dotnet_version="$2"
-    local use_msft_repo="$3"
-
-    if [ "${use_msft_repo}" = "true" ]; then
-        # Install dependencies
-        check_packages apt-transport-https curl ca-certificates gnupg2 dirmngr
-        # Import key safely and import Microsoft apt repo
-        curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
-        echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
-
-        [ ! -f /etc/apt/preferences ] && APT_PREFERENCES_FILE_ADDED="true"
-        APT_PREFERENCES_UPDATED="true"
-
-        # See https://github.com/dotnet/core/issues/7699
-        echo "${APT_PREFERENCES_CONTENT}" >> /etc/apt/preferences
-        apt-get update -y
-    fi
-
-    # .NET 7 is not a LTS version, so handle latest and LTS versions differently
-    export APT_DOTNET_VERSION="$target_dotnet_version"
-    if [ "${APT_DOTNET_VERSION}" = "latest" ]; then 
-        APT_DOTNET_VERSION="${DOTNET_LATEST}.0"
-    elif [ "${APT_DOTNET_VERSION}" = "lts" ]; then
-        APT_DOTNET_VERSION="${DOTNET_LTS}.0"
-    fi
-
-    # Sets target_dotnet_version and dotnet_package if matches found.
-    local base_dotnet_package="dotnet-${sdk_or_runtime}"
-    export DOTNET_PACKAGE="${base_dotnet_package}"
-    apt_cache_package_and_version_soft_match APT_DOTNET_VERSION DOTNET_PACKAGE false
-    if [ "$?" != 0 ] || [ ${DOTNET_PACKAGE} == "${base_dotnet_package}" ]; then
-        echo "Failed to find requested version."
-        return 1
-    fi
-
-    if type dotnet > /dev/null 2>&1 && [[ "$(dotnet --version)" == *"${APT_DOTNET_VERSION}"* ]] ; then
-        echo "dotnet version ${APT_DOTNET_VERSION} is already installed"
-        return 1
-    fi
-
-    echo "Installing '${DOTNET_PACKAGE}${APT_DOTNET_VERSION}'..."
-    apt-get install -yq ${DOTNET_PACKAGE}${APT_DOTNET_VERSION}
-    if [ "$?" != 0 ]; then
-        echo "Failed to complete apt install of ${DOTNET_PACKAGE}${TARGET_DOTNET_VERSION}"
-        return 1
-    fi
-
-    # Add symlink for current
-    CURRENT_DIR="${TARGET_DOTNET_ROOT}/current"
-    if [[ -d "${CURRENT_DIR}" ]]; then
-        rm -rf "${CURRENT_DIR}"
-    fi
-    mkdir -p "${TARGET_DOTNET_ROOT}"
-    local dotnet_installed_version="$(dotnet --version)"
-    # See if its the distro version
-    if [[ "$(dotnet --info)" == *"Base Path:   /usr/lib/dotnet/${DOTNET_SDK_OR_RUNTIME}/${dotnet_installed_version}"* ]]; then
-        ln -s "/usr/lib/dotnet" "${CURRENT_DIR}"
-    else
-        # Location used by MS repo versions
-        ln -s "/usr/share/dotnet" "${CURRENT_DIR}" 
-    fi
-}
-
-# Find and extract .NET binary download details based on user-requested version
-# args:
-# sdk_or_runtime $1
-# dotnet_version_to_download $2
-# exports:
-# DOTNET_DOWNLOAD_URL
-# DOTNET_DOWNLOAD_HASH
-# DOTNET_DOWNLOAD_NAME
-get_full_version_details() {
-    local sdk_or_runtime="$1"
-    local architecture
-    local dotnet_channel_version
-    local dotnet_releases_url
-    local dotnet_releases_json
-    local dotnet_latest_version
-    local dotnet_download_details
-
-    export DOTNET_DOWNLOAD_VERSION="$2"
-    export DOTNET_DOWNLOAD_URL
-    export DOTNET_DOWNLOAD_HASH
-    export DOTNET_DOWNLOAD_NAME
-
-    # Set architecture variable to current user's architecture (x64 or ARM64).
-    architecture="$(get_architecture_name_for_target_os)"
-
-    # Set VERSION to empty string to ensure jq includes all .NET versions in reverse sort below 
-    if [ "${DOTNET_DOWNLOAD_VERSION}" = "latest" ]; then
-        DOTNET_DOWNLOAD_VERSION=""
-    fi
-
-    dotnet_patchless_version="$(echo "${DOTNET_DOWNLOAD_VERSION}" | cut -d "." --field=1,2)"
-
-    set +e
-    dotnet_channel_version="$(curl -s "${DOTNET_CDN_FEED_URI}/dotnet/release-metadata/releases-index.json" | jq -r --arg channel_version "${dotnet_patchless_version}" '[."releases-index"[]] | sort_by(."channel-version") | reverse | map( select(."channel-version" | startswith($channel_version))) | first | ."channel-version"')"
-    set -e
+if [ "$(id -u)" -ne 0 ]; then
+    err 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
+    exit 1
+fi
 
-    # Construct the releases URL using the official channel-version if one was found.  Otherwise make a best-effort using the user input.
-    if [ -n "${dotnet_channel_version}" ] && [ "${dotnet_channel_version}" != "null" ]; then
-        dotnet_releases_url="${DOTNET_CDN_FEED_URI}/dotnet/release-metadata/${dotnet_channel_version}/releases.json"
-    else
-        dotnet_releases_url="${DOTNET_CDN_FEED_URI}/dotnet/release-metadata/${dotnet_patchless_version}/releases.json"
-    fi
+# For our own convenience, combine DOTNET_VERSION and ADDITIONAL_VERSIONS into a single 'versions' array
+versions=()
 
-    set +e
-    dotnet_releases_json="$(curl -s "${dotnet_releases_url}")"
-    set -e
-    
-    if [ -n "${dotnet_releases_json}" ] && [[ ! "${dotnet_releases_json}" = *"Error"* ]]; then
-        dotnet_latest_version="$(echo "${dotnet_releases_json}" | jq -r --arg sdk_or_runtime "${sdk_or_runtime}" '."latest-\($sdk_or_runtime)"')"
-        # If user-specified version has 2 or more dots, use it as is.  Otherwise use latest version.
-        if [ "$(echo "${DOTNET_DOWNLOAD_VERSION}" | grep -o "\." | wc -l)" -lt "2" ]; then
-            DOTNET_DOWNLOAD_VERSION="${dotnet_latest_version}"
-        fi
+# The version can be set to 'none' for runtime-only installations, then the array will just remain empty
+# Ensure there are no leading or trailing spaces that can break regex pattern matching
+if [ "$DOTNET_VERSION" != "none" ]; then
+    versions+=("$(trim_whitespace "$DOTNET_VERSION")")
+    for additional_version in $(split_csv "$ADDITIONAL_VERSIONS"); do
+        versions+=("$additional_version")
+    done
+fi
 
-        dotnet_download_details="$(echo "${dotnet_releases_json}" |  jq -r --arg sdk_or_runtime "${sdk_or_runtime}" --arg dotnet_version "${DOTNET_DOWNLOAD_VERSION}" --arg arch "${architecture}" '.releases[]."\($sdk_or_runtime)" | select(.version==$dotnet_version) | .files[] | select(.name=="dotnet-\($sdk_or_runtime)-linux-\($arch).tar.gz")')"
-        if [ -n "${dotnet_download_details}" ]; then
-            echo "Found .NET binary version ${DOTNET_DOWNLOAD_VERSION}"
-            DOTNET_DOWNLOAD_URL="$(echo "${dotnet_download_details}" | jq -r '.url')"
-            DOTNET_DOWNLOAD_HASH="$(echo "${dotnet_download_details}" | jq -r '.hash')"
-            DOTNET_DOWNLOAD_NAME="$(echo "${dotnet_download_details}" | jq -r '.name')"
-        else
-            err "Unable to find .NET binary for version ${DOTNET_DOWNLOAD_VERSION}"
-            exit 1
-        fi
-    else
-        err "Unable to find .NET release details for version ${DOTNET_DOWNLOAD_VERSION} at ${dotnet_releases_url}"
+dotnetRuntimeVersions=()
+for dotnetRuntimeVersion in $(split_csv "$DOTNET_RUNTIME_VERSIONS"); do
+    dotnetRuntimeVersions+=("$dotnetRuntimeVersion")
+done
+
+aspNetCoreRuntimeVersions=()
+for aspNetCoreRuntimeVersion in $(split_csv "$ASPNETCORE_RUNTIME_VERSIONS"); do
+    aspNetCoreRuntimeVersions+=("$aspNetCoreRuntimeVersion")
+done
+
+# Fail fast in case of bad input to avoid unneccesary work
+# v1 of the .NET feature allowed specifying only a major version 'X' like '3'
+# v2 removed this ability
+# - because install-dotnet.sh does not support it directly
+# - because the previous behavior installed an old version like '3.0.103', not the newest version '3.1.426', which was counterintuitive
+for version in "${versions[@]}"; do
+    if [[ "$version" =~ ^[0-9]+$ ]]; then
+        err "Unsupported .NET SDK version '${version}'. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
         exit 1
     fi
-}
-
-# Install .NET CLI using the .NET releases url
-install_using_dotnet_releases_url() {
-    local sdk_or_runtime="$1"
-    local version="$2"
-
-    # Check listed package dependencies and install them if they are not already installed. 
-    # NOTE: icu-devtools is a small package with similar dependencies to .NET. 
-    #       It will install the appropriate dependencies based on the OS:
-    #         - libgcc-s1 OR libgcc1 depending on OS
-    #         - the latest libicuXX depending on OS (eg libicu57 for stretch)
-    #         - also installs libc6 and libstdc++6 which are required by .NET 
-    check_packages curl ca-certificates tar jq icu-devtools libgssapi-krb5-2 zlib1g
-
-    # Starting with Ubuntu 22.04 (jammy), libssl1.1 does not ship with the OS anymore.
-    if [[  "${DOTNET_VERSION_CODENAMES_REQUIRE_OLDER_LIBSSL_1}" = *"${VERSION_CODENAME}"* ]]; then
-        check_packages libssl1.1
-    else
-        check_packages libssl3
-    fi
+done
 
-    get_full_version_details "${sdk_or_runtime}" "${version}"
-
-    DOTNET_INSTALL_PATH="${TARGET_DOTNET_ROOT}/${DOTNET_DOWNLOAD_VERSION}"
-    if [ -d "${DOTNET_INSTALL_PATH}" ]; then
-        echo "(!) Dotnet version ${DOTNET_DOWNLOAD_VERSION} already exists."
+for version in "${dotnetRuntimeVersions[@]}"; do
+    if [[ "$version" =~ ^[0-9]+$ ]]; then
+        err "Unsupported .NET Runtime version '${version}'. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
         exit 1
     fi
-    # exports DOTNET_DOWNLOAD_URL, DOTNET_DOWNLOAD_HASH, DOTNET_DOWNLOAD_NAME
-    echo "DOWNLOAD LINK: ${DOTNET_DOWNLOAD_URL}"
-
-    # Setup the access group and add the user to it.
-    umask 0002
-    if ! cat /etc/group | grep -e "^${ACCESS_GROUP}:" > /dev/null 2>&1; then
-        groupadd -r "${ACCESS_GROUP}"
-    fi
-    usermod -a -G "${ACCESS_GROUP}" "${USERNAME}"
-
-    # Download the .NET binaries.
-    echo "DOWNLOADING BINARY..."
-    TMP_DIR="/tmp/dotnetinstall"
-    mkdir -p "${TMP_DIR}"
-    curl -sSL "${DOTNET_DOWNLOAD_URL}" -o "${TMP_DIR}/${DOTNET_DOWNLOAD_NAME}"
-
-    # Get checksum from .NET CLI blob storage using the runtime version and
-    # run validation (sha512sum) of checksum against the expected checksum hash.
-    echo "VERIFY CHECKSUM"
-    cd "${TMP_DIR}"
-    echo "${DOTNET_DOWNLOAD_HASH} *${DOTNET_DOWNLOAD_NAME}" | sha512sum -c -
-
-    # Extract binaries and add to path.
-    mkdir -p "${DOTNET_INSTALL_PATH}"
-    echo "Extract Binary to ${DOTNET_INSTALL_PATH}"
-    tar -xzf "${TMP_DIR}/${DOTNET_DOWNLOAD_NAME}" -C "${DOTNET_INSTALL_PATH}" --strip-components=1
+done
 
-    CURRENT_DIR="${TARGET_DOTNET_ROOT}/current"
-    if [[ ! -d "${CURRENT_DIR}" ]]; then
-        ln -s "${DOTNET_INSTALL_PATH}" "${CURRENT_DIR}" 
-    fi
-
-    # Give write permissions to the user.
-    chown -R "${USERNAME}:${USERNAME}" "${CURRENT_DIR}"
-    chmod g+r+w+s "${CURRENT_DIR}"
-    chmod -R g+r+w "${CURRENT_DIR}"
-
-    if [[ "${OVERRIDE_DEFAULT_VERSION}" = "true" ]]; then
-        if [[ $(ls -l ${CURRENT_DIR}) != *"-> ${DOTNET_INSTALL_PATH}"* ]] ; then
-            rm "${CURRENT_DIR}"
-            ln -s "${DOTNET_INSTALL_PATH}" "${CURRENT_DIR}"
-        fi
-    fi
-    
-    updaterc "if [[ \"\${PATH}\" != *\"${CURRENT_DIR}\"* ]]; then export PATH=${CURRENT_DIR}:\${PATH}; fi"
-}
-
-###########################
-# Start .NET installation
-###########################
-
-export DEBIAN_FRONTEND=noninteractive
-
-. /etc/os-release
-architecture="$(dpkg --print-architecture)"
-
-# Dotnet 3.1 and 5 are not supported on Ubuntu 22.04 (jammy)+,
-# due to lack of libssl3.0 support.
-# See: https://github.com/microsoft/vscode-dev-containers/issues/1458#issuecomment-1135077775
-# NOTE: This will only guard against installation of the dotnet versions we propose via 'features'. 
-#       The user can attempt to install any other version at their own risk.
-if [[ "${DOTNET_VERSION}" = "3"* ]] || [[ "${DOTNET_VERSION}" = "5"* ]]; then
-    if [[ ! "${DOTNET_VERSION_CODENAMES_REQUIRE_OLDER_LIBSSL_1}" = *"${VERSION_CODENAME}"* ]]; then
-        err "Dotnet ${DOTNET_VERSION} is not supported on Ubuntu ${VERSION_CODENAME} due to a change in the 'libssl' dependency across distributions.\n Please upgrade your version of dotnet, or downgrade your OS version."
+for version in "${aspNetCoreRuntimeVersions[@]}"; do
+    if [[ "$version" =~ ^[0-9]+$ ]]; then
+        err "Unsupported ASP.NET Core Runtime version '${version}'. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
         exit 1
     fi
-fi
+done
 
-# Determine if the user wants to download .NET Runtime only, or .NET SDK & Runtime
-# and set the appropriate variables.
-if [ "${DOTNET_RUNTIME_ONLY}" = "true" ]; then
-    DOTNET_SDK_OR_RUNTIME="runtime"
-elif [ "${DOTNET_RUNTIME_ONLY}" = "false" ]; then
-    DOTNET_SDK_OR_RUNTIME="sdk"
-else
-    err "Expected true for installing dotnet Runtime only or false for installing SDK and Runtime. Received ${DOTNET_RUNTIME_ONLY}."
-    exit 1
-fi
+# Install .NET versions and dependencies
+# icu-devtools includes dependencies for .NET
+check_packages wget ca-certificates icu-devtools
 
-# Install the .NET CLI
-echo "(*) Installing .NET CLI..."
+for version in "${versions[@]}"; do
+    install_sdk "$version"
+done
 
-CHANGE_OWNERSHIP="false"
-if [[ "${DOTNET_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[  "${DOTNET_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]] && [[ "${INSTALL_USING_APT}" = "true" ]]; then
-    echo "Detected ${VERSION_CODENAME} on ${architecture}. Attempting to install dotnet from apt"
+for version in "${dotnetRuntimeVersions[@]}"; do
+    install_runtime "dotnet" "$version"
+done
 
-    install_using_apt "${DOTNET_SDK_OR_RUNTIME}" "${DOTNET_VERSION}" false || install_using_apt "${DOTNET_SDK_OR_RUNTIME}" "${DOTNET_VERSION}" true
-    if [ "$?" != 0 ]; then
-        echo "Could not install requested version from apt on current distribution."
-        exit 1
-    fi
-else
-    if [[ "${INSTALL_USING_APT}" = "false" ]]; then
-        echo "Installing dotnet from releases url"
-    else
-        echo "Attempting to install dotnet from releases url"
-    fi
-    install_using_dotnet_releases_url "${DOTNET_SDK_OR_RUNTIME}" "${DOTNET_VERSION}"
-    CHANGE_OWNERSHIP="true"
-fi
-
-# Additional dotnet versions to be installed but not be set as default.
-if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
-    OLDIFS=$IFS
-    IFS=","
-        read -a additional_versions <<< "$ADDITIONAL_VERSIONS"
-        for version in "${additional_versions[@]}"; do
-            OVERRIDE_DEFAULT_VERSION="false"
-            install_using_dotnet_releases_url "${DOTNET_SDK_OR_RUNTIME}" "${version}"
-        done
-    IFS=$OLDIFS
-fi
-
-if [ "${CHANGE_OWNERSHIP}" = "true" ]; then
-    if ! cat /etc/group | grep -e "^dotnet:" > /dev/null 2>&1; then
-        groupadd -r dotnet
-    fi
-    usermod -a -G dotnet "${USERNAME}"
-
-    chown -R "${USERNAME}:dotnet" "${TARGET_DOTNET_ROOT}"
-    chmod -R g+r+w "${TARGET_DOTNET_ROOT}"
-    find "${TARGET_DOTNET_ROOT}" -type d -print0 | xargs -n 1 -0 chmod g+s
-fi
+for version in "${aspNetCoreRuntimeVersions[@]}"; do
+    install_runtime "aspnetcore" "$version"
+done
 
 # Clean up
-if [ "${APT_PREFERENCES_UPDATED}" = "true" ]; then
-    if [ "${APT_PREFERENCES_FILE_ADDED}" = "true" ]; then
-        rm -f /etc/apt/preferences
-    else
-        head -n -3 /etc/apt/preferences > /tmp/preferences-temp && mv /tmp/preferences-temp /etc/apt/preferences
-    fi
-fi
-
 rm -rf /var/lib/apt/lists/*
+rm -rf scripts
 
 echo "Done!"
diff --git a/src/dotnet/scripts/dotnet-helpers.sh b/src/dotnet/scripts/dotnet-helpers.sh
new file mode 100644
index 000000000..bda0c9c3a
--- /dev/null
+++ b/src/dotnet/scripts/dotnet-helpers.sh
@@ -0,0 +1,119 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+#
+# Docs: https://github.com/devcontainers/features/tree/main/src/dotnet
+# Maintainer: The Dev Container spec maintainers
+DOTNET_SCRIPTS=$(dirname "${BASH_SOURCE[0]}")
+DOTNET_INSTALL_SCRIPT="$DOTNET_SCRIPTS/vendor/dotnet-install.sh"
+DOTNET_INSTALL_DIR='/usr/share/dotnet'
+
+# Prints the latest dotnet version in the specified channel
+# Usage: fetch_latest_version_in_channel <channel> [<runtime>]
+# Example: fetch_latest_version_in_channel "LTS"
+# Example: fetch_latest_version_in_channel "6.0" "dotnet"
+# Example: fetch_latest_version_in_channel "6.0" "aspnetcore"
+fetch_latest_version_in_channel() {
+    local channel="$1"
+    local runtime="$2"
+    if [ "$runtime" = "dotnet" ]; then
+        wget -qO- "https://dotnetcli.azureedge.net/dotnet/Runtime/$channel/latest.version"
+    elif [ "$runtime" = "aspnetcore" ]; then
+        wget -qO- "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$channel/latest.version"
+    else
+        wget -qO- "https://dotnetcli.azureedge.net/dotnet/Sdk/$channel/latest.version"
+    fi
+    
+}
+
+# Prints the latest dotnet version
+# Usage: fetch_latest_version [<runtime>]
+# Example: fetch_latest_version
+# Example: fetch_latest_version "dotnet"
+# Example: fetch_latest_version "aspnetcore"
+fetch_latest_version() {
+    local runtime="$1"
+    local sts_version
+    local lts_version
+    sts_version=$(fetch_latest_version_in_channel "STS" "$runtime")
+    lts_version=$(fetch_latest_version_in_channel "LTS" "$runtime")
+    if [[ "$sts_version" > "$lts_version" ]]; then
+        echo "$sts_version"
+    else
+        echo "$lts_version"
+    fi
+}
+
+# Installs a version of the .NET SDK
+# Usage: install_sdk <version>
+install_sdk() {
+    local inputVersion="$1"
+    local version=""
+    local channel=""
+    if [[ "$inputVersion" == "latest" ]]; then
+        # Fetch the latest version manually, because dotnet-install.sh does not support it directly
+        version=$(fetch_latest_version)
+    elif [[ "$inputVersion" == "lts" ]]; then
+        # When user input is 'lts'
+        # Then version=latest, channel=LTS
+        version="latest"
+        channel="LTS"
+    elif [[ "$inputVersion" =~ ^[0-9]+\.[0-9]+$ ]]; then
+        # When user input is form 'A.B' like '3.1'
+        # Then version=latest, channel=3.1
+        version="latest"
+        channel="$inputVersion"
+    elif [[ "$inputVersion" =~ ^[0-9]+\.[0-9]+\.[0-9]xx$ ]]; then
+        # When user input is form 'A.B.Cxx' like '6.0.4xx'
+        # Then version=latest, channel=6.0.4xx
+        version="latest"
+        channel="$inputVersion"
+    else
+        # Assume version is an exact version string like '6.0.413' or '8.0.100-rc.2.23425.18'
+        version="$inputVersion"
+    fi
+    
+    # Currently this script does not make it possible to qualify the version, 'GA' is always implied
+    echo "Executing $DOTNET_INSTALL_SCRIPT --version $version --channel $channel --install-dir $DOTNET_INSTALL_DIR --no-path"
+    "$DOTNET_INSTALL_SCRIPT" \
+        --version "$version" \
+        --channel "$channel" \
+        --install-dir "$DOTNET_INSTALL_DIR" \
+        --no-path
+}
+
+# Installs a version of the .NET Runtime
+# Usage: install_runtime <runtime> <version>
+install_runtime() {
+    local runtime="$1"
+    local inputVersion="$2"
+    local version=""
+    local channel=""
+    if [[ "$inputVersion" == "latest" ]]; then
+        # Fetch the latest version manually, because dotnet-install.sh does not support it directly
+        version=$(fetch_latest_version "$runtime")
+    elif [[ "$inputVersion" == "lts" ]]; then
+        # When user input is 'lts'
+        # Then version=latest, channel=LTS
+        version="latest"
+        channel="LTS"
+    elif [[ "$inputVersion" =~ ^[0-9]+\.[0-9]+$ ]]; then
+        # When user input is form 'A.B' like '3.1'
+        # Then version=latest, channel=3.1
+        version="latest"
+        channel="$inputVersion"
+    else
+        # Assume version is an exact version string like '6.0.21' or '8.0.0-preview.7.23375.6'
+        version="$inputVersion"
+    fi
+    
+    echo "Executing $DOTNET_INSTALL_SCRIPT --runtime $runtime --version $version --channel $channel --install-dir $DOTNET_INSTALL_DIR --no-path"
+    "$DOTNET_INSTALL_SCRIPT" \
+        --runtime "$runtime" \
+        --version "$version" \
+        --channel "$channel" \
+        --install-dir "$DOTNET_INSTALL_DIR" \
+        --no-path
+}
diff --git a/src/dotnet/scripts/fetch-latest-dotnet-install.sh b/src/dotnet/scripts/fetch-latest-dotnet-install.sh
new file mode 100755
index 000000000..361d539c4
--- /dev/null
+++ b/src/dotnet/scripts/fetch-latest-dotnet-install.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+#
+# Docs: https://github.com/devcontainers/features/tree/main/src/dotnet
+# Maintainer: The Dev Container spec maintainers
+#
+# Run this script to replace dotnet-install.sh with the latest and greatest available version
+# 
+DOTNET_SCRIPTS=$(dirname "${BASH_SOURCE[0]}")
+DOTNET_INSTALL_SCRIPT="$DOTNET_SCRIPTS/vendor/dotnet-install.sh"
+
+wget https://dot.net/v1/dotnet-install.sh -O "$DOTNET_INSTALL_SCRIPT"
+chmod +x "$DOTNET_INSTALL_SCRIPT"
diff --git a/src/dotnet/scripts/string-helpers.sh b/src/dotnet/scripts/string-helpers.sh
new file mode 100644
index 000000000..35b4017c8
--- /dev/null
+++ b/src/dotnet/scripts/string-helpers.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+#
+# Docs: https://github.com/devcontainers/features/tree/main/src/dotnet
+# Maintainer: The Dev Container spec maintainers
+
+# Removes leading and trailing whitespace from an input string
+# Usage: trim_whitespace <text>
+trim_whitespace() {
+    text="$1"
+
+    # Remove leading spaces
+    while [ "${text:0:1}" == " " ]; do
+        text="${text:1}"
+    done
+
+    # Remove trailing spaces
+    while [ "${text: -1}" == " " ]; do
+        text="${text:0:-1}"
+    done
+
+    echo "$text"
+}
+
+# Splits comma-separated values into an array while ignoring empty entries
+# Usage: split_csv <comma-separated-values>
+split_csv() {
+    local -a values=()
+    while IFS="," read -ra entries; do
+        for entry in "${entries[@]}"; do
+            entry="$(trim_whitespace "$entry")"
+            if [ -n "$entry" ]; then
+                values+=("$entry")
+            fi
+        done
+    done <<< "$1"
+
+    echo "${values[@]}"
+}
\ No newline at end of file
diff --git a/src/dotnet/scripts/vendor/README.md b/src/dotnet/scripts/vendor/README.md
new file mode 100644
index 000000000..181b53781
--- /dev/null
+++ b/src/dotnet/scripts/vendor/README.md
@@ -0,0 +1,27 @@
+### **IMPORTANT NOTE**
+
+Scripts in this directory are sourced externally and not maintained by the Dev Container spec maintainers. Do not make changes directly as they might be overwritten at any moment.
+
+## dotnet-install.sh
+
+`dotnet-install.sh` is a copy of <https://dot.net/v1/dotnet-install.sh>. ([Script reference](https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script))
+
+Quick options reminder for `dotnet-install.sh`:
+
+- `--version`: `"latest"` (default) or an exact version in the form A.B.C like `"6.0.413"`
+- `--channel`: `"LTS"` (default), `"STS"`, a two-part version in the form A.B like `"6.0"` or three-part form A.B.Cxx like `"6.0.1xx"`
+- `--quality`: `"daily"`, `"preview"` or `"GA"`
+- The channel option is only used when version is 'latest' because an exact version overrides the channel option
+- The quality option is only used when channel is 'A.B' or 'A.B.Cxx' because it can't be used with STS or LTS
+
+Examples
+
+```
+dotnet-install.sh [--version latest] [--channel LTS]
+dotnet-install.sh [--version latest] --channel STS
+dotnet-install.sh [--version latest] --channel 6.0 [--quality GA]
+dotnet-install.sh [--version latest] --channel 6.0.4xx [--quality GA]
+dotnet-install.sh [--version latest] --channel 8.0 --quality preview
+dotnet-install.sh [--version latest] --channel 8.0 --quality daily
+dotnet-install.sh --version 6.0.413
+```
\ No newline at end of file
diff --git a/src/dotnet/scripts/vendor/dotnet-install.sh b/src/dotnet/scripts/vendor/dotnet-install.sh
new file mode 100755
index 000000000..a830583cd
--- /dev/null
+++ b/src/dotnet/scripts/vendor/dotnet-install.sh
@@ -0,0 +1,1746 @@
+#!/usr/bin/env bash
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
+
+# Stop script on NZEC
+set -e
+# Stop script if unbound variable found (use ${var:-} if intentional)
+set -u
+# By default cmd1 | cmd2 returns exit code of cmd2 regardless of cmd1 success
+# This is causing it to fail
+set -o pipefail
+
+# Use in the the functions: eval $invocation
+invocation='say_verbose "Calling: ${yellow:-}${FUNCNAME[0]} ${green:-}$*${normal:-}"'
+
+# standard output may be used as a return value in the functions
+# we need a way to write text on the screen in the functions so that
+# it won't interfere with the return value.
+# Exposing stream 3 as a pipe to standard output of the script itself
+exec 3>&1
+
+# Setup some colors to use. These need to work in fairly limited shells, like the Ubuntu Docker container where there are only 8 colors.
+# See if stdout is a terminal
+if [ -t 1 ] && command -v tput > /dev/null; then
+    # see if it supports colors
+    ncolors=$(tput colors || echo 0)
+    if [ -n "$ncolors" ] && [ $ncolors -ge 8 ]; then
+        bold="$(tput bold       || echo)"
+        normal="$(tput sgr0     || echo)"
+        black="$(tput setaf 0   || echo)"
+        red="$(tput setaf 1     || echo)"
+        green="$(tput setaf 2   || echo)"
+        yellow="$(tput setaf 3  || echo)"
+        blue="$(tput setaf 4    || echo)"
+        magenta="$(tput setaf 5 || echo)"
+        cyan="$(tput setaf 6    || echo)"
+        white="$(tput setaf 7   || echo)"
+    fi
+fi
+
+say_warning() {
+    printf "%b\n" "${yellow:-}dotnet_install: Warning: $1${normal:-}" >&3
+}
+
+say_err() {
+    printf "%b\n" "${red:-}dotnet_install: Error: $1${normal:-}" >&2
+}
+
+say() {
+    # using stream 3 (defined in the beginning) to not interfere with stdout of functions
+    # which may be used as return value
+    printf "%b\n" "${cyan:-}dotnet-install:${normal:-} $1" >&3
+}
+
+say_verbose() {
+    if [ "$verbose" = true ]; then
+        say "$1"
+    fi
+}
+
+# This platform list is finite - if the SDK/Runtime has supported Linux distribution-specific assets,
+#   then and only then should the Linux distribution appear in this list.
+# Adding a Linux distribution to this list does not imply distribution-specific support.
+get_legacy_os_name_from_platform() {
+    eval $invocation
+
+    platform="$1"
+    case "$platform" in
+        "centos.7")
+            echo "centos"
+            return 0
+            ;;
+        "debian.8")
+            echo "debian"
+            return 0
+            ;;
+        "debian.9")
+            echo "debian.9"
+            return 0
+            ;;
+        "fedora.23")
+            echo "fedora.23"
+            return 0
+            ;;
+        "fedora.24")
+            echo "fedora.24"
+            return 0
+            ;;
+        "fedora.27")
+            echo "fedora.27"
+            return 0
+            ;;
+        "fedora.28")
+            echo "fedora.28"
+            return 0
+            ;;
+        "opensuse.13.2")
+            echo "opensuse.13.2"
+            return 0
+            ;;
+        "opensuse.42.1")
+            echo "opensuse.42.1"
+            return 0
+            ;;
+        "opensuse.42.3")
+            echo "opensuse.42.3"
+            return 0
+            ;;
+        "rhel.7"*)
+            echo "rhel"
+            return 0
+            ;;
+        "ubuntu.14.04")
+            echo "ubuntu"
+            return 0
+            ;;
+        "ubuntu.16.04")
+            echo "ubuntu.16.04"
+            return 0
+            ;;
+        "ubuntu.16.10")
+            echo "ubuntu.16.10"
+            return 0
+            ;;
+        "ubuntu.18.04")
+            echo "ubuntu.18.04"
+            return 0
+            ;;
+        "alpine.3.4.3")
+            echo "alpine"
+            return 0
+            ;;
+    esac
+    return 1
+}
+
+get_legacy_os_name() {
+    eval $invocation
+
+    local uname=$(uname)
+    if [ "$uname" = "Darwin" ]; then
+        echo "osx"
+        return 0
+    elif [ -n "$runtime_id" ]; then
+        echo $(get_legacy_os_name_from_platform "${runtime_id%-*}" || echo "${runtime_id%-*}")
+        return 0
+    else
+        if [ -e /etc/os-release ]; then
+            . /etc/os-release
+            os=$(get_legacy_os_name_from_platform "$ID${VERSION_ID:+.${VERSION_ID}}" || echo "")
+            if [ -n "$os" ]; then
+                echo "$os"
+                return 0
+            fi
+        fi
+    fi
+
+    say_verbose "Distribution specific OS name and version could not be detected: UName = $uname"
+    return 1
+}
+
+get_linux_platform_name() {
+    eval $invocation
+
+    if [ -n "$runtime_id" ]; then
+        echo "${runtime_id%-*}"
+        return 0
+    else
+        if [ -e /etc/os-release ]; then
+            . /etc/os-release
+            echo "$ID${VERSION_ID:+.${VERSION_ID}}"
+            return 0
+        elif [ -e /etc/redhat-release ]; then
+            local redhatRelease=$(</etc/redhat-release)
+            if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux "*" release 6."* ]]; then
+                echo "rhel.6"
+                return 0
+            fi
+        fi
+    fi
+
+    say_verbose "Linux specific platform name and version could not be detected: UName = $uname"
+    return 1
+}
+
+is_musl_based_distro() {
+    (ldd --version 2>&1 || true) | grep -q musl
+}
+
+get_current_os_name() {
+    eval $invocation
+
+    local uname=$(uname)
+    if [ "$uname" = "Darwin" ]; then
+        echo "osx"
+        return 0
+    elif [ "$uname" = "FreeBSD" ]; then
+        echo "freebsd"
+        return 0
+    elif [ "$uname" = "Linux" ]; then
+        local linux_platform_name=""
+        linux_platform_name="$(get_linux_platform_name)" || true
+
+        if [ "$linux_platform_name" = "rhel.6" ]; then
+            echo $linux_platform_name
+            return 0
+        elif is_musl_based_distro; then
+            echo "linux-musl"
+            return 0
+        elif [ "$linux_platform_name" = "linux-musl" ]; then
+            echo "linux-musl"
+            return 0
+        else
+            echo "linux"
+            return 0
+        fi
+    fi
+
+    say_err "OS name could not be detected: UName = $uname"
+    return 1
+}
+
+machine_has() {
+    eval $invocation
+
+    command -v "$1" > /dev/null 2>&1
+    return $?
+}
+
+check_min_reqs() {
+    local hasMinimum=false
+    if machine_has "curl"; then
+        hasMinimum=true
+    elif machine_has "wget"; then
+        hasMinimum=true
+    fi
+
+    if [ "$hasMinimum" = "false" ]; then
+        say_err "curl (recommended) or wget are required to download dotnet. Install missing prerequisite to proceed."
+        return 1
+    fi
+    return 0
+}
+
+# args:
+# input - $1
+to_lowercase() {
+    #eval $invocation
+
+    echo "$1" | tr '[:upper:]' '[:lower:]'
+    return 0
+}
+
+# args:
+# input - $1
+remove_trailing_slash() {
+    #eval $invocation
+
+    local input="${1:-}"
+    echo "${input%/}"
+    return 0
+}
+
+# args:
+# input - $1
+remove_beginning_slash() {
+    #eval $invocation
+
+    local input="${1:-}"
+    echo "${input#/}"
+    return 0
+}
+
+# args:
+# root_path - $1
+# child_path - $2 - this parameter can be empty
+combine_paths() {
+    eval $invocation
+
+    # TODO: Consider making it work with any number of paths. For now:
+    if [ ! -z "${3:-}" ]; then
+        say_err "combine_paths: Function takes two parameters."
+        return 1
+    fi
+
+    local root_path="$(remove_trailing_slash "$1")"
+    local child_path="$(remove_beginning_slash "${2:-}")"
+    say_verbose "combine_paths: root_path=$root_path"
+    say_verbose "combine_paths: child_path=$child_path"
+    echo "$root_path/$child_path"
+    return 0
+}
+
+get_machine_architecture() {
+    eval $invocation
+
+    if command -v uname > /dev/null; then
+        CPUName=$(uname -m)
+        case $CPUName in
+        armv*l)
+            echo "arm"
+            return 0
+            ;;
+        aarch64|arm64)
+            echo "arm64"
+            return 0
+            ;;
+        s390x)
+            echo "s390x"
+            return 0
+            ;;
+        ppc64le)
+            echo "ppc64le"
+            return 0
+            ;;
+        esac
+    fi
+
+    # Always default to 'x64'
+    echo "x64"
+    return 0
+}
+
+# args:
+# architecture - $1
+get_normalized_architecture_from_architecture() {
+    eval $invocation
+
+    local architecture="$(to_lowercase "$1")"
+
+    if [[ $architecture == \<auto\> ]]; then
+        echo "$(get_machine_architecture)"
+        return 0
+    fi
+
+    case "$architecture" in
+        amd64|x64)
+            echo "x64"
+            return 0
+            ;;
+        arm)
+            echo "arm"
+            return 0
+            ;;
+        arm64)
+            echo "arm64"
+            return 0
+            ;;
+        s390x)
+            echo "s390x"
+            return 0
+            ;;
+        ppc64le)
+            echo "ppc64le"
+            return 0
+            ;;
+    esac
+
+    say_err "Architecture \`$architecture\` not supported. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues"
+    return 1
+}
+
+# args:
+# version - $1
+# channel - $2
+# architecture - $3
+get_normalized_architecture_for_specific_sdk_version() {
+    eval $invocation
+
+    local is_version_support_arm64="$(is_arm64_supported "$1")"
+    local is_channel_support_arm64="$(is_arm64_supported "$2")"
+    local architecture="$3";
+    local osname="$(get_current_os_name)"
+
+    if [ "$osname" == "osx" ] && [ "$architecture" == "arm64" ] && { [ "$is_version_support_arm64" = false ] || [ "$is_channel_support_arm64" = false ]; }; then
+        #check if rosetta is installed
+        if [ "$(/usr/bin/pgrep oahd >/dev/null 2>&1;echo $?)" -eq 0 ]; then 
+            say_verbose "Changing user architecture from '$architecture' to 'x64' because .NET SDKs prior to version 6.0 do not support arm64." 
+            echo "x64"
+            return 0;
+        else
+            say_err "Architecture \`$architecture\` is not supported for .NET SDK version \`$version\`. Please install Rosetta to allow emulation of the \`$architecture\` .NET SDK on this platform"
+            return 1
+        fi
+    fi
+
+    echo "$architecture"
+    return 0
+}
+
+# args:
+# version or channel - $1
+is_arm64_supported() {
+    #any channel or version that starts with the specified versions
+    case "$1" in
+        ( "1"* | "2"* | "3"*  | "4"* | "5"*) 
+            echo false
+            return 0
+    esac
+
+    echo true
+    return 0
+}
+
+# args:
+# user_defined_os - $1
+get_normalized_os() {
+    eval $invocation
+
+    local osname="$(to_lowercase "$1")"
+    if [ ! -z "$osname" ]; then
+        case "$osname" in
+            osx | freebsd | rhel.6 | linux-musl | linux)
+                echo "$osname"
+                return 0
+                ;;
+            *)
+                say_err "'$user_defined_os' is not a supported value for --os option, supported values are: osx, linux, linux-musl, freebsd, rhel.6. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues."
+                return 1
+                ;;
+        esac
+    else
+        osname="$(get_current_os_name)" || return 1
+    fi
+    echo "$osname"
+    return 0
+}
+
+# args:
+# quality - $1
+get_normalized_quality() {
+    eval $invocation
+
+    local quality="$(to_lowercase "$1")"
+    if [ ! -z "$quality" ]; then
+        case "$quality" in
+            daily | signed | validated | preview)
+                echo "$quality"
+                return 0
+                ;;
+            ga)
+                #ga quality is available without specifying quality, so normalizing it to empty
+                return 0
+                ;;
+            *)
+                say_err "'$quality' is not a supported value for --quality option. Supported values are: daily, signed, validated, preview, ga. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues."
+                return 1
+                ;;
+        esac
+    fi
+    return 0
+}
+
+# args:
+# channel - $1
+get_normalized_channel() {
+    eval $invocation
+
+    local channel="$(to_lowercase "$1")"
+
+    if [[ $channel == current ]]; then
+        say_warning 'Value "Current" is deprecated for -Channel option. Use "STS" instead.'
+    fi
+
+    if [[ $channel == release/* ]]; then
+        say_warning 'Using branch name with -Channel option is no longer supported with newer releases. Use -Quality option with a channel in X.Y format instead.';
+    fi
+
+    if [ ! -z "$channel" ]; then
+        case "$channel" in
+            lts)
+                echo "LTS"
+                return 0
+                ;;
+            sts)
+                echo "STS"
+                return 0
+                ;;
+            current)
+                echo "STS"
+                return 0
+                ;;
+            *)
+                echo "$channel"
+                return 0
+                ;;
+        esac
+    fi
+
+    return 0
+}
+
+# args:
+# runtime - $1
+get_normalized_product() {
+    eval $invocation
+
+    local product=""
+    local runtime="$(to_lowercase "$1")"
+    if [[ "$runtime" == "dotnet" ]]; then
+        product="dotnet-runtime"
+    elif [[ "$runtime" == "aspnetcore" ]]; then
+        product="aspnetcore-runtime"
+    elif [ -z "$runtime" ]; then
+        product="dotnet-sdk"
+    fi
+    echo "$product"
+    return 0
+}
+
+# The version text returned from the feeds is a 1-line or 2-line string:
+# For the SDK and the dotnet runtime (2 lines):
+# Line 1: # commit_hash
+# Line 2: # 4-part version
+# For the aspnetcore runtime (1 line):
+# Line 1: # 4-part version
+
+# args:
+# version_text - stdin
+get_version_from_latestversion_file_content() {
+    eval $invocation
+
+    cat | tail -n 1 | sed 's/\r$//'
+    return 0
+}
+
+# args:
+# install_root - $1
+# relative_path_to_package - $2
+# specific_version - $3
+is_dotnet_package_installed() {
+    eval $invocation
+
+    local install_root="$1"
+    local relative_path_to_package="$2"
+    local specific_version="${3//[$'\t\r\n']}"
+
+    local dotnet_package_path="$(combine_paths "$(combine_paths "$install_root" "$relative_path_to_package")" "$specific_version")"
+    say_verbose "is_dotnet_package_installed: dotnet_package_path=$dotnet_package_path"
+
+    if [ -d "$dotnet_package_path" ]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+# args:
+# azure_feed - $1
+# channel - $2
+# normalized_architecture - $3
+get_version_from_latestversion_file() {
+    eval $invocation
+
+    local azure_feed="$1"
+    local channel="$2"
+    local normalized_architecture="$3"
+
+    local version_file_url=null
+    if [[ "$runtime" == "dotnet" ]]; then
+        version_file_url="$azure_feed/Runtime/$channel/latest.version"
+    elif [[ "$runtime" == "aspnetcore" ]]; then
+        version_file_url="$azure_feed/aspnetcore/Runtime/$channel/latest.version"
+    elif [ -z "$runtime" ]; then
+         version_file_url="$azure_feed/Sdk/$channel/latest.version"
+    else
+        say_err "Invalid value for \$runtime"
+        return 1
+    fi
+    say_verbose "get_version_from_latestversion_file: latest url: $version_file_url"
+
+    download "$version_file_url" || return $?
+    return 0
+}
+
+# args:
+# json_file - $1
+parse_globaljson_file_for_version() {
+    eval $invocation
+
+    local json_file="$1"
+    if [ ! -f "$json_file" ]; then
+        say_err "Unable to find \`$json_file\`"
+        return 1
+    fi
+
+    sdk_section=$(cat $json_file | tr -d "\r" | awk '/"sdk"/,/}/')
+    if [ -z "$sdk_section" ]; then
+        say_err "Unable to parse the SDK node in \`$json_file\`"
+        return 1
+    fi
+
+    sdk_list=$(echo $sdk_section | awk -F"[{}]" '{print $2}')
+    sdk_list=${sdk_list//[\" ]/}
+    sdk_list=${sdk_list//,/$'\n'}
+
+    local version_info=""
+    while read -r line; do
+      IFS=:
+      while read -r key value; do
+        if [[ "$key" == "version" ]]; then
+          version_info=$value
+        fi
+      done <<< "$line"
+    done <<< "$sdk_list"
+    if [ -z "$version_info" ]; then
+        say_err "Unable to find the SDK:version node in \`$json_file\`"
+        return 1
+    fi
+
+    unset IFS;
+    echo "$version_info"
+    return 0
+}
+
+# args:
+# azure_feed - $1
+# channel - $2
+# normalized_architecture - $3
+# version - $4
+# json_file - $5
+get_specific_version_from_version() {
+    eval $invocation
+
+    local azure_feed="$1"
+    local channel="$2"
+    local normalized_architecture="$3"
+    local version="$(to_lowercase "$4")"
+    local json_file="$5"
+
+    if [ -z "$json_file" ]; then
+        if [[ "$version" == "latest" ]]; then
+            local version_info
+            version_info="$(get_version_from_latestversion_file "$azure_feed" "$channel" "$normalized_architecture" false)" || return 1
+            say_verbose "get_specific_version_from_version: version_info=$version_info"
+            echo "$version_info" | get_version_from_latestversion_file_content
+            return 0
+        else
+            echo "$version"
+            return 0
+        fi
+    else
+        local version_info
+        version_info="$(parse_globaljson_file_for_version "$json_file")" || return 1
+        echo "$version_info"
+        return 0
+    fi
+}
+
+# args:
+# azure_feed - $1
+# channel - $2
+# normalized_architecture - $3
+# specific_version - $4
+# normalized_os - $5
+construct_download_link() {
+    eval $invocation
+
+    local azure_feed="$1"
+    local channel="$2"
+    local normalized_architecture="$3"
+    local specific_version="${4//[$'\t\r\n']}"
+    local specific_product_version="$(get_specific_product_version "$1" "$4")"
+    local osname="$5"
+
+    local download_link=null
+    if [[ "$runtime" == "dotnet" ]]; then
+        download_link="$azure_feed/Runtime/$specific_version/dotnet-runtime-$specific_product_version-$osname-$normalized_architecture.tar.gz"
+    elif [[ "$runtime" == "aspnetcore" ]]; then
+        download_link="$azure_feed/aspnetcore/Runtime/$specific_version/aspnetcore-runtime-$specific_product_version-$osname-$normalized_architecture.tar.gz"
+    elif [ -z "$runtime" ]; then
+        download_link="$azure_feed/Sdk/$specific_version/dotnet-sdk-$specific_product_version-$osname-$normalized_architecture.tar.gz"
+    else
+        return 1
+    fi
+
+    echo "$download_link"
+    return 0
+}
+
+# args:
+# azure_feed - $1
+# specific_version - $2
+# download link - $3 (optional)
+get_specific_product_version() {
+    # If we find a 'productVersion.txt' at the root of any folder, we'll use its contents
+    # to resolve the version of what's in the folder, superseding the specified version.
+    # if 'productVersion.txt' is missing but download link is already available, product version will be taken from download link
+    eval $invocation
+
+    local azure_feed="$1"
+    local specific_version="${2//[$'\t\r\n']}"
+    local package_download_link=""
+    if [ $# -gt 2  ]; then
+        local package_download_link="$3"
+    fi
+    local specific_product_version=null
+
+    # Try to get the version number, using the productVersion.txt file located next to the installer file.
+    local download_links=($(get_specific_product_version_url "$azure_feed" "$specific_version" true "$package_download_link")
+        $(get_specific_product_version_url "$azure_feed" "$specific_version" false "$package_download_link"))
+
+    for download_link in "${download_links[@]}"
+    do
+        say_verbose "Checking for the existence of $download_link"
+
+        if machine_has "curl"
+        then
+            if ! specific_product_version=$(curl -s --fail "${download_link}${feed_credential}" 2>&1); then
+                continue
+            else
+                echo "${specific_product_version//[$'\t\r\n']}"
+                return 0
+            fi
+
+        elif machine_has "wget"
+        then
+            specific_product_version=$(wget -qO- "${download_link}${feed_credential}" 2>&1)
+            if [ $? = 0 ]; then
+                echo "${specific_product_version//[$'\t\r\n']}"
+                return 0
+            fi
+        fi
+    done
+    
+    # Getting the version number with productVersion.txt has failed. Try parsing the download link for a version number.
+    say_verbose "Failed to get the version using productVersion.txt file. Download link will be parsed instead."
+    specific_product_version="$(get_product_specific_version_from_download_link "$package_download_link" "$specific_version")"
+    echo "${specific_product_version//[$'\t\r\n']}"
+    return 0
+}
+
+# args:
+# azure_feed - $1
+# specific_version - $2
+# is_flattened - $3
+# download link - $4 (optional)
+get_specific_product_version_url() {
+    eval $invocation
+
+    local azure_feed="$1"
+    local specific_version="$2"
+    local is_flattened="$3"
+    local package_download_link=""
+    if [ $# -gt 3  ]; then
+        local package_download_link="$4"
+    fi
+
+    local pvFileName="productVersion.txt"
+    if [ "$is_flattened" = true ]; then
+        if [ -z "$runtime" ]; then
+            pvFileName="sdk-productVersion.txt"
+        elif [[ "$runtime" == "dotnet" ]]; then
+            pvFileName="runtime-productVersion.txt"
+        else
+            pvFileName="$runtime-productVersion.txt"
+        fi
+    fi
+
+    local download_link=null
+
+    if [ -z "$package_download_link" ]; then
+        if [[ "$runtime" == "dotnet" ]]; then
+            download_link="$azure_feed/Runtime/$specific_version/${pvFileName}"
+        elif [[ "$runtime" == "aspnetcore" ]]; then
+            download_link="$azure_feed/aspnetcore/Runtime/$specific_version/${pvFileName}"
+        elif [ -z "$runtime" ]; then
+            download_link="$azure_feed/Sdk/$specific_version/${pvFileName}"
+        else
+            return 1
+        fi
+    else
+        download_link="${package_download_link%/*}/${pvFileName}"
+    fi
+
+    say_verbose "Constructed productVersion link: $download_link"
+    echo "$download_link"
+    return 0
+}
+
+# args:
+# download link - $1
+# specific version - $2
+get_product_specific_version_from_download_link()
+{
+    eval $invocation
+
+    local download_link="$1"
+    local specific_version="$2"
+    local specific_product_version="" 
+
+    if [ -z "$download_link" ]; then
+        echo "$specific_version"
+        return 0
+    fi
+
+    #get filename
+    filename="${download_link##*/}"
+
+    #product specific version follows the product name
+    #for filename 'dotnet-sdk-3.1.404-linux-x64.tar.gz': the product version is 3.1.404
+    IFS='-'
+    read -ra filename_elems <<< "$filename"
+    count=${#filename_elems[@]}
+    if [[ "$count" -gt 2 ]]; then
+        specific_product_version="${filename_elems[2]}"
+    else
+        specific_product_version=$specific_version
+    fi
+    unset IFS;
+    echo "$specific_product_version"
+    return 0
+}
+
+# args:
+# azure_feed - $1
+# channel - $2
+# normalized_architecture - $3
+# specific_version - $4
+construct_legacy_download_link() {
+    eval $invocation
+
+    local azure_feed="$1"
+    local channel="$2"
+    local normalized_architecture="$3"
+    local specific_version="${4//[$'\t\r\n']}"
+
+    local distro_specific_osname
+    distro_specific_osname="$(get_legacy_os_name)" || return 1
+
+    local legacy_download_link=null
+    if [[ "$runtime" == "dotnet" ]]; then
+        legacy_download_link="$azure_feed/Runtime/$specific_version/dotnet-$distro_specific_osname-$normalized_architecture.$specific_version.tar.gz"
+    elif [ -z "$runtime" ]; then
+        legacy_download_link="$azure_feed/Sdk/$specific_version/dotnet-dev-$distro_specific_osname-$normalized_architecture.$specific_version.tar.gz"
+    else
+        return 1
+    fi
+
+    echo "$legacy_download_link"
+    return 0
+}
+
+get_user_install_path() {
+    eval $invocation
+
+    if [ ! -z "${DOTNET_INSTALL_DIR:-}" ]; then
+        echo "$DOTNET_INSTALL_DIR"
+    else
+        echo "$HOME/.dotnet"
+    fi
+    return 0
+}
+
+# args:
+# install_dir - $1
+resolve_installation_path() {
+    eval $invocation
+
+    local install_dir=$1
+    if [ "$install_dir" = "<auto>" ]; then
+        local user_install_path="$(get_user_install_path)"
+        say_verbose "resolve_installation_path: user_install_path=$user_install_path"
+        echo "$user_install_path"
+        return 0
+    fi
+
+    echo "$install_dir"
+    return 0
+}
+
+# args:
+# relative_or_absolute_path - $1
+get_absolute_path() {
+    eval $invocation
+
+    local relative_or_absolute_path=$1
+    echo "$(cd "$(dirname "$1")" && pwd -P)/$(basename "$1")"
+    return 0
+}
+
+# args:
+# input_files - stdin
+# root_path - $1
+# out_path - $2
+# override - $3
+copy_files_or_dirs_from_list() {
+    eval $invocation
+
+    local root_path="$(remove_trailing_slash "$1")"
+    local out_path="$(remove_trailing_slash "$2")"
+    local override="$3"
+    local osname="$(get_current_os_name)"
+    local override_switch=$(
+        if [ "$override" = false ]; then
+            if [ "$osname" = "linux-musl" ]; then
+                printf -- "-u";
+            else
+                printf -- "-n";
+            fi
+        fi)
+
+    cat | uniq | while read -r file_path; do
+        local path="$(remove_beginning_slash "${file_path#$root_path}")"
+        local target="$out_path/$path"
+        if [ "$override" = true ] || (! ([ -d "$target" ] || [ -e "$target" ])); then
+            mkdir -p "$out_path/$(dirname "$path")"
+            if [ -d "$target" ]; then
+                rm -rf "$target"
+            fi
+            cp -R $override_switch "$root_path/$path" "$target"
+        fi
+    done
+}
+
+# args:
+# zip_path - $1
+# out_path - $2
+extract_dotnet_package() {
+    eval $invocation
+
+    local zip_path="$1"
+    local out_path="$2"
+
+    local temp_out_path="$(mktemp -d "$temporary_file_template")"
+
+    local failed=false
+    tar -xzf "$zip_path" -C "$temp_out_path" > /dev/null || failed=true
+
+    local folders_with_version_regex='^.*/[0-9]+\.[0-9]+[^/]+/'
+    find "$temp_out_path" -type f | grep -Eo "$folders_with_version_regex" | sort | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" false
+    find "$temp_out_path" -type f | grep -Ev "$folders_with_version_regex" | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" "$override_non_versioned_files"
+
+    rm -rf "$temp_out_path"
+    rm -f "$zip_path" && say_verbose "Temporary zip file $zip_path was removed"
+
+    if [ "$failed" = true ]; then
+        say_err "Extraction failed"
+        return 1
+    fi
+    return 0
+}
+
+# args:
+# remote_path - $1
+# disable_feed_credential - $2
+get_http_header()
+{
+    eval $invocation
+    local remote_path="$1"
+    local disable_feed_credential="$2"
+
+    local failed=false
+    local response
+    if machine_has "curl"; then
+        get_http_header_curl $remote_path $disable_feed_credential || failed=true
+    elif machine_has "wget"; then
+        get_http_header_wget $remote_path $disable_feed_credential || failed=true
+    else
+        failed=true
+    fi
+    if [ "$failed" = true ]; then
+        say_verbose "Failed to get HTTP header: '$remote_path'."
+        return 1
+    fi
+    return 0
+}
+
+# args:
+# remote_path - $1
+# disable_feed_credential - $2
+get_http_header_curl() {
+    eval $invocation
+    local remote_path="$1"
+    local disable_feed_credential="$2"
+
+    remote_path_with_credential="$remote_path"
+    if [ "$disable_feed_credential" = false ]; then
+        remote_path_with_credential+="$feed_credential"
+    fi
+
+    curl_options="-I -sSL --retry 5 --retry-delay 2 --connect-timeout 15 "
+    curl $curl_options "$remote_path_with_credential" 2>&1 || return 1
+    return 0
+}
+
+# args:
+# remote_path - $1
+# disable_feed_credential - $2
+get_http_header_wget() {
+    eval $invocation
+    local remote_path="$1"
+    local disable_feed_credential="$2"
+    local wget_options="-q -S --spider --tries 5 "
+
+    local wget_options_extra=''
+
+    # Test for options that aren't supported on all wget implementations.
+    if [[ $(wget -h 2>&1 | grep -E 'waitretry|connect-timeout') ]]; then
+        wget_options_extra="--waitretry 2 --connect-timeout 15 "
+    else
+        say "wget extra options are unavailable for this environment"
+    fi
+
+    remote_path_with_credential="$remote_path"
+    if [ "$disable_feed_credential" = false ]; then
+        remote_path_with_credential+="$feed_credential"
+    fi
+
+    wget $wget_options $wget_options_extra "$remote_path_with_credential" 2>&1
+
+    return $?
+}
+
+# args:
+# remote_path - $1
+# [out_path] - $2 - stdout if not provided
+download() {
+    eval $invocation
+
+    local remote_path="$1"
+    local out_path="${2:-}"
+
+    if [[ "$remote_path" != "http"* ]]; then
+        cp "$remote_path" "$out_path"
+        return $?
+    fi
+
+    local failed=false
+    local attempts=0
+    while [ $attempts -lt 3 ]; do
+        attempts=$((attempts+1))
+        failed=false
+        if machine_has "curl"; then
+            downloadcurl "$remote_path" "$out_path" || failed=true
+        elif machine_has "wget"; then
+            downloadwget "$remote_path" "$out_path" || failed=true
+        else
+            say_err "Missing dependency: neither curl nor wget was found."
+            exit 1
+        fi
+
+        if [ "$failed" = false ] || [ $attempts -ge 3 ] || { [ ! -z $http_code ] && [ $http_code = "404" ]; }; then
+            break
+        fi
+
+        say "Download attempt #$attempts has failed: $http_code $download_error_msg"
+        say "Attempt #$((attempts+1)) will start in $((attempts*10)) seconds."
+        sleep $((attempts*10))
+    done
+
+    if [ "$failed" = true ]; then
+        say_verbose "Download failed: $remote_path"
+        return 1
+    fi
+    return 0
+}
+
+# Updates global variables $http_code and $download_error_msg
+downloadcurl() {
+    eval $invocation
+    unset http_code
+    unset download_error_msg
+    local remote_path="$1"
+    local out_path="${2:-}"
+    # Append feed_credential as late as possible before calling curl to avoid logging feed_credential
+    # Avoid passing URI with credentials to functions: note, most of them echoing parameters of invocation in verbose output.
+    local remote_path_with_credential="${remote_path}${feed_credential}"
+    local curl_options="--retry 20 --retry-delay 2 --connect-timeout 15 -sSL -f --create-dirs "
+    local curl_exit_code=0;
+    if [ -z "$out_path" ]; then
+        curl $curl_options "$remote_path_with_credential" 2>&1
+        curl_exit_code=$?
+    else
+        curl $curl_options -o "$out_path" "$remote_path_with_credential" 2>&1
+        curl_exit_code=$?
+    fi
+    
+    if [ $curl_exit_code -gt 0 ]; then
+        download_error_msg="Unable to download $remote_path."
+        # Check for curl timeout codes
+        if [[ $curl_exit_code == 7 || $curl_exit_code == 28 ]]; then
+            download_error_msg+=" Failed to reach the server: connection timeout."
+        else
+            local disable_feed_credential=false
+            local response=$(get_http_header_curl $remote_path $disable_feed_credential)
+            http_code=$( echo "$response" | awk '/^HTTP/{print $2}' | tail -1 )
+            if  [[ ! -z $http_code && $http_code != 2* ]]; then
+                download_error_msg+=" Returned HTTP status code: $http_code."
+            fi
+        fi
+        say_verbose "$download_error_msg"
+        return 1
+    fi
+    return 0
+}
+
+
+# Updates global variables $http_code and $download_error_msg
+downloadwget() {
+    eval $invocation
+    unset http_code
+    unset download_error_msg
+    local remote_path="$1"
+    local out_path="${2:-}"
+    # Append feed_credential as late as possible before calling wget to avoid logging feed_credential
+    local remote_path_with_credential="${remote_path}${feed_credential}"
+    local wget_options="--tries 20 "
+
+    local wget_options_extra=''
+    local wget_result=''
+
+    # Test for options that aren't supported on all wget implementations.
+    if [[ $(wget -h 2>&1 | grep -E 'waitretry|connect-timeout') ]]; then
+        wget_options_extra="--waitretry 2 --connect-timeout 15 "
+    else
+        say "wget extra options are unavailable for this environment"
+    fi
+
+    if [ -z "$out_path" ]; then
+        wget -q $wget_options $wget_options_extra -O - "$remote_path_with_credential" 2>&1
+        wget_result=$?
+    else
+        wget $wget_options $wget_options_extra -O "$out_path" "$remote_path_with_credential" 2>&1
+        wget_result=$?
+    fi
+
+    if [[ $wget_result != 0 ]]; then
+        local disable_feed_credential=false
+        local response=$(get_http_header_wget $remote_path $disable_feed_credential)
+        http_code=$( echo "$response" | awk '/^  HTTP/{print $2}' | tail -1 )
+        download_error_msg="Unable to download $remote_path."
+        if  [[ ! -z $http_code && $http_code != 2* ]]; then
+            download_error_msg+=" Returned HTTP status code: $http_code."
+        # wget exit code 4 stands for network-issue
+        elif [[ $wget_result == 4 ]]; then
+            download_error_msg+=" Failed to reach the server: connection timeout."
+        fi
+        say_verbose "$download_error_msg"
+        return 1
+    fi
+
+    return 0
+}
+
+get_download_link_from_aka_ms() {
+    eval $invocation
+
+    #quality is not supported for LTS or STS channel
+    #STS maps to current
+    if [[ ! -z "$normalized_quality"  && ("$normalized_channel" == "LTS" || "$normalized_channel" == "STS") ]]; then
+        normalized_quality=""
+        say_warning "Specifying quality for STS or LTS channel is not supported, the quality will be ignored."
+    fi
+
+    say_verbose "Retrieving primary payload URL from aka.ms for channel: '$normalized_channel', quality: '$normalized_quality', product: '$normalized_product', os: '$normalized_os', architecture: '$normalized_architecture'." 
+
+    #construct aka.ms link
+    aka_ms_link="https://aka.ms/dotnet"
+    if  [ "$internal" = true ]; then
+        aka_ms_link="$aka_ms_link/internal"
+    fi
+    aka_ms_link="$aka_ms_link/$normalized_channel"
+    if [[ ! -z "$normalized_quality" ]]; then
+        aka_ms_link="$aka_ms_link/$normalized_quality"
+    fi
+    aka_ms_link="$aka_ms_link/$normalized_product-$normalized_os-$normalized_architecture.tar.gz"
+    say_verbose "Constructed aka.ms link: '$aka_ms_link'."
+
+    #get HTTP response
+    #do not pass credentials as a part of the $aka_ms_link and do not apply credentials in the get_http_header function
+    #otherwise the redirect link would have credentials as well
+    #it would result in applying credentials twice to the resulting link and thus breaking it, and in echoing credentials to the output as a part of redirect link
+    disable_feed_credential=true
+    response="$(get_http_header $aka_ms_link $disable_feed_credential)"
+
+    say_verbose "Received response: $response"
+    # Get results of all the redirects.
+    http_codes=$( echo "$response" | awk '$1 ~ /^HTTP/ {print $2}' )
+    # They all need to be 301, otherwise some links are broken (except for the last, which is not a redirect but 200 or 404).
+    broken_redirects=$( echo "$http_codes" | sed '$d' | grep -v '301' )
+
+    # All HTTP codes are 301 (Moved Permanently), the redirect link exists.
+    if [[ -z "$broken_redirects" ]]; then
+        aka_ms_download_link=$( echo "$response" | awk '$1 ~ /^Location/{print $2}' | tail -1 | tr -d '\r')
+
+        if [[ -z "$aka_ms_download_link" ]]; then
+            say_verbose "The aka.ms link '$aka_ms_link' is not valid: failed to get redirect location."
+            return 1
+        fi
+
+        say_verbose "The redirect location retrieved: '$aka_ms_download_link'."
+        return 0
+    else
+        say_verbose "The aka.ms link '$aka_ms_link' is not valid: received HTTP code: $(echo "$broken_redirects" | paste -sd "," -)."
+        return 1
+    fi
+}
+
+get_feeds_to_use()
+{
+    feeds=(
+    "https://dotnetcli.azureedge.net/dotnet"
+    "https://dotnetbuilds.azureedge.net/public"
+    )
+
+    if [[ -n "$azure_feed" ]]; then
+        feeds=("$azure_feed")
+    fi
+
+    if [[ "$no_cdn" == "true" ]]; then
+        feeds=(
+        "https://dotnetcli.blob.core.windows.net/dotnet"
+        "https://dotnetbuilds.blob.core.windows.net/public"
+        )
+
+        if [[ -n "$uncached_feed" ]]; then
+            feeds=("$uncached_feed")
+        fi
+    fi
+}
+
+# THIS FUNCTION MAY EXIT (if the determined version is already installed).
+generate_download_links() {
+
+    download_links=()
+    specific_versions=()
+    effective_versions=()
+    link_types=()
+
+    # If generate_akams_links returns false, no fallback to old links. Just terminate.
+    # This function may also 'exit' (if the determined version is already installed).
+    generate_akams_links || return
+
+    # Check other feeds only if we haven't been able to find an aka.ms link.
+    if [[ "${#download_links[@]}" -lt 1 ]]; then
+        for feed in ${feeds[@]}
+        do
+            # generate_regular_links may also 'exit' (if the determined version is already installed).
+            generate_regular_links $feed || return
+        done
+    fi
+
+    if [[ "${#download_links[@]}" -eq 0 ]]; then
+        say_err "Failed to resolve the exact version number."
+        return 1
+    fi
+
+    say_verbose "Generated ${#download_links[@]} links."
+    for link_index in ${!download_links[@]}
+    do
+        say_verbose "Link $link_index: ${link_types[$link_index]}, ${effective_versions[$link_index]}, ${download_links[$link_index]}"
+    done
+}
+
+# THIS FUNCTION MAY EXIT (if the determined version is already installed).
+generate_akams_links() {
+    local valid_aka_ms_link=true;
+
+    normalized_version="$(to_lowercase "$version")"
+    if [[ "$normalized_version" != "latest" ]] && [ -n "$normalized_quality" ]; then
+        say_err "Quality and Version options are not allowed to be specified simultaneously. See https://learn.microsoft.com/dotnet/core/tools/dotnet-install-script#options for details."
+        return 1
+    fi
+
+    if [[ -n "$json_file" || "$normalized_version" != "latest" ]]; then
+        # aka.ms links are not needed when exact version is specified via command or json file
+        return
+    fi
+
+    get_download_link_from_aka_ms || valid_aka_ms_link=false
+
+    if [[ "$valid_aka_ms_link" == true ]]; then
+        say_verbose "Retrieved primary payload URL from aka.ms link: '$aka_ms_download_link'."
+        say_verbose "Downloading using legacy url will not be attempted."
+
+        download_link=$aka_ms_download_link
+
+        #get version from the path
+        IFS='/'
+        read -ra pathElems <<< "$download_link"
+        count=${#pathElems[@]}
+        specific_version="${pathElems[count-2]}"
+        unset IFS;
+        say_verbose "Version: '$specific_version'."
+
+        #Retrieve effective version
+        effective_version="$(get_specific_product_version "$azure_feed" "$specific_version" "$download_link")"
+
+        # Add link info to arrays
+        download_links+=($download_link)
+        specific_versions+=($specific_version)
+        effective_versions+=($effective_version)
+        link_types+=("aka.ms")
+
+        #  Check if the SDK version is already installed.
+        if [[ "$dry_run" != true ]] && is_dotnet_package_installed "$install_root" "$asset_relative_path" "$effective_version"; then
+            say "$asset_name with version '$effective_version' is already installed."
+            exit 0
+        fi
+
+        return 0
+    fi
+
+    # if quality is specified - exit with error - there is no fallback approach
+    if [ ! -z "$normalized_quality" ]; then
+        say_err "Failed to locate the latest version in the channel '$normalized_channel' with '$normalized_quality' quality for '$normalized_product', os: '$normalized_os', architecture: '$normalized_architecture'."
+        say_err "Refer to: https://aka.ms/dotnet-os-lifecycle for information on .NET Core support."
+        return 1
+    fi
+    say_verbose "Falling back to latest.version file approach."
+}
+
+# THIS FUNCTION MAY EXIT (if the determined version is already installed)
+# args:
+# feed - $1
+generate_regular_links() {
+    local feed="$1"
+    local valid_legacy_download_link=true
+
+    specific_version=$(get_specific_version_from_version "$feed" "$channel" "$normalized_architecture" "$version" "$json_file") || specific_version='0'
+
+    if [[ "$specific_version" == '0' ]]; then
+        say_verbose "Failed to resolve the specific version number using feed '$feed'"
+        return
+    fi
+
+    effective_version="$(get_specific_product_version "$feed" "$specific_version")"
+    say_verbose "specific_version=$specific_version"
+
+    download_link="$(construct_download_link "$feed" "$channel" "$normalized_architecture" "$specific_version" "$normalized_os")"
+    say_verbose "Constructed primary named payload URL: $download_link"
+
+    # Add link info to arrays
+    download_links+=($download_link)
+    specific_versions+=($specific_version)
+    effective_versions+=($effective_version)
+    link_types+=("primary")
+
+    legacy_download_link="$(construct_legacy_download_link "$feed" "$channel" "$normalized_architecture" "$specific_version")" || valid_legacy_download_link=false
+
+    if [ "$valid_legacy_download_link" = true ]; then
+        say_verbose "Constructed legacy named payload URL: $legacy_download_link"
+    
+        download_links+=($legacy_download_link)
+        specific_versions+=($specific_version)
+        effective_versions+=($effective_version)
+        link_types+=("legacy")
+    else
+        legacy_download_link=""
+        say_verbose "Cound not construct a legacy_download_link; omitting..."
+    fi
+
+    #  Check if the SDK version is already installed.
+    if [[ "$dry_run" != true ]] && is_dotnet_package_installed "$install_root" "$asset_relative_path" "$effective_version"; then
+        say "$asset_name with version '$effective_version' is already installed."
+        exit 0
+    fi
+}
+
+print_dry_run() {
+
+    say "Payload URLs:"
+
+    for link_index in "${!download_links[@]}"
+        do
+            say "URL #$link_index - ${link_types[$link_index]}: ${download_links[$link_index]}"
+    done
+
+    resolved_version=${specific_versions[0]}
+    repeatable_command="./$script_name --version "\""$resolved_version"\"" --install-dir "\""$install_root"\"" --architecture "\""$normalized_architecture"\"" --os "\""$normalized_os"\"""
+    
+    if [ ! -z "$normalized_quality" ]; then
+        repeatable_command+=" --quality "\""$normalized_quality"\"""
+    fi
+
+    if [[ "$runtime" == "dotnet" ]]; then
+        repeatable_command+=" --runtime "\""dotnet"\"""
+    elif [[ "$runtime" == "aspnetcore" ]]; then
+        repeatable_command+=" --runtime "\""aspnetcore"\"""
+    fi
+
+    repeatable_command+="$non_dynamic_parameters"
+
+    if [ -n "$feed_credential" ]; then
+        repeatable_command+=" --feed-credential "\""<feed_credential>"\"""
+    fi
+
+    say "Repeatable invocation: $repeatable_command"
+}
+
+calculate_vars() {
+    eval $invocation
+
+    script_name=$(basename "$0")
+    normalized_architecture="$(get_normalized_architecture_from_architecture "$architecture")"
+    say_verbose "Normalized architecture: '$normalized_architecture'."
+    normalized_os="$(get_normalized_os "$user_defined_os")"
+    say_verbose "Normalized OS: '$normalized_os'."
+    normalized_quality="$(get_normalized_quality "$quality")"
+    say_verbose "Normalized quality: '$normalized_quality'."
+    normalized_channel="$(get_normalized_channel "$channel")"
+    say_verbose "Normalized channel: '$normalized_channel'."
+    normalized_product="$(get_normalized_product "$runtime")"
+    say_verbose "Normalized product: '$normalized_product'."
+    install_root="$(resolve_installation_path "$install_dir")"
+    say_verbose "InstallRoot: '$install_root'."
+
+    normalized_architecture="$(get_normalized_architecture_for_specific_sdk_version "$version" "$normalized_channel" "$normalized_architecture")"
+
+    if [[ "$runtime" == "dotnet" ]]; then
+        asset_relative_path="shared/Microsoft.NETCore.App"
+        asset_name=".NET Core Runtime"
+    elif [[ "$runtime" == "aspnetcore" ]]; then
+        asset_relative_path="shared/Microsoft.AspNetCore.App"
+        asset_name="ASP.NET Core Runtime"
+    elif [ -z "$runtime" ]; then
+        asset_relative_path="sdk"
+        asset_name=".NET Core SDK"
+    fi
+
+    get_feeds_to_use
+}
+
+install_dotnet() {
+    eval $invocation
+    local download_failed=false
+    local download_completed=false
+
+    mkdir -p "$install_root"
+    zip_path="$(mktemp "$temporary_file_template")"
+    say_verbose "Zip path: $zip_path"
+
+    for link_index in "${!download_links[@]}"
+    do
+        download_link="${download_links[$link_index]}"
+        specific_version="${specific_versions[$link_index]}"
+        effective_version="${effective_versions[$link_index]}"
+        link_type="${link_types[$link_index]}"
+
+        say "Attempting to download using $link_type link $download_link"
+
+        # The download function will set variables $http_code and $download_error_msg in case of failure.
+        download_failed=false
+        download "$download_link" "$zip_path" 2>&1 || download_failed=true
+
+        if [ "$download_failed" = true ]; then
+            case $http_code in
+            404)
+                say "The resource at $link_type link '$download_link' is not available."
+                ;;
+            *)
+                say "Failed to download $link_type link '$download_link': $download_error_msg"
+                ;;
+            esac
+            rm -f "$zip_path" 2>&1 && say_verbose "Temporary zip file $zip_path was removed"
+        else
+            download_completed=true
+            break
+        fi
+    done
+
+    if [[ "$download_completed" == false ]]; then
+        say_err "Could not find \`$asset_name\` with version = $specific_version"
+        say_err "Refer to: https://aka.ms/dotnet-os-lifecycle for information on .NET Core support"
+        return 1
+    fi
+
+    say "Extracting zip from $download_link"
+    extract_dotnet_package "$zip_path" "$install_root" || return 1
+
+    #  Check if the SDK version is installed; if not, fail the installation.
+    # if the version contains "RTM" or "servicing"; check if a 'release-type' SDK version is installed.
+    if [[ $specific_version == *"rtm"* || $specific_version == *"servicing"* ]]; then
+        IFS='-'
+        read -ra verArr <<< "$specific_version"
+        release_version="${verArr[0]}"
+        unset IFS;
+        say_verbose "Checking installation: version = $release_version"
+        if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$release_version"; then
+            say "Installed version is $effective_version"
+            return 0
+        fi
+    fi
+
+    #  Check if the standard SDK version is installed.
+    say_verbose "Checking installation: version = $effective_version"
+    if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$effective_version"; then
+        say "Installed version is $effective_version"
+        return 0
+    fi
+
+    # Version verification failed. More likely something is wrong either with the downloaded content or with the verification algorithm.
+    say_err "Failed to verify the version of installed \`$asset_name\`.\nInstallation source: $download_link.\nInstallation location: $install_root.\nReport the bug at https://github.com/dotnet/install-scripts/issues."
+    say_err "\`$asset_name\` with version = $effective_version failed to install with an error."
+    return 1
+}
+
+args=("$@")
+
+local_version_file_relative_path="/.version"
+bin_folder_relative_path=""
+temporary_file_template="${TMPDIR:-/tmp}/dotnet.XXXXXXXXX"
+
+channel="LTS"
+version="Latest"
+json_file=""
+install_dir="<auto>"
+architecture="<auto>"
+dry_run=false
+no_path=false
+no_cdn=false
+azure_feed=""
+uncached_feed=""
+feed_credential=""
+verbose=false
+runtime=""
+runtime_id=""
+quality=""
+internal=false
+override_non_versioned_files=true
+non_dynamic_parameters=""
+user_defined_os=""
+
+while [ $# -ne 0 ]
+do
+    name="$1"
+    case "$name" in
+        -c|--channel|-[Cc]hannel)
+            shift
+            channel="$1"
+            ;;
+        -v|--version|-[Vv]ersion)
+            shift
+            version="$1"
+            ;;
+        -q|--quality|-[Qq]uality)
+            shift
+            quality="$1"
+            ;;
+        --internal|-[Ii]nternal)
+            internal=true
+            non_dynamic_parameters+=" $name"
+            ;;
+        -i|--install-dir|-[Ii]nstall[Dd]ir)
+            shift
+            install_dir="$1"
+            ;;
+        --arch|--architecture|-[Aa]rch|-[Aa]rchitecture)
+            shift
+            architecture="$1"
+            ;;
+        --os|-[Oo][SS])
+            shift
+            user_defined_os="$1"
+            ;;
+        --shared-runtime|-[Ss]hared[Rr]untime)
+            say_warning "The --shared-runtime flag is obsolete and may be removed in a future version of this script. The recommended usage is to specify '--runtime dotnet'."
+            if [ -z "$runtime" ]; then
+                runtime="dotnet"
+            fi
+            ;;
+        --runtime|-[Rr]untime)
+            shift
+            runtime="$1"
+            if [[ "$runtime" != "dotnet" ]] && [[ "$runtime" != "aspnetcore" ]]; then
+                say_err "Unsupported value for --runtime: '$1'. Valid values are 'dotnet' and 'aspnetcore'."
+                if [[ "$runtime" == "windowsdesktop" ]]; then
+                    say_err "WindowsDesktop archives are manufactured for Windows platforms only."
+                fi
+                exit 1
+            fi
+            ;;
+        --dry-run|-[Dd]ry[Rr]un)
+            dry_run=true
+            ;;
+        --no-path|-[Nn]o[Pp]ath)
+            no_path=true
+            non_dynamic_parameters+=" $name"
+            ;;
+        --verbose|-[Vv]erbose)
+            verbose=true
+            non_dynamic_parameters+=" $name"
+            ;;
+        --no-cdn|-[Nn]o[Cc]dn)
+            no_cdn=true
+            non_dynamic_parameters+=" $name"
+            ;;
+        --azure-feed|-[Aa]zure[Ff]eed)
+            shift
+            azure_feed="$1"
+            non_dynamic_parameters+=" $name "\""$1"\"""
+            ;;
+        --uncached-feed|-[Uu]ncached[Ff]eed)
+            shift
+            uncached_feed="$1"
+            non_dynamic_parameters+=" $name "\""$1"\"""
+            ;;
+        --feed-credential|-[Ff]eed[Cc]redential)
+            shift
+            feed_credential="$1"
+            #feed_credential should start with "?", for it to be added to the end of the link.
+            #adding "?" at the beginning of the feed_credential if needed.
+            [[ -z "$(echo $feed_credential)" ]] || [[ $feed_credential == \?* ]] || feed_credential="?$feed_credential"
+            ;;
+        --runtime-id|-[Rr]untime[Ii]d)
+            shift
+            runtime_id="$1"
+            non_dynamic_parameters+=" $name "\""$1"\"""
+            say_warning "Use of --runtime-id is obsolete and should be limited to the versions below 2.1. To override architecture, use --architecture option instead. To override OS, use --os option instead."
+            ;;
+        --jsonfile|-[Jj][Ss]on[Ff]ile)
+            shift
+            json_file="$1"
+            ;;
+        --skip-non-versioned-files|-[Ss]kip[Nn]on[Vv]ersioned[Ff]iles)
+            override_non_versioned_files=false
+            non_dynamic_parameters+=" $name"
+            ;;
+        -?|--?|-h|--help|-[Hh]elp)
+            script_name="$(basename "$0")"
+            echo ".NET Tools Installer"
+            echo "Usage: $script_name [-c|--channel <CHANNEL>] [-v|--version <VERSION>] [-p|--prefix <DESTINATION>]"
+            echo "       $script_name -h|-?|--help"
+            echo ""
+            echo "$script_name is a simple command line interface for obtaining dotnet cli."
+            echo "    Note that the intended use of this script is for Continuous Integration (CI) scenarios, where:"
+            echo "    - The SDK needs to be installed without user interaction and without admin rights."
+            echo "    - The SDK installation doesn't need to persist across multiple CI runs."
+            echo "    To set up a development environment or to run apps, use installers rather than this script. Visit https://dotnet.microsoft.com/download to get the installer."
+            echo ""
+            echo "Options:"
+            echo "  -c,--channel <CHANNEL>         Download from the channel specified, Defaults to \`$channel\`."
+            echo "      -Channel"
+            echo "          Possible values:"
+            echo "          - STS - the most recent Standard Term Support release"
+            echo "          - LTS - the most recent Long Term Support release"
+            echo "          - 2-part version in a format A.B - represents a specific release"
+            echo "              examples: 2.0; 1.0"
+            echo "          - 3-part version in a format A.B.Cxx - represents a specific SDK release"
+            echo "              examples: 5.0.1xx, 5.0.2xx."
+            echo "              Supported since 5.0 release"
+            echo "          Warning: Value 'Current' is deprecated for the Channel parameter. Use 'STS' instead."
+            echo "          Note: The version parameter overrides the channel parameter when any version other than 'latest' is used."
+            echo "  -v,--version <VERSION>         Use specific VERSION, Defaults to \`$version\`."
+            echo "      -Version"
+            echo "          Possible values:"
+            echo "          - latest - the latest build on specific channel"
+            echo "          - 3-part version in a format A.B.C - represents specific version of build"
+            echo "              examples: 2.0.0-preview2-006120; 1.1.0"
+            echo "  -q,--quality <quality>         Download the latest build of specified quality in the channel."
+            echo "      -Quality"
+            echo "          The possible values are: daily, signed, validated, preview, GA."
+            echo "          Works only in combination with channel. Not applicable for STS and LTS channels and will be ignored if those channels are used." 
+            echo "          For SDK use channel in A.B.Cxx format. Using quality for SDK together with channel in A.B format is not supported." 
+            echo "          Supported since 5.0 release." 
+            echo "          Note: The version parameter overrides the channel parameter when any version other than 'latest' is used, and therefore overrides the quality."
+            echo "  --internal,-Internal               Download internal builds. Requires providing credentials via --feed-credential parameter."
+            echo "  --feed-credential <FEEDCREDENTIAL> Token to access Azure feed. Used as a query string to append to the Azure feed."
+            echo "      -FeedCredential                This parameter typically is not specified."
+            echo "  -i,--install-dir <DIR>             Install under specified location (see Install Location below)"
+            echo "      -InstallDir"
+            echo "  --architecture <ARCHITECTURE>      Architecture of dotnet binaries to be installed, Defaults to \`$architecture\`."
+            echo "      --arch,-Architecture,-Arch"
+            echo "          Possible values: x64, arm, arm64, s390x and ppc64le"
+            echo "  --os <system>                    Specifies operating system to be used when selecting the installer."
+            echo "          Overrides the OS determination approach used by the script. Supported values: osx, linux, linux-musl, freebsd, rhel.6."
+            echo "          In case any other value is provided, the platform will be determined by the script based on machine configuration."
+            echo "          Not supported for legacy links. Use --runtime-id to specify platform for legacy links."
+            echo "          Refer to: https://aka.ms/dotnet-os-lifecycle for more information."
+            echo "  --runtime <RUNTIME>                Installs a shared runtime only, without the SDK."
+            echo "      -Runtime"
+            echo "          Possible values:"
+            echo "          - dotnet     - the Microsoft.NETCore.App shared runtime"
+            echo "          - aspnetcore - the Microsoft.AspNetCore.App shared runtime"
+            echo "  --dry-run,-DryRun                  Do not perform installation. Display download link."
+            echo "  --no-path, -NoPath                 Do not set PATH for the current process."
+            echo "  --verbose,-Verbose                 Display diagnostics information."
+            echo "  --azure-feed,-AzureFeed            For internal use only."
+            echo "                                     Allows using a different storage to download SDK archives from."
+            echo "                                     This parameter is only used if --no-cdn is false."
+            echo "  --uncached-feed,-UncachedFeed      For internal use only."
+            echo "                                     Allows using a different storage to download SDK archives from."
+            echo "                                     This parameter is only used if --no-cdn is true."
+            echo "  --skip-non-versioned-files         Skips non-versioned files if they already exist, such as the dotnet executable."
+            echo "      -SkipNonVersionedFiles"
+            echo "  --no-cdn,-NoCdn                    Disable downloading from the Azure CDN, and use the uncached feed directly."
+            echo "  --jsonfile <JSONFILE>              Determines the SDK version from a user specified global.json file."
+            echo "                                     Note: global.json must have a value for 'SDK:Version'"
+            echo "  -?,--?,-h,--help,-Help             Shows this help message"
+            echo ""
+            echo "Install Location:"
+            echo "  Location is chosen in following order:"
+            echo "    - --install-dir option"
+            echo "    - Environmental variable DOTNET_INSTALL_DIR"
+            echo "    - $HOME/.dotnet"
+            exit 0
+            ;;
+        *)
+            say_err "Unknown argument \`$name\`"
+            exit 1
+            ;;
+    esac
+
+    shift
+done
+
+say_verbose "Note that the intended use of this script is for Continuous Integration (CI) scenarios, where:"
+say_verbose "- The SDK needs to be installed without user interaction and without admin rights."
+say_verbose "- The SDK installation doesn't need to persist across multiple CI runs."
+say_verbose "To set up a development environment or to run apps, use installers rather than this script. Visit https://dotnet.microsoft.com/download to get the installer.\n"
+
+if [ "$internal" = true ] && [ -z "$(echo $feed_credential)" ]; then
+    message="Provide credentials via --feed-credential parameter."
+    if [ "$dry_run" = true ]; then
+        say_warning "$message"
+    else
+        say_err "$message"
+        exit 1
+    fi
+fi
+
+check_min_reqs
+calculate_vars
+# generate_regular_links call below will 'exit' if the determined version is already installed.
+generate_download_links
+
+if [[ "$dry_run" = true ]]; then
+    print_dry_run
+    exit 0
+fi
+
+install_dotnet
+
+bin_path="$(get_absolute_path "$(combine_paths "$install_root" "$bin_folder_relative_path")")"
+if [ "$no_path" = false ]; then
+    say "Adding to current process PATH: \`$bin_path\`. Note: This change will be visible only when sourcing script."
+    export PATH="$bin_path":"$PATH"
+else
+    say "Binaries of dotnet can be found in $bin_path"
+fi
+
+say "Note that the script does not resolve dependencies during installation."
+say "To check the list of dependencies, go to https://learn.microsoft.com/dotnet/core/install, select your operating system and check the \"Dependencies\" section."
+say "Installation finished successfully."
diff --git a/test/dotnet/dotnet_env.sh b/test/dotnet/dotnet_env.sh
new file mode 100644
index 000000000..37b14ea2b
--- /dev/null
+++ b/test/dotnet/dotnet_env.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+export DOTNET_NOLOGO=true
+export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
+export DOTNET_GENERATE_ASPNET_CERTIFICATE=false
\ No newline at end of file
diff --git a/test/dotnet/dotnet_helpers.sh b/test/dotnet/dotnet_helpers.sh
new file mode 100644
index 000000000..6c833b444
--- /dev/null
+++ b/test/dotnet/dotnet_helpers.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# Prints the latest dotnet version in the specified channel
+# Usage: fetch_latest_version_in_channel <channel> [<runtime>]
+# Example: fetch_latest_version_in_channel "LTS"
+# Example: fetch_latest_version_in_channel "6.0" "dotnet"
+# Example: fetch_latest_version_in_channel "6.0" "aspnetcore"
+fetch_latest_version_in_channel() {
+    local channel="$1"
+    local runtime="$2"
+    if [ "$runtime" = "dotnet" ]; then
+        wget -qO- "https://dotnetcli.azureedge.net/dotnet/Runtime/$channel/latest.version"
+    elif [ "$runtime" = "aspnetcore" ]; then
+        wget -qO- "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$channel/latest.version"
+    else
+        wget -qO- "https://dotnetcli.azureedge.net/dotnet/Sdk/$channel/latest.version"
+    fi
+    
+}
+
+# Prints the latest dotnet version
+# Usage: fetch_latest_version [<runtime>]
+# Example: fetch_latest_version
+# Example: fetch_latest_version "dotnet"
+# Example: fetch_latest_version "aspnetcore"
+fetch_latest_version() {
+    local runtime="$1"
+    local sts_version
+    local lts_version
+    sts_version=$(fetch_latest_version_in_channel "STS" "$runtime")
+    lts_version=$(fetch_latest_version_in_channel "LTS" "$runtime")
+    if [[ "$sts_version" > "$lts_version" ]]; then
+        echo "$sts_version"
+    else
+        echo "$lts_version"
+    fi
+}
+
+# Asserts that the specified .NET SDK version is installed
+# Returns a non-zero exit code if the check fails
+# Usage: is_dotnet_sdk_version_installed <version>
+# Example: is_dotnet_sdk_version_installed "6.0"
+# Example: is_dotnet_sdk_version_installed "6.0.412"
+is_dotnet_sdk_version_installed() {
+    local expected="$1"
+    dotnet --list-sdks | grep --fixed-strings --silent "$expected"
+    return $?
+}
+
+
+# Asserts that the specified .NET Runtime version is installed
+# Returns a non-zero exit code if the check fails
+# Usage: is_dotnet_runtime_version_installed <version>
+# Example: is_dotnet_runtime_version_installed "6.0"
+# Example: is_dotnet_runtime_version_installed "6.0.412"
+is_dotnet_runtime_version_installed() {
+    local expected="$1"
+    dotnet --list-runtimes | grep --fixed-strings --silent "Microsoft.NETCore.App $expected"
+    return $?
+}
+
+# Asserts that the specified ASP.NET Core Runtime version is installed
+# Returns a non-zero exit code if the check fails
+# Usage: is_aspnetcore_runtime_version_installed <version>
+# Example: is_aspnetcore_runtime_version_installed "6.0"
+# Example: is_aspnetcore_runtime_version_installed "6.0.412"
+is_aspnetcore_runtime_version_installed() {
+    local expected="$1"
+    dotnet --list-runtimes | grep --fixed-strings --silent "Microsoft.AspNetCore.App $expected"
+    return $?
+}
\ No newline at end of file
diff --git a/test/dotnet/install_additional_dotnet.sh b/test/dotnet/install_additional_dotnet.sh
deleted file mode 100644
index e69c7dce1..000000000
--- a/test/dotnet/install_additional_dotnet.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "dotnet version 6.0.301 installed as default" bash -c "dotnet --version | grep 6.0.301"
-check "dotnet version 5.0 installed"  bash -c "ls -l /usr/local/dotnet | grep 5.0"
-check "dotnet version 3.1.420 installed"  bash -c "ls -l /usr/local/dotnet | grep 3.1.420"
-
-# Verify current symlink exists and works
-check "current link dotnet" /usr/local/dotnet/current/dotnet --info
-check "current link sdk" ls -l /usr/local/dotnet/current/sdk
-
-# Report result
-reportResults
diff --git a/test/dotnet/install_aspnetcore_runtime_only.sh b/test/dotnet/install_aspnetcore_runtime_only.sh
new file mode 100644
index 000000000..35bd540b7
--- /dev/null
+++ b/test/dotnet/install_aspnetcore_runtime_only.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
+# Provides the 'check' and 'reportResults' commands.
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
+# check <LABEL> <cmd> [args...]
+source dotnet_env.sh
+source dotnet_helpers.sh
+
+expected=$(fetch_latest_version "aspnetcore")
+
+check "Latest ASP.NET Core Runtime version installed" \
+is_aspnetcore_runtime_version_installed "$expected"
+
+# Expect this check to fail in November 2023 when .NET 8.0 becomes GA
+check "It is a flavor of .NET 7.0" \
+is_aspnetcore_runtime_version_installed "7.0"
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults
\ No newline at end of file
diff --git a/test/dotnet/install_dotnet_3.sh b/test/dotnet/install_dotnet_3.sh
deleted file mode 100644
index 51d871bcf..000000000
--- a/test/dotnet/install_dotnet_3.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "dotnet sdks" dotnet --list-sdks
-check "some major version of dotnet 3 is installed" bash -c "dotnet --list-sdks |  grep '3\.[0-9]*\.[0-9]*'"
-check "dotnet version 3 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '3\.[0-9]*\.[0-9]*'"
-
-# Verify current symlink exists and works
-check "current link dotnet" /usr/local/dotnet/current/dotnet --info
-check "current link sdk" ls -l /usr/local/dotnet/current/sdk
-
-# Report result
-reportResults
diff --git a/test/dotnet/install_dotnet_6_bullseye.sh b/test/dotnet/install_dotnet_6_bullseye.sh
deleted file mode 100644
index 758f0402d..000000000
--- a/test/dotnet/install_dotnet_6_bullseye.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "dotnet sdks" dotnet --list-sdks
-check "some major version of dotnet 6 is installed" bash -c "dotnet --list-sdks |  grep '6\.[0-9]*\.[0-9]*'"
-check "dotnet version 6 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '6\.[0-9]*\.[0-9]*'"
-
-# Verify current symlink exists and works
-check "current link dotnet" /usr/local/dotnet/current/dotnet --info
-check "current link sdk" ls -l /usr/local/dotnet/current/sdk
-
-# Report result
-reportResults
diff --git a/test/dotnet/install_dotnet_6_focal.sh b/test/dotnet/install_dotnet_6_focal.sh
deleted file mode 100644
index 758f0402d..000000000
--- a/test/dotnet/install_dotnet_6_focal.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "dotnet sdks" dotnet --list-sdks
-check "some major version of dotnet 6 is installed" bash -c "dotnet --list-sdks |  grep '6\.[0-9]*\.[0-9]*'"
-check "dotnet version 6 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '6\.[0-9]*\.[0-9]*'"
-
-# Verify current symlink exists and works
-check "current link dotnet" /usr/local/dotnet/current/dotnet --info
-check "current link sdk" ls -l /usr/local/dotnet/current/sdk
-
-# Report result
-reportResults
diff --git a/test/dotnet/install_dotnet_6_jammy.sh b/test/dotnet/install_dotnet_6_jammy.sh
deleted file mode 100644
index fd1063473..000000000
--- a/test/dotnet/install_dotnet_6_jammy.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "dotnet sdks" dotnet --list-sdks
-check "some major version of dotnet 6 is installed" bash -c "dotnet --list-sdks |  grep '6\.[0-9]*\.[0-9]*'"
-check "dotnet version 6 installed"  bash -c "ls -l /usr/lib/dotnet/sdk | grep '6\.[0-9]*\.[0-9]*'"
-
-# Verify current symlink exists and works
-check "current link dotnet" /usr/local/dotnet/current/dotnet --info
-check "current link sdk" ls -l /usr/local/dotnet/current/sdk
-
-# Report result
-reportResults
diff --git a/test/dotnet/install_dotnet_7_bullseye.sh b/test/dotnet/install_dotnet_7_bullseye.sh
deleted file mode 100644
index 2c015fc0e..000000000
--- a/test/dotnet/install_dotnet_7_bullseye.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "dotnet sdks" dotnet --list-sdks
-check "some major version of dotnet 7 is installed" bash -c "dotnet --list-sdks |  grep '7\.[0-9]*\.[0-9]*'"
-check "dotnet version 7 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '7\.[0-9]*\.[0-9]*'"
-
-# Verify current symlink exists and works
-check "current link dotnet" /usr/local/dotnet/current/dotnet --info
-check "current link sdk" ls -l /usr/local/dotnet/current/sdk
-
-# Report result
-reportResults
diff --git a/test/dotnet/install_dotnet_7_jammy.sh b/test/dotnet/install_dotnet_7_jammy.sh
deleted file mode 100644
index 139216885..000000000
--- a/test/dotnet/install_dotnet_7_jammy.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "dotnet sdks" dotnet --list-sdks
-check "some major version of dotnet 7 is installed" bash -c "dotnet --list-sdks |  grep '7\.[0-9]*\.[0-9]*'"
-check "dotnet version 7 installed"  bash -c "ls -l /usr/lib/dotnet/sdk | grep '7\.[0-9]*\.[0-9]*'"
-
-# Verify current symlink exists and works
-check "current link dotnet" /usr/local/dotnet/current/dotnet --info
-check "current link sdk" ls -l /usr/local/dotnet/current/sdk
-
-# Report result
-reportResults
diff --git a/test/dotnet/install_dotnet_exact_version.sh b/test/dotnet/install_dotnet_exact_version.sh
new file mode 100644
index 000000000..ec89f3b8d
--- /dev/null
+++ b/test/dotnet/install_dotnet_exact_version.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
+# Provides the 'check' and 'reportResults' commands.
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
+# check <LABEL> <cmd> [args...]
+source dotnet_env.sh
+source dotnet_helpers.sh
+
+check ".NET SDK 8.0.100-preview.6.23330.14 installed" \
+is_dotnet_sdk_version_installed "8.0.100-preview.6.23330.14"
+
+check "Build and run example project" \
+dotnet run --project projects/net8.0 
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults
\ No newline at end of file
diff --git a/test/dotnet/install_dotnet_global_tool.sh b/test/dotnet/install_dotnet_global_tool.sh
new file mode 100644
index 000000000..948b650d7
--- /dev/null
+++ b/test/dotnet/install_dotnet_global_tool.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
+# Provides the 'check' and 'reportResults' commands.
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
+# check <LABEL> <cmd> [args...]
+source dotnet_env.sh
+source dotnet_helpers.sh
+
+# From https://learn.microsoft.com/en-us/dotnet/core/tools/global-tools
+check "Install a .NET global tool" \
+dotnet tool install --global dotnetsay
+
+check "Run the tool" \
+dotnetsay "$(dotnet --info)"
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults
\ No newline at end of file
diff --git a/test/dotnet/install_dotnet_latest.sh b/test/dotnet/install_dotnet_latest.sh
deleted file mode 100644
index 139216885..000000000
--- a/test/dotnet/install_dotnet_latest.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "dotnet sdks" dotnet --list-sdks
-check "some major version of dotnet 7 is installed" bash -c "dotnet --list-sdks |  grep '7\.[0-9]*\.[0-9]*'"
-check "dotnet version 7 installed"  bash -c "ls -l /usr/lib/dotnet/sdk | grep '7\.[0-9]*\.[0-9]*'"
-
-# Verify current symlink exists and works
-check "current link dotnet" /usr/local/dotnet/current/dotnet --info
-check "current link sdk" ls -l /usr/local/dotnet/current/sdk
-
-# Report result
-reportResults
diff --git a/test/dotnet/install_dotnet_latest_when_version_is_empty.sh b/test/dotnet/install_dotnet_latest_when_version_is_empty.sh
new file mode 100644
index 000000000..7418892e1
--- /dev/null
+++ b/test/dotnet/install_dotnet_latest_when_version_is_empty.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
+# Provides the 'check' and 'reportResults' commands.
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
+# check <LABEL> <cmd> [args...]
+source dotnet_env.sh
+source dotnet_helpers.sh
+
+expected=$(fetch_latest_version)
+
+check "Latest .NET SDK version installed" \
+is_dotnet_sdk_version_installed "$expected"
+
+# Expect this check to fail in November 2023 when .NET 8.0 becomes GA
+check "It is a flavor of .NET 7.0" \
+is_dotnet_sdk_version_installed "7.0"
+
+check "Build and run example project" \
+dotnet run --project projects/net7.0
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults
\ No newline at end of file
diff --git a/test/dotnet/install_dotnet_lts.sh b/test/dotnet/install_dotnet_lts.sh
index 758f0402d..fe37b89f7 100644
--- a/test/dotnet/install_dotnet_lts.sh
+++ b/test/dotnet/install_dotnet_lts.sh
@@ -2,16 +2,25 @@
 
 set -e
 
-# Optional: Import test library
+# Optional: Import test library bundled with the devcontainer CLI
+# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
+# Provides the 'check' and 'reportResults' commands.
 source dev-container-features-test-lib
 
-check "dotnet sdks" dotnet --list-sdks
-check "some major version of dotnet 6 is installed" bash -c "dotnet --list-sdks |  grep '6\.[0-9]*\.[0-9]*'"
-check "dotnet version 6 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '6\.[0-9]*\.[0-9]*'"
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
+# check <LABEL> <cmd> [args...]
+source dotnet_env.sh
+source dotnet_helpers.sh
 
-# Verify current symlink exists and works
-check "current link dotnet" /usr/local/dotnet/current/dotnet --info
-check "current link sdk" ls -l /usr/local/dotnet/current/sdk
+expected=$(fetch_latest_version_in_channel "LTS")
 
-# Report result
-reportResults
+check "Latest LTS version installed" \
+is_dotnet_sdk_version_installed "$expected"
+
+check "Build and run example project" \
+dotnet run --project projects/net6.0
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults
\ No newline at end of file
diff --git a/test/dotnet/install_dotnet_multiple_versions.sh b/test/dotnet/install_dotnet_multiple_versions.sh
new file mode 100644
index 000000000..5f0f12533
--- /dev/null
+++ b/test/dotnet/install_dotnet_multiple_versions.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
+# Provides the 'check' and 'reportResults' commands.
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
+# check <LABEL> <cmd> [args...]
+source dotnet_env.sh
+source dotnet_helpers.sh
+
+check ".NET SDK 8.0 installed" \
+is_dotnet_sdk_version_installed "8.0"
+
+check ".NET SDK 7.0 installed" \
+is_dotnet_sdk_version_installed "7.0"
+
+check ".NET SDK 6.0 installed" \
+is_dotnet_sdk_version_installed "6.0"
+
+check "Build example class library" \
+dotnet build projects/multitargeting
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults
\ No newline at end of file
diff --git a/test/dotnet/install_dotnet_runtime_only.sh b/test/dotnet/install_dotnet_runtime_only.sh
new file mode 100644
index 000000000..65188c5ec
--- /dev/null
+++ b/test/dotnet/install_dotnet_runtime_only.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
+# Provides the 'check' and 'reportResults' commands.
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
+# check <LABEL> <cmd> [args...]
+source dotnet_env.sh
+source dotnet_helpers.sh
+
+expected=$(fetch_latest_version "dotnet")
+
+check "Latest .NET Runtime version installed" \
+is_dotnet_runtime_version_installed "$expected"
+
+# Expect this check to fail in November 2023 when .NET 8.0 becomes GA
+check "It is a flavor of .NET 7.0" \
+is_dotnet_runtime_version_installed "7.0"
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults
\ No newline at end of file
diff --git a/test/dotnet/install_dotnet_specific_release.sh b/test/dotnet/install_dotnet_specific_release.sh
new file mode 100644
index 000000000..207e58280
--- /dev/null
+++ b/test/dotnet/install_dotnet_specific_release.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
+# Provides the 'check' and 'reportResults' commands.
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
+# check <LABEL> <cmd> [args...]
+source dotnet_env.sh
+source dotnet_helpers.sh
+
+expected=$(fetch_latest_version_in_channel "3.1")
+
+check ".NET Core SDK 3.1 installed" \
+is_dotnet_sdk_version_installed "$expected"
+
+check "Build and run example project" \
+dotnet run --project projects/netcoreapp3.1 
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults
\ No newline at end of file
diff --git a/test/dotnet/install_dotnet_specific_release_and_feature_band.sh b/test/dotnet/install_dotnet_specific_release_and_feature_band.sh
new file mode 100644
index 000000000..51f5c582b
--- /dev/null
+++ b/test/dotnet/install_dotnet_specific_release_and_feature_band.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
+# Provides the 'check' and 'reportResults' commands.
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
+# check <LABEL> <cmd> [args...]
+source dotnet_env.sh
+source dotnet_helpers.sh
+
+check ".NET SDK 5.0.3xx installed" \
+is_dotnet_sdk_version_installed "5.0.3"
+
+check "Build and run example project" \
+dotnet run --project projects/net5.0 
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults
\ No newline at end of file
diff --git a/test/dotnet/install_wo_apt.sh b/test/dotnet/install_wo_apt.sh
deleted file mode 100644
index a1745c573..000000000
--- a/test/dotnet/install_wo_apt.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "dotnet sdks" dotnet --list-sdks
-check "some major version of dotnet 7 is installed" bash -c "dotnet --list-sdks |  grep '7\.[0-9]*\.[0-9]*'"
-check "dotnet version 7 installed"  bash -c "ls -l /usr/local/dotnet | grep '7\.[0-9]*\.[0-9]*'"
-
-# Verify current symlink exists and works
-check "current link dotnet" /usr/local/dotnet/current/dotnet --info
-check "current link sdk" ls -l /usr/local/dotnet/current/sdk
-
-# Report result
-reportResults
diff --git a/test/dotnet/projects/.gitignore b/test/dotnet/projects/.gitignore
new file mode 100644
index 000000000..8d4a6c08a
--- /dev/null
+++ b/test/dotnet/projects/.gitignore
@@ -0,0 +1,2 @@
+bin
+obj
\ No newline at end of file
diff --git a/test/dotnet/projects/multitargeting/Class1.cs b/test/dotnet/projects/multitargeting/Class1.cs
new file mode 100644
index 000000000..453b6a445
--- /dev/null
+++ b/test/dotnet/projects/multitargeting/Class1.cs
@@ -0,0 +1,4 @@
+public class Class1
+{
+
+}
diff --git a/test/dotnet/projects/multitargeting/example_classlib.csproj b/test/dotnet/projects/multitargeting/example_classlib.csproj
new file mode 100644
index 000000000..ba47b0f46
--- /dev/null
+++ b/test/dotnet/projects/multitargeting/example_classlib.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/test/dotnet/projects/net5.0/Program.cs b/test/dotnet/projects/net5.0/Program.cs
new file mode 100644
index 000000000..3f3144fa7
--- /dev/null
+++ b/test/dotnet/projects/net5.0/Program.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+string json = @"{
+  ""Name"": ""Inception"",
+  ""ReleaseDate"": ""2010-07-08T00:00:00"",
+  ""Genres"": [
+    ""Action"",
+    ""Thriller""
+  ]
+}";
+
+Movie? m = JsonConvert.DeserializeObject<Movie>(json);
+
+if (m == default)
+{
+    Console.WriteLine("Decoding failed!");
+}
+else
+{
+    Console.WriteLine($"Movie name: {m.Name}");
+    Console.WriteLine($"Release Date: {m.ReleaseDate}");
+    Console.WriteLine($"Genres: {string.Join(", ", m.Genres)}");
+}
+
+class Movie
+{
+    public string Name { get; set; } = "Default Name";
+    public DateTime ReleaseDate { get; set; }
+    public List<string> Genres { get; set; } = new List<string>();
+}
diff --git a/test/dotnet/projects/net5.0/example_project.csproj b/test/dotnet/projects/net5.0/example_project.csproj
new file mode 100644
index 000000000..63450c349
--- /dev/null
+++ b/test/dotnet/projects/net5.0/example_project.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/test/dotnet/projects/net6.0/Program.cs b/test/dotnet/projects/net6.0/Program.cs
new file mode 100644
index 000000000..6d7311261
--- /dev/null
+++ b/test/dotnet/projects/net6.0/Program.cs
@@ -0,0 +1,30 @@
+using Newtonsoft.Json;
+
+string json = @"{
+  ""Name"": ""Inception"",
+  ""ReleaseDate"": ""2010-07-08T00:00:00"",
+  ""Genres"": [
+    ""Action"",
+    ""Thriller""
+  ]
+}";
+
+Movie? m = JsonConvert.DeserializeObject<Movie>(json);
+
+if (m == default)
+{
+    Console.WriteLine("Decoding failed!");
+}
+else
+{
+    Console.WriteLine($"Movie name: {m.Name}");
+    Console.WriteLine($"Release Date: {m.ReleaseDate}");
+    Console.WriteLine($"Genres: {string.Join(", ", m.Genres)}");
+}
+
+class Movie
+{
+    public string Name { get; set; } = "Default Name";
+    public DateTime ReleaseDate { get; set; }
+    public List<string> Genres { get; set; } = new List<string>();
+}
diff --git a/test/dotnet/projects/net6.0/example_project.csproj b/test/dotnet/projects/net6.0/example_project.csproj
new file mode 100644
index 000000000..aa2434cb7
--- /dev/null
+++ b/test/dotnet/projects/net6.0/example_project.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/test/dotnet/projects/net7.0/Program.cs b/test/dotnet/projects/net7.0/Program.cs
new file mode 100644
index 000000000..6d7311261
--- /dev/null
+++ b/test/dotnet/projects/net7.0/Program.cs
@@ -0,0 +1,30 @@
+using Newtonsoft.Json;
+
+string json = @"{
+  ""Name"": ""Inception"",
+  ""ReleaseDate"": ""2010-07-08T00:00:00"",
+  ""Genres"": [
+    ""Action"",
+    ""Thriller""
+  ]
+}";
+
+Movie? m = JsonConvert.DeserializeObject<Movie>(json);
+
+if (m == default)
+{
+    Console.WriteLine("Decoding failed!");
+}
+else
+{
+    Console.WriteLine($"Movie name: {m.Name}");
+    Console.WriteLine($"Release Date: {m.ReleaseDate}");
+    Console.WriteLine($"Genres: {string.Join(", ", m.Genres)}");
+}
+
+class Movie
+{
+    public string Name { get; set; } = "Default Name";
+    public DateTime ReleaseDate { get; set; }
+    public List<string> Genres { get; set; } = new List<string>();
+}
diff --git a/test/dotnet/projects/net7.0/example_project.csproj b/test/dotnet/projects/net7.0/example_project.csproj
new file mode 100644
index 000000000..424f54ae7
--- /dev/null
+++ b/test/dotnet/projects/net7.0/example_project.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/test/dotnet/projects/net8.0/Program.cs b/test/dotnet/projects/net8.0/Program.cs
new file mode 100644
index 000000000..690a54eef
--- /dev/null
+++ b/test/dotnet/projects/net8.0/Program.cs
@@ -0,0 +1,32 @@
+using Newtonsoft.Json;
+
+string json = """
+{
+  "Name": "Inception",
+  "ReleaseDate": "2010-07-08T00:00:00",
+  "Genres": [
+    "Action",
+    "Thriller"
+  ]
+}
+""";
+
+Movie? m = JsonConvert.DeserializeObject<Movie>(json);
+
+if (m == default)
+{
+    Console.WriteLine("Decoding failed!");
+}
+else
+{
+    Console.WriteLine($"Movie name: {m.Name}");
+    Console.WriteLine($"Release Date: {m.ReleaseDate}");
+    Console.WriteLine($"Genres: {string.Join(", ", m.Genres)}");
+}
+
+class Movie
+{
+    public string Name { get; set; } = "Default Name";
+    public DateTime ReleaseDate { get; set; }
+    public List<string> Genres { get; set; } = new List<string>();
+}
diff --git a/test/dotnet/projects/net8.0/example_project.csproj b/test/dotnet/projects/net8.0/example_project.csproj
new file mode 100644
index 000000000..2f1f60891
--- /dev/null
+++ b/test/dotnet/projects/net8.0/example_project.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/test/dotnet/projects/netcoreapp3.1/Program.cs b/test/dotnet/projects/netcoreapp3.1/Program.cs
new file mode 100644
index 000000000..3e088a966
--- /dev/null
+++ b/test/dotnet/projects/netcoreapp3.1/Program.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+class Program
+{
+    public static void Main()
+    {
+        string json = @"{
+          ""Name"": ""Inception"",
+          ""ReleaseDate"": ""2010-07-08T00:00:00"",
+          ""Genres"": [
+            ""Action"",
+            ""Thriller""
+          ]
+        }";
+
+        Movie? m = JsonConvert.DeserializeObject<Movie>(json);
+
+        if (m == default)
+        {
+            Console.WriteLine("Decoding failed!");
+        }
+        else
+        {
+            Console.WriteLine($"Movie name: {m.Name}");
+            Console.WriteLine($"Release Date: {m.ReleaseDate}");
+            Console.WriteLine($"Genres: {string.Join(", ", m.Genres)}");
+        }
+    }
+}
+
+
+class Movie
+{
+    public string Name { get; set; } = "Default Name";
+    public DateTime ReleaseDate { get; set; }
+    public List<string> Genres { get; set; } = new List<string>();
+}
diff --git a/test/dotnet/projects/netcoreapp3.1/example_project.csproj b/test/dotnet/projects/netcoreapp3.1/example_project.csproj
new file mode 100644
index 000000000..e2e909c17
--- /dev/null
+++ b/test/dotnet/projects/netcoreapp3.1/example_project.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/test/dotnet/scenarios.json b/test/dotnet/scenarios.json
index afee26f84..f07aaa508 100644
--- a/test/dotnet/scenarios.json
+++ b/test/dotnet/scenarios.json
@@ -1,83 +1,84 @@
 {
-    "install_additional_dotnet": {
-        "image": "ubuntu:focal",
+    "install_dotnet_lts": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "remoteUser": "vscode",
         "features": {
             "dotnet": {
-                "version": "6.0.301",
-                "additionalVersions": "5.0,3.1.420"
+                "version": "lts"
             }
         }
     },
-    "install_dotnet_3": {
-        "image": "ubuntu:focal",
+    "install_dotnet_specific_release": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "remoteUser": "vscode",
         "features": {
             "dotnet": {
-                "version": "3"
+                "version": "3.1"
             }
         }
     },
-    "install_dotnet_6_bullseye": {
-        "image": "debian:bullseye",
+    "install_dotnet_specific_release_and_feature_band": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "remoteUser": "vscode",
         "features": {
             "dotnet": {
-                "version": "6"
+                "version": "5.0.3xx"
             }
         }
     },
-    "install_dotnet_6_focal": {
-        "image": "ubuntu:focal",
+    "install_dotnet_exact_version": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "remoteUser": "vscode",
         "features": {
             "dotnet": {
-                "version": "6"
+                "version": "8.0.100-preview.6.23330.14"
             }
         }
     },
-    "install_dotnet_7_bullseye": {
-        "image": "debian:bullseye",
+    "install_dotnet_multiple_versions": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "remoteUser": "vscode",
         "features": {
             "dotnet": {
-                "version": "7"
+                "version": "8.0.100-preview.6.23330.14",
+                "additionalVersions": [
+                    "7.0",
+                    "6.0"
+                ]
             }
         }
     },
-    "install_dotnet_7_jammy": {
-        "image": "ubuntu:jammy",
+    "install_dotnet_global_tool": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "remoteUser": "vscode",
         "features": {
-            "dotnet": {
-                "version": "7"
-            }
+            "dotnet": {}
         }
     },
-    "install_dotnet_6_jammy": {
-        "image": "mcr.microsoft.com/devcontainers/base:jammy",
+    "install_dotnet_latest_when_version_is_empty": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "remoteUser": "vscode",
         "features": {
-            "dotnet": {
-                "version": "6"
-            }
+            "dotnet": ""
         }
     },
-    "install_dotnet_latest": {
-        "image": "ubuntu:jammy",
+    "install_dotnet_runtime_only": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "remoteUser": "vscode",
         "features": {
             "dotnet": {
-                "version": "latest"
-            }
-        }
-    },
-    "install_dotnet_lts": {
-        "image": "ubuntu:focal",
-        "features": {
-            "dotnet": {
-                "version": "lts"
+                "version": "none",
+                "dotnetRuntimeVersions": "latest"
             }
         }
     },
-    "install_wo_apt": {
-        "image": "ubuntu:jammy",
+    "install_aspnetcore_runtime_only": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "remoteUser": "vscode",
         "features": {
             "dotnet": {
-                "version": "7",
-                "installUsingApt": false
+                "version": "none",
+                "aspnetcoreRuntimeVersions": "latest"
             }
         }
     }
diff --git a/test/dotnet/test.sh b/test/dotnet/test.sh
old mode 100755
new mode 100644
index f433654e6..7418892e1
--- a/test/dotnet/test.sh
+++ b/test/dotnet/test.sh
@@ -2,20 +2,29 @@
 
 set -e
 
-# Optional: Import test library
+# Optional: Import test library bundled with the devcontainer CLI
+# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
+# Provides the 'check' and 'reportResults' commands.
 source dev-container-features-test-lib
 
-# Definition specific tests
-check "dotnet" dotnet --info
-check "sdks" dotnet --list-sdks
-check "version" dotnet --version
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
+# check <LABEL> <cmd> [args...]
+source dotnet_env.sh
+source dotnet_helpers.sh
 
-echo "Validating expected version present..."
-check "some major version of dotnet (7/8) is installed" bash -c "dotnet --version |  grep '[7-8]\.[0-9]*\.[0-9]*'"
+expected=$(fetch_latest_version)
 
-# Verify current symlink exists and works
-check "current link dotnet" /usr/local/dotnet/current/dotnet --info
-check "current link sdk" ls -l /usr/local/dotnet/current/sdk
+check "Latest .NET SDK version installed" \
+is_dotnet_sdk_version_installed "$expected"
 
-# Report result
+# Expect this check to fail in November 2023 when .NET 8.0 becomes GA
+check "It is a flavor of .NET 7.0" \
+is_dotnet_sdk_version_installed "7.0"
+
+check "Build and run example project" \
+dotnet run --project projects/net7.0
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
 reportResults
\ No newline at end of file

From 8ad7c749b3133d5163f6bdf35cab5cf9d0d9f3c9 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Mon, 11 Sep 2023 11:28:49 -0700
Subject: [PATCH 164/478] Automated documentation update (#688)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/dotnet/README.md | 78 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 73 insertions(+), 5 deletions(-)

diff --git a/src/dotnet/README.md b/src/dotnet/README.md
index 83c42494f..972e5d426 100644
--- a/src/dotnet/README.md
+++ b/src/dotnet/README.md
@@ -1,13 +1,13 @@
 
 # Dotnet CLI (dotnet)
 
-Installs the .NET CLI. Provides option of installing sdk or runtime, and option of versions to install. Uses latest version of .NET sdk as defaults to install.
+This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.
 
 ## Example Usage
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/dotnet:1": {}
+    "ghcr.io/devcontainers/features/dotnet:2": {}
 }
 ```
 
@@ -15,9 +15,10 @@ Installs the .NET CLI. Provides option of installing sdk or runtime, and option
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| version | Select or enter a dotnet CLI version. (Available versions may vary by Linux distribution.) | string | latest |
-| runtimeOnly | Install just the dotnet runtime if true, and sdk if false. | boolean | false |
-| installUsingApt | If true, it installs using apt instead of the release URL | boolean | true |
+| version | Select or enter a .NET SDK version. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version. | string | latest |
+| additionalVersions | Enter additional .NET SDK versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version. | string | - |
+| dotnetRuntimeVersions | Enter additional .NET runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version. | string | - |
+| aspNetCoreRuntimeVersions | Enter additional ASP.NET Core runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version. | string | - |
 
 ## Customizations
 
@@ -25,7 +26,74 @@ Installs the .NET CLI. Provides option of installing sdk or runtime, and option
 
 - `ms-dotnettools.csharp`
 
+## Configuration examples
 
+Installing only the latest .NET SDK version (the default).
+
+``` json
+{
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": "latest" // or "" or {}
+}
+```
+
+Installing an additional SDK version. Multiple versions can be specified as comma-separated values.
+
+``` json
+{
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+        "additionalVersions": "lts"
+    }
+}
+```
+
+Installing specific SDK versions.
+
+``` json
+{
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+        "version": "6.0",
+        "additionalVersions": "7.0, 8.0"
+    }
+}
+```
+
+Installing a specific SDK feature band.
+
+``` json
+{
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+        "version": "6.0.4xx",
+    }
+}
+```
+
+Installing a specific SDK patch version.
+
+``` json
+{
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+        "version": "6.0.412",
+    }
+}
+```
+
+Installing only the .NET Runtime or the ASP.NET Core Runtime. (The SDK includes all runtimes so this configuration is only useful if you need to run .NET apps without building them from source.)
+
+``` json
+{
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+        "version": "none",
+        "dotnetRuntimeVersions": "latest, lts",
+        "aspnetCoreRuntimeVersions": "latest, lts",
+    }
+}
+```
 
 ## OS Support
 

From a771e8cb426961dadb6312d857ea272b711714b3 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Mon, 11 Sep 2023 11:32:53 -0700
Subject: [PATCH 165/478] [Docker-in-docker] Support bookworm (#661)

* [Docker-in-docker] Support bookworm

* Update devcontainer-feature.json
---
 src/docker-in-docker/devcontainer-feature.json | 2 +-
 src/docker-in-docker/install.sh                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index edfaa1f09..2feea7d99 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.4.0",
+    "version": "2.5.0",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index a0d4a943c..39d1b77ca 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -16,8 +16,8 @@ DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
-DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy"
-DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal hirsute impish jammy"
+DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal jammy"
+DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal hirsute impish jammy"
 
 # Default: Exit on any failure.
 set -e

From 97eea5deee6cda653f7b9bb4fb66e1a52d62b38e Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 13 Sep 2023 08:42:41 -0700
Subject: [PATCH 166/478] [Go] Update proposals for the "version" option (#654)

Update devcontainer-feature.json
---
 src/go/devcontainer-feature.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/go/devcontainer-feature.json b/src/go/devcontainer-feature.json
index 963dc8948..9cd89b26c 100644
--- a/src/go/devcontainer-feature.json
+++ b/src/go/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "go",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "name": "Go",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/go",
     "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.",
@@ -10,8 +10,8 @@
             "proposals": [
                 "latest",
                 "none",
-                "1.19",
-                "1.18"
+                "1.21",
+                "1.20"
             ],
             "default": "latest",
             "description": "Select or enter a Go version to install"

From f92f7ba7ae53b996a439c77f82ed99fc050ee3da Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Thu, 14 Sep 2023 09:05:50 -0700
Subject: [PATCH 167/478] [common-utils]: Bug fix: Install zsh on an image
 previously built with "installZsh:false" (#649)

* [common-utils]: Bug fix: Installs zsh on an image built with installZsh:false

* version bump

* nit: fix merge conflicts

* Version bump
---
 src/common-utils/devcontainer-feature.json |   2 +-
 src/common-utils/main.sh                   | 279 +++++++++++----------
 2 files changed, 147 insertions(+), 134 deletions(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 747be3074..869812be6 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.1.2",
+    "version": "2.1.3",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 902f9e694..4a048db71 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -28,7 +28,10 @@ install_debian_packages() {
     # Ensure apt is in non-interactive to avoid prompts
     export DEBIAN_FRONTEND=noninteractive
 
-    local package_list="apt-utils \
+    local package_list=""
+    if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
+        package_list="${package_list} \
+        apt-utils \
         openssh-client \
         gnupg2 \
         dirmngr \
@@ -70,6 +73,34 @@ install_debian_packages() {
         manpages-dev \
         init-system-helpers"
 
+        # Include libssl1.1 if available
+        if [[ ! -z $(apt-cache --names-only search ^libssl1.1$) ]]; then
+            package_list="${package_list} libssl1.1"
+        fi
+
+        # Include libssl3 if available
+        if [[ ! -z $(apt-cache --names-only search ^libssl3$) ]]; then
+            package_list="${package_list} libssl3"
+        fi
+
+        # Include appropriate version of libssl1.0.x if available
+        local libssl_package=$(dpkg-query -f '${db:Status-Abbrev}\t${binary:Package}\n' -W 'libssl1\.0\.?' 2>&1 || echo '')
+        if [ "$(echo "$libssl_package" | grep -o 'libssl1\.0\.[0-9]:' | uniq | sort | wc -l)" -eq 0 ]; then
+            if [[ ! -z $(apt-cache --names-only search ^libssl1.0.2$) ]]; then
+                # Debian 9
+                package_list="${package_list} libssl1.0.2"
+            elif [[ ! -z $(apt-cache --names-only search ^libssl1.0.0$) ]]; then
+                # Ubuntu 18.04
+                package_list="${package_list} libssl1.0.0"
+            fi
+        fi
+
+        # Include git if not already installed (may be more recent than distro version)
+        if ! type git > /dev/null 2>&1; then
+            package_list="${package_list} git"
+        fi
+    fi
+
     # Needed for adding manpages-posix and manpages-posix-dev which are non-free packages in Debian
     if [ "${ADD_NON_FREE_PACKAGES}" = "true" ]; then
         # Bring in variables from /etc/os-release like VERSION_CODENAME
@@ -88,33 +119,6 @@ install_debian_packages() {
         package_list="${package_list} manpages-posix manpages-posix-dev"
     fi
 
-    # Include libssl1.1 if available
-    if [[ ! -z $(apt-cache --names-only search ^libssl1.1$) ]]; then
-        package_list="${package_list} libssl1.1"
-    fi
-
-    # Include libssl3 if available
-    if [[ ! -z $(apt-cache --names-only search ^libssl3$) ]]; then
-        package_list="${package_list} libssl3"
-    fi
-
-    # Include appropriate version of libssl1.0.x if available
-    local libssl_package=$(dpkg-query -f '${db:Status-Abbrev}\t${binary:Package}\n' -W 'libssl1\.0\.?' 2>&1 || echo '')
-    if [ "$(echo "$libssl_package" | grep -o 'libssl1\.0\.[0-9]:' | uniq | sort | wc -l)" -eq 0 ]; then
-        if [[ ! -z $(apt-cache --names-only search ^libssl1.0.2$) ]]; then
-            # Debian 9
-            package_list="${package_list} libssl1.0.2"
-        elif [[ ! -z $(apt-cache --names-only search ^libssl1.0.0$) ]]; then
-            # Ubuntu 18.04
-            package_list="${package_list} libssl1.0.0"
-        fi
-    fi
-
-    # Include git if not already installed (may be more recent than distro version)
-    if ! type git > /dev/null 2>&1; then
-        package_list="${package_list} git"
-    fi
-
     # Install the list of packages
     echo "Packages to verify are installed: ${package_list}"
     rm -rf /var/lib/apt/lists/*
@@ -139,6 +143,8 @@ install_debian_packages() {
         LOCALE_ALREADY_SET="true"
     fi
 
+    PACKAGES_ALREADY_INSTALLED="true"
+
     # Clean up
     apt-get -y clean
     rm -rf /var/lib/apt/lists/*
@@ -146,59 +152,69 @@ install_debian_packages() {
 
 # RedHat / RockyLinux / CentOS / Fedora packages
 install_redhat_packages() {
-    local package_list="\
-        gawk \
-        openssh-clients \
-        gnupg2 \
-        iproute \
-        procps \
-        lsof \
-        net-tools \
-        psmisc \
-        wget \
-        ca-certificates \
-        rsync \
-        unzip \
-        zip \
-        nano \
-        vim-minimal \
-        less \
-        jq \
-        openssl-libs \
-        krb5-libs \
-        libicu \
-        zlib \
-        sudo \
-        sed \
-        grep \
-        which \
-        man-db \
-        strace"
-
+    local package_list=""
+    local remove_epel="false"
     local install_cmd=dnf
     if ! type dnf > /dev/null 2>&1; then
         install_cmd=yum
     fi
 
+    if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
+        package_list="${package_list} \
+            gawk \
+            openssh-clients \
+            gnupg2 \
+            iproute \
+            procps \
+            lsof \
+            net-tools \
+            psmisc \
+            wget \
+            ca-certificates \
+            rsync \
+            unzip \
+            zip \
+            nano \
+            vim-minimal \
+            less \
+            jq \
+            openssl-libs \
+            krb5-libs \
+            libicu \
+            zlib \
+            sudo \
+            sed \
+            grep \
+            which \
+            man-db \
+            strace"
+
     # rockylinux:9 installs 'curl-minimal' which clashes with 'curl'
     # Install 'curl' for every OS except this rockylinux:9
     if [[ "${ID}" = "rocky" ]] && [[ "${VERSION}" != *"9."* ]]; then
         package_list="${package_list} curl"
     fi
 
-    # Install OpenSSL 1.0 compat if needed
-    if ${install_cmd} -q list compat-openssl10 >/dev/null 2>&1; then
-        package_list="${package_list} compat-openssl10"
-    fi
+        # Install OpenSSL 1.0 compat if needed
+        if ${install_cmd} -q list compat-openssl10 >/dev/null 2>&1; then
+            package_list="${package_list} compat-openssl10"
+        fi
 
-    # Install lsb_release if available
-    if ${install_cmd} -q list redhat-lsb-core >/dev/null 2>&1; then
-        package_list="${package_list} redhat-lsb-core"
-    fi
+        # Install lsb_release if available
+        if ${install_cmd} -q list redhat-lsb-core >/dev/null 2>&1; then
+            package_list="${package_list} redhat-lsb-core"
+        fi
 
-    # Install git if not already installed (may be more recent than distro version)
-    if ! type git > /dev/null 2>&1; then
-        package_list="${package_list} git"
+        # Install git if not already installed (may be more recent than distro version)
+        if ! type git > /dev/null 2>&1; then
+            package_list="${package_list} git"
+        fi
+
+        # Install EPEL repository if needed (required to install 'jq' for CentOS)
+        if ! ${install_cmd} -q list jq >/dev/null 2>&1; then
+            ${install_cmd} -y install epel-release
+            remove_epel="true"
+        fi
     fi
 
     # Install zsh if needed
@@ -206,13 +222,6 @@ install_redhat_packages() {
         package_list="${package_list} zsh"
     fi
 
-    # Install EPEL repository if needed (required to install 'jq' for CentOS)
-    local remove_epel="false"
-    if ! ${install_cmd} -q list jq >/dev/null 2>&1; then
-        ${install_cmd} -y install epel-release
-        remove_epel="true"
-    fi
-
     ${install_cmd} -y install ${package_list}
 
     # Get to latest versions of all packages
@@ -223,63 +232,70 @@ install_redhat_packages() {
     if [[ "${remove_epel}" = "true" ]]; then
         ${install_cmd} -y remove epel-release
     fi
+
+    PACKAGES_ALREADY_INSTALLED="true"
 }
 
 # Alpine Linux packages
 install_alpine_packages() {
     apk update
-    apk add --no-cache \
-        openssh-client \
-        gnupg \
-        procps \
-        lsof \
-        htop \
-        net-tools \
-        psmisc \
-        curl \
-        wget \
-        rsync \
-        ca-certificates \
-        unzip \
-        zip \
-        nano \
-        vim \
-        less \
-        jq \
-        libgcc \
-        libstdc++ \
-        krb5-libs \
-        libintl \
-        libssl1.1 \
-        lttng-ust \
-        tzdata \
-        userspace-rcu \
-        zlib \
-        sudo \
-        coreutils \
-        sed \
-        grep \
-        which \
-        ncdu \
-        shadow \
-        strace
 
-    # Install man pages - package name varies between 3.12 and earlier versions
-    if apk info man > /dev/null 2>&1; then
-        apk add --no-cache man man-pages
-    else
-        apk add --no-cache mandoc man-pages
-    fi
+    if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
+        apk add --no-cache \
+            openssh-client \
+            gnupg \
+            procps \
+            lsof \
+            htop \
+            net-tools \
+            psmisc \
+            curl \
+            wget \
+            rsync \
+            ca-certificates \
+            unzip \
+            zip \
+            nano \
+            vim \
+            less \
+            jq \
+            libgcc \
+            libstdc++ \
+            krb5-libs \
+            libintl \
+            libssl1.1 \
+            lttng-ust \
+            tzdata \
+            userspace-rcu \
+            zlib \
+            sudo \
+            coreutils \
+            sed \
+            grep \
+            which \
+            ncdu \
+            shadow \
+            strace
+
+        # Install man pages - package name varies between 3.12 and earlier versions
+        if apk info man > /dev/null 2>&1; then
+            apk add --no-cache man man-pages
+        else
+            apk add --no-cache mandoc man-pages
+        fi
 
-    # Install git if not already installed (may be more recent than distro version)
-    if ! type git > /dev/null 2>&1; then
-        apk add --no-cache git
+        # Install git if not already installed (may be more recent than distro version)
+        if ! type git > /dev/null 2>&1; then
+            apk add --no-cache git
+        fi
     fi
 
     # Install zsh if needed
     if [ "${INSTALL_ZSH}" = "true" ] && ! type zsh > /dev/null 2>&1; then
         apk add --no-cache zsh
     fi
+
+    PACKAGES_ALREADY_INSTALLED="true"
 }
 
 # ******************
@@ -318,20 +334,17 @@ else
 fi
 
 # Install packages for appropriate OS
-if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
-    case "${ADJUSTED_ID}" in
-        "debian")
-            install_debian_packages
-            ;;
-        "rhel")
-            install_redhat_packages
-            ;;
-        "alpine")
-            install_alpine_packages
-            ;;
-    esac
-    PACKAGES_ALREADY_INSTALLED="true"
-fi
+case "${ADJUSTED_ID}" in
+    "debian")
+        install_debian_packages
+        ;;
+    "rhel")
+        install_redhat_packages
+        ;;
+    "alpine")
+        install_alpine_packages
+        ;;
+esac
 
 # If in automatic mode, determine if a user already exists, if not use vscode
 if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then

From 3a22c419403b5c099c71a74c7079cde813e269d8 Mon Sep 17 00:00:00 2001
From: Steven <steven.liekens@gmail.com>
Date: Tue, 19 Sep 2023 18:58:33 +0200
Subject: [PATCH 168/478] Configure environment for
 update-dotnet-install-script.yml (#693)

---
 .github/workflows/update-dotnet-install-script.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/update-dotnet-install-script.yml b/.github/workflows/update-dotnet-install-script.yml
index 56adf854d..30a5aa458 100644
--- a/.github/workflows/update-dotnet-install-script.yml
+++ b/.github/workflows/update-dotnet-install-script.yml
@@ -7,6 +7,7 @@ on:
 jobs:
   fetch-latest-dotnet-install:
     runs-on: ubuntu-latest
+    environment: documentation # grants access to secrets.PAT, for creating pull requests
     steps:
       - uses: actions/checkout@v3
 

From 9852ca8888b613daff741b3f26fd7d3b0387b42d Mon Sep 17 00:00:00 2001
From: Pablo Ulloa <pablo.ulloac@usach.cl>
Date: Wed, 27 Sep 2023 13:26:53 -0300
Subject: [PATCH 169/478] [java] fix version regex to support graalce jdk 21
 (#701)

* [java] fixed feature test scenario check

* [java] support for non conentional version

* Update src/java/install.sh to not include whitespaces

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* bumped patch version

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/java/devcontainer-feature.json            |  2 +-
 src/java/install.sh                           |  4 ++--
 test/java/install_from_non_default_distro.sh  |  2 +-
 test/java/install_non_conventional_version.sh | 11 +++++++++++
 test/java/scenarios.json                      |  9 +++++++++
 5 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 test/java/install_non_conventional_version.sh

diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index 7bdec6ab0..d4aede873 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "name": "Java (via SDKMAN!)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
diff --git a/src/java/install.sh b/src/java/install.sh
index ea43dd3e9..2decc31b5 100644
--- a/src/java/install.sh
+++ b/src/java/install.sh
@@ -111,13 +111,13 @@ sdk_install() {
     elif echo "${requested_version}" | grep -oE "${full_version_check}" > /dev/null 2>&1; then
         echo "${requested_version}"
     else
-        local regex="${prefix}\\K[0-9]+\\.[0-9]+\\.[0-9]+${suffix}"
+        local regex="${prefix}\\K[0-9]+\\.?[0-9]*\\.?[0-9]*${suffix}"
         local version_list=$(su ${USERNAME} -c ". \${SDKMAN_DIR}/bin/sdkman-init.sh && sdk list ${install_type} 2>&1 | grep -oP \"${regex}\" | tr -d ' ' | sort -rV")
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ]; then
             requested_version="$(echo "${version_list}" | head -n 1)"
         else
             set +e
-            requested_version="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            requested_version="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|-|$)")"
             set -e
         fi
         if [ -z "${requested_version}" ] || ! echo "${version_list}" | grep "^${requested_version//./\\.}$" > /dev/null 2>&1; then
diff --git a/test/java/install_from_non_default_distro.sh b/test/java/install_from_non_default_distro.sh
index d4f53818e..021a72a21 100644
--- a/test/java/install_from_non_default_distro.sh
+++ b/test/java/install_from_non_default_distro.sh
@@ -5,7 +5,7 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-check "java version openjdk 11 installed" grep "openjdk 11." <(java --version)
+check "java version openjdk 19 installed" grep "openjdk 19." <(java --version)
 
 # Report result
 reportResults
diff --git a/test/java/install_non_conventional_version.sh b/test/java/install_non_conventional_version.sh
new file mode 100644
index 000000000..3ab648cab
--- /dev/null
+++ b/test/java/install_non_conventional_version.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "java version openjdk 21 installed" grep "openjdk 21." <(java --version)
+
+# Report result
+reportResults
diff --git a/test/java/scenarios.json b/test/java/scenarios.json
index 11fb7ba33..5d7e684ba 100644
--- a/test/java/scenarios.json
+++ b/test/java/scenarios.json
@@ -56,5 +56,14 @@
                 "mavenVersion": "3.6.3"
             }
         }
+    },
+    "install_non_conventional_version": {
+        "image": "ubuntu:focal",
+        "features":{
+            "java": {
+                "version": "21",
+                "jdkDistro": "graalce"
+            }
+        }
     }
 }

From e7f7d194d634e86b29ed2b74a35dd3c24fa1f7a5 Mon Sep 17 00:00:00 2001
From: Pablo Ulloa <pablo.ulloac@usach.cl>
Date: Wed, 27 Sep 2023 15:45:29 -0300
Subject: [PATCH 170/478] [common-utils] fix bug when user home is custom by
 base docker (#703)

* [common-utils] fix bug when user home is custom by base docker

* bumped minor version

* reduced conditions to improve readability
---
 src/common-utils/devcontainer-feature.json       |  2 +-
 src/common-utils/main.sh                         |  3 +++
 test/common-utils/devcontainer-custom-home.sh    | 13 +++++++++++++
 .../devcontainer-custom-home/Dockerfile          |  4 ++++
 .../devcontainer-custom-user-default-home.sh     | 13 +++++++++++++
 test/common-utils/scenarios.json                 | 16 ++++++++++++++++
 6 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 test/common-utils/devcontainer-custom-home.sh
 create mode 100644 test/common-utils/devcontainer-custom-home/Dockerfile
 create mode 100644 test/common-utils/devcontainer-custom-user-default-home.sh

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 869812be6..181e54594 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.1.3",
+    "version": "2.2.0",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 4a048db71..71422465c 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -407,6 +407,9 @@ fi
 
 if [ "${USERNAME}" = "root" ]; then
     user_home="/root"
+# Check if user already has a home directory other than /home/${USERNAME}
+elif [ "/home/${USERNAME}" != $( getent passwd $USERNAME | cut -d: -f6 ) ]; then
+    user_home=$( getent passwd $USERNAME | cut -d: -f6 )
 else
     user_home="/home/${USERNAME}"
     if [ ! -d "${user_home}" ]; then
diff --git a/test/common-utils/devcontainer-custom-home.sh b/test/common-utils/devcontainer-custom-home.sh
new file mode 100644
index 000000000..9b64cc0bf
--- /dev/null
+++ b/test/common-utils/devcontainer-custom-home.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "user is customUser" grep customUser <(whoami)
+check "home is /customHome" grep "/customHome" <(getent passwd customUser | cut -d: -f6) 
+
+# Report result
+reportResults
diff --git a/test/common-utils/devcontainer-custom-home/Dockerfile b/test/common-utils/devcontainer-custom-home/Dockerfile
new file mode 100644
index 000000000..a94af4bc1
--- /dev/null
+++ b/test/common-utils/devcontainer-custom-home/Dockerfile
@@ -0,0 +1,4 @@
+FROM ubuntu:focal
+
+RUN groupadd customUser -g 30000 && \
+    useradd customUser -u 30000 -g 30000 --create-home --home-dir /customHome
diff --git a/test/common-utils/devcontainer-custom-user-default-home.sh b/test/common-utils/devcontainer-custom-user-default-home.sh
new file mode 100644
index 000000000..f29bd7c74
--- /dev/null
+++ b/test/common-utils/devcontainer-custom-user-default-home.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "user is customUser" grep customUser <(whoami)
+check "home is /home/customUser" grep "/home/customUser" <(getent passwd customUser | cut -d: -f6) 
+
+# Report result
+reportResults
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index d7b296d41..bb65874e1 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -183,5 +183,21 @@
                 "configureZshAsDefaultShell": true
             }
         }
+    },
+    "devcontainer-custom-home": {
+        "build": {
+            "dockerfile": "Dockerfile"
+        },
+        "remoteUser": "customUser",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "devcontainer-custom-user-default-home": {
+        "image": "mcr.microsoft.com/devcontainers/base:alpine",
+        "remoteUser": "customUser",
+        "features": {
+            "common-utils": {}
+        }
     }
 }

From 0d2fc3ad5b9d6bb33a29891c2378a377f0618c9b Mon Sep 17 00:00:00 2001
From: Alexander Smolyakov <v-asmoliakov@microsoft.com>
Date: Wed, 27 Sep 2023 22:51:26 +0400
Subject: [PATCH 171/478] [python] Change the `sudo_if` function to avoid
 issues with Bash (#694)

* [python] Updated `sudo_if` function

- Remove double quotes to avoid issues with string tokenization

* Add test scenario

* Revert "Add test scenario"

This reverts commit 9e62a3797a8f5eddf5c24a6b5fd30bd2c4be8c54.

* Update `jupyterlab git` package name

* Bump feature version

* Test: Install jupyterlab under root user

* Refactor changes

* Bump patch version

* Address review points
---
 src/python/devcontainer-feature.json         |  2 +-
 src/python/install.sh                        | 39 +++++++++++++++-----
 test/python/install_additional_jupyterlab.sh |  2 +-
 test/python/install_jupyterlab.sh            |  2 +-
 test/python/install_jupyterlab_debian.sh     | 22 +++++++++++
 test/python/install_jupyterlab_ubuntu.sh     | 22 +++++++++++
 test/python/scenarios.json                   | 22 ++++++++++-
 7 files changed, 97 insertions(+), 14 deletions(-)
 create mode 100644 test/python/install_jupyterlab_debian.sh
 create mode 100644 test/python/install_jupyterlab_ubuntu.sh

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index b4aa21e25..638fa6006 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/python/install.sh b/src/python/install.sh
index 0e2b1253c..7be5eea8a 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -304,25 +304,31 @@ sudo_if() {
     if [ "$(id -u)" -eq 0 ] && [ "$USERNAME" != "root" ]; then
         su - "$USERNAME" -c "$COMMAND"
     else
-        "$COMMAND"
+        $COMMAND
     fi
 }
 
 install_user_package() {
-    PACKAGE="$1"
-    sudo_if "${PYTHON_SRC}" -m pip install --user --upgrade --no-cache-dir "$PACKAGE"
+    INSTALL_UNDER_ROOT="$1"
+    PACKAGE="$2"
+
+    if [ "$INSTALL_UNDER_ROOT" = true ]; then
+        sudo_if "${PYTHON_SRC}" -m pip install --upgrade --no-cache-dir "$PACKAGE"
+    else
+        sudo_if "${PYTHON_SRC}" -m pip install --user --upgrade --no-cache-dir "$PACKAGE"
+    fi
 }
 
 add_user_jupyter_config() {
-    CONFIG_DIR="/home/$USERNAME/.jupyter"
-    CONFIG_FILE="$CONFIG_DIR/jupyter_server_config.py"
+    CONFIG_DIR="$1"
+    CONFIG_FILE="$2"
 
     # Make sure the config file exists or create it with proper permissions
     test -d "$CONFIG_DIR" || sudo_if mkdir "$CONFIG_DIR"
     test -f "$CONFIG_FILE" || sudo_if touch "$CONFIG_FILE"
 
     # Don't write the same config more than once
-    grep -q "$1" "$CONFIG_FILE" || echo "$1" >> "$CONFIG_FILE"
+    grep -q "$3" "$CONFIG_FILE" || echo "$3" >> "$CONFIG_FILE"
 }
 
 install_python() {
@@ -461,13 +467,26 @@ if [ "${INSTALL_JUPYTERLAB}" = "true" ]; then
         exit 1
     fi
 
-    install_user_package jupyterlab
-    install_user_package jupyterlab-git
+    INSTALL_UNDER_ROOT=true
+    if [ "$(id -u)" -eq 0 ] && [ "$USERNAME" != "root" ]; then
+        INSTALL_UNDER_ROOT=false
+    fi
+
+    install_user_package $INSTALL_UNDER_ROOT jupyterlab
+    install_user_package $INSTALL_UNDER_ROOT jupyterlab-git
 
     # Configure JupyterLab if needed
     if [ -n "${CONFIGURE_JUPYTERLAB_ALLOW_ORIGIN}" ]; then
-        add_user_jupyter_config "c.ServerApp.allow_origin = '${CONFIGURE_JUPYTERLAB_ALLOW_ORIGIN}'"
-        add_user_jupyter_config "c.NotebookApp.allow_origin = '${CONFIGURE_JUPYTERLAB_ALLOW_ORIGIN}'"
+        # Resolve config directory
+        CONFIG_DIR="/root/.jupyter"
+        if [ "$INSTALL_UNDER_ROOT" = false ]; then
+            CONFIG_DIR="/home/$USERNAME/.jupyter"
+        fi
+
+        CONFIG_FILE="$CONFIG_DIR/jupyter_server_config.py"
+
+        add_user_jupyter_config $CONFIG_DIR $CONFIG_FILE "c.ServerApp.allow_origin = '${CONFIGURE_JUPYTERLAB_ALLOW_ORIGIN}'"
+        add_user_jupyter_config $CONFIG_DIR $CONFIG_FILE "c.NotebookApp.allow_origin = '${CONFIGURE_JUPYTERLAB_ALLOW_ORIGIN}'"
     fi
 fi
 
diff --git a/test/python/install_additional_jupyterlab.sh b/test/python/install_additional_jupyterlab.sh
index a5658f0d2..58c4f7f54 100755
--- a/test/python/install_additional_jupyterlab.sh
+++ b/test/python/install_additional_jupyterlab.sh
@@ -17,7 +17,7 @@ packages="$(python3 -m pip list)"
 check "location" grep jupyter <<< "$packages"
 
 # Check for git extension
-check "jupyterlab-git" grep jupyterlab-git <<< "$packages"
+check "jupyterlab_git" grep jupyterlab_git <<< "$packages"
 
 # Check for correct JupyterLab configuration
 check "config" grep ".*.allow_origin = '*'" /home/vscode/.jupyter/jupyter_server_config.py
diff --git a/test/python/install_jupyterlab.sh b/test/python/install_jupyterlab.sh
index a5658f0d2..58c4f7f54 100755
--- a/test/python/install_jupyterlab.sh
+++ b/test/python/install_jupyterlab.sh
@@ -17,7 +17,7 @@ packages="$(python3 -m pip list)"
 check "location" grep jupyter <<< "$packages"
 
 # Check for git extension
-check "jupyterlab-git" grep jupyterlab-git <<< "$packages"
+check "jupyterlab_git" grep jupyterlab_git <<< "$packages"
 
 # Check for correct JupyterLab configuration
 check "config" grep ".*.allow_origin = '*'" /home/vscode/.jupyter/jupyter_server_config.py
diff --git a/test/python/install_jupyterlab_debian.sh b/test/python/install_jupyterlab_debian.sh
new file mode 100644
index 000000000..3db7fd477
--- /dev/null
+++ b/test/python/install_jupyterlab_debian.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Check for an installation of JupyterLab
+check "version" jupyter lab --version
+
+# Check location of JupyterLab installation
+packages="$(python3 -m pip list)"
+check "location" grep jupyter <<< "$packages"
+
+# Check for git extension
+check "jupyterlab_git" grep jupyterlab_git <<< "$packages"
+
+# Check for correct JupyterLab configuration
+check "config" grep ".*.allow_origin = '*'" /root/.jupyter/jupyter_server_config.py
+
+# Report result
+reportResults
diff --git a/test/python/install_jupyterlab_ubuntu.sh b/test/python/install_jupyterlab_ubuntu.sh
new file mode 100644
index 000000000..3db7fd477
--- /dev/null
+++ b/test/python/install_jupyterlab_ubuntu.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Check for an installation of JupyterLab
+check "version" jupyter lab --version
+
+# Check location of JupyterLab installation
+packages="$(python3 -m pip list)"
+check "location" grep jupyter <<< "$packages"
+
+# Check for git extension
+check "jupyterlab_git" grep jupyterlab_git <<< "$packages"
+
+# Check for correct JupyterLab configuration
+check "config" grep ".*.allow_origin = '*'" /root/.jupyter/jupyter_server_config.py
+
+# Report result
+reportResults
diff --git a/test/python/scenarios.json b/test/python/scenarios.json
index c3c1a828b..c3c55d52e 100644
--- a/test/python/scenarios.json
+++ b/test/python/scenarios.json
@@ -53,5 +53,25 @@
         "features": {
             "python": "3.10"
         }
+    },
+    "install_jupyterlab_debian": {
+        "image": "debian:bullseye-slim",
+        "features": {
+            "python": {
+                "version": "3.11",
+                "installJupyterlab": true,
+                "configureJupyterlabAllowOrigin": "*"
+            }
+        }
+    },
+    "install_jupyterlab_ubuntu": {
+        "image": "ubuntu:focal",
+        "features": {
+            "python": {
+                "version": "3.11",
+                "installJupyterlab": true,
+                "configureJupyterlabAllowOrigin": "*"
+            }
+        }
     }
-}
\ No newline at end of file
+}

From 243671eece9c9e3d38b7cecf404acd4ea4bd2f05 Mon Sep 17 00:00:00 2001
From: Masahiro Wada <argon.argon.argon@gmail.com>
Date: Thu, 28 Sep 2023 04:17:31 +0900
Subject: [PATCH 172/478] Enhancements in CUDA Support (#699)

* add cuda tookit installing support

* add nvcc installing support

* add libcudnn8-dev installing support

* add new cuda versions adn cudnn versions

* add specificaitons of new option

* remove installNvcc

installNvcc process is included in installToolkit

* add tests for new nvidia-cuda options

* fix wrong scenario name

* Revert "add specificaitons of new option"

This reverts commit 0dcdb92406e38caa297643eab5af641f814b4f69.

README.md should be generated by CI workflow.

* make cudnn-dev installation isolated

* dump minor version to 1.1.0
---
 src/nvidia-cuda/devcontainer-feature.json     | 24 ++++++++++++++++++-
 src/nvidia-cuda/install.sh                    | 20 ++++++++++++++++
 ...l_cudnn_nvxt.sh => install_all_options.sh} |  6 +++++
 test/nvidia-cuda/scenarios.json               |  8 ++++---
 4 files changed, 54 insertions(+), 4 deletions(-)
 rename test/nvidia-cuda/{install_cudnn_nvxt.sh => install_all_options.sh} (63%)

diff --git a/src/nvidia-cuda/devcontainer-feature.json b/src/nvidia-cuda/devcontainer-feature.json
index 81e1dff8d..78ad10cd9 100644
--- a/src/nvidia-cuda/devcontainer-feature.json
+++ b/src/nvidia-cuda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "nvidia-cuda",
-  "version": "1.0.7",
+  "version": "1.1.0",
   "name": "NVIDIA CUDA",
   "description": "Installs shared libraries for NVIDIA CUDA.",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nvidia-cuda",
@@ -10,14 +10,27 @@
       "default": false,
       "description": "Additionally install CUDA Deep Neural Network (cuDNN) shared library"
     },
+    "installCudnnDev": {
+      "type": "boolean",
+      "default": false,
+      "description": "Additionally install CUDA Deep Neural Network (cuDNN) development libraries and headers"
+    },
     "installNvtx": {
       "type": "boolean",
       "default": false,
       "description": "Additionally install NVIDIA Tools Extension (NVTX)"
     },
+    "installToolkit": {
+      "type": "boolean",
+      "default": false,
+      "description": "Additionally install NVIDIA CUDA Toolkit"
+    },
     "cudaVersion": {
       "type": "string",
       "proposals": [
+        "12.2",
+        "12.1",
+        "12.0",
         "11.8",
         "11.7",
         "11.6",
@@ -32,6 +45,15 @@
     "cudnnVersion": {
       "type": "string",
       "proposals": [
+	"8.9.5.29",
+	"8.9.4.25",
+	"8.9.3.28",
+	"8.9.2.26",
+	"8.9.1.23",
+	"8.9.0.131",
+	"8.8.1.3",
+	"8.8.0.121",
+	"8.7.0.84",
         "8.6.0.163",
         "8.5.0.96",
         "8.4.1.50",
diff --git a/src/nvidia-cuda/install.sh b/src/nvidia-cuda/install.sh
index f7db18e5e..cb66d3955 100644
--- a/src/nvidia-cuda/install.sh
+++ b/src/nvidia-cuda/install.sh
@@ -6,7 +6,9 @@ set -e
 rm -rf /var/lib/apt/lists/*
 
 INSTALL_CUDNN=${INSTALLCUDNN}
+INSTALL_CUDNNDEV=${INSTALLCUDNNDEV}
 INSTALL_NVTX=${INSTALLNVTX}
+INSTALL_TOOLKIT=${INSTALLTOOLKIT}
 CUDA_VERSION=${CUDAVERSION}
 CUDNN_VERSION=${CUDNNVERSION}
 
@@ -47,6 +49,7 @@ apt-get update -yq
 # Ensure that the requested version of CUDA is available
 cuda_pkg="cuda-libraries-${CUDA_VERSION/./-}"
 nvtx_pkg="cuda-nvtx-${CUDA_VERSION/./-}"
+toolkit_pkg="cuda-toolkit-${CUDA_VERSION/./-}"
 if ! apt-cache show "$cuda_pkg"; then
     echo "The requested version of CUDA is not available: CUDA $CUDA_VERSION"
     exit 1
@@ -67,11 +70,28 @@ if [ "$INSTALL_CUDNN" = "true" ]; then
     apt-get install -yq "$cudnn_pkg_version"
 fi
 
+if [ "$INSTALL_CUDNNDEV" = "true" ]; then
+    # Ensure that the requested version of cuDNN development package is available AND compatible
+    cudnn_dev_pkg_version="libcudnn8-dev=${CUDNN_VERSION}-1+cuda${CUDA_VERSION}"
+    if ! apt-cache show "$cudnn_dev_pkg_version"; then
+        echo "The requested version of cuDNN development package is not available: cuDNN $CUDNN_VERSION for CUDA $CUDA_VERSION"
+        exit 1
+    fi
+
+    echo "Installing cuDNN dev libraries..."
+    apt-get install -yq "$cudnn_dev_pkg_version"
+fi
+
 if [ "$INSTALL_NVTX" = "true" ]; then
     echo "Installing NVTX..."
     apt-get install -yq "$nvtx_pkg"
 fi
 
+if [ "$INSTALL_TOOLKIT" = "true" ]; then
+    echo "Installing CUDA Toolkit..."
+    apt-get install -yq "$toolkit_pkg"
+fi
+
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
diff --git a/test/nvidia-cuda/install_cudnn_nvxt.sh b/test/nvidia-cuda/install_all_options.sh
similarity index 63%
rename from test/nvidia-cuda/install_cudnn_nvxt.sh
rename to test/nvidia-cuda/install_all_options.sh
index 7b20f4361..7d9e03107 100644
--- a/test/nvidia-cuda/install_cudnn_nvxt.sh
+++ b/test/nvidia-cuda/install_all_options.sh
@@ -8,8 +8,14 @@ source dev-container-features-test-lib
 # Check installation of libcudnn8
 check "libcudnn.so.8" test 1 -eq "$(find /usr -name 'libcudnn.so.8' | wc -l)"
 
+# Check installation of libcudnn8-dev
+check "cudnn.h" test 1 -eq "$(find /usr -name 'cudnn.h' | wc -l)"
+
 # Check installation of cuda-nvtx-11-<version>
 check "cuda-11+nvtx" test -e '/usr/local/cuda-11/targets/x86_64-linux/include/nvtx3'
 
+# Check installation of cuda-nvcc-11-<version>
+check "cuda-11+nvcc" test -e '/usr/local/cuda-11/bin/nvcc'
+
 # Report result
 reportResults
diff --git a/test/nvidia-cuda/scenarios.json b/test/nvidia-cuda/scenarios.json
index 1993dcd96..3018330e2 100644
--- a/test/nvidia-cuda/scenarios.json
+++ b/test/nvidia-cuda/scenarios.json
@@ -1,10 +1,12 @@
 {
-    "install_cudnn_nvxt": {
+    "install_all_options": {
         "image": "debian",
         "features": {
             "nvidia-cuda": {
                 "installCudnn": true,
-                "installNvtx": true
+                "installCudnnDev": true,
+                "installNvtx": true,
+                "installToolkit": true
             }
         }
     },
@@ -19,4 +21,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

From 3aad9a72f4e0bd9cb2d2e2ce3dc4aa8396a62c00 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Thu, 28 Sep 2023 09:59:04 -0700
Subject: [PATCH 173/478] Terraform - Adds licensing information (#697)

* Terraform - Adds licensing information

* Update src/terraform/NOTES.md

Co-authored-by: Brigit Murtaugh <brigit.murtaugh@microsoft.com>

---------

Co-authored-by: Brigit Murtaugh <brigit.murtaugh@microsoft.com>
---
 src/terraform/NOTES.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/terraform/NOTES.md b/src/terraform/NOTES.md
index 19fe92f31..2c1540aee 100644
--- a/src/terraform/NOTES.md
+++ b/src/terraform/NOTES.md
@@ -1,5 +1,9 @@
 
 
+## Licensing
+
+On August 10, 2023, HashiCorp announced a change of license for its products, including Terraform. After ~9 years of Terraform being open source under the MPL v2 license, it was to move under a non-open source BSL v1.1 license, starting from the next (1.6) version. See https://github.com/hashicorp/terraform/blob/main/LICENSE
+
 ## OS Support
 
 This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.

From 0599c63f8fdfd5fd9f81144fc4737d974620ebe8 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Thu, 28 Sep 2023 10:08:39 -0700
Subject: [PATCH 174/478] [Updates] Automated vendor dotnet-install script
 (#698)

* Automated dotnet-install script update

* version bump

---------

Co-authored-by: github-actions <github-actions@github.com>
---
 src/dotnet/devcontainer-feature.json        |  2 +-
 src/dotnet/scripts/vendor/dotnet-install.sh | 94 +++++++++++++++++++--
 2 files changed, 90 insertions(+), 6 deletions(-)

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index f00e0d3ea..6585afb51 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
diff --git a/src/dotnet/scripts/vendor/dotnet-install.sh b/src/dotnet/scripts/vendor/dotnet-install.sh
index a830583cd..4547589b5 100755
--- a/src/dotnet/scripts/vendor/dotnet-install.sh
+++ b/src/dotnet/scripts/vendor/dotnet-install.sh
@@ -314,6 +314,10 @@ get_machine_architecture() {
             echo "ppc64le"
             return 0
             ;;
+        loongarch64)
+            echo "loongarch64"
+            return 0
+            ;;
         esac
     fi
 
@@ -355,6 +359,10 @@ get_normalized_architecture_from_architecture() {
             echo "ppc64le"
             return 0
             ;;
+        loongarch64)
+            echo "loongarch64"
+            return 0
+            ;;
     esac
 
     say_err "Architecture \`$architecture\` not supported. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues"
@@ -546,6 +554,40 @@ is_dotnet_package_installed() {
     fi
 }
 
+# args:
+# downloaded file - $1
+# remote_file_size - $2
+validate_remote_local_file_sizes() 
+{
+    eval $invocation
+
+    local downloaded_file="$1"
+    local remote_file_size="$2"
+    local file_size=''
+
+    if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+        file_size="$(stat -c '%s' "$downloaded_file")"
+    elif [[ "$OSTYPE" == "darwin"* ]]; then
+        # hardcode in order to avoid conflicts with GNU stat
+        file_size="$(/usr/bin/stat -f '%z' "$downloaded_file")"
+    fi  
+    
+    if [ -n "$file_size" ]; then
+        say "Downloaded file size is $file_size bytes."
+
+        if [ -n "$remote_file_size" ] && [ -n "$file_size" ]; then
+            if [ "$remote_file_size" -ne "$file_size" ]; then
+                say "The remote and local file sizes are not equal. The remote file size is $remote_file_size bytes and the local size is $file_size bytes. The local package may be corrupted."
+            else
+                say "The remote and local file sizes are equal."
+            fi
+        fi
+        
+    else
+        say "Either downloaded or local package size can not be measured. One of them may be corrupted."      
+    fi 
+}
+
 # args:
 # azure_feed - $1
 # channel - $2
@@ -914,14 +956,39 @@ copy_files_or_dirs_from_list() {
     done
 }
 
+# args:
+# zip_uri - $1
+get_remote_file_size() {
+    local zip_uri="$1"
+
+    if machine_has "curl"; then
+        file_size=$(curl -sI  "$zip_uri" | grep -i content-length | awk '{ num = $2 + 0; print num }')
+    elif machine_has "wget"; then
+        file_size=$(wget --spider --server-response -O /dev/null "$zip_uri" 2>&1 | grep -i 'Content-Length:' | awk '{ num = $2 + 0; print num }')
+    else
+        say "Neither curl nor wget is available on this system."
+        return
+    fi
+
+    if [ -n "$file_size" ]; then
+        say "Remote file $zip_uri size is $file_size bytes."
+        echo "$file_size"
+    else
+        say_verbose "Content-Length header was not extracted for $zip_uri."
+        echo ""
+    fi
+}
+
 # args:
 # zip_path - $1
 # out_path - $2
+# remote_file_size - $3
 extract_dotnet_package() {
     eval $invocation
 
     local zip_path="$1"
     local out_path="$2"
+    local remote_file_size="$3"
 
     local temp_out_path="$(mktemp -d "$temporary_file_template")"
 
@@ -931,9 +998,13 @@ extract_dotnet_package() {
     local folders_with_version_regex='^.*/[0-9]+\.[0-9]+[^/]+/'
     find "$temp_out_path" -type f | grep -Eo "$folders_with_version_regex" | sort | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" false
     find "$temp_out_path" -type f | grep -Ev "$folders_with_version_regex" | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" "$override_non_versioned_files"
-
+    
+    validate_remote_local_file_sizes "$zip_path" "$remote_file_size"
+    
     rm -rf "$temp_out_path"
-    rm -f "$zip_path" && say_verbose "Temporary zip file $zip_path was removed"
+    if [ -z ${keep_zip+x} ]; then
+        rm -f "$zip_path" && say_verbose "Temporary zip file $zip_path was removed"
+    fi
 
     if [ "$failed" = true ]; then
         say_err "Extraction failed"
@@ -1427,9 +1498,10 @@ install_dotnet() {
     eval $invocation
     local download_failed=false
     local download_completed=false
+    local remote_file_size=0
 
     mkdir -p "$install_root"
-    zip_path="$(mktemp "$temporary_file_template")"
+    zip_path="${zip_path:-$(mktemp "$temporary_file_template")}"
     say_verbose "Zip path: $zip_path"
 
     for link_index in "${!download_links[@]}"
@@ -1467,8 +1539,10 @@ install_dotnet() {
         return 1
     fi
 
+    remote_file_size="$(get_remote_file_size "$download_link")"
+
     say "Extracting zip from $download_link"
-    extract_dotnet_package "$zip_path" "$install_root" || return 1
+    extract_dotnet_package "$zip_path" "$install_root" "$remote_file_size" || return 1
 
     #  Check if the SDK version is installed; if not, fail the installation.
     # if the version contains "RTM" or "servicing"; check if a 'release-type' SDK version is installed.
@@ -1618,6 +1692,14 @@ do
             override_non_versioned_files=false
             non_dynamic_parameters+=" $name"
             ;;
+        --keep-zip|-[Kk]eep[Zz]ip)
+            keep_zip=true
+            non_dynamic_parameters+=" $name"
+            ;;
+        --zip-path|-[Zz]ip[Pp]ath)
+            shift
+            zip_path="$1"
+            ;;
         -?|--?|-h|--help|-[Hh]elp)
             script_name="$(basename "$0")"
             echo ".NET Tools Installer"
@@ -1663,7 +1745,7 @@ do
             echo "      -InstallDir"
             echo "  --architecture <ARCHITECTURE>      Architecture of dotnet binaries to be installed, Defaults to \`$architecture\`."
             echo "      --arch,-Architecture,-Arch"
-            echo "          Possible values: x64, arm, arm64, s390x and ppc64le"
+            echo "          Possible values: x64, arm, arm64, s390x, ppc64le and loongarch64"
             echo "  --os <system>                    Specifies operating system to be used when selecting the installer."
             echo "          Overrides the OS determination approach used by the script. Supported values: osx, linux, linux-musl, freebsd, rhel.6."
             echo "          In case any other value is provided, the platform will be determined by the script based on machine configuration."
@@ -1688,6 +1770,8 @@ do
             echo "  --no-cdn,-NoCdn                    Disable downloading from the Azure CDN, and use the uncached feed directly."
             echo "  --jsonfile <JSONFILE>              Determines the SDK version from a user specified global.json file."
             echo "                                     Note: global.json must have a value for 'SDK:Version'"
+            echo "  --keep-zip,-KeepZip                If set, downloaded file is kept."
+            echo "  --zip-path, -ZipPath               If set, downloaded file is stored at the specified path."
             echo "  -?,--?,-h,--help,-Help             Shows this help message"
             echo ""
             echo "Install Location:"

From 803ec6e0e53011db77ebe4696fe7663c7b59bf99 Mon Sep 17 00:00:00 2001
From: Steven <steven.liekens@gmail.com>
Date: Thu, 28 Sep 2023 19:50:20 +0200
Subject: [PATCH 175/478] Bump the dotnet version after a script update (#707)

* Bump the dotnet version after a script update

* Forgot to add file

* Keep 4 spaces indentation
---
 .github/workflows/update-dotnet-install-script.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/update-dotnet-install-script.yml b/.github/workflows/update-dotnet-install-script.yml
index 30a5aa458..72d06099b 100644
--- a/.github/workflows/update-dotnet-install-script.yml
+++ b/.github/workflows/update-dotnet-install-script.yml
@@ -35,8 +35,11 @@ jobs:
           git add src/dotnet/scripts/vendor/dotnet-install.sh
           git commit -m 'Automated dotnet-install script update' || export NO_UPDATES=true
 
-          # Push
+          # Bump version and push
           if [ "$NO_UPDATES" != "true" ] ; then
+              echo "$(jq --indent 4 '.version = (.version | split(".") | map(tonumber) | .[2] += 1 | join("."))' src/dotnet/devcontainer-feature.json)"  > src/dotnet/devcontainer-feature.json 
+              git add src/dotnet/devcontainer-feature.json
+              git commit -m 'Bump version'
               git push origin "$branch"
               gh api \
                 --method POST \

From cf92754bf4535ac3344a6b5c5d444dc16e9922cb Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Fri, 29 Sep 2023 11:50:09 -0700
Subject: [PATCH 176/478] Automated documentation update (#709)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/nvidia-cuda/README.md | 2 ++
 src/terraform/README.md   | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src/nvidia-cuda/README.md b/src/nvidia-cuda/README.md
index 7a0343de4..e5b9d4012 100644
--- a/src/nvidia-cuda/README.md
+++ b/src/nvidia-cuda/README.md
@@ -16,7 +16,9 @@ Installs shared libraries for NVIDIA CUDA.
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
 | installCudnn | Additionally install CUDA Deep Neural Network (cuDNN) shared library | boolean | false |
+| installCudnnDev | Additionally install CUDA Deep Neural Network (cuDNN) development libraries and headers | boolean | false |
 | installNvtx | Additionally install NVIDIA Tools Extension (NVTX) | boolean | false |
+| installToolkit | Additionally install NVIDIA CUDA Toolkit | boolean | false |
 | cudaVersion | Version of CUDA to install | string | 11.8 |
 | cudnnVersion | Version of cuDNN to install | string | 8.6.0.163 |
 
diff --git a/src/terraform/README.md b/src/terraform/README.md
index 2201c8db8..199c566d6 100644
--- a/src/terraform/README.md
+++ b/src/terraform/README.md
@@ -32,6 +32,10 @@ Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects la
 
 
 
+## Licensing
+
+On August 10, 2023, HashiCorp announced a change of license for its products, including Terraform. After ~9 years of Terraform being open source under the MPL v2 license, it was to move under a non-open source BSL v1.1 license, starting from the next (1.6) version. See https://github.com/hashicorp/terraform/blob/main/LICENSE
+
 ## OS Support
 
 This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.

From 04cb7d1e797a81ce00450aa1174fff8f74b3ac12 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Fri, 29 Sep 2023 12:02:54 -0700
Subject: [PATCH 177/478] Docker-in-docker: Updates docker-init with "pkill"
 (#711)

* Docker-in-docker: Updates docker-init with "pkill"

* pkill only if container didn't start at first

* pkill with condition

* add back sudo_if
---
 src/docker-in-docker/devcontainer-feature.json |  2 +-
 src/docker-in-docker/install.sh                | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 2feea7d99..c64c590f7 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.5.0",
+    "version": "2.6.0",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 39d1b77ca..63dd567c3 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -362,8 +362,9 @@ EOF
 tee -a /usr/local/share/docker-init.sh > /dev/null \
 << 'EOF'
 dockerd_start="AZURE_DNS_AUTO_DETECTION=${AZURE_DNS_AUTO_DETECTION} DOCKER_DEFAULT_ADDRESS_POOL=${DOCKER_DEFAULT_ADDRESS_POOL} $(cat << 'INNEREOF'
+    # Stop dockerd and containerd in case they are already running
+    docker info > /dev/null 2>&1 && pkill dockerd && pkill containerd
     # explicitly remove dockerd and containerd PID file to ensure that it can start properly if it was stopped uncleanly
-    # ie: docker kill <ID>
     find /run /var/run -iname 'docker*.pid' -delete || :
     find /run /var/run -iname 'container*.pid' -delete || :
 
@@ -444,6 +445,16 @@ dockerd_start="AZURE_DNS_AUTO_DETECTION=${AZURE_DNS_AUTO_DETECTION} DOCKER_DEFAU
 INNEREOF
 )"
 
+sudo_if() {
+    COMMAND="$*"
+
+    if [ "$(id -u)" -ne 0 ]; then
+        sudo $COMMAND
+    else
+        $COMMAND
+    fi
+}
+
 retry_docker_start_count=0
 docker_ok="false"
 
@@ -469,6 +480,8 @@ do
     
     if [ "${docker_ok}" != "true" ]; then
         echo "(*) Failed to start docker, retrying..."
+        sudo_if pkill dockerd
+        sudo_if pkill containerd
     fi
     
     retry_docker_start_count=`expr $retry_docker_start_count + 1`

From c3f9105048bf96b51c321f665bdc7990fdd4fc1e Mon Sep 17 00:00:00 2001
From: Luciana Abud <45497113+luabud@users.noreply.github.com>
Date: Mon, 2 Oct 2023 08:59:25 -0700
Subject: [PATCH 178/478] Remove deprecated Python settings (#625)

* Remove deprecated Python settings

* No longer install Python linters and formatters

* Revert "No longer install Python linters and formatters"

This reverts commit 57c7bec14dca54fde4b4df2580ed429484180882.

* Bump minor version
---
 src/python/devcontainer-feature.json | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 638fa6006..9a01268f1 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
@@ -65,15 +65,7 @@
         "ms-python.vscode-pylance"
       ],
       "settings": {
-        "python.defaultInterpreterPath": "/usr/local/python/current/bin/python",
-        "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
-        "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-        "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
-        "python.linting.flake8Enabled": false,
-        "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
-        "python.linting.mypyEnabled": false,
-        "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint",
-        "python.linting.pylintEnabled": false
+        "python.defaultInterpreterPath": "/usr/local/python/current/bin/python"
       }
     }
   },

From 90a9b1d6044235ab84af99922cb45b7e3093f4cd Mon Sep 17 00:00:00 2001
From: Alexander Smolyakov <v-asmoliakov@microsoft.com>
Date: Wed, 4 Oct 2023 21:00:11 +0400
Subject: [PATCH 179/478] [terraform] Update retry logic to handle DNS-related
 errors more gracefully (#713)

* [terraform] Update retry logic

- Add `dnsutils` package to dependencies
- Update retry logic to handle DNS-related errors more gracefully

* Update install.sh

* Bump version
---
 src/terraform/devcontainer-feature.json |  2 +-
 src/terraform/install.sh                | 21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index 119b4335e..51fb9a27a 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.3.4",
+    "version": "1.3.5",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index 1156f6d41..c1a382597 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -77,6 +77,25 @@ receive_gpg_keys() {
             sleep 10s
         fi
     done
+
+    # If all attempts fail, try getting the keyserver IP address and explicitly passing it to gpg
+    if [ "${gpg_ok}" = "false" ]; then
+        retry_count=0;
+        echo "(*) Resolving GPG keyserver IP address..."
+        local keyserver_ip_address=$( dig +short keyserver.ubuntu.com | head -n1 )
+        echo "(*) GPG keyserver IP address $keyserver_ip_address"
+        
+        until [ "${gpg_ok}" = "true" ] || [ "${retry_count}" -eq "3" ]; 
+        do
+            echo "(*) Downloading GPG key..."
+            ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys --keyserver ${keyserver_ip_address}) 2>&1 && gpg_ok="true"
+            if [ "${gpg_ok}" != "true" ]; then
+                echo "(*) Failed getting key, retring in 10s..."
+                (( retry_count++ ))
+                sleep 10s
+            fi
+        done
+    fi
     set -e
     if [ "${gpg_ok}" = "false" ]; then
         echo "(!) Failed to get gpg key."
@@ -183,7 +202,7 @@ ensure_cosign() {
 export DEBIAN_FRONTEND=noninteractive
 
 # Install dependencies if missing
-check_packages curl ca-certificates gnupg2 dirmngr coreutils unzip
+check_packages curl ca-certificates gnupg2 dirmngr coreutils unzip dnsutils
 if ! type git > /dev/null 2>&1; then
     check_packages git
 fi

From 0d7ad7c5fcc2569b46035b151dabba3449d1a0a7 Mon Sep 17 00:00:00 2001
From: Jan-Marco Edelmann <jmedelmann@gmx.de>
Date: Thu, 5 Oct 2023 00:09:35 +0200
Subject: [PATCH 180/478] Configure npm proxy when proxy environmentals exist
 (#712)

---
 src/node/devcontainer-feature.json | 2 +-
 src/node/install.sh                | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index aee55a1f6..0123fdb73 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "name": "Node.js (via nvm), yarn and pnpm",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
diff --git a/src/node/install.sh b/src/node/install.sh
index 809109413..9a696ca54 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -228,6 +228,9 @@ if type pnpm > /dev/null 2>&1; then
     echo "pnpm already installed."
 else
     if type npm > /dev/null 2>&1; then
+        [ ! -z "$http_proxy" ] && npm set proxy="$http_proxy"
+        [ ! -z "$https_proxy" ] && npm set https-proxy="$https_proxy"
+        [ ! -z "$no_proxy" ] && npm set noproxy="$no_proxy"
         npm install -g pnpm
     else
         echo "Skip installing pnpm because npm is missing"

From 4fca96b5e8a4bfc93679098cb19d73c65ce571eb Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Thu, 5 Oct 2023 11:27:01 -0700
Subject: [PATCH 181/478] [Docker-in-docker] Updates docker-init scripts (#715)

* updates

* version bump
---
 src/docker-in-docker/devcontainer-feature.json |  2 +-
 src/docker-in-docker/install.sh                | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index c64c590f7..8d41acae7 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.6.0",
+    "version": "2.7.0",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 63dd567c3..5a4f0fa5d 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -362,8 +362,6 @@ EOF
 tee -a /usr/local/share/docker-init.sh > /dev/null \
 << 'EOF'
 dockerd_start="AZURE_DNS_AUTO_DETECTION=${AZURE_DNS_AUTO_DETECTION} DOCKER_DEFAULT_ADDRESS_POOL=${DOCKER_DEFAULT_ADDRESS_POOL} $(cat << 'INNEREOF'
-    # Stop dockerd and containerd in case they are already running
-    docker info > /dev/null 2>&1 && pkill dockerd && pkill containerd
     # explicitly remove dockerd and containerd PID file to ensure that it can start properly if it was stopped uncleanly
     find /run /var/run -iname 'docker*.pid' -delete || :
     find /run /var/run -iname 'container*.pid' -delete || :
@@ -478,10 +476,12 @@ do
         retry_count=`expr $retry_count + 1`
     done
     
-    if [ "${docker_ok}" != "true" ]; then
+    if [ "${docker_ok}" != "true" ] && [ "${retry_docker_start_count}" != "4" ]; then
         echo "(*) Failed to start docker, retrying..."
-        sudo_if pkill dockerd
-        sudo_if pkill containerd
+        set +e
+            sudo_if pkill dockerd
+            sudo_if pkill containerd
+        set -e
     fi
     
     retry_docker_start_count=`expr $retry_docker_start_count + 1`

From 36a3604b90762307dddd1ff2b89387f84b6ec66c Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 17 Oct 2023 15:05:01 -0700
Subject: [PATCH 182/478] [Python] - Support 3.12 (#726)

---
 src/python/devcontainer-feature.json |  3 ++-
 src/python/install.sh                |  2 +-
 test/python/install_python_3_12.sh   | 38 ++++++++++++++++++++++++++++
 test/python/scenarios.json           | 10 +++++++-
 4 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100755 test/python/install_python_3_12.sh

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 9a01268f1..bbc78bb72 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
@@ -11,6 +11,7 @@
         "latest",
         "os-provided",
         "none",
+        "3.12",
         "3.11",
         "3.10",
         "3.9",
diff --git a/src/python/install.sh b/src/python/install.sh
index 7be5eea8a..09727a833 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -27,7 +27,7 @@ CONFIGURE_JUPYTERLAB_ALLOW_ORIGIN="${CONFIGUREJUPYTERLABALLOWORIGIN:-""}"
 ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 
 DEFAULT_UTILS=("pylint" "flake8" "autopep8" "black" "yapf" "mypy" "pydocstyle" "pycodestyle" "bandit" "pipenv" "virtualenv" "pytest")
-PYTHON_SOURCE_GPG_KEYS="64E628F8D684696D B26995E310250568 2D347EA6AA65421D FB9921286F5E1540 3A5CA953F73C700D 04C367C218ADD4FF 0EDDC5F26A45C816 6AF053F07D9DC8D2 C9BE28DEE6DF025C 126EB563A74B06BF D9866941EA5BBD71 ED9D77D5"
+PYTHON_SOURCE_GPG_KEYS="64E628F8D684696D B26995E310250568 2D347EA6AA65421D FB9921286F5E1540 3A5CA953F73C700D 04C367C218ADD4FF 0EDDC5F26A45C816 6AF053F07D9DC8D2 C9BE28DEE6DF025C 126EB563A74B06BF D9866941EA5BBD71 ED9D77D5 A821E680E5FA6305"
 GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
diff --git a/test/python/install_python_3_12.sh b/test/python/install_python_3_12.sh
new file mode 100755
index 000000000..2437aefe7
--- /dev/null
+++ b/test/python/install_python_3_12.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "python version 3.12 installed as default" bash -c "python --version | grep 3.12"
+check "python3 version 3.12 installed as default" bash -c "python3 --version | grep 3.12"
+
+# Check that tools can execute - make sure something didn't get messed up in this scenario
+check "autopep8" autopep8 --version
+check "black" black --version
+check "yapf" yapf --version
+check "bandit" bandit --version
+check "flake8" flake8 --version
+check "mypy" mypy --version
+check "pycodestyle" pycodestyle --version
+check "pydocstyle" pydocstyle --version
+check "pylint" pylint --version
+check "pytest" pytest --version
+
+# Check paths in settings
+check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
+check "current symlink works" /usr/local/python/current/bin/python --version
+check "which autopep8" bash -c "which autopep8 | grep /usr/local/py-utils/bin/autopep8"
+check "which black" bash -c "which black | grep /usr/local/py-utils/bin/black"
+check "which yapf" bash -c "which yapf | grep /usr/local/py-utils/bin/yapf"
+check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit"
+check "which flake8" bash -c "which flake8 | grep /usr/local/py-utils/bin/flake8"
+check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
+check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
+check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
+check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
+
+# Report result
+reportResults
diff --git a/test/python/scenarios.json b/test/python/scenarios.json
index c3c55d52e..23b6cfc92 100644
--- a/test/python/scenarios.json
+++ b/test/python/scenarios.json
@@ -32,7 +32,7 @@
         }
     },
     "install_os_provided_python": {
-        "image": "mcr.microsoft.com/devcontainers/base:0-bullseye",
+        "image": "mcr.microsoft.com/devcontainers/base:1-bullseye",
         "features": {
             "python": "os-provided"
         }
@@ -73,5 +73,13 @@
                 "configureJupyterlabAllowOrigin": "*"
             }
         }
+    },
+    "install_python_3_12": {
+        "image": "mcr.microsoft.com/devcontainers/base:1-ubuntu-22.04",
+        "features": {
+            "python": {
+                "version": "3.12"
+            }
+        }
     }
 }

From 1155a9906b3324617d3e491f2f01b0175e43b522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20H=C3=B6chenberger?=
 <richard.hoechenberger@gmail.com>
Date: Wed, 18 Oct 2023 01:45:04 +0200
Subject: [PATCH 183/478] Try connecting to Ubuntu keyserver on port 80 if
 default HKP port fails (#722)

* Try Ubuntu keyserver on port 80 if default HKP port fails

Closes #719
Closes #717

* Bump feature versions

---------

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
---
 src/git-lfs/devcontainer-feature.json               | 2 +-
 src/git-lfs/install.sh                              | 1 +
 src/git/devcontainer-feature.json                   | 2 +-
 src/git/install.sh                                  | 1 +
 src/github-cli/devcontainer-feature.json            | 2 +-
 src/github-cli/install.sh                           | 1 +
 src/kubectl-helm-minikube/devcontainer-feature.json | 2 +-
 src/kubectl-helm-minikube/install.sh                | 1 +
 src/powershell/devcontainer-feature.json            | 2 +-
 src/powershell/install.sh                           | 1 +
 src/python/devcontainer-feature.json                | 2 +-
 src/python/install.sh                               | 1 +
 src/ruby/devcontainer-feature.json                  | 2 +-
 src/ruby/install.sh                                 | 1 +
 14 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/git-lfs/devcontainer-feature.json b/src/git-lfs/devcontainer-feature.json
index dc61dead9..998b0b50e 100644
--- a/src/git-lfs/devcontainer-feature.json
+++ b/src/git-lfs/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git-lfs",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "name": "Git Large File Support (LFS)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git-lfs",
     "description": "Installs Git Large File Support (Git LFS) along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like git and curl.",
diff --git a/src/git-lfs/install.sh b/src/git-lfs/install.sh
index 393109995..3f9aa2fff 100755
--- a/src/git-lfs/install.sh
+++ b/src/git-lfs/install.sh
@@ -15,6 +15,7 @@ GIT_LFS_ARCHIVE_ARCHITECTURES="amd64 arm64"
 GIT_LFS_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal jammy"
 GIT_LFS_CHECKSUM_GPG_KEYS="0x88ace9b29196305ba9947552f1ba225c0223b187 0x86cd3297749375bcf8206715f54fe648088335a9 0xaa3b3450295830d2de6db90caba67be5a5795889"
 GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
+keyserver hkp://keyserver.ubuntu.com:80
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
 
diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
index 23e1c04f4..8cbca6cf8 100644
--- a/src/git/devcontainer-feature.json
+++ b/src/git/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.1.5",
+    "version": "1.1.6",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
diff --git a/src/git/install.sh b/src/git/install.sh
index 7bfa490e7..67338b8da 100755
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -12,6 +12,7 @@ USE_PPA_IF_AVAILABLE=${PPA}
 
 GIT_CORE_PPA_ARCHIVE_GPG_KEY=E1DD270288B4E6030699E45FA1715D88E1DF1F24
 GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
+keyserver hkp://keyserver.ubuntu.com:80
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
 
diff --git a/src/github-cli/devcontainer-feature.json b/src/github-cli/devcontainer-feature.json
index 24ef9802f..c47f4ac0d 100644
--- a/src/github-cli/devcontainer-feature.json
+++ b/src/github-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "github-cli",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "name": "GitHub CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/github-cli",
     "description": "Installs the GitHub CLI. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/github-cli/install.sh b/src/github-cli/install.sh
index c1dd6924e..2cdc0a684 100755
--- a/src/github-cli/install.sh
+++ b/src/github-cli/install.sh
@@ -12,6 +12,7 @@ INSTALL_DIRECTLY_FROM_GITHUB_RELEASE=${INSTALLDIRECTLYFROMGITHUBRELEASE:-"true"}
 
 GITHUB_CLI_ARCHIVE_GPG_KEY=23F3D4EA75716059
 GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
+keyserver hkp://keyserver.ubuntu.com:80
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
 
diff --git a/src/kubectl-helm-minikube/devcontainer-feature.json b/src/kubectl-helm-minikube/devcontainer-feature.json
index 9229a96e6..4206772b2 100644
--- a/src/kubectl-helm-minikube/devcontainer-feature.json
+++ b/src/kubectl-helm-minikube/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "kubectl-helm-minikube",
-    "version": "1.1.4",
+    "version": "1.1.5",
     "name": "Kubectl, Helm, and Minikube",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
     "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
diff --git a/src/kubectl-helm-minikube/install.sh b/src/kubectl-helm-minikube/install.sh
index d2d11364e..35444c5dc 100755
--- a/src/kubectl-helm-minikube/install.sh
+++ b/src/kubectl-helm-minikube/install.sh
@@ -23,6 +23,7 @@ USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 
 HELM_GPG_KEYS_URI="https://raw.githubusercontent.com/helm/helm/main/KEYS"
 GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
+keyserver hkp://keyserver.ubuntu.com:80
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
 
diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json
index dce05755e..18338eb12 100644
--- a/src/powershell/devcontainer-feature.json
+++ b/src/powershell/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "powershell",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "name": "PowerShell",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
     "description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/powershell/install.sh b/src/powershell/install.sh
index b220c3acf..666071f55 100755
--- a/src/powershell/install.sh
+++ b/src/powershell/install.sh
@@ -19,6 +19,7 @@ MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 POWERSHELL_ARCHIVE_ARCHITECTURES="amd64"
 POWERSHELL_ARCHIVE_VERSION_CODENAMES="stretch buster bionic focal bullseye jammy"
 GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
+keyserver hkp://keyserver.ubuntu.com:80
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
 
diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index bbc78bb72..7ebdad38a 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/python/install.sh b/src/python/install.sh
index 09727a833..e6eefd055 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -29,6 +29,7 @@ ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 DEFAULT_UTILS=("pylint" "flake8" "autopep8" "black" "yapf" "mypy" "pydocstyle" "pycodestyle" "bandit" "pipenv" "virtualenv" "pytest")
 PYTHON_SOURCE_GPG_KEYS="64E628F8D684696D B26995E310250568 2D347EA6AA65421D FB9921286F5E1540 3A5CA953F73C700D 04C367C218ADD4FF 0EDDC5F26A45C816 6AF053F07D9DC8D2 C9BE28DEE6DF025C 126EB563A74B06BF D9866941EA5BBD71 ED9D77D5 A821E680E5FA6305"
 GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
+keyserver hkp://keyserver.ubuntu.com:80
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
 
diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json
index 29591e6a6..f02ce6c50 100644
--- a/src/ruby/devcontainer-feature.json
+++ b/src/ruby/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "name": "Ruby (via rvm)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
     "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
diff --git a/src/ruby/install.sh b/src/ruby/install.sh
index 2b47d8a27..7e4514bba 100755
--- a/src/ruby/install.sh
+++ b/src/ruby/install.sh
@@ -24,6 +24,7 @@ DEFAULT_GEMS="rake"
 
 RVM_GPG_KEYS="409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"
 GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
+keyserver hkp://keyserver.ubuntu.com:80
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
 

From e645120a39c2ad1bb659bd26b2a4e2ce18c1bb89 Mon Sep 17 00:00:00 2001
From: Lyon Till <158992+ljtill@users.noreply.github.com>
Date: Tue, 24 Oct 2023 00:08:27 +0100
Subject: [PATCH 184/478] Add PowerShell extension (#731)

* Add PowerShell extension

* Bump feature version
---
 src/powershell/devcontainer-feature.json | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json
index 18338eb12..c72923fdc 100644
--- a/src/powershell/devcontainer-feature.json
+++ b/src/powershell/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "powershell",
-    "version": "1.1.1",
+    "version": "1.2.0",
     "name": "PowerShell",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
     "description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -19,9 +19,16 @@
             "type": "string",
             "default": "",
             "description": "Optional comma separated list of PowerShell modules to install."
-          }
-        },
+        }
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-vscode.powershell"
+            ]
+        }
+    },
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
-}
+}
\ No newline at end of file

From 4c2c9f7b95fcc160e275c1624cec02a9bba25bdb Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Mon, 23 Oct 2023 16:14:35 -0700
Subject: [PATCH 185/478] Automated documentation update (#732)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/powershell/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/powershell/README.md b/src/powershell/README.md
index ccc62f7fe..6112de79e 100644
--- a/src/powershell/README.md
+++ b/src/powershell/README.md
@@ -18,6 +18,12 @@ Installs PowerShell along with needed dependencies. Useful for base Dockerfiles
 | version | Select or enter a version of PowerShell. | string | latest |
 | modules | Optional comma separated list of PowerShell modules to install. | string | - |
 
+## Customizations
+
+### VS Code Extensions
+
+- `ms-vscode.powershell`
+
 
 
 ## OS Support

From 719901a1b4751d5d9864d9700f56b6ecf80cc4f4 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Fri, 27 Oct 2023 15:47:26 -0700
Subject: [PATCH 186/478] [common-utils] Bug fix: zsh missing rc snippet (#736)

* [common-utils] Bug fix: zsp missing rc snippet

* condion rc snippet

* fix bug

* remove debugging step
---
 src/common-utils/devcontainer-feature.json          | 2 +-
 src/common-utils/main.sh                            | 7 ++++++-
 test/common-utils/configure_zsh_as_default_shell.sh | 1 +
 test/common-utils/scenarios.json                    | 6 ++++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 181e54594..dc54e6918 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.2.0",
+    "version": "2.3.0",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 71422465c..d1a977f9c 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -421,6 +421,7 @@ fi
 # Restore user .bashrc / .profile / .zshrc defaults from skeleton file if it doesn't exist or is empty
 possible_rc_files=( ".bashrc" ".profile" )
 [ "$INSTALL_OH_MY_ZSH_CONFIG" == "true" ] && possible_rc_files+=('.zshrc')
+[ "$INSTALL_ZSH" == "true" ] && possible_rc_files+=('.zprofile')
 for rc_file in "${possible_rc_files[@]}"; do
     if [ -f "/etc/skel/${rc_file}" ]; then
         if [ ! -e "${user_home}/${rc_file}" ] || [ ! -s "${user_home}/${rc_file}" ]; then
@@ -456,13 +457,17 @@ fi
 
 # Optionally configure zsh and Oh My Zsh!
 if [ "${INSTALL_ZSH}" = "true" ]; then
+    if [ ! -f "${user_home}/.zprofile" ] || ! grep -Fxq 'source $HOME/.profile' "${user_home}/.zprofile" ; then
+        echo 'source $HOME/.profile' >> "${user_home}/.zprofile"
+    fi
+
     if [ "${ZSH_ALREADY_INSTALLED}" != "true" ]; then
         if [ "${ADJUSTED_ID}" = "rhel" ]; then
              global_rc_path="/etc/zshrc"
         else
             global_rc_path="/etc/zsh/zshrc"
         fi
-        cat "${FEATURE_DIR}/scripts/rc_snippet.sh" >> /etc/zshrc
+        cat "${FEATURE_DIR}/scripts/rc_snippet.sh" >> ${global_rc_path}
         ZSH_ALREADY_INSTALLED="true"
     fi
 
diff --git a/test/common-utils/configure_zsh_as_default_shell.sh b/test/common-utils/configure_zsh_as_default_shell.sh
index 6a569a990..01d15227e 100644
--- a/test/common-utils/configure_zsh_as_default_shell.sh
+++ b/test/common-utils/configure_zsh_as_default_shell.sh
@@ -9,6 +9,7 @@ source dev-container-features-test-lib
 check "default-shell-is-zsh" bash -c "getent passwd $(whoami) | awk -F: '{ print $7 }' | grep '/bin/zsh'"
 # check it overrides the ~/.zshrc with default dev containers template
 check "default-zshrc-is-dev-container-template" bash -c "cat ~/.zshrc | grep ZSH_THEME | grep devcontainers"
+check "zsh-path-contains-local-bin" zsh -l -c "echo $PATH | grep '/home/devcontainer/.local/bin'"
 
 # Report result
 reportResults
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index bb65874e1..c1ee18dde 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -108,12 +108,14 @@
         }
     },
     "configure_zsh_as_default_shell": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "image": "ubuntu",
         "features": {
             "common-utils": {
+                "installZsh": true,
                 "configureZshAsDefaultShell": true
             }
-        }
+        },
+        "remoteUser": "devcontainer"
     },
     "configure_zsh_no_template_second_step": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu",

From d4ecc7be066bfc9fe3bd0f5eef7e9a429b2b68f7 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Fri, 27 Oct 2023 15:47:44 -0700
Subject: [PATCH 187/478] Update Features - Remove use of get_common_setting
 (#735)

---
 .../devcontainer.json                         | 17 +++++++-------
 src/aws-cli/devcontainer-feature.json         |  2 +-
 src/aws-cli/install.sh                        | 18 ---------------
 src/azure-cli/devcontainer-feature.json       |  2 +-
 src/azure-cli/install.sh                      | 16 -------------
 .../devcontainer-feature.json                 |  2 +-
 src/docker-in-docker/install.sh               | 19 ---------------
 .../devcontainer-feature.json                 |  2 +-
 src/docker-outside-of-docker/install.sh       | 23 ++-----------------
 src/go/devcontainer-feature.json              |  2 +-
 src/go/install.sh                             | 16 -------------
 src/rust/devcontainer-feature.json            |  2 +-
 src/rust/install.sh                           | 15 ------------
 13 files changed, 16 insertions(+), 120 deletions(-)
 rename .devcontainer.json => .devcontainer/devcontainer.json (77%)

diff --git a/.devcontainer.json b/.devcontainer/devcontainer.json
similarity index 77%
rename from .devcontainer.json
rename to .devcontainer/devcontainer.json
index c24649ab6..096a3d095 100644
--- a/.devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,18 +1,17 @@
 {
-    "image": "mcr.microsoft.com/vscode/devcontainers/javascript-node:0-18",
-    "remoteUser": "node",
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "mads-hartmann.bash-ide-vscode"
-            ]
-        }
-    },
+    "image": "mcr.microsoft.com/devcontainers/javascript-node:1-18",
     "features": {
         "ghcr.io/devcontainers/features/docker-in-docker:2": {}
     },
     "postCreateCommand": "npm install -g @devcontainers/cli",
     "hostRequirements": {
         "cpus": 4
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "mads-hartmann.bash-ide-vscode"
+            ]
+        }
     }
 }
diff --git a/src/aws-cli/devcontainer-feature.json b/src/aws-cli/devcontainer-feature.json
index 8de431868..35a035917 100644
--- a/src/aws-cli/devcontainer-feature.json
+++ b/src/aws-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "aws-cli",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "name": "AWS CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/aws-cli",
     "description": "Installs the AWS CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/aws-cli/install.sh b/src/aws-cli/install.sh
index a8b414ee6..d802400ef 100755
--- a/src/aws-cli/install.sh
+++ b/src/aws-cli/install.sh
@@ -50,21 +50,6 @@ if [ "$(id -u)" -ne 0 ]; then
     exit 1
 fi
 
-# Get central common setting
-get_common_setting() {
-    if [ "${common_settings_file_loaded}" != "true" ]; then
-        curl -sfL "https://aka.ms/vscode-dev-containers/script-library/settings.env" 2>/dev/null -o /tmp/vsdc-settings.env || echo "Could not download settings file. Skipping."
-        common_settings_file_loaded=true
-    fi
-    if [ -f "/tmp/vsdc-settings.env" ]; then
-        local multi_line=""
-        if [ "$2" = "true" ]; then multi_line="-z"; fi
-        local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
-        if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
-    fi
-    echo "$1=${!1}"
-}
-
 apt_get_update()
 {
     echo "Running apt-get update..."
@@ -89,9 +74,6 @@ check_packages curl ca-certificates gnupg2 dirmngr unzip
 verify_aws_cli_gpg_signature() {
     local filePath=$1
     local sigFilePath=$2
-
-    get_common_setting AWSCLI_GPG_KEY
-    get_common_setting AWSCLI_GPG_KEY_MATERIAL true
     local awsGpgKeyring=aws-cli-public-key.gpg
 
     echo "${AWSCLI_GPG_KEY_MATERIAL}" | gpg --dearmor > "./${awsGpgKeyring}"
diff --git a/src/azure-cli/devcontainer-feature.json b/src/azure-cli/devcontainer-feature.json
index 3d1c0dfa3..136b03fdc 100644
--- a/src/azure-cli/devcontainer-feature.json
+++ b/src/azure-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "azure-cli",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "name": "Azure CLI",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/azure-cli",
   "description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/azure-cli/install.sh b/src/azure-cli/install.sh
index 51759488d..6d3426699 100755
--- a/src/azure-cli/install.sh
+++ b/src/azure-cli/install.sh
@@ -32,21 +32,6 @@ fi
 
 echo "Effective REMOTE_USER: ${_REMOTE_USER}"
 
-# Get central common setting
-get_common_setting() {
-    if [ "${common_settings_file_loaded}" != "true" ]; then
-        curl -sfL "https://aka.ms/vscode-dev-containers/script-library/settings.env" 2>/dev/null -o /tmp/vsdc-settings.env || echo "Could not download settings file. Skipping."
-        common_settings_file_loaded=true
-    fi
-    if [ -f "/tmp/vsdc-settings.env" ]; then
-        local multi_line=""
-        if [ "$2" = "true" ]; then multi_line="-z"; fi
-        local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
-        if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
-    fi
-    echo "$1=${!1}"
-}
-
 apt_get_update()
 {
     echo "Running apt-get update..."
@@ -110,7 +95,6 @@ install_using_apt() {
     # Install dependencies
     check_packages apt-transport-https curl ca-certificates gnupg2 dirmngr
     # Import key safely (new 'signed-by' method rather than deprecated apt-key approach) and install
-    get_common_setting MICROSOFT_GPG_KEYS_URI
     curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
     echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/azure-cli/ ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/azure-cli.list
     apt-get update
diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 8d41acae7..366905c2a 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.7.0",
+    "version": "2.7.1",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 5a4f0fa5d..3d47d4674 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -57,21 +57,6 @@ elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
     USERNAME=root
 fi
 
-# Get central common setting
-get_common_setting() {
-    if [ "${common_settings_file_loaded}" != "true" ]; then
-        curl -sfL "https://aka.ms/vscode-dev-containers/script-library/settings.env" 2>/dev/null -o /tmp/vsdc-settings.env || echo "Could not download settings file. Skipping."
-        common_settings_file_loaded=true
-    fi
-    if [ -f "/tmp/vsdc-settings.env" ]; then
-        local multi_line=""
-        if [ "$2" = "true" ]; then multi_line="-z"; fi
-        local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
-        if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
-    fi
-    echo "$1=${!1}"
-}
-
 apt_get_update()
 {
     if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
@@ -137,8 +122,6 @@ architecture="$(dpkg --print-architecture)"
 
 # Check if distro is supported
 if [ "${USE_MOBY}" = "true" ]; then
-    # 'get_common_setting' allows attribute to be updated remotely
-    get_common_setting DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES
     if [[ "${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
         err "Unsupported  distribution version '${VERSION_CODENAME}'. To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS distribution"
         err "Support distributions include:  ${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}"
@@ -146,7 +129,6 @@ if [ "${USE_MOBY}" = "true" ]; then
     fi
     echo "Distro codename  '${VERSION_CODENAME}'  matched filter  '${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}'"
 else
-    get_common_setting DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES
     if [[ "${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
         err "Unsupported distribution version '${VERSION_CODENAME}'. To resolve, please choose a compatible OS distribution"
         err "Support distributions include:  ${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}"
@@ -177,7 +159,6 @@ if [ "${USE_MOBY}" = "true" ]; then
     cli_package_name="moby-cli"
 
     # Import key safely and import Microsoft apt repo
-    get_common_setting MICROSOFT_GPG_KEYS_URI
     curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
     echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
 else
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index d3123fabe..b82fc6d8b 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 7bf2138b4..3c0520698 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -18,8 +18,8 @@ USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
-DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy"
-DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal hirsute impish jammy"
+DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal jammy"
+DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal hirsute impish jammy"
 
 set -e
 
@@ -48,21 +48,6 @@ elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
     USERNAME=root
 fi
 
-# Get central common setting
-get_common_setting() {
-    if [ "${common_settings_file_loaded}" != "true" ]; then
-        curl -sfL "https://aka.ms/vscode-dev-containers/script-library/settings.env" 2>/dev/null -o /tmp/vsdc-settings.env || echo "Could not download settings file. Skipping."
-        common_settings_file_loaded=true
-    fi
-    if [ -f "/tmp/vsdc-settings.env" ]; then
-        local multi_line=""
-        if [ "$2" = "true" ]; then multi_line="-z"; fi
-        local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
-        if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
-    fi
-    echo "$1=${!1}"
-}
-
 apt_get_update()
 {
     if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
@@ -129,8 +114,6 @@ architecture="$(dpkg --print-architecture)"
 
 # Check if distro is supported
 if [ "${USE_MOBY}" = "true" ]; then
-    # 'get_common_setting' allows attribute to be updated remotely
-    get_common_setting DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES
     if [[ "${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
         err "Unsupported  distribution version '${VERSION_CODENAME}'. To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS distribution"
         err "Support distributions include:  ${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}"
@@ -138,7 +121,6 @@ if [ "${USE_MOBY}" = "true" ]; then
     fi
     echo "Distro codename  '${VERSION_CODENAME}'  matched filter  '${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}'"
 else
-    get_common_setting DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES
     if [[ "${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
         err "Unsupported distribution version '${VERSION_CODENAME}'. To resolve, please choose a compatible OS distribution"
         err "Support distributions include:  ${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}"
@@ -153,7 +135,6 @@ if [ "${USE_MOBY}" = "true" ]; then
     cli_package_name="moby-cli"
 
     # Import key safely and import Microsoft apt repo
-    get_common_setting MICROSOFT_GPG_KEYS_URI
     curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
     echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
 else
diff --git a/src/go/devcontainer-feature.json b/src/go/devcontainer-feature.json
index 9cd89b26c..307ab217b 100644
--- a/src/go/devcontainer-feature.json
+++ b/src/go/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "go",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "name": "Go",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/go",
     "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/go/install.sh b/src/go/install.sh
index f79fc6f3d..90e0973f5 100755
--- a/src/go/install.sh
+++ b/src/go/install.sh
@@ -84,21 +84,6 @@ find_version_from_git_tags() {
     echo "${variable_name}=${!variable_name}"
 }
 
-# Get central common setting
-get_common_setting() {
-    if [ "${common_settings_file_loaded}" != "true" ]; then
-        curl -sfL "https://aka.ms/vscode-dev-containers/script-library/settings.env" 2>/dev/null -o /tmp/vsdc-settings.env || echo "Could not download settings file. Skipping."
-        common_settings_file_loaded=true
-    fi
-    if [ -f "/tmp/vsdc-settings.env" ]; then
-        local multi_line=""
-        if [ "$2" = "true" ]; then multi_line="-z"; fi
-        local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
-        if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
-    fi
-    echo "$1=${!1}"
-}
-
 apt_get_update()
 {
     if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
@@ -148,7 +133,6 @@ if [[ "${TARGET_GO_VERSION}" != "none" ]] && [[ "$(go version)" != *"${TARGET_GO
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
     chmod 700 ${GNUPGHOME}
-    get_common_setting GO_GPG_KEY_URI
     curl -sSL -o /tmp/tmp-gnupg/golang_key "${GO_GPG_KEY_URI}"
     gpg -q --import /tmp/tmp-gnupg/golang_key
     echo "Downloading Go ${TARGET_GO_VERSION}..."
diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index 70ed39eab..7ee455f3f 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "rust",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "name": "Rust",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
     "description": "Installs Rust, common Rust utilities, and their required dependencies",
diff --git a/src/rust/install.sh b/src/rust/install.sh
index 1a309923a..00c0a6e72 100755
--- a/src/rust/install.sh
+++ b/src/rust/install.sh
@@ -48,21 +48,6 @@ elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
     USERNAME=root
 fi
 
-# Get central common setting
-get_common_setting() {
-    if [ "${common_settings_file_loaded}" != "true" ]; then
-        curl -sfL "https://aka.ms/vscode-dev-containers/script-library/settings.env" 2>/dev/null -o /tmp/vsdc-settings.env || echo "Could not download settings file. Skipping."
-        common_settings_file_loaded=true
-    fi
-    if [ -f "/tmp/vsdc-settings.env" ]; then
-        local multi_line=""
-        if [ "$2" = "true" ]; then multi_line="-z"; fi
-        local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
-        if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
-    fi
-    echo "$1=${!1}"
-}
-
 # Figure out correct version of a three part version number is not passed
 find_version_from_git_tags() {
     local variable_name=$1

From 7324b6d03c7110fc108a22470ab6d72099f2d862 Mon Sep 17 00:00:00 2001
From: Oscar <oskarromero3@gmail.com>
Date: Mon, 30 Oct 2023 13:16:28 -0400
Subject: [PATCH 188/478] Remove rebornix.Ruby extension (#737)

Remove the deprecated rebornix.Ruby extension from the list of installed extensions.
---
 src/ruby/devcontainer-feature.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json
index f02ce6c50..73bcbcced 100644
--- a/src/ruby/devcontainer-feature.json
+++ b/src/ruby/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "1.1.2",
+    "version": "1.2.0",
     "name": "Ruby (via rvm)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
     "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
@@ -21,7 +21,6 @@
     "customizations": {
         "vscode": {
             "extensions": [
-                "rebornix.Ruby",
                 "shopify.ruby-lsp"
             ]
         }

From 710103a6382810faade9f37f180bac038c8f38aa Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Mon, 30 Oct 2023 10:20:06 -0700
Subject: [PATCH 189/478] Automated documentation update (#738)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/ruby/README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ruby/README.md b/src/ruby/README.md
index 8184036c6..7df6965c7 100644
--- a/src/ruby/README.md
+++ b/src/ruby/README.md
@@ -21,7 +21,6 @@ Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.
 
 ### VS Code Extensions
 
-- `rebornix.Ruby`
 - `shopify.ruby-lsp`
 
 

From d53b9d1816bac7a62f9ba5f20723eef428042d1f Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Tue, 14 Nov 2023 09:56:03 -0800
Subject: [PATCH 190/478] [Updates] Automated vendor dotnet-install script
 (#750)

* Automated dotnet-install script update

* Bump version

---------

Co-authored-by: github-actions <github-actions@github.com>
---
 src/dotnet/devcontainer-feature.json        | 2 +-
 src/dotnet/scripts/vendor/dotnet-install.sh | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index 6585afb51..b9c7260ea 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
diff --git a/src/dotnet/scripts/vendor/dotnet-install.sh b/src/dotnet/scripts/vendor/dotnet-install.sh
index 4547589b5..b350ad4e1 100755
--- a/src/dotnet/scripts/vendor/dotnet-install.sh
+++ b/src/dotnet/scripts/vendor/dotnet-install.sh
@@ -423,8 +423,13 @@ get_normalized_os() {
                 echo "$osname"
                 return 0
                 ;;
+            macos)
+                osname='osx'
+                echo "$osname"
+                return 0
+                ;;
             *)
-                say_err "'$user_defined_os' is not a supported value for --os option, supported values are: osx, linux, linux-musl, freebsd, rhel.6. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues."
+                say_err "'$user_defined_os' is not a supported value for --os option, supported values are: osx, macos, linux, linux-musl, freebsd, rhel.6. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues."
                 return 1
                 ;;
         esac

From def3a41f576ceffebdff8266b41b8589a2512ac2 Mon Sep 17 00:00:00 2001
From: Philipp Wagner <mail@philipp-wagner.com>
Date: Wed, 6 Dec 2023 02:02:58 +0100
Subject: [PATCH 191/478] Fix common-utils installation on RHEL (and friends)
 (#772)

* Fix indentation in common-utils/main.sh

* common-utils: Fix install error on RHEL

On RHEL (and derivatives) the installation of the common-utils feature
could fail if the feature ran before (i.e., `PACKAGES_ALREADY_INSTALLED`
is set) and if either `INSTALL_ZSH` is false, or zsh was installed
earlier and `ZSH_ALREADY_INSTALLED` is true.

In these cases the script the `package_list` is empty, and `dnf`
terminates with the following error message:

```
usage: dnf install [-c [config file]] [-q] [-v] [--version]
                   [--installroot [path]] [--nodocs] [--noplugins]
                   [--enableplugin [plugin]] [--disableplugin [plugin]]
                   [--releasever RELEASEVER] [--setopt SETOPTS]
                   [--skip-broken] [-h] [--allowerasing] [-b | --nobest] [-C]
                   [-R [minutes]] [-d [debug level]] [--debugsolver]
                   [--showduplicates] [-e ERRORLEVEL] [--obsoletes]
                   [--rpmverbosity [debug level name]] [-y] [--assumeno]
                   [--enablerepo [repo]] [--disablerepo [repo] | --repo
                   [repo]] [--enable | --disable] [-x [package]]
                   [--disableexcludes [repo]] [--repofrompath [repo,path]]
                   [--noautoremove] [--nogpgcheck] [--color COLOR] [--refresh]
                   [-4] [-6] [--destdir DESTDIR] [--downloadonly]
                   [--comment COMMENT] [--bugfix] [--enhancement]
                   [--newpackage] [--security] [--advisory ADVISORY]
                   [--bz BUGZILLA] [--cve CVES]
                   [--sec-severity {Critical,Important,Moderate,Low}]
                   [--forcearch ARCH]
                   PACKAGE [PACKAGE ...]
dnf install: error: the following arguments are required: PACKAGE
```

Fix the problem by running `dnf` only with a non-zero `package_list`.
---
 src/common-utils/main.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index d1a977f9c..a291f98e2 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -189,11 +189,11 @@ install_redhat_packages() {
             man-db \
             strace"
 
-    # rockylinux:9 installs 'curl-minimal' which clashes with 'curl'
-    # Install 'curl' for every OS except this rockylinux:9
-    if [[ "${ID}" = "rocky" ]] && [[ "${VERSION}" != *"9."* ]]; then
-        package_list="${package_list} curl"
-    fi
+        # rockylinux:9 installs 'curl-minimal' which clashes with 'curl'
+        # Install 'curl' for every OS except this rockylinux:9
+        if [[ "${ID}" = "rocky" ]] && [[ "${VERSION}" != *"9."* ]]; then
+            package_list="${package_list} curl"
+        fi
 
         # Install OpenSSL 1.0 compat if needed
         if ${install_cmd} -q list compat-openssl10 >/dev/null 2>&1; then
@@ -222,7 +222,9 @@ install_redhat_packages() {
         package_list="${package_list} zsh"
     fi
 
-    ${install_cmd} -y install ${package_list}
+    if [ -n "${package_list}" ]; then
+        ${install_cmd} -y install ${package_list}
+    fi
 
     # Get to latest versions of all packages
     if [ "${UPGRADE_PACKAGES}" = "true" ]; then

From 3ea4d6bbd7864bcf7b5a91fdeeb66e4f5a6f46c0 Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Thu, 7 Dec 2023 10:49:18 -0800
Subject: [PATCH 192/478] Fix `.zprofile` is owned by root (#775)

* revert behavior of sourcing .profile in .zprofile

https://github.com/devcontainers/features/pull/736/files#diff-3e71c0a0669a0410f7dd0d8f2b83f3b6bf6b525d3eabd354f19f32822da669fcR460-R463

* add test

* increment version

* create empty .zprofile is not present, and fix test

* temporarily add back .profile to .zprofile (only if file did not exist)
---
 src/common-utils/devcontainer-feature.json          | 2 +-
 src/common-utils/main.sh                            | 6 ++++--
 test/common-utils/configure_zsh_as_default_shell.sh | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index dc54e6918..329f8dec8 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index a291f98e2..26f0a7512 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -459,8 +459,10 @@ fi
 
 # Optionally configure zsh and Oh My Zsh!
 if [ "${INSTALL_ZSH}" = "true" ]; then
-    if [ ! -f "${user_home}/.zprofile" ] || ! grep -Fxq 'source $HOME/.profile' "${user_home}/.zprofile" ; then
-        echo 'source $HOME/.profile' >> "${user_home}/.zprofile"
+   if [ ! -f "${user_home}/.zprofile" ]; then
+        touch "${user_home}/.zprofile"
+        echo 'source $HOME/.profile' >> "${user_home}/.zprofile" # TODO: Reconsider adding '.profile' to '.zprofile'
+        chown ${USERNAME}:${group_name} "${user_home}/.zprofile"
     fi
 
     if [ "${ZSH_ALREADY_INSTALLED}" != "true" ]; then
diff --git a/test/common-utils/configure_zsh_as_default_shell.sh b/test/common-utils/configure_zsh_as_default_shell.sh
index 01d15227e..21b12101e 100644
--- a/test/common-utils/configure_zsh_as_default_shell.sh
+++ b/test/common-utils/configure_zsh_as_default_shell.sh
@@ -11,5 +11,7 @@ check "default-shell-is-zsh" bash -c "getent passwd $(whoami) | awk -F: '{ print
 check "default-zshrc-is-dev-container-template" bash -c "cat ~/.zshrc | grep ZSH_THEME | grep devcontainers"
 check "zsh-path-contains-local-bin" zsh -l -c "echo $PATH | grep '/home/devcontainer/.local/bin'"
 
+check "Ensure .zprofile is owned by remoteUser" bash -c "stat -c '%U' /home/devcontainer/.zprofile | grep devcontainer"
+
 # Report result
 reportResults

From 5258a80c67e92b548c7a53d27be1a30669308521 Mon Sep 17 00:00:00 2001
From: Eljo George <eljog@github.com>
Date: Mon, 8 Jan 2024 13:16:23 -0800
Subject: [PATCH 193/478] Alpine - Install libssl1.1 only if available (#793)

---
 src/common-utils/main.sh         |  7 ++++++-
 test/common-utils/alpine-3-18.sh | 16 ++++++++++++++++
 test/common-utils/scenarios.json |  7 +++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100755 test/common-utils/alpine-3-18.sh

diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 26f0a7512..6214d2580 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -265,7 +265,6 @@ install_alpine_packages() {
             libstdc++ \
             krb5-libs \
             libintl \
-            libssl1.1 \
             lttng-ust \
             tzdata \
             userspace-rcu \
@@ -279,6 +278,12 @@ install_alpine_packages() {
             shadow \
             strace
 
+        # # Include libssl1.1 if available (not available for 3.19 and newer)
+        LIBSSL1_PKG=libssl1.1
+        if [[ $(apk search --no-cache -a $LIBSSL1_PKG | grep $LIBSSL1_PKG) ]]; then
+            apk add --no-cache $LIBSSL1_PKG
+        fi
+
         # Install man pages - package name varies between 3.12 and earlier versions
         if apk info man > /dev/null 2>&1; then
             apk add --no-cache man man-pages
diff --git a/test/common-utils/alpine-3-18.sh b/test/common-utils/alpine-3-18.sh
new file mode 100755
index 000000000..eaf384b9e
--- /dev/null
+++ b/test/common-utils/alpine-3-18.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${ID}" = "alpine"
+check "bashrc" ls /etc/bash/bashrc
+check "libssl1.1 is installed" grep "libssl1.1" <(apk list --no-cache libssl1.1)
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index c1ee18dde..eef2bffcd 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -162,6 +162,13 @@
             "common-utils": {}
         }
     },
+    "alpine-3-18": {
+        "image": "alpine:3.18",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
     "devcontainer-info": {
         "build": {
             "dockerfile": "Dockerfile"

From 562305d37b97d47331d96306ffc2a0a3cce55e64 Mon Sep 17 00:00:00 2001
From: Eljo George <eljog@github.com>
Date: Mon, 8 Jan 2024 14:53:08 -0800
Subject: [PATCH 194/478] Bump version for common-utils (#794)

Version bump for https://github.com/devcontainers/features/pull/793
---
 src/common-utils/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 329f8dec8..dbe466beb 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.3.1",
+    "version": "2.3.2",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",

From 6c87ba7564e9db5f7cc380c238b196e5fc676cd9 Mon Sep 17 00:00:00 2001
From: gmeans <gmeans@users.noreply.github.com>
Date: Tue, 16 Jan 2024 19:01:41 -0500
Subject: [PATCH 195/478] Fix kubectl zsh completions typo (#792)

* fix typo

* version bump

---------

Co-authored-by: Eljo George <eljog@github.com>
---
 src/kubectl-helm-minikube/devcontainer-feature.json | 2 +-
 src/kubectl-helm-minikube/install.sh                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kubectl-helm-minikube/devcontainer-feature.json b/src/kubectl-helm-minikube/devcontainer-feature.json
index 4206772b2..fa8ea6138 100644
--- a/src/kubectl-helm-minikube/devcontainer-feature.json
+++ b/src/kubectl-helm-minikube/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "kubectl-helm-minikube",
-    "version": "1.1.5",
+    "version": "1.1.6",
     "name": "Kubectl, Helm, and Minikube",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
     "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
diff --git a/src/kubectl-helm-minikube/install.sh b/src/kubectl-helm-minikube/install.sh
index 35444c5dc..5deb377c3 100755
--- a/src/kubectl-helm-minikube/install.sh
+++ b/src/kubectl-helm-minikube/install.sh
@@ -148,7 +148,7 @@ if [ ${KUBECTL_VERSION} != "none" ]; then
     kubectl completion bash > /etc/bash_completion.d/kubectl
 
     # kubectl zsh completion
-    if [ -e "${USERHOME}}/.oh-my-zsh" ]; then
+    if [ -e "${USERHOME}/.oh-my-zsh" ]; then
         mkdir -p "${USERHOME}/.oh-my-zsh/completions"
         kubectl completion zsh > "${USERHOME}/.oh-my-zsh/completions/_kubectl"
         chown -R "${USERNAME}" "${USERHOME}/.oh-my-zsh"

From f3cbd989e15761534f3cb8efa6b8fce150e5fe3a Mon Sep 17 00:00:00 2001
From: Michael Persico <michael.a.persico@gmail.com>
Date: Wed, 17 Jan 2024 14:19:23 -0800
Subject: [PATCH 196/478] [common-utils] Add xz (#798)

Bump common-utils to v2.4.0 to reflect new package addition

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
---
 src/common-utils/devcontainer-feature.json | 2 +-
 src/common-utils/main.sh                   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index dbe466beb..de0d02d29 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.3.2",
+    "version": "2.4.0",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 6214d2580..4f3dcf8e8 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -48,6 +48,7 @@ install_debian_packages() {
         ca-certificates \
         unzip \
         bzip2 \
+        xz-utils \
         zip \
         nano \
         vim-tiny \
@@ -173,6 +174,7 @@ install_redhat_packages() {
             ca-certificates \
             rsync \
             unzip \
+            xz \
             zip \
             nano \
             vim-minimal \
@@ -256,6 +258,7 @@ install_alpine_packages() {
             rsync \
             ca-certificates \
             unzip \
+            xz \
             zip \
             nano \
             vim \

From 2b2a5f652bd3df0cb514e21af064c5390b53d0f0 Mon Sep 17 00:00:00 2001
From: "nohz.afk" <149959021+nohzafk@users.noreply.github.com>
Date: Fri, 19 Jan 2024 01:20:49 +0800
Subject: [PATCH 197/478] feature nix: add option useAttrPath to use packages
 attribute path (#787)

* add option `useAttrPath` to support `nix-env -iA`

* add test and fix problem

* change to useAttributePath

* bump the version

* update test
---
 src/nix/devcontainer-feature.json  | 11 +++++++---
 src/nix/install.sh                 |  9 ++++----
 src/nix/post-install-steps.sh      | 19 ++++++++++++++++
 test/nix/packages-use-attr-path.sh | 35 ++++++++++++++++++++++++++++++
 test/nix/scenarios.json            | 13 ++++++++++-
 5 files changed, 79 insertions(+), 8 deletions(-)
 create mode 100755 test/nix/packages-use-attr-path.sh

diff --git a/src/nix/devcontainer-feature.json b/src/nix/devcontainer-feature.json
index 96a75016b..0e37efed2 100644
--- a/src/nix/devcontainer-feature.json
+++ b/src/nix/devcontainer-feature.json
@@ -1,9 +1,9 @@
 {
     "id": "nix",
-    "version": "1.1.3",
+    "version": "1.2.0",
     "name": "Nix Package Manager",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nix",
-    "description": "Installs the Nix package manager and optionally a set of packages.",  
+    "description": "Installs the Nix package manager and optionally a set of packages.",
     "options": {
         "version": {
             "type": "string",
@@ -21,6 +21,11 @@
             "default": "",
             "description": "Optional comma separated list of Nix packages to install in profile."
         },
+        "useAttributePath": {
+            "type": "boolean",
+            "default": false,
+            "description": "Enable this option to use exact attribute path of the package in the Nixpkgs repository, aligning with the nix-env -iA command."
+        },
         "flakeUri": {
             "type": "string",
             "default": "",
@@ -39,4 +44,4 @@
         "PATH": "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:${PATH}"
     },
     "entrypoint": "/usr/local/share/nix-entrypoint.sh"
-}
\ No newline at end of file
+}
diff --git a/src/nix/install.sh b/src/nix/install.sh
index ed048fe8d..5b8fe8f28 100755
--- a/src/nix/install.sh
+++ b/src/nix/install.sh
@@ -8,6 +8,7 @@ cd "${FEATURE_DIR}"
 VERSION="${VERSION:-"latest"}"
 MULTIUSER="${MULTIUSER:-"true"}"
 PACKAGES="${PACKAGES//,/ }"
+USEATTRIBUTEPATH="${USEATTRIBUTEPATH:-"false"}"
 FLAKEURI="${FLAKEURI:-""}"
 EXTRANIXCONFIG="${EXTRANIXCONFIG:-""}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
@@ -68,7 +69,7 @@ else
             exit 1
         fi
         echo "(*) Performing single-user install..."
-        echo -e "\n**NOTE: Nix will only work for user ${USERNAME} on Linux if the host machine user's UID is $(id -u ${USERNAME}). You will need to chown /nix otherwise.**\n"    
+        echo -e "\n**NOTE: Nix will only work for user ${USERNAME} on Linux if the host machine user's UID is $(id -u ${USERNAME}). You will need to chown /nix otherwise.**\n"
         # Install per https://nixos.org/manual/nix/stable/installation/installing-binary.html#single-user-installation
         mkdir -p /nix
         chown ${USERNAME} /nix ${tmpdir}
@@ -79,14 +80,14 @@ else
         '
         update_rc_file "$home_dir/.bashrc" "${snippet}"
         update_rc_file "$home_dir/.zshenv" "${snippet}"
-        update_rc_file "$home_dir/.profile" "${snippet}"    
+        update_rc_file "$home_dir/.profile" "${snippet}"
     fi
     rm -rf "${tmpdir}" "/tmp/tmp-gnupg"
 fi
 
 # Set nix config
 mkdir -p /etc/nix
-create_or_update_file /etc/nix/nix.conf 'sandbox = false' 
+create_or_update_file /etc/nix/nix.conf 'sandbox = false'
 if  [ ! -z "${FLAKEURI}" ] && [ "${FLAKEURI}" != "none" ]; then
     create_or_update_file /etc/nix/nix.conf 'experimental-features = nix-command flakes'
 fi
@@ -127,4 +128,4 @@ else
     "
 fi
 
-echo "Done!"
\ No newline at end of file
+echo "Done!"
diff --git a/src/nix/post-install-steps.sh b/src/nix/post-install-steps.sh
index aa466798b..68f93a391 100755
--- a/src/nix/post-install-steps.sh
+++ b/src/nix/post-install-steps.sh
@@ -2,10 +2,29 @@
 set -e
 echo "(*) Executing post-installation steps..."
 
+# if not starts with "nixpkgs." add it as prefix to package name
+add_nixpkgs_prefix() {
+  local packages=$1
+  local -a addr
+  IFS=' ' read -ra addr <<<"$packages"
+  for i in "${!addr[@]}"; do
+    if [[ ${addr[i]} != nixpkgs.* ]]; then
+      addr[i]="nixpkgs.${addr[i]}"
+    fi
+  done
+  IFS=' ' echo "${addr[*]}"
+}
+
 # Install list of packages in profile if specified.
 if [ ! -z "${PACKAGES}" ] && [ "${PACKAGES}" != "none" ]; then
+  if [ "${USEATTRIBUTEPATH}" = "true" ]; then
+    PACKAGES=$(add_nixpkgs_prefix "$PACKAGES")
+    echo "Installing packages \"${PACKAGES}\" in profile..."
+    nix-env -iA ${PACKAGES}
+  else
     echo "Installing packages \"${PACKAGES}\" in profile..."
     nix-env --install ${PACKAGES}
+  fi
 fi
 
 # Install Nix flake in profile if specified
diff --git a/test/nix/packages-use-attr-path.sh b/test/nix/packages-use-attr-path.sh
new file mode 100755
index 000000000..7f34a96ea
--- /dev/null
+++ b/test/nix/packages-use-attr-path.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+source dev-container-features-test-lib
+
+uid="$(id -u)"
+echo "Current user UID is ${uid}."
+if [ "${uid}" != "1000" ]; then
+    echo "Current user UID was adjusted."
+fi
+set +e
+vscode_uid="$(id -u vscode)"
+set -e
+if [ "${vscode_uid}" != "" ]; then
+    echo "User vscode UID is ${vscode_uid}."
+    if [ "${vscode_uid}" != "1000" ]; then
+        echo "User vscode UID was adjusted."
+    fi
+fi
+nix_uid="$(stat /nix -c "%u")"
+echo "/nix UID is ${nix_uid}."
+
+cat /etc/os-release
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib.
+check "nix-env" type nix-env
+check "vim_installed" type vim
+check "node_installed" type node
+check "yarn_installed" type yarn
+
+# Report result
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults &2>1
diff --git a/test/nix/scenarios.json b/test/nix/scenarios.json
index c287f58c7..80ead7ff6 100644
--- a/test/nix/scenarios.json
+++ b/test/nix/scenarios.json
@@ -81,6 +81,17 @@
             }
         }
     },
+    "packages-use-attr-path": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "remoteUser": "vscode",
+        "features": {
+            "nix": {
+                "packages": "nodePackages.nodejs,nixpkgs.vim,nixpkgs.yarn",
+                "useAttributePath": true
+            }
+        }
+    },
+
     "flake": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
         "remoteUser": "vscode",
@@ -99,4 +110,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

From 8a63fabbf91c64309fbf0873c311a468f7910755 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Thu, 18 Jan 2024 09:38:18 -0800
Subject: [PATCH 198/478] Automated documentation update (#799)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/nix/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/nix/README.md b/src/nix/README.md
index 3ab9b0017..4fd9700f3 100644
--- a/src/nix/README.md
+++ b/src/nix/README.md
@@ -18,6 +18,7 @@ Installs the Nix package manager and optionally a set of packages.
 | version | Version of Nix to install. | string | latest |
 | multiUser | Perform a multi-user install (instead of single user) | boolean | true |
 | packages | Optional comma separated list of Nix packages to install in profile. | string | - |
+| useAttributePath | Enable this option to use exact attribute path of the package in the Nixpkgs repository, aligning with the nix-env -iA command. | boolean | false |
 | flakeUri | Optional URI to a Nix Flake to install in profile. | string | - |
 | extraNixConfig | Optional comma separated list of extra lines to add to /etc/nix/nix.conf. | string | - |
 

From 65fb90b7fc8634986ab5644d00d66b983e9a50df Mon Sep 17 00:00:00 2001
From: Kai Groner <kai@gronr.com>
Date: Fri, 19 Jan 2024 00:04:19 -0500
Subject: [PATCH 199/478] [Docker-outside-of-docker] Increase backlog depth for
 socat proxy (#789) (#790)

Co-authored-by: Eljo George <eljog@github.com>
---
 src/docker-outside-of-docker/devcontainer-feature.json | 2 +-
 src/docker-outside-of-docker/install.sh                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index b82fc6d8b..4e5eae721 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 3c0520698..901dd7870 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -329,7 +329,7 @@ if [ "${ENABLE_NONROOT_DOCKER}" = "true" ] && [ "${SOURCE_SOCKET}" != "${TARGET_
             log "Enabling socket proxy."
             log "Proxying ${SOURCE_SOCKET} to ${TARGET_SOCKET} for vscode"
             sudoIf rm -rf ${TARGET_SOCKET}
-            (sudoIf socat UNIX-LISTEN:${TARGET_SOCKET},fork,mode=660,user=${USERNAME} UNIX-CONNECT:${SOURCE_SOCKET} 2>&1 | sudoIf tee -a \${SOCAT_LOG} > /dev/null & echo "\$!" | sudoIf tee \${SOCAT_PID} > /dev/null)
+            (sudoIf socat UNIX-LISTEN:${TARGET_SOCKET},fork,mode=660,user=${USERNAME},backlog=128 UNIX-CONNECT:${SOURCE_SOCKET} 2>&1 | sudoIf tee -a \${SOCAT_LOG} > /dev/null & echo "\$!" | sudoIf tee \${SOCAT_PID} > /dev/null)
         else
             log "Socket proxy already running."
         fi

From 76ffd41c97d7e6c7bd5219b9e29ee9e22b4a3c99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C4=8C=C3=A1bera?= <jakub.cabera@outlook.com>
Date: Mon, 22 Jan 2024 22:45:23 +0100
Subject: [PATCH 200/478] [java] Support groovy installations (#779)

* [java] Support groovy installations

Fix java test failing with non existent 19 version of `open` distro

* fix: Typo

* feat: Implement code review comments

---------

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
---
 src/java/devcontainer-feature.json            | 23 ++++++++++++++++---
 src/java/install.sh                           |  7 ++++++
 ...ll_ant_and_gradle_and_maven_and_groovy.sh} |  6 +++++
 ...d_gradle_and_maven_and_groovy_for_user.sh} |  6 +++++
 ...maven_and_groovy_with_specific_version.sh} |  2 ++
 test/java/install_from_non_default_distro.sh  |  2 +-
 test/java/scenarios.json                      | 20 +++++++++-------
 7 files changed, 54 insertions(+), 12 deletions(-)
 rename test/java/{install_ant_and_gradle_and_maven.sh => install_ant_and_gradle_and_maven_and_groovy.sh} (84%)
 rename test/java/{install_ant_and_gradle_and_maven_for_user.sh => install_ant_and_gradle_and_maven_and_groovy_for_user.sh} (84%)
 rename test/java/{install_ant_and_gradle_and_maven_with_specific_version.sh => install_ant_and_gradle_and_maven_and_groovy_with_specific_version.sh} (92%)

diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index d4aede873..64a4ca932 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "name": "Java (via SDKMAN!)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
@@ -23,7 +23,8 @@
         "ms",
         "open",
         "oracle",
-        "tem"
+        "tem",
+        "amzn"
       ],
       "default": "ms",
       "description": "Select or enter a JDK distribution"
@@ -74,6 +75,22 @@
       ],
       "default": "latest",
       "description": "Select or enter an Ant version"
+    },
+    "installGroovy": {
+      "type": "boolean",
+      "default": false,
+      "description": "Install Groovy, powerful, optionally typed and dynamic language with static-typing and static compilation capabilities"
+    },
+    "groovyVersion": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "2.5.22",
+        "3.0.19",
+        "4.0.16"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Groovy version"
     }
   },
   "customizations": {
@@ -92,6 +109,6 @@
     "PATH": "/usr/local/sdkman/bin:/usr/local/sdkman/candidates/java/current/bin:/usr/local/sdkman/candidates/gradle/current/bin:/usr/local/sdkman/candidates/maven/current/bin:/usr/local/sdkman/candidates/ant/current/bin:${PATH}"
   },
   "installsAfter": [
-      "ghcr.io/devcontainers/features/common-utils"
+    "ghcr.io/devcontainers/features/common-utils"
   ]
 }
diff --git a/src/java/install.sh b/src/java/install.sh
index 2decc31b5..16bbb1c66 100644
--- a/src/java/install.sh
+++ b/src/java/install.sh
@@ -16,6 +16,8 @@ INSTALL_MAVEN="${INSTALLMAVEN:-"false"}"
 MAVEN_VERSION="${MAVENVERSION:-"latest"}"
 INSTALL_ANT="${INSTALLANT:-"false"}"
 ANT_VERSION="${ANTVERSION:-"latest"}"
+INSTALL_GROOVY="${INSTALLGROOVY:-"false"}"
+GROOVY_VERSION="${GROOVYVERSION:-"latest"}"
 JDK_DISTRO="${JDKDISTRO}"
 
 export SDKMAN_DIR="${SDKMAN_DIR:-"/usr/local/sdkman"}"
@@ -190,6 +192,11 @@ if [[ "${INSTALL_MAVEN}" = "true" ]] && ! mvn --version > /dev/null; then
     sdk_install maven ${MAVEN_VERSION}
 fi
 
+# Install Groovy
+if [[ "${INSTALL_GROOVY}" = "true" ]] && ! groovy --version > /dev/null; then
+    sdk_install groovy "${GROOVY_VERSION}"
+fi
+
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
diff --git a/test/java/install_ant_and_gradle_and_maven.sh b/test/java/install_ant_and_gradle_and_maven_and_groovy.sh
similarity index 84%
rename from test/java/install_ant_and_gradle_and_maven.sh
rename to test/java/install_ant_and_gradle_and_maven_and_groovy.sh
index 599f8d9d5..e171f5be5 100644
--- a/test/java/install_ant_and_gradle_and_maven.sh
+++ b/test/java/install_ant_and_gradle_and_maven_and_groovy.sh
@@ -24,5 +24,11 @@ check "maven" mvn --version
 cd /tmp && mvn archetype:generate -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false
 check "m2 exists" grep ".m2" <(ls -la /root)
 
+check "groovy" groovy --version
+cat << EOF > /tmp/test.groovy
+println("verify")
+EOF
+check "groovy works" test "$(groovy /tmp/test.groovy)" = "verify"
+
 # Report result
 reportResults
diff --git a/test/java/install_ant_and_gradle_and_maven_for_user.sh b/test/java/install_ant_and_gradle_and_maven_and_groovy_for_user.sh
similarity index 84%
rename from test/java/install_ant_and_gradle_and_maven_for_user.sh
rename to test/java/install_ant_and_gradle_and_maven_and_groovy_for_user.sh
index 4e8b43134..8d9f293e9 100644
--- a/test/java/install_ant_and_gradle_and_maven_for_user.sh
+++ b/test/java/install_ant_and_gradle_and_maven_and_groovy_for_user.sh
@@ -24,5 +24,11 @@ check "maven" mvn --version
 cd /tmp && mvn archetype:generate -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false
 check "m2 exists" grep ".m2" <(ls -la /home/vscode)
 
+check "groovy" groovy --version
+cat << EOF > /tmp/test.groovy
+println("verify")
+EOF
+check "groovy works" test "$(groovy /tmp/test.groovy)" = "verify"
+
 # Report result
 reportResults
diff --git a/test/java/install_ant_and_gradle_and_maven_with_specific_version.sh b/test/java/install_ant_and_gradle_and_maven_and_groovy_with_specific_version.sh
similarity index 92%
rename from test/java/install_ant_and_gradle_and_maven_with_specific_version.sh
rename to test/java/install_ant_and_gradle_and_maven_and_groovy_with_specific_version.sh
index 7727f51b6..54e13e0cf 100644
--- a/test/java/install_ant_and_gradle_and_maven_with_specific_version.sh
+++ b/test/java/install_ant_and_gradle_and_maven_and_groovy_with_specific_version.sh
@@ -24,5 +24,7 @@ check "maven version" grep "Apache Maven 3.6.3" <(mvn --version)
 cd /tmp && mvn archetype:generate -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false
 check "m2 exists" grep ".m2" <(ls -la /root)
 
+check "groovy version" grep "Groovy Version: 2.5.22" <(groovy --version)
+
 # Report result
 reportResults
diff --git a/test/java/install_from_non_default_distro.sh b/test/java/install_from_non_default_distro.sh
index 021a72a21..3ab648cab 100644
--- a/test/java/install_from_non_default_distro.sh
+++ b/test/java/install_from_non_default_distro.sh
@@ -5,7 +5,7 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-check "java version openjdk 19 installed" grep "openjdk 19." <(java --version)
+check "java version openjdk 21 installed" grep "openjdk 21." <(java --version)
 
 # Report result
 reportResults
diff --git a/test/java/scenarios.json b/test/java/scenarios.json
index 5d7e684ba..dac9850f2 100644
--- a/test/java/scenarios.json
+++ b/test/java/scenarios.json
@@ -3,7 +3,7 @@
         "image": "ubuntu:focal",
         "features": {
             "java": {
-                "version": "19",
+                "version": "21",
                 "jdkDistro": "open"
             }
         }
@@ -17,7 +17,7 @@
             }
         }
     },
-    "install_ant_and_gradle_and_maven_for_user": {
+    "install_ant_and_gradle_and_maven_and_groovy_for_user": {
         "image": "ubuntu:focal",
         "remoteUser": "vscode",
         "features": {
@@ -28,22 +28,24 @@
                 "version": "latest",
                 "installAnt": true,
                 "installGradle": true,
-                "installMaven": true
+                "installMaven": true,
+                "installGroovy": true
             }
         }
     },
-    "install_ant_and_gradle_and_maven": {
+    "install_ant_and_gradle_and_maven_and_groovy": {
         "image": "ubuntu:focal",
         "features": {
             "java": {
                 "version": "latest",
                 "installAnt": true,
                 "installGradle": true,
-                "installMaven": true
+                "installMaven": true,
+                "installGroovy": true
             }
         }
     },
-    "install_ant_and_gradle_and_maven_with_specific_version": {
+    "install_ant_and_gradle_and_maven_and_groovy_with_specific_version": {
         "image": "ubuntu:focal",
         "features": {
             "java": {
@@ -53,13 +55,15 @@
                 "installGradle": "true",
                 "gradleVersion": "6.8.3",
                 "installMaven": "true",
-                "mavenVersion": "3.6.3"
+                "mavenVersion": "3.6.3",
+                "installGroovy": "true",
+                "groovyVersion": "2.5.22"
             }
         }
     },
     "install_non_conventional_version": {
         "image": "ubuntu:focal",
-        "features":{
+        "features": {
             "java": {
                 "version": "21",
                 "jdkDistro": "graalce"

From 43bb98bbf2e8adbf19947a94639badbdd68369e1 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Mon, 22 Jan 2024 13:53:23 -0800
Subject: [PATCH 201/478] Automated documentation update (#803)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/java/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/java/README.md b/src/java/README.md
index 1ffd6188b..4699eb517 100644
--- a/src/java/README.md
+++ b/src/java/README.md
@@ -23,6 +23,8 @@ Installs Java, SDKMAN! (if not installed), and needed dependencies.
 | mavenVersion | Select or enter a Maven version | string | latest |
 | installAnt | Install Ant, a software tool for automating software build processes | boolean | false |
 | antVersion | Select or enter an Ant version | string | latest |
+| installGroovy | Install Groovy, powerful, optionally typed and dynamic language with static-typing and static compilation capabilities | boolean | false |
+| groovyVersion | Select or enter a Groovy version | string | latest |
 
 ## Customizations
 

From 96f5303928d9aef8f10965682f4480ac6bd963d7 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Mon, 22 Jan 2024 14:48:43 -0800
Subject: [PATCH 202/478] [Dotnet] - Fix tests ; removes stale check (#802)

* [Dotnet] - Fix tests ; removes stale check

* Update projects
---
 test/dotnet/install_aspnetcore_runtime_only.sh             | 4 ----
 test/dotnet/install_dotnet_latest_when_version_is_empty.sh | 6 +-----
 test/dotnet/install_dotnet_lts.sh                          | 2 +-
 test/dotnet/install_dotnet_runtime_only.sh                 | 4 ----
 test/dotnet/test.sh                                        | 6 +-----
 5 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/test/dotnet/install_aspnetcore_runtime_only.sh b/test/dotnet/install_aspnetcore_runtime_only.sh
index 35bd540b7..78e4f099c 100644
--- a/test/dotnet/install_aspnetcore_runtime_only.sh
+++ b/test/dotnet/install_aspnetcore_runtime_only.sh
@@ -18,10 +18,6 @@ expected=$(fetch_latest_version "aspnetcore")
 check "Latest ASP.NET Core Runtime version installed" \
 is_aspnetcore_runtime_version_installed "$expected"
 
-# Expect this check to fail in November 2023 when .NET 8.0 becomes GA
-check "It is a flavor of .NET 7.0" \
-is_aspnetcore_runtime_version_installed "7.0"
-
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
 reportResults
\ No newline at end of file
diff --git a/test/dotnet/install_dotnet_latest_when_version_is_empty.sh b/test/dotnet/install_dotnet_latest_when_version_is_empty.sh
index 7418892e1..cd23edcf1 100644
--- a/test/dotnet/install_dotnet_latest_when_version_is_empty.sh
+++ b/test/dotnet/install_dotnet_latest_when_version_is_empty.sh
@@ -18,12 +18,8 @@ expected=$(fetch_latest_version)
 check "Latest .NET SDK version installed" \
 is_dotnet_sdk_version_installed "$expected"
 
-# Expect this check to fail in November 2023 when .NET 8.0 becomes GA
-check "It is a flavor of .NET 7.0" \
-is_dotnet_sdk_version_installed "7.0"
-
 check "Build and run example project" \
-dotnet run --project projects/net7.0
+dotnet run --project projects/net8.0
 
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
diff --git a/test/dotnet/install_dotnet_lts.sh b/test/dotnet/install_dotnet_lts.sh
index fe37b89f7..bc2d40782 100644
--- a/test/dotnet/install_dotnet_lts.sh
+++ b/test/dotnet/install_dotnet_lts.sh
@@ -19,7 +19,7 @@ check "Latest LTS version installed" \
 is_dotnet_sdk_version_installed "$expected"
 
 check "Build and run example project" \
-dotnet run --project projects/net6.0
+dotnet run --project projects/net8.0
 
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
diff --git a/test/dotnet/install_dotnet_runtime_only.sh b/test/dotnet/install_dotnet_runtime_only.sh
index 65188c5ec..3c58340d1 100644
--- a/test/dotnet/install_dotnet_runtime_only.sh
+++ b/test/dotnet/install_dotnet_runtime_only.sh
@@ -18,10 +18,6 @@ expected=$(fetch_latest_version "dotnet")
 check "Latest .NET Runtime version installed" \
 is_dotnet_runtime_version_installed "$expected"
 
-# Expect this check to fail in November 2023 when .NET 8.0 becomes GA
-check "It is a flavor of .NET 7.0" \
-is_dotnet_runtime_version_installed "7.0"
-
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
 reportResults
\ No newline at end of file
diff --git a/test/dotnet/test.sh b/test/dotnet/test.sh
index 7418892e1..cd23edcf1 100644
--- a/test/dotnet/test.sh
+++ b/test/dotnet/test.sh
@@ -18,12 +18,8 @@ expected=$(fetch_latest_version)
 check "Latest .NET SDK version installed" \
 is_dotnet_sdk_version_installed "$expected"
 
-# Expect this check to fail in November 2023 when .NET 8.0 becomes GA
-check "It is a flavor of .NET 7.0" \
-is_dotnet_sdk_version_installed "7.0"
-
 check "Build and run example project" \
-dotnet run --project projects/net7.0
+dotnet run --project projects/net8.0
 
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.

From 4697d25cc57cb79fd37845147d6f9adb6044b8c4 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Mon, 22 Jan 2024 14:55:21 -0800
Subject: [PATCH 203/478] [Updates] Automated vendor dotnet-install script
 (#801)

* Automated dotnet-install script update

* Bump version

---------

Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
---
 src/dotnet/devcontainer-feature.json        | 2 +-
 src/dotnet/scripts/vendor/dotnet-install.sh | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index b9c7260ea..7abfc2d30 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.0.2",
+    "version": "2.0.3",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
diff --git a/src/dotnet/scripts/vendor/dotnet-install.sh b/src/dotnet/scripts/vendor/dotnet-install.sh
index b350ad4e1..86a2d0bad 100755
--- a/src/dotnet/scripts/vendor/dotnet-install.sh
+++ b/src/dotnet/scripts/vendor/dotnet-install.sh
@@ -1708,7 +1708,11 @@ do
         -?|--?|-h|--help|-[Hh]elp)
             script_name="$(basename "$0")"
             echo ".NET Tools Installer"
-            echo "Usage: $script_name [-c|--channel <CHANNEL>] [-v|--version <VERSION>] [-p|--prefix <DESTINATION>]"
+            echo "Usage:"
+            echo "       # Install a .NET SDK of a given Quality from a given Channel"
+            echo "       $script_name [-c|--channel <CHANNEL>] [-q|--quality <QUALITY>]"
+            echo "       # Install a .NET SDK of a specific public version"
+            echo "       $script_name [-v|--version <VERSION>]"
             echo "       $script_name -h|-?|--help"
             echo ""
             echo "$script_name is a simple command line interface for obtaining dotnet cli."

From 3e0c0ae17831b21f93a929e7264710456e37c684 Mon Sep 17 00:00:00 2001
From: Jeff Putsch <150963136+jdputschadi@users.noreply.github.com>
Date: Fri, 26 Jan 2024 15:38:39 -0800
Subject: [PATCH 204/478] allow common-utils to be installed on "minimal"
 RHEL-based distributions (#811)

* allow common-utils to be installed on "minimal" RHEL-based distributions.

* bump version to reflect bug fix

* add missing test scripts for alma scenarios

---------

Co-authored-by: Jeff Putsch <jputsch@analog.com>
---
 src/common-utils/devcontainer-feature.json |  4 +-
 src/common-utils/main.sh                   |  9 +++--
 test/common-utils/alma-8-minimal.sh        | 16 ++++++++
 test/common-utils/alma-8.sh                | 16 ++++++++
 test/common-utils/alma-9-minimal.sh        | 16 ++++++++
 test/common-utils/alma-9.sh                | 16 ++++++++
 test/common-utils/rocky-8-minimal.sh       | 16 ++++++++
 test/common-utils/rocky-9-minimal.sh       | 16 ++++++++
 test/common-utils/scenarios.json           | 44 +++++++++++++++++++++-
 9 files changed, 147 insertions(+), 6 deletions(-)
 create mode 100755 test/common-utils/alma-8-minimal.sh
 create mode 100755 test/common-utils/alma-8.sh
 create mode 100755 test/common-utils/alma-9-minimal.sh
 create mode 100755 test/common-utils/alma-9.sh
 create mode 100755 test/common-utils/rocky-8-minimal.sh
 create mode 100755 test/common-utils/rocky-9-minimal.sh

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index de0d02d29..44f9b32b4 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.4.0",
+    "version": "2.4.1",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
@@ -66,4 +66,4 @@
             "description": "Add packages from non-free Debian repository? (Debian only)"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 4f3dcf8e8..0eec1ecb9 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -155,9 +155,12 @@ install_debian_packages() {
 install_redhat_packages() {
     local package_list=""
     local remove_epel="false"
-    local install_cmd=dnf
-    if ! type dnf > /dev/null 2>&1; then
-        install_cmd=yum
+    local install_cmd=microdnf
+    if ! type microdnf > /dev/null 2>&1; then
+        install_cmd=dnf
+        if ! type dnf > /dev/null 2>&1; then
+            install_cmd=yum
+        fi
     fi
 
     if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
diff --git a/test/common-utils/alma-8-minimal.sh b/test/common-utils/alma-8-minimal.sh
new file mode 100755
index 000000000..d08731824
--- /dev/null
+++ b/test/common-utils/alma-8-minimal.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${PLATFORM_ID}" = "platform:el8"
+check "curl" curl --version
+check "jq" jq  --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/alma-8.sh b/test/common-utils/alma-8.sh
new file mode 100755
index 000000000..d08731824
--- /dev/null
+++ b/test/common-utils/alma-8.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${PLATFORM_ID}" = "platform:el8"
+check "curl" curl --version
+check "jq" jq  --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/alma-9-minimal.sh b/test/common-utils/alma-9-minimal.sh
new file mode 100755
index 000000000..cb2b339e1
--- /dev/null
+++ b/test/common-utils/alma-9-minimal.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${PLATFORM_ID}" = "platform:el9"
+check "curl" curl --version
+check "jq" jq  --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/alma-9.sh b/test/common-utils/alma-9.sh
new file mode 100755
index 000000000..cb2b339e1
--- /dev/null
+++ b/test/common-utils/alma-9.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${PLATFORM_ID}" = "platform:el9"
+check "curl" curl --version
+check "jq" jq  --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/rocky-8-minimal.sh b/test/common-utils/rocky-8-minimal.sh
new file mode 100755
index 000000000..d08731824
--- /dev/null
+++ b/test/common-utils/rocky-8-minimal.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${PLATFORM_ID}" = "platform:el8"
+check "curl" curl --version
+check "jq" jq  --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/rocky-9-minimal.sh b/test/common-utils/rocky-9-minimal.sh
new file mode 100755
index 000000000..cb2b339e1
--- /dev/null
+++ b/test/common-utils/rocky-9-minimal.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${PLATFORM_ID}" = "platform:el9"
+check "curl" curl --version
+check "jq" jq  --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index eef2bffcd..2e357bc2b 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -41,6 +41,34 @@
             "common-utils": {}
         }
     },
+    "alma-8": {
+        "image": "almalinux:8",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "alma-9": {
+        "image": "almalinux:9",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "alma-8-minimal": {
+        "image": "almalinux:8-minimal",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "alma-9-minimal": {
+        "image": "almalinux:9-minimal",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
     "rocky-8": {
         "image": "rockylinux:8",
         "remoteUser": "devcontainer",
@@ -55,6 +83,20 @@
             "common-utils": {}
         }
     },
+    "rocky-8-minimal": {
+        "image": "rockylinux:8-minimal",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "rocky-9-minimal": {
+        "image": "rockylinux:9-minimal",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
     "fedora": {
         "image": "fedora",
         "remoteUser": "devcontainer",
@@ -209,4 +251,4 @@
             "common-utils": {}
         }
     }
-}
+}
\ No newline at end of file

From 97565a7e60cbdf7fa1e2d079e260d875f2cd11ed Mon Sep 17 00:00:00 2001
From: Jeff Putsch <150963136+jdputschadi@users.noreply.github.com>
Date: Mon, 29 Jan 2024 11:49:46 -0800
Subject: [PATCH 205/478] Add RHEL support to git feature (#782)

* Git feature passes all tests: existing + rhel-based base images: centos7, alma-{8,9}, alma-{8,9}-minimal

* update per PR comments

* Fix apt typo...

* udpate per PR code review

* revert README.md

* update per samruddhikhandale's feedback.

* Update src/git/install.sh

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* stop non-fatal error messages in RHEL tests.

* remove tests for alma-[89]-minimal base images for now.

* add install system git tests for RHEL base images

* *_system_* tests install from system repositories, not latest version

* fix broken install_git_from_system_mariner test

* fix broken install_git_from_system_mariner test

---------

Co-authored-by: Jeff Putsch <jputsch@analog.com>
Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/git/NOTES.md                             |   2 +-
 src/git/devcontainer-feature.json            |   6 +-
 src/git/install.sh                           | 154 +++++++++++++++----
 test/common-utils/alma-minimal-8.sh          |  16 ++
 test/common-utils/alma-minimal-9.sh          |  16 ++
 test/git/install_git_from_src.sh             |   1 +
 test/git/install_git_from_src_alma-8.sh      |  16 ++
 test/git/install_git_from_src_alma-9.sh      |  16 ++
 test/git/install_git_from_src_bionic.sh      |   1 +
 test/git/install_git_from_src_bullseye.sh    |   1 +
 test/git/install_git_from_src_buster.sh      |   1 +
 test/git/install_git_from_src_centos-7.sh    |  16 ++
 test/git/install_git_from_src_fedora.sh      |  16 ++
 test/git/install_git_from_src_jammy.sh       |   1 +
 test/git/install_git_from_src_mariner.sh     |  16 ++
 test/git/install_git_from_src_rocky-8.sh     |  16 ++
 test/git/install_git_from_src_rocky-9.sh     |  16 ++
 test/git/install_git_from_system_alma-8.sh   |  16 ++
 test/git/install_git_from_system_alma-9.sh   |  16 ++
 test/git/install_git_from_system_centos-7.sh |  16 ++
 test/git/install_git_from_system_fedora.sh   |  16 ++
 test/git/install_git_from_system_mariner.sh  |  15 ++
 test/git/install_git_from_system_rocky-8.sh  |  16 ++
 test/git/install_git_from_system_rocky-9.sh  |  16 ++
 test/git/scenarios.json                      | 128 ++++++++++++++-
 25 files changed, 513 insertions(+), 37 deletions(-)
 mode change 100755 => 100644 src/git/install.sh
 create mode 100755 test/common-utils/alma-minimal-8.sh
 create mode 100755 test/common-utils/alma-minimal-9.sh
 create mode 100644 test/git/install_git_from_src_alma-8.sh
 create mode 100644 test/git/install_git_from_src_alma-9.sh
 create mode 100644 test/git/install_git_from_src_centos-7.sh
 create mode 100644 test/git/install_git_from_src_fedora.sh
 create mode 100644 test/git/install_git_from_src_mariner.sh
 create mode 100644 test/git/install_git_from_src_rocky-8.sh
 create mode 100644 test/git/install_git_from_src_rocky-9.sh
 create mode 100644 test/git/install_git_from_system_alma-8.sh
 create mode 100644 test/git/install_git_from_system_alma-9.sh
 create mode 100644 test/git/install_git_from_system_centos-7.sh
 create mode 100644 test/git/install_git_from_system_fedora.sh
 create mode 100644 test/git/install_git_from_system_mariner.sh
 create mode 100644 test/git/install_git_from_system_rocky-8.sh
 create mode 100644 test/git/install_git_from_system_rocky-9.sh

diff --git a/src/git/NOTES.md b/src/git/NOTES.md
index 19fe92f31..e809f2099 100644
--- a/src/git/NOTES.md
+++ b/src/git/NOTES.md
@@ -2,6 +2,6 @@
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and RockyLinux distributions with the `apt`, `yum`, `dnf`, or `microdnf` package manager installed.
 
 `bash` is required to execute the `install.sh` script.
diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
index 8cbca6cf8..8d88c4f3b 100644
--- a/src/git/devcontainer-feature.json
+++ b/src/git/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.1.6",
+    "version": "1.2.0",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
@@ -17,10 +17,10 @@
         "ppa": {
             "type": "boolean",
             "default": true,
-            "description": "Install from PPA if available"
+            "description": "Install from PPA if available (only supported for Ubuntu distributions)"
         }
     },
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
-}
+}
\ No newline at end of file
diff --git a/src/git/install.sh b/src/git/install.sh
old mode 100755
new mode 100644
index 67338b8da..8a0731933
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -16,16 +16,51 @@ keyserver hkp://keyserver.ubuntu.com:80
 keyserver hkps://keys.openpgp.org
 keyserver hkp://keyserver.pgp.com"
 
-set -e
-
-# Clean up
-rm -rf /var/lib/apt/lists/*
-
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
     exit 1
 fi
 
+# Bring in ID, ID_LIKE, VERSION_ID, VERSION_CODENAME
+. /etc/os-release
+# Get an adjusted ID independent of distro variants
+if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
+    ADJUSTED_ID="debian"
+elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
+    ADJUSTED_ID="rhel"
+    VERSION_CODENAME="${ID}{$VERSION_ID}"
+else
+    echo "Linux distro ${ID} not supported."
+    exit 1
+fi
+
+if type apt-get > /dev/null 2>&1; then
+    INSTALL_CMD=apt-get
+elif type microdnf > /dev/null 2>&1; then
+    INSTALL_CMD=microdnf
+elif type dnf > /dev/null 2>&1; then
+    INSTALL_CMD=dnf
+elif type yum > /dev/null 2>&1; then
+    INSTALL_CMD=yum
+else
+    echo "(Error) Unable to find a supported package manager."
+    exit 1
+fi
+
+# Clean up
+clean_up() {
+    case $ADJUSTED_ID in
+        debian)
+            rm -rf /var/lib/apt/lists/*
+            ;;
+        rhel)
+            rm -rf /var/cache/dnf/*
+            rm -rf /var/cache/yum/*
+            ;;
+    esac
+}
+clean_up
+
 # Import the specified key in a variable name passed in as 
 receive_gpg_keys() {
     local keys=${!1}
@@ -61,40 +96,73 @@ receive_gpg_keys() {
     fi
 }
 
-apt_get_update()
-{
-    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
-        echo "Running apt-get update..."
-        apt-get update -y
+pkg_mgr_update() {
+    if [ ${INSTALL_CMD} = "apt-get" ]; then
+        if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+            echo "Running apt-get update..."
+            ${INSTALL_CMD} update -y
+        fi
+    elif [ ${INSTALL_CMD} = "dnf" ] || [ ${INSTALL_CMD} = "yum" ]; then
+        if [ "$(find /var/cache/${INSTALL_CMD}/* | wc -l)" = "0" ]; then
+            echo "Running ${INSTALL_CMD} check-update ..."
+            ${INSTALL_CMD} check-update
+        fi
     fi
 }
 
+
 # Checks if packages are installed and installs them if not
 check_packages() {
-    if ! dpkg -s "$@" > /dev/null 2>&1; then
-        apt_get_update
-        apt-get -y install --no-install-recommends "$@"
+    if [ ${INSTALL_CMD} = "apt-get" ]; then
+        if ! dpkg -s "$@" > /dev/null 2>&1; then
+            pkg_mgr_update
+            ${INSTALL_CMD} -y install --no-install-recommends "$@"
+        fi
+    elif [ ${INSTALL_CMD} = "dnf" ] || [ ${INSTALL_CMD} = "yum" ]; then
+        _num_pkgs=$(echo "$@" | tr ' ' \\012 | wc -l)
+        _num_installed=$(${INSTALL_CMD} -C list installed "$@" | sed '1,/^Installed/d' | wc -l)
+        if [ ${_num_pkgs} != ${_num_installed} ]; then
+            pkg_mgr_update
+            ${INSTALL_CMD} -y install "$@"
+        fi
+    elif [ ${INSTALL_CMD} = "microdnf" ]; then
+        ${INSTALL_CMD} -y install \
+            --refresh \
+            --best \
+            --nodocs \
+            --noplugins \
+            --setopt=install_weak_deps=0 \
+            "$@"
+    else
+        echo "Linux distro ${ID} not supported."
+        exit 1
     fi
 }
 
 export DEBIAN_FRONTEND=noninteractive
 
-# Source /etc/os-release to get OS info
-. /etc/os-release
+# Debian / Ubuntu packages
 
 # If the os provided version is "good enough", just install that.
 if [ ${GIT_VERSION} = "os-provided" ] || [ ${GIT_VERSION} = "system" ]; then
     if type git > /dev/null 2>&1; then
         echo "Detected existing system install: $(git version)"
         # Clean up
-        rm -rf /var/lib/apt/lists/*
+        clean_up
         exit 0
     fi
 
-    echo "Installing git from OS apt repository"
+    if [ "$INSTALL_CMD" = "apt-get" ]; then
+        echo "Installing git from OS apt repository"
+    else
+        echo "Installing git from OS yum/dnf repository"
+    fi
+    if [ $ID = "mariner" ]; then
+        check_packages ca-certificates
+    fi
     check_packages git
     # Clean up
-    rm -rf /var/lib/apt/lists/*
+    clean_up
     exit 0
 fi
 
@@ -104,15 +172,47 @@ if ([ "${GIT_VERSION}" = "latest" ] || [ "${GIT_VERSION}" = "lts" ] || [ "${GIT_
     check_packages apt-transport-https curl ca-certificates gnupg2 dirmngr
     receive_gpg_keys GIT_CORE_PPA_ARCHIVE_GPG_KEY /usr/share/keyrings/gitcoreppa-archive-keyring.gpg
     echo -e "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/gitcoreppa-archive-keyring.gpg] http://ppa.launchpad.net/git-core/ppa/ubuntu ${VERSION_CODENAME} main\ndeb-src [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/gitcoreppa-archive-keyring.gpg] http://ppa.launchpad.net/git-core/ppa/ubuntu ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/git-core-ppa.list
-    apt-get update
-    apt-get -y install --no-install-recommends git 
+    ${INSTALL_CMD} update
+    ${INSTALL_CMD} -y install --no-install-recommends git 
     rm -rf "/tmp/tmp-gnupg"
     rm -rf /var/lib/apt/lists/*
     exit 0
 fi
 
 # Install required packages to build if missing
-check_packages build-essential curl ca-certificates tar gettext libssl-dev zlib1g-dev libcurl?-openssl-dev libexpat1-dev
+if [ "${ADJUSTED_ID}" = "debian" ]; then
+
+    check_packages build-essential curl ca-certificates tar gettext libssl-dev zlib1g-dev libcurl?-openssl-dev libexpat1-dev
+
+    check_packages libpcre2-dev
+
+    if [ "${VERSION_CODENAME}" = "focal" ] || [ "${VERSION_CODENAME}" = "bullseye" ]; then
+        check_packages libpcre2-posix2
+    elif [ "${VERSION_CODENAME}" = "bionic" ] || [ "${VERSION_CODENAME}" = "buster" ]; then
+        check_packages libpcre2-posix0
+    else
+        check_packages libpcre2-posix3
+    fi
+
+elif [ "${ADJUSTED_ID}" = "rhel" ]; then
+
+    if [ $VERSION_CODENAME = "centos7" ]; then
+        check_packages centos-release-scl 
+        check_packages devtoolset-11
+        source /opt/rh/devtoolset-11/enable
+    else
+        check_packages gcc
+    fi
+
+
+    check_packages libcurl-devel expat-devel gettext-devel openssl-devel perl-devel zlib-devel cmake pcre2-devel tar gzip ca-certificates
+    if ! type curl > /dev/null 2>&1; then
+        check_packages curl
+    fi
+    if [ $ID = "mariner" ]; then
+        check_packages glibc-devel kernel-headers binutils
+    fi
+fi
 
 # Partial version matching
 if [ "$(echo "${GIT_VERSION}" | grep -o '\.' | wc -l)" != "2" ]; then
@@ -131,21 +231,11 @@ if [ "$(echo "${GIT_VERSION}" | grep -o '\.' | wc -l)" != "2" ]; then
     fi
 fi
 
-check_packages libpcre2-dev
-
-if [ "${VERSION_CODENAME}" = "focal" ] || [ "${VERSION_CODENAME}" = "bullseye" ]; then
-    check_packages libpcre2-posix2
-elif [ "${VERSION_CODENAME}" = "bionic" ] || [ "${VERSION_CODENAME}" = "buster" ]; then
-    check_packages libpcre2-posix0
-else
-    check_packages libpcre2-posix3
-fi
-
 echo "Downloading source for ${GIT_VERSION}..."
 curl -sL https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz | tar -xzC /tmp 2>&1
 echo "Building..."
 cd /tmp/git-${GIT_VERSION}
 make -s USE_LIBPCRE=YesPlease prefix=/usr/local sysconfdir=/etc all && make -s USE_LIBPCRE=YesPlease prefix=/usr/local sysconfdir=/etc install 2>&1
 rm -rf /tmp/git-${GIT_VERSION}
-rm -rf /var/lib/apt/lists/*
+clean_up
 echo "Done!"
diff --git a/test/common-utils/alma-minimal-8.sh b/test/common-utils/alma-minimal-8.sh
new file mode 100755
index 000000000..cb2b339e1
--- /dev/null
+++ b/test/common-utils/alma-minimal-8.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${PLATFORM_ID}" = "platform:el9"
+check "curl" curl --version
+check "jq" jq  --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/alma-minimal-9.sh b/test/common-utils/alma-minimal-9.sh
new file mode 100755
index 000000000..cb2b339e1
--- /dev/null
+++ b/test/common-utils/alma-minimal-9.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${PLATFORM_ID}" = "platform:el9"
+check "curl" curl --version
+check "jq" jq  --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/git/install_git_from_src.sh b/test/git/install_git_from_src.sh
index c3552240d..d0ebaa282 100644
--- a/test/git/install_git_from_src.sh
+++ b/test/git/install_git_from_src.sh
@@ -5,6 +5,7 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Definition specific tests
 check "version" git  --version
 check "gettext" dpkg-query -l gettext
 
diff --git a/test/git/install_git_from_src_alma-8.sh b/test/git/install_git_from_src_alma-8.sh
new file mode 100644
index 000000000..84800b543
--- /dev/null
+++ b/test/git/install_git_from_src_alma-8.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/install_git_from_src_alma-9.sh b/test/git/install_git_from_src_alma-9.sh
new file mode 100644
index 000000000..84800b543
--- /dev/null
+++ b/test/git/install_git_from_src_alma-9.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/install_git_from_src_bionic.sh b/test/git/install_git_from_src_bionic.sh
index 4bdcf3066..6a1f639cf 100644
--- a/test/git/install_git_from_src_bionic.sh
+++ b/test/git/install_git_from_src_bionic.sh
@@ -5,6 +5,7 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Definition specific tests
 check "version" git  --version
 check "gettext" dpkg-query -l gettext
 
diff --git a/test/git/install_git_from_src_bullseye.sh b/test/git/install_git_from_src_bullseye.sh
index 4bdcf3066..6a1f639cf 100644
--- a/test/git/install_git_from_src_bullseye.sh
+++ b/test/git/install_git_from_src_bullseye.sh
@@ -5,6 +5,7 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Definition specific tests
 check "version" git  --version
 check "gettext" dpkg-query -l gettext
 
diff --git a/test/git/install_git_from_src_buster.sh b/test/git/install_git_from_src_buster.sh
index 4bdcf3066..6a1f639cf 100644
--- a/test/git/install_git_from_src_buster.sh
+++ b/test/git/install_git_from_src_buster.sh
@@ -5,6 +5,7 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Definition specific tests
 check "version" git  --version
 check "gettext" dpkg-query -l gettext
 
diff --git a/test/git/install_git_from_src_centos-7.sh b/test/git/install_git_from_src_centos-7.sh
new file mode 100644
index 000000000..84800b543
--- /dev/null
+++ b/test/git/install_git_from_src_centos-7.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/install_git_from_src_fedora.sh b/test/git/install_git_from_src_fedora.sh
new file mode 100644
index 000000000..84800b543
--- /dev/null
+++ b/test/git/install_git_from_src_fedora.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/install_git_from_src_jammy.sh b/test/git/install_git_from_src_jammy.sh
index 4bdcf3066..6a1f639cf 100644
--- a/test/git/install_git_from_src_jammy.sh
+++ b/test/git/install_git_from_src_jammy.sh
@@ -5,6 +5,7 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Definition specific tests
 check "version" git  --version
 check "gettext" dpkg-query -l gettext
 
diff --git a/test/git/install_git_from_src_mariner.sh b/test/git/install_git_from_src_mariner.sh
new file mode 100644
index 000000000..84800b543
--- /dev/null
+++ b/test/git/install_git_from_src_mariner.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/install_git_from_src_rocky-8.sh b/test/git/install_git_from_src_rocky-8.sh
new file mode 100644
index 000000000..84800b543
--- /dev/null
+++ b/test/git/install_git_from_src_rocky-8.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/install_git_from_src_rocky-9.sh b/test/git/install_git_from_src_rocky-9.sh
new file mode 100644
index 000000000..84800b543
--- /dev/null
+++ b/test/git/install_git_from_src_rocky-9.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/install_git_from_system_alma-8.sh b/test/git/install_git_from_system_alma-8.sh
new file mode 100644
index 000000000..84800b543
--- /dev/null
+++ b/test/git/install_git_from_system_alma-8.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/install_git_from_system_alma-9.sh b/test/git/install_git_from_system_alma-9.sh
new file mode 100644
index 000000000..84800b543
--- /dev/null
+++ b/test/git/install_git_from_system_alma-9.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/install_git_from_system_centos-7.sh b/test/git/install_git_from_system_centos-7.sh
new file mode 100644
index 000000000..84800b543
--- /dev/null
+++ b/test/git/install_git_from_system_centos-7.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/install_git_from_system_fedora.sh b/test/git/install_git_from_system_fedora.sh
new file mode 100644
index 000000000..84800b543
--- /dev/null
+++ b/test/git/install_git_from_system_fedora.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/install_git_from_system_mariner.sh b/test/git/install_git_from_system_mariner.sh
new file mode 100644
index 000000000..2114dfdf6
--- /dev/null
+++ b/test/git/install_git_from_system_mariner.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+
+# Ensure git clone works, i.e. ca-certificates are installed.
+check "git clone" bash -c "cd /tmp && git clone https://github.com/devcontainers/feature-starter.git"
+
+# Report result
+reportResults
diff --git a/test/git/install_git_from_system_rocky-8.sh b/test/git/install_git_from_system_rocky-8.sh
new file mode 100644
index 000000000..84800b543
--- /dev/null
+++ b/test/git/install_git_from_system_rocky-8.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/install_git_from_system_rocky-9.sh b/test/git/install_git_from_system_rocky-9.sh
new file mode 100644
index 000000000..84800b543
--- /dev/null
+++ b/test/git/install_git_from_system_rocky-9.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/scenarios.json b/test/git/scenarios.json
index 22af7a860..583c1adbe 100644
--- a/test/git/scenarios.json
+++ b/test/git/scenarios.json
@@ -43,5 +43,131 @@
                 "ppa": "false"
             }
         }
+    },
+    "install_git_from_src_centos-7": {
+        "image": "centos:centos7",
+        "features": {
+            "git": {
+                "version": "latest",
+                "ppa": "false"
+            }
+        }
+    },
+    "install_git_from_src_alma-8": {
+        "image": "almalinux:8",
+        "features": {
+            "git": {
+                "version": "latest",
+                "ppa": "false"
+            }
+        }
+    },
+    "install_git_from_src_alma-9": {
+        "image": "almalinux:9",
+        "features": {
+            "git": {
+                "version": "latest",
+                "ppa": "false"
+            }
+        }
+    },
+    "install_git_from_src_rocky-8": {
+        "image": "rockylinux:8",
+        "features": {
+            "git": {
+                "version": "latest",
+                "ppa": "false"
+            }
+        }
+    },
+    "install_git_from_src_rocky-9": {
+        "image": "rockylinux:9",
+        "features": {
+            "git": {
+                "version": "latest",
+                "ppa": "false"
+            }
+        }
+    },
+    "install_git_from_src_fedora": {
+        "image": "fedora",
+        "features": {
+            "git": {
+                "version": "latest",
+                "ppa": "false"
+            }
+        }
+    },
+    "install_git_from_src_mariner": {
+        "image": "mcr.microsoft.com/cbl-mariner/base/core:2.0",
+        "features": {
+            "git": {
+                "version": "latest",
+                "ppa": "false"
+            }
+        }
+    },
+    "install_git_from_system_centos-7": {
+        "image": "centos:centos7",
+        "features": {
+            "git": {
+                "version": "system",
+                "ppa": "true"
+            }
+        }
+    },
+    "install_git_from_system_alma-8": {
+        "image": "almalinux:8",
+        "features": {
+            "git": {
+                "version": "system",
+                "ppa": "true"
+            }
+        }
+    },
+    "install_git_from_system_alma-9": {
+        "image": "almalinux:9",
+        "features": {
+            "git": {
+                "version": "system",
+                "ppa": "true"
+            }
+        }
+    },
+    "install_git_from_system_rocky-8": {
+        "image": "rockylinux:8",
+        "features": {
+            "git": {
+                "version": "system",
+                "ppa": "true"
+            }
+        }
+    },
+    "install_git_from_system_rocky-9": {
+        "image": "rockylinux:9",
+        "features": {
+            "git": {
+                "version": "system",
+                "ppa": "true"
+            }
+        }
+    },
+    "install_git_from_system_fedora": {
+        "image": "fedora",
+        "features": {
+            "git": {
+                "version": "system",
+                "ppa": "true"
+            }
+        }
+    },
+    "install_git_from_system_mariner": {
+        "image": "mcr.microsoft.com/cbl-mariner/base/core:2.0",
+        "features": {
+            "git": {
+                "version": "system",
+                "ppa": "true"
+            }
+        }
     }
-}
+}
\ No newline at end of file

From 239e6dd5f2a8cf4f9b2143b93796094887efa523 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Mon, 29 Jan 2024 11:53:39 -0800
Subject: [PATCH 206/478] Automated documentation update (#818)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/git/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/git/README.md b/src/git/README.md
index a9e54fa18..adcb04e36 100644
--- a/src/git/README.md
+++ b/src/git/README.md
@@ -16,13 +16,13 @@ Install an up-to-date version of Git, built from source as needed. Useful for wh
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
 | version | Select or enter a Git version. | string | os-provided |
-| ppa | Install from PPA if available | boolean | true |
+| ppa | Install from PPA if available (only supported for Ubuntu distributions) | boolean | true |
 
 
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and RockyLinux distributions with the `apt`, `yum`, `dnf`, or `microdnf` package manager installed.
 
 `bash` is required to execute the `install.sh` script.
 

From 84883548465e18f88b1831d11ac363b253ecfc43 Mon Sep 17 00:00:00 2001
From: "David J. Malan" <malan@harvard.edu>
Date: Mon, 29 Jan 2024 16:06:27 -0500
Subject: [PATCH 207/478] Adds a number for formatting consistency (#813)

* Adds number for consistency

* Added numbering to NOTES.md instead

* Update README.md
---
 src/docker-outside-of-docker/NOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docker-outside-of-docker/NOTES.md b/src/docker-outside-of-docker/NOTES.md
index fede053ae..6e85010ea 100644
--- a/src/docker-outside-of-docker/NOTES.md
+++ b/src/docker-outside-of-docker/NOTES.md
@@ -36,7 +36,7 @@ services:
 
 - The defaults value `./` is added so that the `docker-compose.yaml` file can work when it is run outside of the container
 
-### Change the workspace to `${localWorkspaceFolder}`
+### 2. Change the workspace to `${localWorkspaceFolder}`
 
 - This is useful if we don't want to edit the `docker-compose.yaml` file
 

From b08484e74f82ceaa35a48bef4b126b2c25343790 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Mon, 29 Jan 2024 13:08:33 -0800
Subject: [PATCH 208/478] Automated documentation update (#819)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/docker-outside-of-docker/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docker-outside-of-docker/README.md b/src/docker-outside-of-docker/README.md
index 94c891564..74dca7ae4 100644
--- a/src/docker-outside-of-docker/README.md
+++ b/src/docker-outside-of-docker/README.md
@@ -66,7 +66,7 @@ services:
 
 - The defaults value `./` is added so that the `docker-compose.yaml` file can work when it is run outside of the container
 
-### Change the workspace to `${localWorkspaceFolder}`
+### 2. Change the workspace to `${localWorkspaceFolder}`
 
 - This is useful if we don't want to edit the `docker-compose.yaml` file
 

From a88a95e1e8a10965eafe2e95438da61fbf4e09c0 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 31 Jan 2024 09:01:17 -0800
Subject: [PATCH 209/478] Oryx: Update to use .NET 8 (#825)

* Oryx: Update to use .NET 8

* Fix install_prev_dotnet_and_oryx

* fix install_prev_dotnet_and_oryx
---
 src/oryx/devcontainer-feature.json         |  2 +-
 src/oryx/install.sh                        | 12 +++---
 test/oryx/install_dotnet_and_oryx.sh       |  6 +--
 test/oryx/install_older_dotnet_and_oryx.sh | 47 ++++++++++++++++++++++
 test/oryx/install_prev_dotnet_and_oryx.sh  |  6 +--
 test/oryx/scenarios.json                   | 20 ++++++---
 6 files changed, 75 insertions(+), 18 deletions(-)
 create mode 100644 test/oryx/install_older_dotnet_and_oryx.sh

diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index 66a528ec5..aae6d43db 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "oryx",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "name": "Oryx",
     "description": "Installs the oryx CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
diff --git a/src/oryx/install.sh b/src/oryx/install.sh
index cb2e1b6b7..a16890bef 100755
--- a/src/oryx/install.sh
+++ b/src/oryx/install.sh
@@ -74,7 +74,7 @@ install_dotnet_using_apt() {
     echo "Attempting to auto-install dotnet..."
     install_from_microsoft_feed=false
     apt_get_update
-    DOTNET_INSTALLATION_PACKAGE="dotnet7"
+    DOTNET_INSTALLATION_PACKAGE="dotnet8"
     apt-get -yq install $DOTNET_INSTALLATION_PACKAGE || install_from_microsoft_feed="true"
 
     if [ "${install_from_microsoft_feed}" = "true" ]; then
@@ -82,7 +82,7 @@ install_dotnet_using_apt() {
         curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
         echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
         apt-get update -y
-        DOTNET_INSTALLATION_PACKAGE="dotnet-sdk-7.0"
+        DOTNET_INSTALLATION_PACKAGE="dotnet-sdk-8.0"
         DOTNET_SKIP_FIRST_TIME_EXPERIENCE="true" apt-get install -yq $DOTNET_INSTALLATION_PACKAGE
     fi
 
@@ -132,9 +132,11 @@ if dotnet --version > /dev/null ; then
     DOTNET_BINARY=$(which dotnet)
 fi
 
-# Oryx needs to be built with .NET 7
-if [[ "${DOTNET_BINARY}" = "" ]] || [[ "$(dotnet --version)" != *"7"* ]] ; then
-    echo "'dotnet 7' was not detected. Attempting to install .NET 7 to build oryx."
+MAJOR_VERSION_ID=$(echo $(dotnet --version) | cut -d . -f 1)
+
+# Oryx needs to be built with .NET 8
+if [[ "${DOTNET_BINARY}" = "" ]] || [[ $MAJOR_VERSION_ID != "8" ]] ; then
+    echo "'dotnet 8' was not detected. Attempting to install .NET 8 to build oryx."
     install_dotnet_using_apt
 
     if ! dotnet --version > /dev/null ; then
diff --git a/test/oryx/install_dotnet_and_oryx.sh b/test/oryx/install_dotnet_and_oryx.sh
index 175482847..da0a9162d 100644
--- a/test/oryx/install_dotnet_and_oryx.sh
+++ b/test/oryx/install_dotnet_and_oryx.sh
@@ -26,9 +26,9 @@ mkdir -p /opt/oryx
 echo "vso-focal" >> /opt/oryx/.imagetype
 
 mkdir -p /opt/dotnet/lts
-cp -R /usr/local/dotnet/current/dotnet /opt/dotnet/lts
-cp -R /usr/local/dotnet/current/LICENSE.txt /opt/dotnet/lts
-cp -R /usr/local/dotnet/current/ThirdPartyNotices.txt /opt/dotnet/lts
+cp -R /usr/share/dotnet/dotnet /opt/dotnet/lts
+cp -R /usr/share/dotnet/LICENSE.txt /opt/dotnet/lts
+cp -R /usr/share/dotnet/ThirdPartyNotices.txt /opt/dotnet/lts
 
 # Install platforms with oryx build tool
 check "oryx-install-dotnet-2.1-universal" oryx prep --skip-detection --platforms-and-versions dotnet=2.1.30
diff --git a/test/oryx/install_older_dotnet_and_oryx.sh b/test/oryx/install_older_dotnet_and_oryx.sh
new file mode 100644
index 000000000..da0a9162d
--- /dev/null
+++ b/test/oryx/install_older_dotnet_and_oryx.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "Oryx version" oryx --version
+check "Dotnet is not removed if it is not installed by the Oryx Feature" dotnet --version
+
+# Install platforms with oryx build tool
+check "oryx-install-dotnet-2.1" oryx prep --skip-detection --platforms-and-versions dotnet=2.1.30
+check "dotnet-2-installed-by-oryx" ls /opt/dotnet/ | grep 2.1
+
+check "oryx-install-nodejs-12.22.11" oryx prep --skip-detection --platforms-and-versions nodejs=12.22.11
+check "nodejs-12.22.11-installed-by-oryx" ls /opt/nodejs/ | grep 12.22.11
+
+check "oryx-install-php-7.3.25" oryx prep --skip-detection --platforms-and-versions php=7.3.25
+check "php-7.3.25-installed-by-oryx" ls /opt/php/ | grep 7.3.25
+
+check "oryx-install-java-12.0.2" oryx prep --skip-detection --platforms-and-versions java=12.0.2
+check "java-12.0.2-installed-by-oryx" ls /opt/java/ | grep 12.0.2
+
+# Replicates Oryx's behavior for universal image
+mkdir -p /opt/oryx
+echo "vso-focal" >> /opt/oryx/.imagetype
+
+mkdir -p /opt/dotnet/lts
+cp -R /usr/share/dotnet/dotnet /opt/dotnet/lts
+cp -R /usr/share/dotnet/LICENSE.txt /opt/dotnet/lts
+cp -R /usr/share/dotnet/ThirdPartyNotices.txt /opt/dotnet/lts
+
+# Install platforms with oryx build tool
+check "oryx-install-dotnet-2.1-universal" oryx prep --skip-detection --platforms-and-versions dotnet=2.1.30
+check "dotnet-2-installed-by-oryx-universal" ls /opt/dotnet/ | grep 2.1
+
+check "oryx-install-nodejs-12.22.11-universal" oryx prep --skip-detection --platforms-and-versions nodejs=12.22.11
+check "nodejs-12.22.11-installed-by-oryx-universal" ls /opt/nodejs/ | grep 12.22.11
+
+check "oryx-install-php-7.3.25-universal" oryx prep --skip-detection --platforms-and-versions php=7.3.25
+check "php-7.3.25-installed-by-oryx-universal" ls /opt/php/ | grep 7.3.25
+
+check "oryx-install-java-12.0.2-universal" oryx prep --skip-detection --platforms-and-versions java=12.0.2
+check "java-12.0.2-installed-by-oryx-universal" ls /opt/java/ | grep 12.0.2
+
+# Report result
+reportResults
diff --git a/test/oryx/install_prev_dotnet_and_oryx.sh b/test/oryx/install_prev_dotnet_and_oryx.sh
index 175482847..da0a9162d 100644
--- a/test/oryx/install_prev_dotnet_and_oryx.sh
+++ b/test/oryx/install_prev_dotnet_and_oryx.sh
@@ -26,9 +26,9 @@ mkdir -p /opt/oryx
 echo "vso-focal" >> /opt/oryx/.imagetype
 
 mkdir -p /opt/dotnet/lts
-cp -R /usr/local/dotnet/current/dotnet /opt/dotnet/lts
-cp -R /usr/local/dotnet/current/LICENSE.txt /opt/dotnet/lts
-cp -R /usr/local/dotnet/current/ThirdPartyNotices.txt /opt/dotnet/lts
+cp -R /usr/share/dotnet/dotnet /opt/dotnet/lts
+cp -R /usr/share/dotnet/LICENSE.txt /opt/dotnet/lts
+cp -R /usr/share/dotnet/ThirdPartyNotices.txt /opt/dotnet/lts
 
 # Install platforms with oryx build tool
 check "oryx-install-dotnet-2.1-universal" oryx prep --skip-detection --platforms-and-versions dotnet=2.1.30
diff --git a/test/oryx/scenarios.json b/test/oryx/scenarios.json
index c61483eb4..d7a70f319 100644
--- a/test/oryx/scenarios.json
+++ b/test/oryx/scenarios.json
@@ -3,8 +3,18 @@
         "image": "ubuntu:focal",
         "features": {
             "dotnet": {
-                "version": "7",
-                "installUsingApt": "false"
+                "version": "8.0",
+                "dotnetRuntimeVersions": "7.0",
+                "aspNetCoreRuntimeVersions": "7.0"
+            },
+            "oryx": {}
+        }
+    },
+    "install_older_dotnet_and_oryx": {
+        "image": "ubuntu:focal",
+        "features": {
+            "dotnet": {
+                "version": "7.0"
             },
             "oryx": {}
         }
@@ -13,8 +23,7 @@
         "image": "ubuntu:focal",
         "features": {
             "dotnet": {
-                "version": "6",
-                "installUsingApt": "false"
+                "version": "6.0"
             },
             "oryx": {}
         }
@@ -28,8 +37,7 @@
                 "useOryxIfAvailable": "false"
             },
             "dotnet": {
-                "version": "7",
-                "installUsingApt": "false"
+                "version": "8.0"
             },
             "oryx": {}
         }

From 67de3c279a50a12175580e199071ecfc083c610b Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 31 Jan 2024 09:05:26 -0800
Subject: [PATCH 210/478] Anaconda: Fix bug - Pass proxy variables to new shell
 for successful anaconda installation behind proxies (#808)

Anaconda: Fix bug - Pass proxy variables to new shell
---
 src/anaconda/devcontainer-feature.json | 2 +-
 src/anaconda/install.sh                | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/anaconda/devcontainer-feature.json b/src/anaconda/devcontainer-feature.json
index e0d013d86..6b92b9147 100644
--- a/src/anaconda/devcontainer-feature.json
+++ b/src/anaconda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "anaconda",
-    "version": "1.0.11",
+    "version": "1.0.12",
     "name": "Anaconda",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/anaconda",
     "options": {
diff --git a/src/anaconda/install.sh b/src/anaconda/install.sh
index 53c606a1e..7c7af5b00 100755
--- a/src/anaconda/install.sh
+++ b/src/anaconda/install.sh
@@ -97,7 +97,8 @@ if ! conda --version &> /dev/null ; then
         CONDA_VERSION="2021.11"
     fi
 
-    su --login -c "wget -q https://repo.anaconda.com/archive/Anaconda3-${CONDA_VERSION}-Linux-x86_64.sh -O /tmp/anaconda-install.sh \
+    su --login -c "export http_proxy=${http_proxy:-} && export https_proxy=${https_proxy:-} \
+        && wget -q https://repo.anaconda.com/archive/Anaconda3-${CONDA_VERSION}-Linux-x86_64.sh -O /tmp/anaconda-install.sh \
         && /bin/bash /tmp/anaconda-install.sh -u -b -p ${CONDA_DIR}" ${USERNAME} 2>&1 
     
     if [ "${VERSION}" = "latest" ] || [ "${VERSION}" = "lts" ]; then

From 3063f5f105224ee039cddee4df8b6aaee934430e Mon Sep 17 00:00:00 2001
From: Jeff Putsch <150963136+jdputschadi@users.noreply.github.com>
Date: Wed, 31 Jan 2024 09:21:33 -0800
Subject: [PATCH 211/478] Add RHEL support to Java feature (#821)

* Initial rhel update

* RHEL support added.

* Add tests

* quiet down test for ant/gradle/maven/groovy when they are not yet installed.

* revert README -- it is autobuilt

* Update src/java/NOTES.md

add "`" around package manager names.

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* address PR feedback

---------

Co-authored-by: Jeff Putsch <jputsch@analog.com>
Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/java/NOTES.md                             |   2 +-
 src/java/devcontainer-feature.json            |   4 +-
 src/java/install.sh                           | 160 +++++++++++++++---
 test/java/alma-8-minimal.sh                   |  15 ++
 test/java/alma-8.sh                           |  15 ++
 test/java/alma-9-minimal.sh                   |  15 ++
 test/java/alma-9.sh                           |  15 ++
 test/java/centos-7.sh                         |  15 ++
 test/java/fedora.sh                           |  15 ++
 .../install_additional_java_rhel_family.sh    |  13 ++
 ...d_maven_and_groovy_for_user_rhel_family.sh |  34 ++++
 ...gradle_and_maven_and_groovy_rhel_family.sh |  34 ++++
 ...roovy_with_specific_version_rhel_family.sh |  30 ++++
 ...all_from_non_default_distro_rhel_family.sh |  11 ++
 ...ll_non_conventional_version_rhel_family.sh |  11 ++
 test/java/mariner.sh                          |  15 ++
 test/java/rocky-8-minimal.sh                  |  15 ++
 test/java/rocky-8.sh                          |  15 ++
 test/java/rocky-9-minimal.sh                  |  15 ++
 test/java/rocky-9.sh                          |  15 ++
 test/java/scenarios.json                      | 139 ++++++++++++++-
 21 files changed, 574 insertions(+), 29 deletions(-)
 create mode 100644 test/java/alma-8-minimal.sh
 create mode 100644 test/java/alma-8.sh
 create mode 100644 test/java/alma-9-minimal.sh
 create mode 100644 test/java/alma-9.sh
 create mode 100644 test/java/centos-7.sh
 create mode 100644 test/java/fedora.sh
 create mode 100644 test/java/install_additional_java_rhel_family.sh
 create mode 100644 test/java/install_ant_and_gradle_and_maven_and_groovy_for_user_rhel_family.sh
 create mode 100644 test/java/install_ant_and_gradle_and_maven_and_groovy_rhel_family.sh
 create mode 100644 test/java/install_ant_and_gradle_and_maven_and_groovy_with_specific_version_rhel_family.sh
 create mode 100644 test/java/install_from_non_default_distro_rhel_family.sh
 create mode 100644 test/java/install_non_conventional_version_rhel_family.sh
 create mode 100644 test/java/mariner.sh
 create mode 100644 test/java/rocky-8-minimal.sh
 create mode 100644 test/java/rocky-8.sh
 create mode 100644 test/java/rocky-9-minimal.sh
 create mode 100644 test/java/rocky-9.sh

diff --git a/src/java/NOTES.md b/src/java/NOTES.md
index 63622afaf..edc310e23 100644
--- a/src/java/NOTES.md
+++ b/src/java/NOTES.md
@@ -5,6 +5,6 @@ For the Java Feature from this repository, see [NOTICE.txt](https://github.com/d
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and RockyLinux distributions with the `apt`, `yum`, `dnf`, or `microdnf` package manager installed.
 
 `bash` is required to execute the `install.sh` script.
diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index 64a4ca932..f65a8f360 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "name": "Java (via SDKMAN!)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
@@ -111,4 +111,4 @@
   "installsAfter": [
     "ghcr.io/devcontainers/features/common-utils"
   ]
-}
+}
\ No newline at end of file
diff --git a/src/java/install.sh b/src/java/install.sh
index 16bbb1c66..37cb9e52b 100644
--- a/src/java/install.sh
+++ b/src/java/install.sh
@@ -30,14 +30,65 @@ ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 
 set -e
 
-# Clean up
-rm -rf /var/lib/apt/lists/*
-
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
     exit 1
 fi
 
+# Bring in ID, ID_LIKE, VERSION_ID, VERSION_CODENAME
+. /etc/os-release
+# Get an adjusted ID independent of distro variants
+MAJOR_VERSION_ID=$(echo ${VERSION_ID} | cut -d . -f 1)
+if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
+    ADJUSTED_ID="debian"
+elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
+    ADJUSTED_ID="rhel"
+    if [[ "${ID}" = "rhel" ]] || [[ "${ID}" = *"alma"* ]] || [[ "${ID}" = *"rocky"* ]]; then
+        VERSION_CODENAME="rhel${MAJOR_VERSION_ID}"
+    else
+        VERSION_CODENAME="${ID}${MAJOR_VERSION_ID}"
+    fi
+else
+    echo "Linux distro ${ID} not supported."
+    exit 1
+fi
+
+# Setup INSTALL_CMD & PKG_MGR_CMD
+if type apt-get > /dev/null 2>&1; then
+    PKG_MGR_CMD=apt-get
+    INSTALL_CMD="${PKG_MGR_CMD} -y install --no-install-recommends"
+elif type microdnf > /dev/null 2>&1; then
+    PKG_MGR_CMD=microdnf
+    INSTALL_CMD="${PKG_MGR_CMD} -y install --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0"
+elif type dnf > /dev/null 2>&1; then
+    PKG_MGR_CMD=dnf
+    INSTALL_CMD="${PKG_MGR_CMD} -y install"
+elif type yum > /dev/null 2>&1; then
+    PKG_MGR_CMD=yum
+    INSTALL_CMD="${PKG_MGR_CMD} -y install"
+else
+    echo "(Error) Unable to find a supported package manager."
+    exit 1
+fi
+
+# Clean up
+clean_up() {
+    local pkg
+    case ${ADJUSTED_ID} in
+        debian)
+            rm -rf /var/lib/apt/lists/*
+            ;;
+        rhel)
+            for pkg in epel-release epel-release-latest packages-microsoft-prod; do
+                ${PKG_MGR_CMD} -y remove $pkg 2>/dev/null || /bin/true
+            done
+            rm -rf /var/cache/dnf/* /var/cache/yum/*
+            rm -f /etc/yum.repos.d/docker-ce.repo
+            ;;
+    esac
+}
+clean_up
+
 # Ensure that login shells get the correct path if the user updated the PATH using ENV.
 rm -f /etc/profile.d/00-restore-env.sh
 echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
@@ -61,31 +112,79 @@ elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
 fi
 
 updaterc() {
+    local _bashrc
+    local _zshrc
     if [ "${UPDATE_RC}" = "true" ]; then
-        echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
-        if [[ "$(cat /etc/bash.bashrc)" != *"$1"* ]]; then
-            echo -e "$1" >> /etc/bash.bashrc
+        case $ADJUSTED_ID in
+            debian)
+                _bashrc=/etc/bash.bashrc
+                _zshrc=/etc/zsh/zshrc
+                ;;
+            rhel)
+                _bashrc=/etc/bashrc
+                _zshrc=/etc/zshrc
+            ;;
+        esac
+        echo "Updating ${_bashrc} and ${_zshrc}..."
+        if [[ "$(cat ${_bashrc})" != *"$1"* ]]; then
+            echo -e "$1" >> "${_bashrc}"
         fi
-        if [ -f "/etc/zsh/zshrc" ] && [[ "$(cat /etc/zsh/zshrc)" != *"$1"* ]]; then
-            echo -e "$1" >> /etc/zsh/zshrc
+        if [ -f "${_zshrc}" ] && [[ "$(cat ${_zshrc})" != *"$1"* ]]; then
+            echo -e "$1" >> "${_zshrc}"
         fi
     fi
 }
 
-apt_get_update()
-{
-    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
-        echo "Running apt-get update..."
-        apt-get update -y
-    fi
+
+pkg_manager_update() {
+    case $ADJUSTED_ID in
+        debian)
+            if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+                echo "Running apt-get update..."
+                ${PKG_MGR_CMD} update -y
+            fi
+            ;;
+        rhel)
+            if [ ${PKG_MGR_CMD} = "microdnf" ]; then
+                if [ "$(ls /var/cache/yum/* 2>/dev/null | wc -l)" = 0 ]; then
+                    echo "Running ${PKG_MGR_CMD} makecache ..."
+                    ${PKG_MGR_CMD} makecache
+                fi
+            else
+                if [ "$(ls /var/cache/${PKG_MGR_CMD}/* 2>/dev/null | wc -l)" = 0 ]; then
+                    echo "Running ${PKG_MGR_CMD} check-update ..."
+                    set +e
+                        stderr_messages=$(${PKG_MGR_CMD} -q check-update 2>&1)
+                        rc=$?
+                        # centos 7 sometimes returns a status of 100 when it apears to work.
+                        if [ $rc != 0 ] && [ $rc != 100 ]; then
+                            echo "(Error) ${PKG_MGR_CMD} check-update produced the following error message(s):"
+                            echo "${stderr_messages}"
+                            exit 1
+                        fi
+                    set -e
+                fi
+            fi
+            ;;
+    esac
 }
 
 # Checks if packages are installed and installs them if not
 check_packages() {
-    if ! dpkg -s "$@" > /dev/null 2>&1; then
-        apt_get_update
-        apt-get -y install --no-install-recommends "$@"
-    fi
+    case ${ADJUSTED_ID} in
+        debian)
+            if ! dpkg -s "$@" > /dev/null 2>&1; then
+                pkg_manager_update
+                ${INSTALL_CMD} "$@"
+            fi
+            ;;
+        rhel)
+            if ! rpm -q "$@" > /dev/null 2>&1; then
+                pkg_manager_update
+                ${INSTALL_CMD} "$@"
+            fi
+            ;;
+    esac
 }
 
 # Use Microsoft JDK for everything but JDK 8 and 18 (unless specified differently with jdkDistro option)
@@ -142,8 +241,19 @@ if [ "${architecture}" != "amd64" ] && [ "${architecture}" != "x86_64" ] && [ "$
     exit 1
 fi
 
-# Install dependencies
-check_packages curl ca-certificates zip unzip sed
+# Install dependencies,
+check_packages ca-certificates zip unzip sed findutils util-linux tar
+# Make sure passwd (Debian) and shadow-utils RHEL family is installed
+if [ ${ADJUSTED_ID} = "debian" ]; then
+    check_packages passwd
+elif [ ${ADJUSTED_ID} = "rhel" ]; then
+    check_packages shadow-utils
+fi
+# minimal RHEL installs may not include curl, or includes curl-minimal instead.
+# Install curl if the "curl" command is not present.
+if ! type curl > /dev/null 2>&1; then
+    check_packages curl
+fi
 
 # Install sdkman if not installed
 if [ ! -d "${SDKMAN_DIR}" ]; then
@@ -178,26 +288,26 @@ if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
 fi
 
 # Install Ant
-if [[ "${INSTALL_ANT}" = "true" ]] && ! ant -version > /dev/null; then
+if [[ "${INSTALL_ANT}" = "true" ]] && ! ant -version > /dev/null 2>&1; then
     sdk_install ant ${ANT_VERSION}
 fi
 
 # Install Gradle
-if [[ "${INSTALL_GRADLE}" = "true" ]] && ! gradle --version > /dev/null; then
+if [[ "${INSTALL_GRADLE}" = "true" ]] && ! gradle --version > /dev/null 2>&1; then
     sdk_install gradle ${GRADLE_VERSION}
 fi
 
 # Install Maven
-if [[ "${INSTALL_MAVEN}" = "true" ]] && ! mvn --version > /dev/null; then
+if [[ "${INSTALL_MAVEN}" = "true" ]] && ! mvn --version > /dev/null 2>&1; then
     sdk_install maven ${MAVEN_VERSION}
 fi
 
 # Install Groovy
-if [[ "${INSTALL_GROOVY}" = "true" ]] && ! groovy --version > /dev/null; then
+if [[ "${INSTALL_GROOVY}" = "true" ]] && ! groovy --version > /dev/null 2>&1; then
     sdk_install groovy "${GROOVY_VERSION}"
 fi
 
 # Clean up
-rm -rf /var/lib/apt/lists/*
+clean_up
 
 echo "Done!"
diff --git a/test/java/alma-8-minimal.sh b/test/java/alma-8-minimal.sh
new file mode 100644
index 000000000..40f48562c
--- /dev/null
+++ b/test/java/alma-8-minimal.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" java  --version
+
+# Check env
+check "JAVA_HOME is set correctly" echo $JAVA_HOME | grep "/usr/local/sdkman/candidates/java/current"
+
+# Report result
+reportResults
diff --git a/test/java/alma-8.sh b/test/java/alma-8.sh
new file mode 100644
index 000000000..40f48562c
--- /dev/null
+++ b/test/java/alma-8.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" java  --version
+
+# Check env
+check "JAVA_HOME is set correctly" echo $JAVA_HOME | grep "/usr/local/sdkman/candidates/java/current"
+
+# Report result
+reportResults
diff --git a/test/java/alma-9-minimal.sh b/test/java/alma-9-minimal.sh
new file mode 100644
index 000000000..40f48562c
--- /dev/null
+++ b/test/java/alma-9-minimal.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" java  --version
+
+# Check env
+check "JAVA_HOME is set correctly" echo $JAVA_HOME | grep "/usr/local/sdkman/candidates/java/current"
+
+# Report result
+reportResults
diff --git a/test/java/alma-9.sh b/test/java/alma-9.sh
new file mode 100644
index 000000000..40f48562c
--- /dev/null
+++ b/test/java/alma-9.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" java  --version
+
+# Check env
+check "JAVA_HOME is set correctly" echo $JAVA_HOME | grep "/usr/local/sdkman/candidates/java/current"
+
+# Report result
+reportResults
diff --git a/test/java/centos-7.sh b/test/java/centos-7.sh
new file mode 100644
index 000000000..40f48562c
--- /dev/null
+++ b/test/java/centos-7.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" java  --version
+
+# Check env
+check "JAVA_HOME is set correctly" echo $JAVA_HOME | grep "/usr/local/sdkman/candidates/java/current"
+
+# Report result
+reportResults
diff --git a/test/java/fedora.sh b/test/java/fedora.sh
new file mode 100644
index 000000000..40f48562c
--- /dev/null
+++ b/test/java/fedora.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" java  --version
+
+# Check env
+check "JAVA_HOME is set correctly" echo $JAVA_HOME | grep "/usr/local/sdkman/candidates/java/current"
+
+# Report result
+reportResults
diff --git a/test/java/install_additional_java_rhel_family.sh b/test/java/install_additional_java_rhel_family.sh
new file mode 100644
index 000000000..882c49d1c
--- /dev/null
+++ b/test/java/install_additional_java_rhel_family.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "java version 11 installed as default" grep "11\." <(java --version)
+check "java version 17 installed" grep "^17\." <(ls /usr/local/sdkman/candidates/java)
+check "java version 8 installed" grep "^8\." <(ls /usr/local/sdkman/candidates/java)
+
+# Report result
+reportResults
diff --git a/test/java/install_ant_and_gradle_and_maven_and_groovy_for_user_rhel_family.sh b/test/java/install_ant_and_gradle_and_maven_and_groovy_for_user_rhel_family.sh
new file mode 100644
index 000000000..8d9f293e9
--- /dev/null
+++ b/test/java/install_ant_and_gradle_and_maven_and_groovy_for_user_rhel_family.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "user is vscode" grep vscode <(whoami)
+
+check "java" java --version
+
+check "ant" ant -version
+cat << EOF > /tmp/build.xml
+<project><target name="init"><mkdir dir="ant-src"/></target></project>
+EOF
+cd /tmp && ant init
+check "ant-src exists" grep "ant-src" <(ls -la /tmp)
+
+check "gradle" gradle --version
+cd /tmp && gradle init --type basic --dsl groovy --incubating --project-name test
+check "GRADLE_USER_HOME exists" grep ".gradle" <(ls -la /home/vscode)
+
+check "maven" mvn --version
+cd /tmp && mvn archetype:generate -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false
+check "m2 exists" grep ".m2" <(ls -la /home/vscode)
+
+check "groovy" groovy --version
+cat << EOF > /tmp/test.groovy
+println("verify")
+EOF
+check "groovy works" test "$(groovy /tmp/test.groovy)" = "verify"
+
+# Report result
+reportResults
diff --git a/test/java/install_ant_and_gradle_and_maven_and_groovy_rhel_family.sh b/test/java/install_ant_and_gradle_and_maven_and_groovy_rhel_family.sh
new file mode 100644
index 000000000..e171f5be5
--- /dev/null
+++ b/test/java/install_ant_and_gradle_and_maven_and_groovy_rhel_family.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "user is root" grep root <(whoami)
+
+check "java" java --version
+
+check "ant" ant -version
+cat << EOF > /tmp/build.xml
+<project><target name="init"><mkdir dir="ant-src"/></target></project>
+EOF
+cd /tmp && ant init
+check "ant-src exists" grep "ant-src" <(ls -la /tmp)
+
+check "gradle" gradle --version
+cd /tmp && gradle init --type basic --dsl groovy --incubating --project-name test
+check "GRADLE_USER_HOME exists" grep ".gradle" <(ls -la /root)
+
+check "maven" mvn --version
+cd /tmp && mvn archetype:generate -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false
+check "m2 exists" grep ".m2" <(ls -la /root)
+
+check "groovy" groovy --version
+cat << EOF > /tmp/test.groovy
+println("verify")
+EOF
+check "groovy works" test "$(groovy /tmp/test.groovy)" = "verify"
+
+# Report result
+reportResults
diff --git a/test/java/install_ant_and_gradle_and_maven_and_groovy_with_specific_version_rhel_family.sh b/test/java/install_ant_and_gradle_and_maven_and_groovy_with_specific_version_rhel_family.sh
new file mode 100644
index 000000000..54e13e0cf
--- /dev/null
+++ b/test/java/install_ant_and_gradle_and_maven_and_groovy_with_specific_version_rhel_family.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "user is root" grep root <(whoami)
+
+check "java" java --version
+
+check "ant version" grep "Ant(TM) version 1.10.12" <(ant -version)
+cat << EOF > /tmp/build.xml
+<project><target name="init"><mkdir dir="ant-src"/></target></project>
+EOF
+cd /tmp && ant init
+check "ant-src exists" grep "ant-src" <(ls -la /tmp)
+
+check "gradle version" grep "Gradle 6.8.3" <(gradle --version)
+cd /tmp && gradle init --type basic --dsl groovy --project-name test
+check "GRADLE_USER_HOME exists" grep ".gradle" <(ls -la /root)
+
+check "maven version" grep "Apache Maven 3.6.3" <(mvn --version)
+cd /tmp && mvn archetype:generate -DgroupId=com.mycompany.app -DartifactId=my-app -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false
+check "m2 exists" grep ".m2" <(ls -la /root)
+
+check "groovy version" grep "Groovy Version: 2.5.22" <(groovy --version)
+
+# Report result
+reportResults
diff --git a/test/java/install_from_non_default_distro_rhel_family.sh b/test/java/install_from_non_default_distro_rhel_family.sh
new file mode 100644
index 000000000..3ab648cab
--- /dev/null
+++ b/test/java/install_from_non_default_distro_rhel_family.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "java version openjdk 21 installed" grep "openjdk 21." <(java --version)
+
+# Report result
+reportResults
diff --git a/test/java/install_non_conventional_version_rhel_family.sh b/test/java/install_non_conventional_version_rhel_family.sh
new file mode 100644
index 000000000..3ab648cab
--- /dev/null
+++ b/test/java/install_non_conventional_version_rhel_family.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "java version openjdk 21 installed" grep "openjdk 21." <(java --version)
+
+# Report result
+reportResults
diff --git a/test/java/mariner.sh b/test/java/mariner.sh
new file mode 100644
index 000000000..40f48562c
--- /dev/null
+++ b/test/java/mariner.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" java  --version
+
+# Check env
+check "JAVA_HOME is set correctly" echo $JAVA_HOME | grep "/usr/local/sdkman/candidates/java/current"
+
+# Report result
+reportResults
diff --git a/test/java/rocky-8-minimal.sh b/test/java/rocky-8-minimal.sh
new file mode 100644
index 000000000..40f48562c
--- /dev/null
+++ b/test/java/rocky-8-minimal.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" java  --version
+
+# Check env
+check "JAVA_HOME is set correctly" echo $JAVA_HOME | grep "/usr/local/sdkman/candidates/java/current"
+
+# Report result
+reportResults
diff --git a/test/java/rocky-8.sh b/test/java/rocky-8.sh
new file mode 100644
index 000000000..40f48562c
--- /dev/null
+++ b/test/java/rocky-8.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" java  --version
+
+# Check env
+check "JAVA_HOME is set correctly" echo $JAVA_HOME | grep "/usr/local/sdkman/candidates/java/current"
+
+# Report result
+reportResults
diff --git a/test/java/rocky-9-minimal.sh b/test/java/rocky-9-minimal.sh
new file mode 100644
index 000000000..40f48562c
--- /dev/null
+++ b/test/java/rocky-9-minimal.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" java  --version
+
+# Check env
+check "JAVA_HOME is set correctly" echo $JAVA_HOME | grep "/usr/local/sdkman/candidates/java/current"
+
+# Report result
+reportResults
diff --git a/test/java/rocky-9.sh b/test/java/rocky-9.sh
new file mode 100644
index 000000000..40f48562c
--- /dev/null
+++ b/test/java/rocky-9.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" java  --version
+
+# Check env
+check "JAVA_HOME is set correctly" echo $JAVA_HOME | grep "/usr/local/sdkman/candidates/java/current"
+
+# Report result
+reportResults
diff --git a/test/java/scenarios.json b/test/java/scenarios.json
index dac9850f2..6e6426969 100644
--- a/test/java/scenarios.json
+++ b/test/java/scenarios.json
@@ -69,5 +69,142 @@
                 "jdkDistro": "graalce"
             }
         }
+    },
+    "install_from_non_default_distro_rhel_family": {
+        "image": "almalinux:8",
+        "features": {
+            "java": {
+                "version": "21",
+                "jdkDistro": "open"
+            }
+        }
+    },
+    "install_additional_java_rhel_family": {
+        "image": "almalinux:8",
+        "features": {
+            "java": {
+                "version": "11",
+                "additionalVersions": "17,8"
+            }
+        }
+    },
+    "install_ant_and_gradle_and_maven_and_groovy_for_user_rhel_family": {
+        "image": "almalinux:8",
+        "remoteUser": "vscode",
+        "features": {
+            "common-utils": {
+                "username": "vscode"
+            },
+            "java": {
+                "version": "latest",
+                "installAnt": true,
+                "installGradle": true,
+                "installMaven": true,
+                "installGroovy": true
+            }
+        }
+    },
+    "install_ant_and_gradle_and_maven_and_groovy_rhel_family": {
+        "image": "almalinux:8",
+        "features": {
+            "java": {
+                "version": "latest",
+                "installAnt": true,
+                "installGradle": true,
+                "installMaven": true,
+                "installGroovy": true
+            }
+        }
+    },
+    "install_ant_and_gradle_and_maven_and_groovy_with_specific_version_rhel_family": {
+        "image": "almalinux:8",
+        "features": {
+            "java": {
+                "version": "latest",
+                "installAnt": "true",
+                "antVersion": "1.10.12",
+                "installGradle": "true",
+                "gradleVersion": "6.8.3",
+                "installMaven": "true",
+                "mavenVersion": "3.6.3",
+                "installGroovy": "true",
+                "groovyVersion": "2.5.22"
+            }
+        }
+    },
+    "install_non_conventional_version_rhel_family": {
+        "image": "almalinux:8",
+        "features": {
+            "java": {
+                "version": "21",
+                "jdkDistro": "graalce"
+            }
+        }
+    },
+    "centos-7": {
+        "image": "centos:centos7",
+        "features": {
+            "java": {}
+        }
+    },
+    "alma-8": {
+        "image": "almalinux:8",
+        "features": {
+            "java": {}
+        }
+    },
+    "alma-8-minimal": {
+        "image": "almalinux:8-minimal",
+        "features": {
+            "java": {}
+        }
+    },
+    "alma-9": {
+        "image": "almalinux:9",
+        "features": {
+            "java": {}
+        }
+    },
+    "alma-9-minimal": {
+        "image": "almalinux:9-minimal",
+        "features": {
+            "java": {}
+        }
+    },
+    "rocky-8": {
+        "image": "rockylinux:8",
+        "features": {
+            "java": {}
+        }
+    },
+    "rocky-8-minimal": {
+        "image": "rockylinux:8-minimal",
+        "features": {
+            "java": {}
+        }
+    },
+    "rocky-9": {
+        "image": "rockylinux:9",
+        "features": {
+            "java": {}
+        }
+    },
+    "rocky-9-minimal": {
+        "image": "rockylinux:9-minimal",
+        "features": {
+            "java": {}
+        }
+    },
+    "mariner": {
+        "image": "mcr.microsoft.com/cbl-mariner/base/core:2.0",
+        "features": {
+            "java": {}
+        }
+    },
+    "fedora": {
+        "image": "fedora",
+        "features": {
+            "java": {}
+        }
     }
-}
+}
\ No newline at end of file

From 19d1edcbdf758d94f5ff7580da31c3f23dc2529c Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Wed, 31 Jan 2024 09:23:10 -0800
Subject: [PATCH 212/478] Automated documentation update (#826)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/java/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java/README.md b/src/java/README.md
index 4699eb517..938cd0f89 100644
--- a/src/java/README.md
+++ b/src/java/README.md
@@ -39,7 +39,7 @@ For the Java Feature from this repository, see [NOTICE.txt](https://github.com/d
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and RockyLinux distributions with the `apt`, `yum`, `dnf`, or `microdnf` package manager installed.
 
 `bash` is required to execute the `install.sh` script.
 

From 4f0d020909096dac60d3fb379b034eb2d02ad323 Mon Sep 17 00:00:00 2001
From: Jeff Putsch <150963136+jdputschadi@users.noreply.github.com>
Date: Wed, 31 Jan 2024 11:26:41 -0800
Subject: [PATCH 213/478] Add RHEL support to node feature. (#823)

* node feature working for RHEL and family, passing all tests

* RHEL support added

* fix linting error by removing debugging code.

* incorporate PR feedback

* address PR feedback

---------

Co-authored-by: Jeff Putsch <jputsch@analog.com>
---
 src/node/NOTES.md                             |   4 +-
 src/node/devcontainer-feature.json            |   4 +-
 src/node/install.sh                           | 274 ++++++++++++++----
 test/node/alma-8-minimal.sh                   |  15 +
 test/node/alma-8.sh                           |  15 +
 test/node/alma-9-minimal.sh                   |  15 +
 test/node/alma-9.sh                           |  15 +
 test/node/centos-7.sh                         |  15 +
 test/node/fedora.sh                           |  15 +
 test/node/install_additional_node.sh          |   6 +-
 .../install_additional_node_on_rhel_family.sh |  18 ++
 test/node/install_nvm_0.39_on_rhel_family.sh  |  14 +
 test/node/mariner.sh                          |  17 ++
 test/node/rocky-8-minimal.sh                  |  15 +
 test/node/rocky-8.sh                          |  15 +
 test/node/rocky-9-minimal.sh                  |  15 +
 test/node/rocky-9.sh                          |  15 +
 test/node/scenarios.json                      | 127 +++++++-
 test/node/version_none_on_rhel_family.sh      |  12 +
 test/node/zsh_default_on_rhel_family.sh       |  12 +
 20 files changed, 570 insertions(+), 68 deletions(-)
 create mode 100755 test/node/alma-8-minimal.sh
 create mode 100755 test/node/alma-8.sh
 create mode 100755 test/node/alma-9-minimal.sh
 create mode 100755 test/node/alma-9.sh
 create mode 100755 test/node/centos-7.sh
 create mode 100755 test/node/fedora.sh
 create mode 100644 test/node/install_additional_node_on_rhel_family.sh
 create mode 100755 test/node/install_nvm_0.39_on_rhel_family.sh
 create mode 100755 test/node/mariner.sh
 create mode 100755 test/node/rocky-8-minimal.sh
 create mode 100755 test/node/rocky-8.sh
 create mode 100755 test/node/rocky-9-minimal.sh
 create mode 100755 test/node/rocky-9.sh
 create mode 100755 test/node/version_none_on_rhel_family.sh
 create mode 100755 test/node/zsh_default_on_rhel_family.sh

diff --git a/src/node/NOTES.md b/src/node/NOTES.md
index 65eb93bf3..506fa1b4e 100644
--- a/src/node/NOTES.md
+++ b/src/node/NOTES.md
@@ -20,6 +20,8 @@ Alternatively, you can start up an interactive shell which will in turn source `
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and Rocky Linux distributions with the `apt`, `yum`, `dnf`, or `microdnf` package manager installed.
+
+**Note**:  RedHat 7 Family (RedHat, CentOS, etc.) must use Node versions less than 18 due to its system libraries and long-term support (LTS) policies.
 
 `bash` is required to execute the `install.sh` script.
diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index 0123fdb73..a93f75ace 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.3.1",
+    "version": "1.4.0",
     "name": "Node.js (via nvm), yarn and pnpm",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
@@ -53,4 +53,4 @@
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
-}
+}
\ No newline at end of file
diff --git a/src/node/install.sh b/src/node/install.sh
index 9a696ca54..493166d84 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -21,61 +21,136 @@ UPDATE_RC="${UPDATE_RC:-"true"}"
 
 set -e
 
-# Clean up
-rm -rf /var/lib/apt/lists/*
-
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
     exit 1
 fi
 
+# Bring in ID, ID_LIKE, VERSION_ID, VERSION_CODENAME
+. /etc/os-release
+# Get an adjusted ID independent of distro variants
+MAJOR_VERSION_ID=$(echo ${VERSION_ID} | cut -d . -f 1)
+if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
+    ADJUSTED_ID="debian"
+elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
+    ADJUSTED_ID="rhel"
+    if [[ "${ID}" = "rhel" ]] || [[ "${ID}" = *"alma"* ]] || [[ "${ID}" = *"rocky"* ]]; then
+        VERSION_CODENAME="rhel${MAJOR_VERSION_ID}"
+    else
+        VERSION_CODENAME="${ID}${MAJOR_VERSION_ID}"
+    fi
+else
+    echo "Linux distro ${ID} not supported."
+    exit 1
+fi
+
+# Setup INSTALL_CMD & PKG_MGR_CMD
+if type apt-get > /dev/null 2>&1; then
+    PKG_MGR_CMD=apt-get
+    INSTALL_CMD="${PKG_MGR_CMD} -y install --no-install-recommends"
+elif type microdnf > /dev/null 2>&1; then
+    PKG_MGR_CMD=microdnf
+    INSTALL_CMD="${PKG_MGR_CMD} -y install --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0"
+elif type dnf > /dev/null 2>&1; then
+    PKG_MGR_CMD=dnf
+    INSTALL_CMD="${PKG_MGR_CMD} -y install"
+else
+    PKG_MGR_CMD=yum
+    INSTALL_CMD="${PKG_MGR_CMD} -y install"
+fi
+
+# Clean up
+clean_up() {
+    case ${ADJUSTED_ID} in
+        debian)
+            rm -rf /var/lib/apt/lists/*
+            ;;
+        rhel)
+            rm -rf /var/cache/dnf/* /var/cache/yum/*
+            rm -f /etc/yum.repos.d/yarn.repo
+            ;;
+    esac
+}
+clean_up
+
 # Ensure that login shells get the correct path if the user updated the PATH using ENV.
 rm -f /etc/profile.d/00-restore-env.sh
 echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
 chmod +x /etc/profile.d/00-restore-env.sh
 
-# Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
-
 updaterc() {
+    local _bashrc
+    local _zshrc
     if [ "${UPDATE_RC}" = "true" ]; then
-        echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
-        if [[ "$(cat /etc/bash.bashrc)" != *"$1"* ]]; then
-            echo -e "$1" >> /etc/bash.bashrc
+        case $ADJUSTED_ID in
+            debian)
+                _bashrc=/etc/bash.bashrc
+                _zshrc=/etc/zsh/zshrc
+                ;;
+            rhel)
+                _bashrc=/etc/bashrc
+                _zshrc=/etc/zshrc
+            ;;
+        esac
+        echo "Updating ${_bashrc} and ${_zshrc}..."
+        if [[ "$(cat ${_bashrc})" != *"$1"* ]]; then
+            echo -e "$1" >> "${_bashrc}"
         fi
-        if [ -f "/etc/zsh/zshrc" ] && [[ "$(cat /etc/zsh/zshrc)" != *"$1"* ]]; then
-            echo -e "$1" >> /etc/zsh/zshrc
+        if [ -f "${_zshrc}" ] && [[ "$(cat ${_zshrc})" != *"$1"* ]]; then
+            echo -e "$1" >> "${_zshrc}"
         fi
     fi
 }
 
-apt_get_update() {
-    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
-        echo "Running apt-get update..."
-        apt-get update -y
-    fi
+pkg_mgr_update() {
+    case $ADJUSTED_ID in
+        debian)
+            if [ "$(find /var/lib/apt/lists/* 2>/dev/null | wc -l)" = "0" ]; then
+                echo "Running apt-get update..."
+                ${PKG_MGR_CMD} update -y
+            fi
+            ;;
+        rhel)
+            if [ ${PKG_MGR_CMD} = "microdnf" ]; then
+                if [ "$(ls /var/cache/yum/* 2>/dev/null | wc -l)" = 0 ]; then
+                    echo "Running ${PKG_MGR_CMD} makecache ..."
+                    ${PKG_MGR_CMD} makecache
+                fi
+            else
+                if [ "$(ls /var/cache/${PKG_MGR_CMD}/* 2>/dev/null | wc -l)" = 0 ]; then
+                    echo "Running ${PKG_MGR_CMD} check-update ..."
+                    set +e
+                        stderr_messages=$(${PKG_MGR_CMD} -q check-update 2>&1)
+                        rc=$?
+                        # centos 7 sometimes returns a status of 100 when it apears to work.
+                        if [ $rc != 0 ] && [ $rc != 100 ]; then
+                            echo "(Error) ${PKG_MGR_CMD} check-update produced the following error message(s):"
+                            echo "${stderr_messages}"
+                            exit 1
+                        fi
+                    set -e
+                fi
+            fi
+            ;;
+    esac
 }
 
 # Checks if packages are installed and installs them if not
 check_packages() {
-    if ! dpkg -s "$@" > /dev/null 2>&1; then
-        apt_get_update
-        apt-get -y install --no-install-recommends "$@"
-    fi
+    case ${ADJUSTED_ID} in
+        debian)
+            if ! dpkg -s "$@" > /dev/null 2>&1; then
+                pkg_mgr_update
+                ${INSTALL_CMD} "$@"
+            fi
+            ;;
+        rhel)
+            if ! rpm -q "$@" > /dev/null 2>&1; then
+                pkg_mgr_update
+                ${INSTALL_CMD} "$@"
+            fi
+            ;;
+    esac
 }
 
 # Figure out correct version of a three part version number is not passed
@@ -112,35 +187,95 @@ find_version_from_git_tags() {
     echo "${variable_name}=${!variable_name}"
 }
 
+install_yarn() {
+    if [ "${ADJUSTED_ID}" = "debian" ]; then
+        # for backward compatiblity with existing devcontainer features, install yarn
+        # via apt-get on Debian systems
+        if ! type yarn >/dev/null 2>&1; then
+            # Import key safely (new method rather than deprecated apt-key approach) and install
+            curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor > /usr/share/keyrings/yarn-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/yarn-archive-keyring.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
+            apt-get update
+            apt-get -y install --no-install-recommends yarn
+        else
+            echo "Yarn is already installed."
+        fi
+    else
+        local _ver=${1:-node}
+        # on non-debian systems, prefer corepack, fallback to npm based installation of yarn...
+        # Try to leverage corepack if possible
+        # From https://yarnpkg.com:
+        # The preferred way to manage Yarn is by-project and through Corepack, a tool
+        # shipped by default with Node.js. Modern releases of Yarn aren't meant to be
+        # installed globally, or from npm.
+        if ! bash -c ". '${NVM_DIR}/nvm.sh' && nvm use ${_ver} && type yarn >/dev/null 2>&1"; then
+            if bash -c ". '${NVM_DIR}/nvm.sh' && nvm use ${_ver} && type corepack >/dev/null 2>&1"; then
+                su ${USERNAME} -c "umask 0002 && . '${NVM_DIR}/nvm.sh' && nvm use ${_ver} && corepack enable"
+            fi
+            if ! bash -c ". '${NVM_DIR}/nvm.sh' && nvm use ${_ver} && type yarn >/dev/null 2>&1"; then
+                # Yum/DNF want to install nodejs dependencies, we'll use NPM to install yarn
+                su ${USERNAME} -c "umask 0002 && . '${NVM_DIR}/nvm.sh' && nvm use ${_ver} && npm install --global yarn"
+            fi
+        else 
+            echo "Yarn already installed."
+        fi
+    fi
+}
+
+# Mariner does not have awk installed by default, this can cause
+# problems is username is auto* and later when we try to install
+# node via npm.
+if ! type awk >/dev/null 2>&1; then
+    check_packages awk
+fi
+
+# Determine the appropriate non-root user
+if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
+    USERNAME=""
+    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
+    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
+        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            USERNAME=${CURRENT_USER}
+            break
+        fi
+    done
+    if [ "${USERNAME}" = "" ]; then
+        USERNAME=root
+    fi
+elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
+    USERNAME=root
+fi
+
 # Ensure apt is in non-interactive to avoid prompts
 export DEBIAN_FRONTEND=noninteractive
 
-. /etc/os-release
-if [[ "bionic" = *"${VERSION_CODENAME}"* ]]; then
-    if [[ "${NODE_VERSION}" =~ "18" ]] || [[ "${NODE_VERSION}" = "lts" ]]; then
-        echo "(!) Unsupported distribution version '${VERSION_CODENAME}' for Node 18. Details: https://github.com/nodejs/node/issues/42351#issuecomment-1068424442"
+if ( [ -n "${VERSION_CODENAME}" ] && [[ "bionic" = *"${VERSION_CODENAME}"* ]] ) || [[ "rhel7" = *"${ADJUSTED_ID}${MAJOR_VERSION_ID}"* ]]; then
+    node_major_version=$(echo "${NODE_VERSION}" | cut -d . -f 1)
+    if [[ "${node_major_version}" -ge 18 ]] || [[ "${NODE_VERSION}" = "lts" ]] || [[ "${NODE_VERSION}" = "latest" ]]; then
+        echo "(!) Unsupported distribution version '${VERSION_CODENAME}' for Node >= 18. Details: https://github.com/nodejs/node/issues/42351#issuecomment-1068424442"
         exit 1
     fi
 fi
 
 # Install dependencies
-check_packages apt-transport-https curl ca-certificates tar gnupg2 dirmngr
+case ${ADJUSTED_ID} in
+    debian)
+        check_packages apt-transport-https curl ca-certificates tar gnupg2 dirmngr
+        ;;
+    rhel)
+        check_packages ca-certificates tar gnupg2 which findutils util-linux tar
+        # minimal RHEL installs may not include curl, or includes curl-minimal instead.
+        # Install curl if the "curl" command is not present.
+        if ! type curl > /dev/null 2>&1; then
+            check_packages curl
+        fi
+        ;;
+esac
 
 if ! type git > /dev/null 2>&1; then
     check_packages git
 fi
 
-# Install yarn
-if type yarn > /dev/null 2>&1; then
-    echo "Yarn already installed."
-else
-    # Import key safely (new method rather than deprecated apt-key approach) and install
-    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor > /usr/share/keyrings/yarn-archive-keyring.gpg
-    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/yarn-archive-keyring.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
-    apt-get update
-    apt-get -y install --no-install-recommends yarn
-fi
-
 # Adjust node version if required
 if [ "${NODE_VERSION}" = "none" ]; then
     export NODE_VERSION=
@@ -159,6 +294,7 @@ umask 0002
 # Do not update profile - we'll do this manually
 export PROFILE=/dev/null
 curl -so- "https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh" | bash
+
 source "${NVM_DIR}/nvm.sh"
 if [ "${NODE_VERSION}" != "" ]; then
     nvm alias default "${NODE_VERSION}"
@@ -204,6 +340,9 @@ else
     fi
 fi
 
+# Possibly install yarn (puts yarn in per-Node install on RHEL, uses system yarn on Debian)
+install_yarn
+
 # Additional node versions to be installed but not be set as
 # default we can assume the nvm is the group owner of the nvm
 # directory and the sticky bit on directories so any installed
@@ -214,6 +353,8 @@ if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
         read -a additional_versions <<< "$ADDITIONAL_VERSIONS"
         for ver in "${additional_versions[@]}"; do
             su ${USERNAME} -c "umask 0002 && . '$NVM_DIR/nvm.sh' && nvm install '${ver}'"
+            # possibly install yarn (puts yarn in per-Node install on RHEL, uses system yarn on Debian)
+            install_yarn "${ver}"
         done
 
         # Ensure $NODE_VERSION is on the $PATH
@@ -224,14 +365,17 @@ if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
 fi
 
 # Install pnpm
-if type pnpm > /dev/null 2>&1; then
+if bash -c ". '${NVM_DIR}/nvm.sh' && type pnpm >/dev/null 2>&1"; then
     echo "pnpm already installed."
 else
-    if type npm > /dev/null 2>&1; then
-        [ ! -z "$http_proxy" ] && npm set proxy="$http_proxy"
-        [ ! -z "$https_proxy" ] && npm set https-proxy="$https_proxy"
-        [ ! -z "$no_proxy" ] && npm set noproxy="$no_proxy"
-        npm install -g pnpm
+    if bash -c ". '${NVM_DIR}/nvm.sh' && type npm >/dev/null 2>&1"; then
+        (
+            . "${NVM_DIR}/nvm.sh"
+            [ ! -z "$http_proxy" ] && npm set proxy="$http_proxy"
+            [ ! -z "$https_proxy" ] && npm set https-proxy="$https_proxy"
+            [ ! -z "$no_proxy" ] && npm set noproxy="$no_proxy"
+            npm install -g pnpm
+        )
     else
         echo "Skip installing pnpm because npm is missing"
     fi
@@ -248,21 +392,29 @@ if [ "${INSTALL_TOOLS_FOR_NODE_GYP}" = "true" ]; then
         to_install="${to_install} gcc"
     fi
     if ! type g++ > /dev/null 2>&1; then
-        to_install="${to_install} g++"
+        if [ ${ADJUSTED_ID} = "debian" ]; then
+            to_install="${to_install} g++"
+        elif [ ${ADJUSTED_ID} = "rhel" ]; then
+            to_install="${to_install} gcc-c++"
+        fi
     fi
     if ! type python3 > /dev/null 2>&1; then
-        to_install="${to_install} python3-minimal"
+        if [ ${ADJUSTED_ID} = "debian" ]; then
+            to_install="${to_install} python3-minimal"
+        elif [ ${ADJUSTED_ID} = "rhel" ]; then
+            to_install="${to_install} python3"
+        fi
     fi
     if [ ! -z "${to_install}" ]; then
-        apt_get_update
-        apt-get -y install ${to_install}
+        pkg_mgr_update
+        check_packages ${to_install}
     fi
 fi
 
 
 # Clean up
 su ${USERNAME} -c "umask 0002 && . '$NVM_DIR/nvm.sh' && nvm clear-cache"
-rm -rf /var/lib/apt/lists/*
+clean_up
 
 # Ensure privs are correct for installed node versions. Unfortunately the
 # way nvm installs node versions pulls privs from the tar which does not
diff --git a/test/node/alma-8-minimal.sh b/test/node/alma-8-minimal.sh
new file mode 100755
index 000000000..c5980129b
--- /dev/null
+++ b/test/node/alma-8-minimal.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+check "yarn" yarn --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/node/alma-8.sh b/test/node/alma-8.sh
new file mode 100755
index 000000000..c5980129b
--- /dev/null
+++ b/test/node/alma-8.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+check "yarn" yarn --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/node/alma-9-minimal.sh b/test/node/alma-9-minimal.sh
new file mode 100755
index 000000000..c5980129b
--- /dev/null
+++ b/test/node/alma-9-minimal.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+check "yarn" yarn --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/node/alma-9.sh b/test/node/alma-9.sh
new file mode 100755
index 000000000..c5980129b
--- /dev/null
+++ b/test/node/alma-9.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+check "yarn" yarn --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/node/centos-7.sh b/test/node/centos-7.sh
new file mode 100755
index 000000000..c5980129b
--- /dev/null
+++ b/test/node/centos-7.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+check "yarn" yarn --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/node/fedora.sh b/test/node/fedora.sh
new file mode 100755
index 000000000..c5980129b
--- /dev/null
+++ b/test/node/fedora.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+check "yarn" yarn --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/node/install_additional_node.sh b/test/node/install_additional_node.sh
index f47f928c0..d8f27317f 100644
--- a/test/node/install_additional_node.sh
+++ b/test/node/install_additional_node.sh
@@ -5,11 +5,11 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-# 'lts' is some version of node 18 for a while.
-check "version_on_path"  node -v | grep 18
+# 'lts' is now some version of node 20...
+check "version_on_path"  node -v | grep 20
 check "pnpm" pnpm -v
 
-check "v18_installed" ls -1 /usr/local/share/nvm/versions/node | grep 18
+check "v20_installed" ls -1 /usr/local/share/nvm/versions/node | grep 20
 check "v14_installed" ls -1 /usr/local/share/nvm/versions/node | grep 14.19.3
 check "v17_installed" ls -1 /usr/local/share/nvm/versions/node | grep 17.9.1
 
diff --git a/test/node/install_additional_node_on_rhel_family.sh b/test/node/install_additional_node_on_rhel_family.sh
new file mode 100644
index 000000000..d8f27317f
--- /dev/null
+++ b/test/node/install_additional_node_on_rhel_family.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# 'lts' is now some version of node 20...
+check "version_on_path"  node -v | grep 20
+check "pnpm" pnpm -v
+
+check "v20_installed" ls -1 /usr/local/share/nvm/versions/node | grep 20
+check "v14_installed" ls -1 /usr/local/share/nvm/versions/node | grep 14.19.3
+check "v17_installed" ls -1 /usr/local/share/nvm/versions/node | grep 17.9.1
+
+
+# Report result
+reportResults
diff --git a/test/node/install_nvm_0.39_on_rhel_family.sh b/test/node/install_nvm_0.39_on_rhel_family.sh
new file mode 100755
index 000000000..6b96381b5
--- /dev/null
+++ b/test/node/install_nvm_0.39_on_rhel_family.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" bash -c "node --version"
+check "pnpm" pnpm -v
+check "nvm version" bash -c ". /usr/local/share/nvm/nvm.sh && nvm --version | grep 0.39"
+
+# Report result
+reportResults
diff --git a/test/node/mariner.sh b/test/node/mariner.sh
new file mode 100755
index 000000000..d4ebb7d69
--- /dev/null
+++ b/test/node/mariner.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+# for some reason the "nvm" test switches the default node version on Mariner
+# test yarn before that: it is only enabled in the default node version
+check "yarn" yarn --version_list
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/node/rocky-8-minimal.sh b/test/node/rocky-8-minimal.sh
new file mode 100755
index 000000000..c5980129b
--- /dev/null
+++ b/test/node/rocky-8-minimal.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+check "yarn" yarn --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/node/rocky-8.sh b/test/node/rocky-8.sh
new file mode 100755
index 000000000..c5980129b
--- /dev/null
+++ b/test/node/rocky-8.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+check "yarn" yarn --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/node/rocky-9-minimal.sh b/test/node/rocky-9-minimal.sh
new file mode 100755
index 000000000..c5980129b
--- /dev/null
+++ b/test/node/rocky-9-minimal.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+check "yarn" yarn --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/node/rocky-9.sh b/test/node/rocky-9.sh
new file mode 100755
index 000000000..c5980129b
--- /dev/null
+++ b/test/node/rocky-9.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+check "yarn" yarn --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/node/scenarios.json b/test/node/scenarios.json
index a45620fbe..262fba8ea 100644
--- a/test/node/scenarios.json
+++ b/test/node/scenarios.json
@@ -8,6 +8,15 @@
             }
         }
     },
+    "install_additional_node_on_rhel_family": {
+        "image": "almalinux:8",
+        "features": {
+            "node": {
+                "version": "lts",
+                "additionalVersions": "v17.9.1,v14.19.3"
+            }
+        }
+    },
     "non_root_user": {
         "image": "mcr.microsoft.com/devcontainers/base",
         "remoteUser": "vscode",
@@ -28,6 +37,17 @@
             }
         }
     },
+    "zsh_default_on_rhel_family": {
+        "image": "almalinux:8",
+        "features": {
+            "node": {
+                "version": "lts"
+            },
+            "common-utils": {
+                "configureZshAsDefaultShell": true
+            }
+        }
+    },
     "version_none": {
         "image": "mcr.microsoft.com/devcontainers/base",
         "remoteUser": "vscode",
@@ -37,6 +57,15 @@
             }
         }
     },
+    "version_none_on_rhel_family": {
+        "image": "mcr.microsoft.com/devcontainers/base",
+        "remoteUser": "vscode",
+        "features": {
+            "node": {
+                "version": "none"
+            }
+        }
+    },
     "install_node_16_on_bionic": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu-18.04",
         "features": {
@@ -52,5 +81,101 @@
                 "nvmVersion": "0.39"
             }
         }
+    },
+    "install_nvm_0.39_on_rhel_family": {
+        "image": "almalinux:8",
+        "features": {
+            "node": {
+                "nvmVersion": "0.39"
+            }
+        }
+    },
+    "centos-7": {
+        "image": "centos:centos7",
+        "features": {
+            "node": {
+                "version": "16"
+            }
+        }
+    },
+    "alma-8": {
+        "image": "almalinux:8",
+        "features": {
+            "node": {
+                "version": "lts"
+            }
+        }
+    },
+    "alma-8-minimal": {
+        "image": "almalinux:8-minimal",
+        "features": {
+            "node": {
+                "version": "lts"
+            }
+        }
+    },
+    "alma-9": {
+        "image": "almalinux:9",
+        "features": {
+            "node": {
+                "version": "lts"
+            }
+        }
+    },
+    "alma-9-minimal": {
+        "image": "almalinux:9-minimal",
+        "features": {
+            "node": {
+                "version": "lts"
+            }
+        }
+    },
+    "rocky-8": {
+        "image": "rockylinux:8",
+        "features": {
+            "node": {
+                "version": "lts"
+            }
+        }
+    },
+    "rocky-8-minimal": {
+        "image": "rockylinux:8-minimal",
+        "features": {
+            "node": {
+                "version": "lts"
+            }
+        }
+    },
+    "rocky-9": {
+        "image": "rockylinux:9",
+        "features": {
+            "node": {
+                "version": "lts"
+            }
+        }
+    },
+    "rocky-9-minimal": {
+        "image": "rockylinux:9-minimal",
+        "features": {
+            "node": {
+                "version": "lts"
+            }
+        }
+    },
+    "fedora": {
+        "image": "fedora",
+        "features": {
+            "node": {
+                "version": "lts"
+            }
+        }
+    },
+    "mariner": {
+        "image": "mcr.microsoft.com/cbl-mariner/base/core:2.0",
+        "features": {
+            "node": {
+                "version": "lts"
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/test/node/version_none_on_rhel_family.sh b/test/node/version_none_on_rhel_family.sh
new file mode 100755
index 000000000..c7c9e57f4
--- /dev/null
+++ b/test/node/version_none_on_rhel_family.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+
+# Report result
+reportResults
diff --git a/test/node/zsh_default_on_rhel_family.sh b/test/node/zsh_default_on_rhel_family.sh
new file mode 100755
index 000000000..c7c9e57f4
--- /dev/null
+++ b/test/node/zsh_default_on_rhel_family.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+
+# Report result
+reportResults

From ccc86033c09f1161e6e55971455fafcd0ed80a4c Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Wed, 31 Jan 2024 11:29:08 -0800
Subject: [PATCH 214/478] Automated documentation update (#828)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/node/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/node/README.md b/src/node/README.md
index b98391922..6ac1b0ff0 100644
--- a/src/node/README.md
+++ b/src/node/README.md
@@ -48,7 +48,9 @@ Alternatively, you can start up an interactive shell which will in turn source `
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and Rocky Linux distributions with the `apt`, `yum`, `dnf`, or `microdnf` package manager installed.
+
+**Note**:  RedHat 7 Family (RedHat, CentOS, etc.) must use Node versions less than 18 due to its system libraries and long-term support (LTS) policies.
 
 `bash` is required to execute the `install.sh` script.
 

From 6d6fb2bab02edd2431ce3b2151ef29a981d8a82a Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Wed, 31 Jan 2024 12:04:20 -0800
Subject: [PATCH 215/478] [docker-in-docker] : Bug fix - Buildx installation
 when moby:false (#827)

---
 .../devcontainer-feature.json                 |  2 +-
 src/docker-in-docker/install.sh               | 15 +++++++++------
 test/docker-in-docker/docker_build.sh         |  2 ++
 test/docker-in-docker/docker_build_2.sh       |  2 ++
 test/docker-in-docker/docker_build_older.sh   |  2 ++
 test/docker-in-docker/docker_buildx.sh        | 19 +++++++++++++++++++
 test/docker-in-docker/scenarios.json          |  9 +++++++++
 7 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100755 test/docker-in-docker/docker_buildx.sh

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 366905c2a..3e112ddcb 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.7.1",
+    "version": "2.8.0",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 3d47d4674..4e042e3e8 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -317,13 +317,16 @@ if [ "${INSTALL_DOCKER_BUILDX}" = "true" ]; then
     buildx_file_name="buildx-v${buildx_version}.linux-${architecture}"
     cd /tmp && wget "https://github.com/docker/buildx/releases/download/v${buildx_version}/${buildx_file_name}"
 
-    mkdir -p ${_REMOTE_USER_HOME}/.docker/cli-plugins
-    mv ${buildx_file_name} ${_REMOTE_USER_HOME}/.docker/cli-plugins/docker-buildx
-    chmod +x ${_REMOTE_USER_HOME}/.docker/cli-plugins/docker-buildx
+    docker_home="/usr/libexec/docker"
+    cli_plugins_dir="${docker_home}/cli-plugins"
 
-    chown -R "${USERNAME}:docker" "${_REMOTE_USER_HOME}/.docker"
-    chmod -R g+r+w "${_REMOTE_USER_HOME}/.docker"
-    find "${_REMOTE_USER_HOME}/.docker" -type d -print0 | xargs -n 1 -0 chmod g+s
+    mkdir -p ${cli_plugins_dir}
+    mv ${buildx_file_name} ${cli_plugins_dir}/docker-buildx
+    chmod +x ${cli_plugins_dir}/docker-buildx
+
+    chown -R "${USERNAME}:docker" "${docker_home}"
+    chmod -R g+r+w "${docker_home}"
+    find "${docker_home}" -type d -print0 | xargs -n 1 -0 chmod g+s
 fi
 
 tee /usr/local/share/docker-init.sh > /dev/null \
diff --git a/test/docker-in-docker/docker_build.sh b/test/docker-in-docker/docker_build.sh
index d51e7d644..7e71be8a1 100755
--- a/test/docker-in-docker/docker_build.sh
+++ b/test/docker-in-docker/docker_build.sh
@@ -11,6 +11,8 @@ check "docker-build" docker build ./
 
 check "installs docker-compose v1 install" bash -c "type docker-compose"
 check "installs compose-switch" bash -c "[[ -f /usr/local/bin/compose-switch ]]"
+check "docker-buildx" bash -c "docker buildx version"
+check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
 
 # Report result
 reportResults
diff --git a/test/docker-in-docker/docker_build_2.sh b/test/docker-in-docker/docker_build_2.sh
index 742b222fb..d60cd937a 100644
--- a/test/docker-in-docker/docker_build_2.sh
+++ b/test/docker-in-docker/docker_build_2.sh
@@ -8,6 +8,8 @@ source dev-container-features-test-lib
 # Definition specific tests
 check "docker-buildx" docker buildx version
 check "docker-build" docker build ./
+check "docker-buildx" bash -c "docker buildx version"
+check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
 
 # Report result
 reportResults
diff --git a/test/docker-in-docker/docker_build_older.sh b/test/docker-in-docker/docker_build_older.sh
index 742b222fb..d60cd937a 100644
--- a/test/docker-in-docker/docker_build_older.sh
+++ b/test/docker-in-docker/docker_build_older.sh
@@ -8,6 +8,8 @@ source dev-container-features-test-lib
 # Definition specific tests
 check "docker-buildx" docker buildx version
 check "docker-build" docker build ./
+check "docker-buildx" bash -c "docker buildx version"
+check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
 
 # Report result
 reportResults
diff --git a/test/docker-in-docker/docker_buildx.sh b/test/docker-in-docker/docker_buildx.sh
new file mode 100755
index 000000000..c571596fc
--- /dev/null
+++ b/test/docker-in-docker/docker_buildx.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker-buildx" bash -c "docker buildx version"
+check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
+
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+
+check "installs docker-compose v1 install" bash -c "type docker-compose"
+check "installs compose-switch" bash -c "[[ -f /usr/local/bin/compose-switch ]]"
+
+# Report result
+reportResults
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index 1274877b9..975ea7cd2 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -68,6 +68,15 @@
         },
         "remoteUser": "node"
     },
+    "docker_buildx": {
+        "image": "mcr.microsoft.com/devcontainers/base:bookworm",
+        "features": {
+            "docker-in-docker": {
+                "moby": false,
+                "installDockerBuildx": true
+            }
+        }
+    },
     // DO NOT REMOVE: This scenario is used by the docker-in-docker-stress-test workflow
     "docker_with_on_create_command": {
         "image": "mcr.microsoft.com/devcontainers/base:debian",

From 08fb370a59cc311d9f81a9e90be33cf2e6648baa Mon Sep 17 00:00:00 2001
From: gauravsaini04 <147703805+gauravsaini04@users.noreply.github.com>
Date: Fri, 2 Feb 2024 22:56:55 +0530
Subject: [PATCH 216/478] [Python] - Fix for security vulnerability
 GHSA-r9hx-vwmv-q579 for setuptools-65.5.0 lib on python using python image
 (#815)

* [Python] - Fix for security vulnerability GHSA-r9hx-vwmv-q579 for setuptools-65.5.0 lib on python using python image

* [Python] - Added one more test

* [Python] - Fix for security vulnerability GHSA-r9hx-vwmv-q579 for setuptools-65.5.0 lib on python using python image

* [Python] - Added one more test

* Changes as suggested by comments

* removed second line (L465) that removed a non existent dirrectory

* bump patch version & change code to pass failing tests
---
 src/python/devcontainer-feature.json          |  2 +-
 src/python/install.sh                         | 10 +++
 ...tall_python310_setuptools_vulnerability.sh | 89 ++++++++++++++++++
 ...tall_python311_setuptools_vulnerability.sh | 90 +++++++++++++++++++
 test/python/scenarios.json                    | 18 ++++
 5 files changed, 208 insertions(+), 1 deletion(-)
 create mode 100644 test/python/install_python310_setuptools_vulnerability.sh
 create mode 100644 test/python/install_python311_setuptools_vulnerability.sh

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 7ebdad38a..46f19b6ab 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/python/install.sh b/src/python/install.sh
index e6eefd055..799f1ed8a 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -454,6 +454,16 @@ if [[ "${INSTALL_PYTHON_TOOLS}" = "true" ]] && [[ $(python --version) != "" ]];
             echo "${util} already installed. Skipping."
         fi
     done
+    
+    # Temporary: Removes “setup tools” metadata directory due to https://github.com/advisories/GHSA-r9hx-vwmv-q579
+
+    VULNERABLE_VERSIONS=("3.10" "3.11")
+    RUN_TIME_PY_VER_DETECT=$(python --version 2>&1)
+    PY_MAJOR_MINOR_VER=${RUN_TIME_PY_VER_DETECT:7:4};
+    if [[ ${VULNERABLE_VERSIONS[*]} =~ $PY_MAJOR_MINOR_VER ]]; then
+        rm -rf  ${PIPX_HOME}/shared/lib/"python${PY_MAJOR_MINOR_VER}"/site-packages/setuptools-65.5.0.dist-info
+    fi
+
     rm -rf /tmp/pip-tmp
 
     updaterc "export PIPX_HOME=\"${PIPX_HOME}\""
diff --git a/test/python/install_python310_setuptools_vulnerability.sh b/test/python/install_python310_setuptools_vulnerability.sh
new file mode 100644
index 000000000..d6f68f1fb
--- /dev/null
+++ b/test/python/install_python310_setuptools_vulnerability.sh
@@ -0,0 +1,89 @@
+#!/bin/bash
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+FAILED=()
+
+echoStderr()
+{
+    echo "$@" 1>&2
+}
+
+check-version-ge() {
+    LABEL=$1
+    CURRENT_VERSION=$2
+    REQUIRED_VERSION=$3
+    shift
+    echo -e "\n🧪 Testing $LABEL: '$CURRENT_VERSION' is >= '$REQUIRED_VERSION'"
+    local GREATER_VERSION=$((echo ${CURRENT_VERSION}; echo ${REQUIRED_VERSION}) | sort -V | tail -1)
+    if [ "${CURRENT_VERSION}" == "${GREATER_VERSION}" ]; then
+        echo "✅  Passed!"
+        return 0
+    else
+        echoStderr "❌ $LABEL check failed."
+        FAILED+=("$LABEL")
+        return 1
+    fi
+}
+
+checkPythonPackageVersion()
+{
+    PACKAGE=$1
+    REQUIRED_VERSION=$2
+
+    current_version=$(python -c "import importlib.metadata; print(importlib.metadata.version('${PACKAGE}'))")
+    check-version-ge "${PACKAGE}-requirement" "${current_version}" "${REQUIRED_VERSION}"
+}
+
+checkPythonPackageVersion "setuptools" "65.5.1"
+
+# Check that tools can execute - make sure something didn't get messed up in this scenario
+check "autopep8" autopep8 --version
+check "black" black --version
+check "yapf" yapf --version
+check "bandit" bandit --version
+check "flake8" flake8 --version
+check "mypy" mypy --version
+check "pycodestyle" pycodestyle --version
+check "pydocstyle" pydocstyle --version
+check "pylint" pylint --version
+check "pytest" pytest --version
+check "setuptools" pip list | grep setuptools
+
+# Check paths in settings
+check "which autopep8" bash -c "which autopep8 | grep /usr/local/py-utils/bin/autopep8"
+check "which black" bash -c "which black | grep /usr/local/py-utils/bin/black"
+check "which yapf" bash -c "which yapf | grep /usr/local/py-utils/bin/yapf"
+check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit"
+check "which flake8" bash -c "which flake8 | grep /usr/local/py-utils/bin/flake8"
+check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
+check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
+check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
+check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
+
+checkVulnerableDir() 
+{
+    DIRECTORY=$1
+    VERSION=$2
+    
+    if [[ -d $DIRECTORY ]] ; then
+        echoStderr "❌ check for vulnerable setuptools version failed for python ${VERSION}."
+        return 1
+    else
+        echo "✅ Passed! Either the container does not have vulnerable version or vulnerable version specific directory got removed."
+        return 0
+    fi
+}
+
+bash -c "echo -e -n '\n'";
+bash -c "echo -e 'Files/Folders related to setuptools :-'"; 
+bash -c "find / -name \"*setuptools*\";" 
+
+# only for 3.10
+checkVulnerableDir "/usr/local/py-utils/shared/lib/python3.10/site-packages/setuptools-65.5.0.dist-info" "3.10"
+
+# Report result
+reportResults
diff --git a/test/python/install_python311_setuptools_vulnerability.sh b/test/python/install_python311_setuptools_vulnerability.sh
new file mode 100644
index 000000000..b1e3983d2
--- /dev/null
+++ b/test/python/install_python311_setuptools_vulnerability.sh
@@ -0,0 +1,90 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+FAILED=()
+
+echoStderr()
+{
+    echo "$@" 1>&2
+}
+
+check-version-ge() {
+    LABEL=$1
+    CURRENT_VERSION=$2
+    REQUIRED_VERSION=$3
+    shift
+    echo -e "\n🧪 Testing $LABEL: '$CURRENT_VERSION' is >= '$REQUIRED_VERSION'"
+    local GREATER_VERSION=$((echo ${CURRENT_VERSION}; echo ${REQUIRED_VERSION}) | sort -V | tail -1)
+    if [ "${CURRENT_VERSION}" == "${GREATER_VERSION}" ]; then
+        echo "✅  Passed!"
+        return 0
+    else
+        echoStderr "❌ $LABEL check failed."
+        FAILED+=("$LABEL")
+        return 1
+    fi
+}
+
+checkPythonPackageVersion()
+{
+    PACKAGE=$1
+    REQUIRED_VERSION=$2
+
+    current_version=$(python -c "import importlib.metadata; print(importlib.metadata.version('${PACKAGE}'))")
+    check-version-ge "${PACKAGE}-requirement" "${current_version}" "${REQUIRED_VERSION}"
+}
+
+checkPythonPackageVersion "setuptools" "65.5.1"
+
+# Check that tools can execute - make sure something didn't get messed up in this scenario
+check "autopep8" autopep8 --version
+check "black" black --version
+check "yapf" yapf --version
+check "bandit" bandit --version
+check "flake8" flake8 --version
+check "mypy" mypy --version
+check "pycodestyle" pycodestyle --version
+check "pydocstyle" pydocstyle --version
+check "pylint" pylint --version
+check "pytest" pytest --version
+check "setuptools" pip list | grep setuptools
+
+# Check paths in settings
+check "which autopep8" bash -c "which autopep8 | grep /usr/local/py-utils/bin/autopep8"
+check "which black" bash -c "which black | grep /usr/local/py-utils/bin/black"
+check "which yapf" bash -c "which yapf | grep /usr/local/py-utils/bin/yapf"
+check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit"
+check "which flake8" bash -c "which flake8 | grep /usr/local/py-utils/bin/flake8"
+check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
+check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
+check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
+check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
+
+checkVulnerableDir() 
+{
+    DIRECTORY=$1
+    VERSION=$2
+    
+    if [[ -d $DIRECTORY ]] ; then
+        echoStderr "❌ check for vulnerable setuptools version failed for python ${VERSION}."
+        return 1
+    else
+        echo "✅ Passed! Either the container does not have vulnerable version or vulnerable version specific directory got removed."
+        return 0
+    fi
+}
+
+bash -c "echo -e -n '\n'";
+bash -c "echo -e 'Files/Folders related to setuptools :-'"; 
+bash -c "find / -name \"*setuptools*\";" 
+
+# only for 3.11
+checkVulnerableDir "/usr/local/py-utils/shared/lib/python3.11/site-packages/setuptools-65.5.0.dist-info" "3.11"
+
+# Report result
+reportResults
diff --git a/test/python/scenarios.json b/test/python/scenarios.json
index 23b6cfc92..493f99f1f 100644
--- a/test/python/scenarios.json
+++ b/test/python/scenarios.json
@@ -1,4 +1,22 @@
 {
+    "install_python310_setuptools_vulnerability": {
+        "image": "python:3.10",
+        "features": {
+            "python": {
+                "version": "none",
+                "installTools": true
+            }
+        }
+    },
+    "install_python311_setuptools_vulnerability": {
+        "image": "python:3.11",
+        "features": {
+            "python": {
+                "version": "none",
+                "installTools": true
+            }
+        }
+    },
     "install_additional_python": {
         "image": "ubuntu:focal",
         "features": {

From d5ef6a74a2f0f393f046a0af5444bd2851e5db37 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Thu, 8 Feb 2024 09:16:38 -0800
Subject: [PATCH 217/478] Docker-in-docker - [Bug fix] : Fix
 externally-managed-environment python error for "bookworm" (#833)

* Docker-in-docker - [Bug fix] : Fix externally-managed-environment python error for "bookworm"

* add comment
---
 .../devcontainer-feature.json                 |  2 +-
 src/docker-in-docker/install.sh               |  3 ++-
 .../docker_python_bookworm.sh                 | 22 +++++++++++++++++++
 test/docker-in-docker/scenarios.json          | 10 +++++++++
 4 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100755 test/docker-in-docker/docker_python_bookworm.sh

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 3e112ddcb..6b5c9840c 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.8.0",
+    "version": "2.8.1",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 4e042e3e8..8543b65dd 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -233,7 +233,8 @@ if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
         if [ "${target_compose_arch}" = "amd64" ]; then
             target_compose_arch="x86_64"
         fi
-        if [ "${target_compose_arch}" != "x86_64" ]; then
+        # https://github.com/devcontainers/features/issues/832
+        if [ "${target_compose_arch}" != "x86_64" ] && [ "${VERSION_CODENAME}" != "bookworm" ]; then
             # Use pip to get a version that runs on this architecture
             check_packages python3-minimal python3-pip libffi-dev python3-venv
             export PIPX_HOME=/usr/local/pipx
diff --git a/test/docker-in-docker/docker_python_bookworm.sh b/test/docker-in-docker/docker_python_bookworm.sh
new file mode 100755
index 000000000..b7080dee1
--- /dev/null
+++ b/test/docker-in-docker/docker_python_bookworm.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker-buildx" bash -c "docker buildx version"
+check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
+
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+
+check "installs docker-compose v2 install" bash -c "type docker-compose"
+check "docker compose" bash -c "docker compose version | grep -E '2.[0-9]+.[0-9]+'"
+check "docker-compose" bash -c "docker-compose --version | grep -E '2.[0-9]+.[0-9]+'"
+
+check "installs compose-switch as docker-compose" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
+
+# Report result
+reportResults
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index 975ea7cd2..6de695555 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -77,6 +77,16 @@
             }
         }
     },
+    "docker_python_bookworm": {
+        "image": "mcr.microsoft.com/devcontainers/base:bookworm",
+        "features": {
+            "docker-in-docker": {
+                "moby": true,
+                "installDockerBuildx": true,
+                "dockerDashComposeVersion": "v2"
+            }
+        }
+    },
     // DO NOT REMOVE: This scenario is used by the docker-in-docker-stress-test workflow
     "docker_with_on_create_command": {
         "image": "mcr.microsoft.com/devcontainers/base:debian",

From 1592dd59781fc861a6ea3c6e39faa7cf9eecec7e Mon Sep 17 00:00:00 2001
From: gauravsaini04 <147703805+gauravsaini04@users.noreply.github.com>
Date: Fri, 9 Feb 2024 05:32:03 +0530
Subject: [PATCH 218/478] [common-utils] - Bookworm - enabled nonFreePackages
 option for installing manpages-posix, manpages-posix-dev packages (#834)

* [common-utils] - Bookworm - enabled nonFreePackages option for installing manpages-posix, manpages-posix-dev packages (non-free)

* change to correct the regular expression replacement with sed cmd

* changes according to comments by Samruddhi

* Changes acc. to comments as on 08/02

* Updated patch version based on comments
---
 src/common-utils/devcontainer-feature.json |  2 +-
 src/common-utils/main.sh                   | 28 ++++++++------
 test/common-utils/bookworm.sh              | 45 ++++++++++++++++++++++
 test/common-utils/scenarios.json           |  9 +++++
 4 files changed, 71 insertions(+), 13 deletions(-)
 create mode 100755 test/common-utils/bookworm.sh

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 44f9b32b4..a058864af 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.4.1",
+    "version": "2.4.2",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 0eec1ecb9..8b74830cc 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -104,18 +104,22 @@ install_debian_packages() {
 
     # Needed for adding manpages-posix and manpages-posix-dev which are non-free packages in Debian
     if [ "${ADD_NON_FREE_PACKAGES}" = "true" ]; then
-        # Bring in variables from /etc/os-release like VERSION_CODENAME
-        sed -i -E "s/deb http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME} main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME} main contrib non-free/" /etc/apt/sources.list
-        sed -i -E "s/deb-src http:\/\/(deb|httredir)\.debian\.org\/debian ${VERSION_CODENAME} main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME} main contrib non-free/" /etc/apt/sources.list
-        sed -i -E "s/deb http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME}-updates main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME}-updates main contrib non-free/" /etc/apt/sources.list
-        sed -i -E "s/deb-src http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME}-updates main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME}-updates main contrib non-free/" /etc/apt/sources.list
-        sed -i "s/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main contrib non-free/" /etc/apt/sources.list
-        sed -i "s/deb-src http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main contrib non-free/" /etc/apt/sources.list
-        sed -i "s/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main contrib non-free/" /etc/apt/sources.list
-        sed -i "s/deb-src http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main contrib non-free/" /etc/apt/sources.list
-        # Handle bullseye location for security https://www.debian.org/releases/bullseye/amd64/release-notes/ch-information.en.html
-        sed -i "s/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main contrib non-free/" /etc/apt/sources.list
-        sed -i "s/deb-src http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main contrib non-free/" /etc/apt/sources.list
+        if [[ ! -e "/etc/apt/sources.list" ]] && [[ -e "/etc/apt/sources.list.d/debian.sources" ]]; then 
+            sed -i '/^URIs: http:\/\/deb.debian.org\/debian$/ { N; N; s/Components: main/Components: main non-free non-free-firmware/ }' /etc/apt/sources.list.d/debian.sources
+        else
+            # Bring in variables from /etc/os-release like VERSION_CODENAME
+            sed -i -E "s/deb http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME} main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME} main contrib non-free/" /etc/apt/sources.list
+            sed -i -E "s/deb-src http:\/\/(deb|httredir)\.debian\.org\/debian ${VERSION_CODENAME} main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME} main contrib non-free/" /etc/apt/sources.list
+            sed -i -E "s/deb http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME}-updates main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME}-updates main contrib non-free/" /etc/apt/sources.list
+            sed -i -E "s/deb-src http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME}-updates main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME}-updates main contrib non-free/" /etc/apt/sources.list
+            sed -i "s/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main contrib non-free/" /etc/apt/sources.list
+            sed -i "s/deb-src http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main contrib non-free/" /etc/apt/sources.list
+            sed -i "s/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main contrib non-free/" /etc/apt/sources.list
+            sed -i "s/deb-src http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main contrib non-free/" /etc/apt/sources.list
+            # Handle bullseye location for security https://www.debian.org/releases/bullseye/amd64/release-notes/ch-information.en.html
+            sed -i "s/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main contrib non-free/" /etc/apt/sources.list
+            sed -i "s/deb-src http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main contrib non-free/" /etc/apt/sources.list
+        fi;
         echo "Running apt-get update..."
         package_list="${package_list} manpages-posix manpages-posix-dev"
     fi
diff --git a/test/common-utils/bookworm.sh b/test/common-utils/bookworm.sh
new file mode 100755
index 000000000..db8628713
--- /dev/null
+++ b/test/common-utils/bookworm.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+FAILED=()
+echoStderr()
+{
+    echo "$@" 1>&2
+}
+
+checkOSPackages() {
+    LABEL=$1
+    shift
+    echo -e "\n🧪 Testing $LABEL"
+    if dpkg-query --show -f='${Package}: ${Version}\n' "$@"; then 
+        echo "✅  Passed!"
+        return 0
+    else
+        echoStderr "❌ $LABEL check failed."
+        FAILED+=("$LABEL")
+        return 1
+    fi
+}
+
+checkCommon()
+{
+    PACKAGE_LIST="manpages-posix \
+        manpages-posix-dev"
+
+    checkOSPackages "Installation of manpages-posix and manpages-posix-dev (non-free)" ${PACKAGE_LIST}
+}
+
+# Check for manpages-posix, manpages-posix-dev non-free packages
+checkCommon
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${VERSION_CODENAME}" = "bookworm"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index 2e357bc2b..744f16dc1 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -34,6 +34,15 @@
             "common-utils": {}
         }
     },
+    "bookworm": {
+        "image": "debian:bookworm",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {
+                "nonFreePackages": "true"
+            }
+        }
+    },
     "centos-7": {
         "image": "centos:7",
         "remoteUser": "devcontainer",

From 30e03b62e28bbf3abc6fbd80fb75f2b592c81ff3 Mon Sep 17 00:00:00 2001
From: Jeff Putsch <150963136+jdputschadi@users.noreply.github.com>
Date: Fri, 9 Feb 2024 10:59:19 -0800
Subject: [PATCH 219/478] Add RHEL support to the python feature (#830)

* install gpg2.22 on centos 7 when installing python

* RHEL support, exisiting tests pass, new RHEL tests pass.

* add tests, cleanup install organization

* update testing to include RHEL tests

* update testing to include RHEL tests

* undo addition of installing additional pip modules

* fix errors installing os-provided Python on recent Debian systems and on Mariner systems

* adjust to properly use newly installed python (PYTHON_SRC) instead of assuming "python" will work

* When installing pipx, check if python is marked as externally
managed. If so, add "--break-system-packages" to the pip install
flags.

This does not really breack system packages due to the setting of
PYTHONUSERBASE during the install of pipx, but does get us past
checks for installing python packages into the system python install.

* merge from main

* update check for managed python install. pass all tests.

* add "packages" option from PR #768

* remove "packages" option

* Address PR feedback, passes all tests locally.

* fix install error on centos

---------

Co-authored-by: Jeff Putsch <jputsch@analog.com>
---
 .github/workflows/test-pr.yaml                |   2 +-
 src/python/NOTES.md                           |   2 +-
 src/python/devcontainer-feature.json          |  20 +-
 src/python/install.sh                         | 412 +++++++++++++++---
 test/python/alma-8-minimal.sh                 |  40 ++
 test/python/alma-8.sh                         |  40 ++
 test/python/alma-9-minimal.sh                 |  40 ++
 test/python/alma-9.sh                         |  40 ++
 test/python/centos-7.sh                       |  40 ++
 test/python/fedora.sh                         |  40 ++
 ...stall_additional_jupyterlab_rhel_family.sh |  26 ++
 .../install_additional_python_rhel_family.sh  |  41 ++
 test/python/install_alternate_tools.sh        |  32 ++
 .../install_alternate_tools_rhel_family.sh    |  32 ++
 test/python/install_jupyterlab_rhel_family.sh |  26 ++
 ...n.sh => install_os_provided_python_deb.sh} |   0
 .../install_os_provided_python_mariner.sh     |  40 ++
 .../install_os_provided_python_rhel_family.sh |  40 ++
 ...tall_python310_setuptools_vulnerability.sh |   4 -
 ...tall_python311_setuptools_vulnerability.sh |   4 -
 test/python/install_python_shared_lib_deb.sh  |  45 ++
 .../install_python_shared_lib_rhel_family.sh  |  45 ++
 test/python/scenarios.json                    | 138 +++++-
 23 files changed, 1073 insertions(+), 76 deletions(-)
 create mode 100755 test/python/alma-8-minimal.sh
 create mode 100755 test/python/alma-8.sh
 create mode 100755 test/python/alma-9-minimal.sh
 create mode 100755 test/python/alma-9.sh
 create mode 100755 test/python/centos-7.sh
 create mode 100755 test/python/fedora.sh
 create mode 100644 test/python/install_additional_jupyterlab_rhel_family.sh
 create mode 100644 test/python/install_additional_python_rhel_family.sh
 create mode 100755 test/python/install_alternate_tools.sh
 create mode 100644 test/python/install_alternate_tools_rhel_family.sh
 create mode 100644 test/python/install_jupyterlab_rhel_family.sh
 rename test/python/{install_os_provided_python.sh => install_os_provided_python_deb.sh} (100%)
 create mode 100755 test/python/install_os_provided_python_mariner.sh
 create mode 100644 test/python/install_os_provided_python_rhel_family.sh
 create mode 100755 test/python/install_python_shared_lib_deb.sh
 create mode 100755 test/python/install_python_shared_lib_rhel_family.sh

diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index d60733574..3aae841e2 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -67,7 +67,7 @@ jobs:
 
   test-scenarios:
     needs: [detect-changes]
-    runs-on: ubuntu-latest
+    runs-on: devcontainer-image-builder-ubuntu
     continue-on-error: true
     strategy:
       matrix:
diff --git a/src/python/NOTES.md b/src/python/NOTES.md
index 19fe92f31..79a308cf5 100644
--- a/src/python/NOTES.md
+++ b/src/python/NOTES.md
@@ -2,6 +2,6 @@
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and RockyLinux distributions with the apt, yum, dnf, or microdnf package manager installed.
 
 `bash` is required to execute the `install.sh` script.
diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 46f19b6ab..26f2e5a52 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
@@ -25,13 +25,23 @@
     "installTools": {
       "type": "boolean",
       "default": true,
-      "description": "Install common Python tools like pylint"
+      "description": "Flag indicating whether or not to install the tools specified via the 'toolsToInstall' option. Default is 'true'."
+    },
+    "toolsToInstall": {
+      "type": "string",
+      "default": "flake8,autopep8,black,yapf,mypy,pydocstyle,pycodestyle,bandit,pipenv,virtualenv,pytest,pylint",
+      "description": "Comma-separated list of tools to install when 'installTools' is true. Defaults to a set of common Python tools like pylint."
     },
     "optimize": {
       "type": "boolean",
       "default": false,
       "description": "Optimize Python for performance when compiled (slow)"
     },
+    "enableShared": {
+      "type": "boolean",
+      "default": false,
+      "description": "Enable building a shared Python library"
+    },
     "installPath": {
       "type": "string",
       "default": "/usr/local/python",
@@ -71,7 +81,7 @@
     }
   },
   "installsAfter": [
-      "ghcr.io/devcontainers/features/common-utils",
-      "ghcr.io/devcontainers/features/oryx"
+    "ghcr.io/devcontainers/features/common-utils",
+    "ghcr.io/devcontainers/features/oryx"
   ]
-}
+}
\ No newline at end of file
diff --git a/src/python/install.sh b/src/python/install.sh
index 799f1ed8a..9094191f3 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -10,6 +10,7 @@
 PYTHON_VERSION="${VERSION:-"latest"}" # 'system' or 'os-provided' checks the base image first, else installs 'latest'
 INSTALL_PYTHON_TOOLS="${INSTALLTOOLS:-"true"}"
 OPTIMIZE_BUILD_FROM_SOURCE="${OPTIMIZE:-"false"}"
+ENABLE_SHARED_FROM_SOURCE="${ENABLESHARED:-"false"}"
 PYTHON_INSTALL_PATH="${INSTALLPATH:-"/usr/local/python"}"
 OVERRIDE_DEFAULT_VERSION="${OVERRIDEDEFAULTVERSION:-"true"}"
 
@@ -26,7 +27,10 @@ CONFIGURE_JUPYTERLAB_ALLOW_ORIGIN="${CONFIGUREJUPYTERLABALLOWORIGIN:-""}"
 # alongside PYTHON_VERSION, but not set as default.
 ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 
-DEFAULT_UTILS=("pylint" "flake8" "autopep8" "black" "yapf" "mypy" "pydocstyle" "pycodestyle" "bandit" "pipenv" "virtualenv" "pytest")
+# Comma-separated list of additional tools to be installed via pipx.
+IFS="," read -r -a DEFAULT_UTILS <<< "${TOOLSTOINSTALL:-flake8,autopep8,black,yapf,mypy,pydocstyle,pycodestyle,bandit,pipenv,virtualenv,pytest}"
+
+
 PYTHON_SOURCE_GPG_KEYS="64E628F8D684696D B26995E310250568 2D347EA6AA65421D FB9921286F5E1540 3A5CA953F73C700D 04C367C218ADD4FF 0EDDC5F26A45C816 6AF053F07D9DC8D2 C9BE28DEE6DF025C 126EB563A74B06BF D9866941EA5BBD71 ED9D77D5 A821E680E5FA6305"
 GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
 keyserver hkp://keyserver.ubuntu.com:80
@@ -37,44 +41,90 @@ KEYSERVER_PROXY="${HTTPPROXY:-"${HTTP_PROXY:-""}"}"
 
 set -e
 
-# Clean up
-rm -rf /var/lib/apt/lists/*
-
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
     exit 1
 fi
 
-# Ensure that login shells get the correct path if the user updated the PATH using ENV.
-rm -f /etc/profile.d/00-restore-env.sh
-echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
-chmod +x /etc/profile.d/00-restore-env.sh
+# Bring in ID, ID_LIKE, VERSION_ID, VERSION_CODENAME
+. /etc/os-release
+# Get an adjusted ID independent of distro variants
+MAJOR_VERSION_ID=$(echo ${VERSION_ID} | cut -d . -f 1)
+if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
+    ADJUSTED_ID="debian"
+elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
+    ADJUSTED_ID="rhel"
+    if [[ "${ID}" = "rhel" ]] || [[ "${ID}" = *"alma"* ]] || [[ "${ID}" = *"rocky"* ]]; then
+        VERSION_CODENAME="rhel${MAJOR_VERSION_ID}"
+    else
+        VERSION_CODENAME="${ID}${MAJOR_VERSION_ID}"
+    fi
+else
+    echo "Linux distro ${ID} not supported."
+    exit 1
+fi
 
-# Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
+# To find some devel packages, some rhel need to enable specific extra repos, but not on RedHat ubi images...
+INSTALL_CMD_ADDL_REPO=""
+if [ ${ADJUSTED_ID} = "rhel" ] && [ ${ID} != "rhel" ]; then
+    if [ ${MAJOR_VERSION_ID} = "8" ]; then
+        INSTALL_CMD_ADDL_REPOS="--enablerepo powertools"
+    elif [ ${MAJOR_VERSION_ID} = "9" ]; then
+        INSTALL_CMD_ADDL_REPOS="--enablerepo crb"
     fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
 fi
 
+# Setup INSTALL_CMD & PKG_MGR_CMD
+if type apt-get > /dev/null 2>&1; then
+    PKG_MGR_CMD=apt-get
+    INSTALL_CMD="${PKG_MGR_CMD} -y install --no-install-recommends"
+elif type microdnf > /dev/null 2>&1; then
+    PKG_MGR_CMD=microdnf
+    INSTALL_CMD="${PKG_MGR_CMD} ${INSTALL_CMD_ADDL_REPOS} -y install --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0"
+elif type dnf > /dev/null 2>&1; then
+    PKG_MGR_CMD=dnf
+    INSTALL_CMD="${PKG_MGR_CMD} ${INSTALL_CMD_ADDL_REPOS} -y install --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0"
+else
+    PKG_MGR_CMD=yum
+    INSTALL_CMD="${PKG_MGR_CMD} ${INSTALL_CMD_ADDL_REPOS} -y install --noplugins --setopt=install_weak_deps=0"
+fi
+
+# Clean up
+clean_up() {
+    case ${ADJUSTED_ID} in
+        debian)
+            rm -rf /var/lib/apt/lists/*
+            ;;
+        rhel)
+            rm -rf /var/cache/dnf/* /var/cache/yum/*
+            rm -rf /tmp/yum.log
+            rm -rf ${GPG_INSTALL_PATH}
+            ;;
+    esac
+}
+clean_up
+
+
+
 updaterc() {
+    local _bashrc
+    local _zshrc
     if [ "${UPDATE_RC}" = "true" ]; then
-        echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
-        if [[ "$(cat /etc/bash.bashrc)" != *"$1"* ]]; then
-            echo -e "$1" >> /etc/bash.bashrc
+        case $ADJUSTED_ID in
+            debian) echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
+                _bashrc=/etc/bash.bashrc
+                _zshrc=/etc/zsh/zshrc
+                ;;
+            rhel) echo "Updating /etc/bashrc and /etc/zshrc..."
+                _bashrc=/etc/bashrc
+                _zshrc=/etc/zshrc
+            ;;
+        esac
+        if [[ "$(cat ${_bashrc})" != *"$1"* ]]; then
+            echo -e "$1" >> ${_bashrc}
         fi
-        if [ -f "/etc/zsh/zshrc" ] && [[ "$(cat /etc/zsh/zshrc)" != *"$1"* ]]; then
-            echo -e "$1" >> /etc/zsh/zshrc
+        if [ -f "${_zshrc}" ] && [[ "$(cat ${_zshrc})" != *"$1"* ]]; then
+            echo -e "$1" >> ${_zshrc}
         fi
     fi
 }
@@ -83,6 +133,7 @@ updaterc() {
 receive_gpg_keys() {
     local keys=${!1}
     local keyring_args=""
+    local gpg_cmd="gpg"
     if [ ! -z "$2" ]; then
         mkdir -p "$(dirname \"$2\")"
         keyring_args="--no-default-keyring --keyring $2"
@@ -116,6 +167,51 @@ receive_gpg_keys() {
         exit 1
     fi
 }
+# RHEL7/CentOS7 has an older gpg that does not have dirmngr
+# Iterate through keyservers until we have all the keys downloaded
+receive_gpg_keys_centos7() {
+    local keys=${!1}
+    local keyring_args=""
+    local gpg_cmd="gpg"
+    if [ ! -z "$2" ]; then
+        mkdir -p "$(dirname \"$2\")"
+        keyring_args="--no-default-keyring --keyring $2"
+    fi
+    if [ ! -z "${KEYSERVER_PROXY}" ]; then
+        keyring_args="${keyring_args} --keyserver-options http-proxy=${KEYSERVER_PROXY}"
+    fi
+
+    # Use a temporary location for gpg keys to avoid polluting image
+    export GNUPGHOME="/tmp/tmp-gnupg"
+    mkdir -p ${GNUPGHOME}
+    chmod 700 ${GNUPGHOME}
+    # GPG key download sometimes fails for some reason and retrying fixes it.
+    local retry_count=0
+    local gpg_ok="false"
+    num_keys=$(echo ${keys} | wc -w)
+    set +e
+        echo "(*) Downloading GPG keys..."
+        until [ "${gpg_ok}" = "true" ] || [ "${retry_count}" -eq "5" ]; do
+            for keyserver in $(echo "${GPG_KEY_SERVERS}" | sed 's/keyserver //'); do
+                ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys --keyserver=${keyserver} ) 2>&1
+                downloaded_keys=$(gpg --list-keys | grep ^pub | wc -l)
+                if [[ ${num_keys} = ${downloaded_keys} ]]; then
+                    gpg_ok="true"
+                    break
+                fi
+            done
+            if [ "${gpg_ok}" != "true" ]; then
+                echo "(*) Failed getting key, retring in 10s..."
+                (( retry_count++ ))
+                sleep 10s
+            fi
+        done
+    set -e
+    if [ "${gpg_ok}" = "false" ]; then
+        echo "(!) Failed to get gpg key."
+        exit 1
+    fi
+}
 
 # Figure out correct version of a three part version number is not passed
 find_version_from_git_tags() {
@@ -189,20 +285,52 @@ oryx_install() {
     fi
 }
 
-apt_get_update()
-{
-    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
-        echo "Running apt-get update..."
-        apt-get update -y
-    fi
+pkg_mgr_update() {
+    case $ADJUSTED_ID in
+        debian)
+            if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+                echo "Running apt-get update..."
+                ${PKG_MGR_CMD} update -y
+            fi
+            ;;
+        rhel)
+            if [ ${PKG_MGR_CMD} = "microdnf" ]; then
+                if [ "$(ls /var/cache/yum/* 2>/dev/null | wc -l)" = 0 ]; then
+                    echo "Running ${PKG_MGR_CMD} makecache ..."
+                    ${PKG_MGR_CMD} makecache
+                fi
+            else
+                if [ "$(ls /var/cache/${PKG_MGR_CMD}/* 2>/dev/null | wc -l)" = 0 ]; then
+                    echo "Running ${PKG_MGR_CMD} check-update ..."
+                    set +e
+                    ${PKG_MGR_CMD} check-update
+                    rc=$?
+                    if [ $rc != 0 ] && [ $rc != 100 ]; then
+                        exit 1
+                    fi
+                    set -e
+                fi
+            fi
+            ;;
+    esac
 }
 
 # Checks if packages are installed and installs them if not
 check_packages() {
-    if ! dpkg -s "$@" > /dev/null 2>&1; then
-        apt_get_update
-        apt-get -y install --no-install-recommends "$@"
-    fi
+    case ${ADJUSTED_ID} in
+        debian)
+            if ! dpkg -s "$@" > /dev/null 2>&1; then
+                pkg_mgr_update
+                ${INSTALL_CMD} "$@"
+            fi
+            ;;
+        rhel)
+            if ! rpm -q "$@" > /dev/null 2>&1; then
+                pkg_mgr_update
+                ${INSTALL_CMD} "$@"
+            fi
+            ;;
+    esac
 }
 
 add_symlink() {
@@ -218,13 +346,30 @@ add_symlink() {
     fi
 }
 
+install_openssl3() {
+    local _prefix=$1
+    mkdir /tmp/openssl3
+    (
+        cd /tmp/openssl3
+        openssl3_version="3.0"
+        # Find version using soft match
+        find_version_from_git_tags openssl3_version "https://github.com/openssl/openssl" "openssl-"
+        local tgz_filename="openssl-${openssl3_version}.tar.gz" 
+        local tgz_url="https://github.com/openssl/openssl/releases/download/openssl-${openssl3_version}/${tgz_filename}"
+        echo "Downloading ${tgz_filename}..."
+        curl -sSL -o "/tmp/openssl3/${tgz_filename}" "${tgz_url}"
+        tar xzf ${tgz_filename}
+        cd openssl-${openssl3_version}
+        ./config --prefix=${_prefix} --openssldir=${_prefix} --libdir=lib
+        make -j $(nproc)
+        make install_dev
+    )
+    rm -rf /tmp/openssl3
+}
+
 install_from_source() {
-    VERSION=$1 
+    VERSION=$1  
     echo "(*) Building Python ${VERSION} from source..."
-    # Install prereqs if missing
-    check_packages curl ca-certificates gnupg2 tar make gcc libssl-dev zlib1g-dev libncurses5-dev \
-                libbz2-dev libreadline-dev libxml2-dev xz-utils libgdbm-dev tk-dev dirmngr \
-                libxmlsec1-dev libsqlite3-dev libffi-dev liblzma-dev uuid-dev 
     if ! type git > /dev/null 2>&1; then
         check_packages git
     fi
@@ -239,6 +384,17 @@ install_from_source() {
         exit 1
     fi
 
+    # Some platforms/os versions need modern versions of openssl installed
+    # via common package repositories, for now rhel-7 family, use case statement to 
+    # make it easy to expand
+    case ${VERSION_CODENAME} in
+        centos7|rhel7)
+            check_packages perl-IPC-Cmd
+            install_openssl3 ${INSTALL_PATH}
+            ADDL_CONFIG_ARGS="--with-openssl=${INSTALL_PATH} --with-openssl-rpath=${INSTALL_PATH}/lib"
+            ;;
+    esac
+
     # Download tgz of source
     mkdir -p /tmp/python-src ${INSTALL_PATH}
     cd /tmp/python-src
@@ -248,13 +404,21 @@ install_from_source() {
     curl -sSL -o "/tmp/python-src/${tgz_filename}" "${tgz_url}"
 
     # Verify signature
-    receive_gpg_keys PYTHON_SOURCE_GPG_KEYS
+    if [[ ${VERSION_CODENAME} = "centos7" ]] || [[ ${VERSION_CODENAME} = "rhel7" ]]; then
+        receive_gpg_keys_centos7 PYTHON_SOURCE_GPG_KEYS
+    else
+        receive_gpg_keys PYTHON_SOURCE_GPG_KEYS
+    fi
     echo "Downloading ${tgz_filename}.asc..."
     curl -sSL -o "/tmp/python-src/${tgz_filename}.asc" "${tgz_url}.asc"
     gpg --verify "${tgz_filename}.asc"
 
     # Update min protocol for testing only - https://bugs.python.org/issue41561
-    cp /etc/ssl/openssl.cnf /tmp/python-src/
+    if [ -f /etc/pki/tls/openssl.cnf ]; then
+        cp /etc/pki/tls/openssl.cnf /tmp/python-src/
+    else
+        cp /etc/ssl/openssl.cnf /tmp/python-src/
+    fi
     sed -i -E 's/MinProtocol[=\ ]+.*/MinProtocol = TLSv1.0/g' /tmp/python-src/openssl.cnf
     export OPENSSL_CONF=/tmp/python-src/openssl.cnf
 
@@ -262,11 +426,21 @@ install_from_source() {
     tar -xzf "/tmp/python-src/${tgz_filename}" -C "/tmp/python-src" --strip-components=1
     local config_args=""
     if [ "${OPTIMIZE_BUILD_FROM_SOURCE}" = "true" ]; then
-        config_args="--enable-optimizations"
+        config_args="${config_args} --enable-optimizations"
+    fi
+    if [ "${ENABLESHARED}" = "true" ]; then
+        config_args=" ${config_args} --enable-shared"
+        # need double-$: LDFLAGS ends up in Makefile $$ becomes $ when evaluated.
+        # backslash needed for shell that Make calls escape the $.
+        export LDFLAGS="${LDFLAGS} -Wl,-rpath="'\$$ORIGIN'"/../lib"
+    fi
+    if [ -n "${ADDL_CONFIG_ARGS}" ]; then
+        config_args="${config_args} ${ADDL_CONFIG_ARGS}"
     fi
     ./configure --prefix="${INSTALL_PATH}" --with-ensurepip=install ${config_args}
     make -j 8
     make install
+
     cd /tmp
     rm -rf /tmp/python-src ${GNUPGHOME} /tmp/vscdc-settings.env
 
@@ -336,7 +510,15 @@ install_python() {
     version=$1
     # If the os-provided versions are "good enough", detect that and bail out.
     if [ ${version} = "os-provided" ] || [ ${version} = "system" ]; then
-        check_packages python3 python3-doc python3-pip python3-venv python3-dev python3-tk
+        if [ ${ADJUSTED_ID} = "debian" ]; then
+            check_packages python3 python3-doc python3-pip python3-venv python3-dev python3-tk
+        else
+            if [ ${ID} != "mariner" ]; then
+                check_packages python3 python3-pip python3-devel python3-tkinter
+            else
+                check_packages python3 python3-pip python3-devel
+            fi
+        fi
         INSTALL_PATH="/usr"
 
         local current_bin_path="${CURRENT_PATH}/bin"
@@ -355,7 +537,7 @@ install_python() {
         fi
 
         should_install_from_source=false
-    elif [ "$(dpkg --print-architecture)" = "amd64" ] && [ "${USE_ORYX_IF_AVAILABLE}" = "true" ] && type oryx > /dev/null 2>&1; then
+    elif [ ${ADJUSTED_ID} = "debian" ] && [ "$(dpkg --print-architecture)" = "amd64" ] && [ "${USE_ORYX_IF_AVAILABLE}" = "true" ] && type oryx > /dev/null 2>&1; then
         install_using_oryx $version || should_install_from_source=true
     else
         should_install_from_source=true
@@ -365,14 +547,120 @@ install_python() {
     fi
 }
 
+python_is_externally_managed() {
+    local _python_cmd=$1
+    local python_stdlib_dir=$(
+        ${_python_cmd} -c '
+import sys
+import sysconfig
+sys.prefix == sys.base_prefix and print(sysconfig.get_path("stdlib", sysconfig.get_default_scheme()))'
+    )
+    if [ -f ${python_stdlib_dir}/EXTERNALLY-MANAGED ]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+# Ensure that login shells get the correct path if the user updated the PATH using ENV.
+rm -f /etc/profile.d/00-restore-env.sh
+echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
+chmod +x /etc/profile.d/00-restore-env.sh
+
+# Some distributions do not install awk by default (e.g. Mariner)
+if ! type awk >/dev/null 2>&1; then
+    check_packages awk
+fi
+
+# Determine the appropriate non-root user
+if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
+    USERNAME=""
+    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
+    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
+        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            USERNAME=${CURRENT_USER}
+            break
+        fi
+    done
+    if [ "${USERNAME}" = "" ]; then
+        USERNAME=root
+    fi
+elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
+    USERNAME=root
+fi
+
 # Ensure apt is in non-interactive to avoid prompts
 export DEBIAN_FRONTEND=noninteractive
 
 # General requirements
-check_packages curl ca-certificates gnupg2 tar make gcc libssl-dev zlib1g-dev libncurses5-dev \
-            libbz2-dev libreadline-dev libxml2-dev xz-utils libgdbm-dev tk-dev dirmngr \
-            libxmlsec1-dev libsqlite3-dev libffi-dev liblzma-dev uuid-dev 
 
+REQUIRED_PKGS=""
+case ${ADJUSTED_ID} in
+    debian)
+        REQUIRED_PKGS="${REQUIRED_PKGS} \
+            ca-certificates \
+            curl \
+            dirmngr \
+            gcc \
+            gnupg2 \
+            libbz2-dev \
+            libffi-dev \
+            libgdbm-dev \
+            liblzma-dev \
+            libncurses5-dev \
+            libreadline-dev \
+            libsqlite3-dev \
+            libssl-dev \
+            libxml2-dev \
+            libxmlsec1-dev \
+            make \
+            tar \
+            tk-dev \
+            uuid-dev \
+            xz-utils \
+            zlib1g-dev"
+        ;;
+    rhel)
+        REQUIRED_PKGS="${REQUIRED_PKGS} \
+            bzip2-devel \
+            ca-certificates \
+            findutils \
+            gcc \
+            gnupg2 \
+            libffi-devel \
+            libxml2-devel \
+            make \
+            ncurses-devel \
+            openssl-devel \
+            shadow-utils \
+            sqlite-devel \
+            tar \
+            which \
+            xz-devel \
+            xz \
+            zlib-devel"
+        if ! type curl >/dev/null 2>&1; then
+            REQUIRED_PKGS="${REQUIRED_PKGS} \
+                curl"
+        fi
+        # Mariner does not have tk-devel package available, RedHat ubi8 and ubi9 do not have tk-devel
+        if [ ${ID} != "mariner" ] && [ ${ID} != "rhel" ]; then
+            REQUIRED_PKGS="${REQUIRED_PKGS} \
+                tk-devel"
+        fi
+        # Redhat ubi8 and ubi9 do not have some packages by default, only add them
+        # if we're not on RedHat ...
+        if [ ${ID} != "rhel" ]; then
+            REQUIRED_PKGS="${REQUIRED_PKGS} \
+                gdbm-devel \
+                readline-devel \
+                uuid-devel \
+                xmlsec1-devel"
+        fi
+        ;;
+esac
+
+check_packages ${REQUIRED_PKGS}
 
 # Install Python from source if needed
 if [ "${PYTHON_VERSION}" != "none" ]; then
@@ -410,12 +698,15 @@ if [ "${PYTHON_VERSION}" != "none" ]; then
     find "${PYTHON_INSTALL_PATH}" -type d -print0 | xargs -0 -n 1 chmod g+s
 
     PYTHON_SRC="${INSTALL_PATH}/bin/python3"
+    if ! type pip >/dev/null 2>&1 && type pip3 >/dev/null 2>&1; then
+        ln -s /usr/bin/pip3 /usr/bin/pip
+    fi
 else
     PYTHON_SRC=$(which python)
 fi
 
 # Install Python tools if needed
-if [[ "${INSTALL_PYTHON_TOOLS}" = "true" ]] && [[ $(python --version) != "" ]]; then
+if [[ "${INSTALL_PYTHON_TOOLS}" = "true" ]] && [[ -n "${PYTHON_SRC}" ]]; then
     echo 'Installing Python tools...'
     export PIPX_BIN_DIR="${PIPX_HOME}/bin"
     PATH="${PATH}:${PIPX_BIN_DIR}"
@@ -432,20 +723,23 @@ if [[ "${INSTALL_PYTHON_TOOLS}" = "true" ]] && [[ $(python --version) != "" ]];
     find "${PIPX_HOME}" -type d -print0 | xargs -0 -n 1 chmod g+s
 
     # Update pip if not using os provided python
-    if [[ $(python --version) != "" ]] || [[ ${PYTHON_VERSION} != "os-provided" ]] && [[ ${PYTHON_VERSION} != "system" ]] && [[ ${PYTHON_VERSION} != "none" ]]; then
+    if [[ -n "${PYTHON_SRC}" ]] && [[ ${PYTHON_VERSION} != "os-provided" ]] && [[ ${PYTHON_VERSION} != "system" ]] && [[ ${PYTHON_VERSION} != "none" ]]; then
         echo "Updating pip..."
-        python -m pip install --no-cache-dir --upgrade pip
+        ${PYTHON_SRC} -m pip install --no-cache-dir --upgrade pip
     fi
 
     # Install tools
-    echo "Installing Python tools..."
     export PYTHONUSERBASE=/tmp/pip-tmp
     export PIP_CACHE_DIR=/tmp/pip-tmp/cache
     PIPX_DIR=""
     if ! type pipx > /dev/null 2>&1; then
-        pip3 install --disable-pip-version-check --no-cache-dir --user pipx 2>&1
-        /tmp/pip-tmp/bin/pipx install --pip-args=--no-cache-dir pipx
-        PIPX_DIR="/tmp/pip-tmp/bin/"
+        if python_is_externally_managed ${PYTHON_SRC}; then
+            check_packages pipx
+        else
+            pip3 install --disable-pip-version-check --no-cache-dir --user pipx 2>&1
+            /tmp/pip-tmp/bin/pipx install --pip-args=--no-cache-dir pipx
+            PIPX_DIR="/tmp/pip-tmp/bin/"
+        fi
     fi
     for util in "${DEFAULT_UTILS[@]}"; do
         if ! type ${util} > /dev/null 2>&1; then
@@ -458,7 +752,7 @@ if [[ "${INSTALL_PYTHON_TOOLS}" = "true" ]] && [[ $(python --version) != "" ]];
     # Temporary: Removes “setup tools” metadata directory due to https://github.com/advisories/GHSA-r9hx-vwmv-q579
 
     VULNERABLE_VERSIONS=("3.10" "3.11")
-    RUN_TIME_PY_VER_DETECT=$(python --version 2>&1)
+    RUN_TIME_PY_VER_DETECT=$(${PYTHON_SRC} --version 2>&1)
     PY_MAJOR_MINOR_VER=${RUN_TIME_PY_VER_DETECT:7:4};
     if [[ ${VULNERABLE_VERSIONS[*]} =~ $PY_MAJOR_MINOR_VER ]]; then
         rm -rf  ${PIPX_HOME}/shared/lib/"python${PY_MAJOR_MINOR_VER}"/site-packages/setuptools-65.5.0.dist-info
@@ -502,6 +796,6 @@ if [ "${INSTALL_JUPYTERLAB}" = "true" ]; then
 fi
 
 # Clean up
-rm -rf /var/lib/apt/lists/*
+clean_up
 
 echo "Done!"
diff --git a/test/python/alma-8-minimal.sh b/test/python/alma-8-minimal.sh
new file mode 100755
index 000000000..038826d5c
--- /dev/null
+++ b/test/python/alma-8-minimal.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" python  --version
+check "pip is installed" pip --version
+check "pip is installed" pip3 --version
+
+# Check that tools can execute
+check "autopep8" autopep8 --version
+check "black" black --version
+check "yapf" yapf --version
+check "bandit" bandit --version
+check "flake8" flake8 --version
+check "mypy" mypy --version
+check "pycodestyle" pycodestyle --version
+check "pydocstyle" pydocstyle --version
+check "pylint" pylint --version
+check "pytest" pytest --version
+
+# Check paths in settings
+check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
+check "current symlink works" /usr/local/python/current/bin/python --version
+check "which autopep8" bash -c "which autopep8 | grep /usr/local/py-utils/bin/autopep8"
+check "which black" bash -c "which black | grep /usr/local/py-utils/bin/black"
+check "which yapf" bash -c "which yapf | grep /usr/local/py-utils/bin/yapf"
+check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit"
+check "which flake8" bash -c "which flake8 | grep /usr/local/py-utils/bin/flake8"
+check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
+check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
+check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
+check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
+
+# Report result
+reportResults
diff --git a/test/python/alma-8.sh b/test/python/alma-8.sh
new file mode 100755
index 000000000..038826d5c
--- /dev/null
+++ b/test/python/alma-8.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" python  --version
+check "pip is installed" pip --version
+check "pip is installed" pip3 --version
+
+# Check that tools can execute
+check "autopep8" autopep8 --version
+check "black" black --version
+check "yapf" yapf --version
+check "bandit" bandit --version
+check "flake8" flake8 --version
+check "mypy" mypy --version
+check "pycodestyle" pycodestyle --version
+check "pydocstyle" pydocstyle --version
+check "pylint" pylint --version
+check "pytest" pytest --version
+
+# Check paths in settings
+check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
+check "current symlink works" /usr/local/python/current/bin/python --version
+check "which autopep8" bash -c "which autopep8 | grep /usr/local/py-utils/bin/autopep8"
+check "which black" bash -c "which black | grep /usr/local/py-utils/bin/black"
+check "which yapf" bash -c "which yapf | grep /usr/local/py-utils/bin/yapf"
+check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit"
+check "which flake8" bash -c "which flake8 | grep /usr/local/py-utils/bin/flake8"
+check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
+check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
+check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
+check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
+
+# Report result
+reportResults
diff --git a/test/python/alma-9-minimal.sh b/test/python/alma-9-minimal.sh
new file mode 100755
index 000000000..038826d5c
--- /dev/null
+++ b/test/python/alma-9-minimal.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" python  --version
+check "pip is installed" pip --version
+check "pip is installed" pip3 --version
+
+# Check that tools can execute
+check "autopep8" autopep8 --version
+check "black" black --version
+check "yapf" yapf --version
+check "bandit" bandit --version
+check "flake8" flake8 --version
+check "mypy" mypy --version
+check "pycodestyle" pycodestyle --version
+check "pydocstyle" pydocstyle --version
+check "pylint" pylint --version
+check "pytest" pytest --version
+
+# Check paths in settings
+check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
+check "current symlink works" /usr/local/python/current/bin/python --version
+check "which autopep8" bash -c "which autopep8 | grep /usr/local/py-utils/bin/autopep8"
+check "which black" bash -c "which black | grep /usr/local/py-utils/bin/black"
+check "which yapf" bash -c "which yapf | grep /usr/local/py-utils/bin/yapf"
+check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit"
+check "which flake8" bash -c "which flake8 | grep /usr/local/py-utils/bin/flake8"
+check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
+check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
+check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
+check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
+
+# Report result
+reportResults
diff --git a/test/python/alma-9.sh b/test/python/alma-9.sh
new file mode 100755
index 000000000..038826d5c
--- /dev/null
+++ b/test/python/alma-9.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" python  --version
+check "pip is installed" pip --version
+check "pip is installed" pip3 --version
+
+# Check that tools can execute
+check "autopep8" autopep8 --version
+check "black" black --version
+check "yapf" yapf --version
+check "bandit" bandit --version
+check "flake8" flake8 --version
+check "mypy" mypy --version
+check "pycodestyle" pycodestyle --version
+check "pydocstyle" pydocstyle --version
+check "pylint" pylint --version
+check "pytest" pytest --version
+
+# Check paths in settings
+check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
+check "current symlink works" /usr/local/python/current/bin/python --version
+check "which autopep8" bash -c "which autopep8 | grep /usr/local/py-utils/bin/autopep8"
+check "which black" bash -c "which black | grep /usr/local/py-utils/bin/black"
+check "which yapf" bash -c "which yapf | grep /usr/local/py-utils/bin/yapf"
+check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit"
+check "which flake8" bash -c "which flake8 | grep /usr/local/py-utils/bin/flake8"
+check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
+check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
+check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
+check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
+
+# Report result
+reportResults
diff --git a/test/python/centos-7.sh b/test/python/centos-7.sh
new file mode 100755
index 000000000..038826d5c
--- /dev/null
+++ b/test/python/centos-7.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" python  --version
+check "pip is installed" pip --version
+check "pip is installed" pip3 --version
+
+# Check that tools can execute
+check "autopep8" autopep8 --version
+check "black" black --version
+check "yapf" yapf --version
+check "bandit" bandit --version
+check "flake8" flake8 --version
+check "mypy" mypy --version
+check "pycodestyle" pycodestyle --version
+check "pydocstyle" pydocstyle --version
+check "pylint" pylint --version
+check "pytest" pytest --version
+
+# Check paths in settings
+check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
+check "current symlink works" /usr/local/python/current/bin/python --version
+check "which autopep8" bash -c "which autopep8 | grep /usr/local/py-utils/bin/autopep8"
+check "which black" bash -c "which black | grep /usr/local/py-utils/bin/black"
+check "which yapf" bash -c "which yapf | grep /usr/local/py-utils/bin/yapf"
+check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit"
+check "which flake8" bash -c "which flake8 | grep /usr/local/py-utils/bin/flake8"
+check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
+check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
+check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
+check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
+
+# Report result
+reportResults
diff --git a/test/python/fedora.sh b/test/python/fedora.sh
new file mode 100755
index 000000000..038826d5c
--- /dev/null
+++ b/test/python/fedora.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" python  --version
+check "pip is installed" pip --version
+check "pip is installed" pip3 --version
+
+# Check that tools can execute
+check "autopep8" autopep8 --version
+check "black" black --version
+check "yapf" yapf --version
+check "bandit" bandit --version
+check "flake8" flake8 --version
+check "mypy" mypy --version
+check "pycodestyle" pycodestyle --version
+check "pydocstyle" pydocstyle --version
+check "pylint" pylint --version
+check "pytest" pytest --version
+
+# Check paths in settings
+check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
+check "current symlink works" /usr/local/python/current/bin/python --version
+check "which autopep8" bash -c "which autopep8 | grep /usr/local/py-utils/bin/autopep8"
+check "which black" bash -c "which black | grep /usr/local/py-utils/bin/black"
+check "which yapf" bash -c "which yapf | grep /usr/local/py-utils/bin/yapf"
+check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit"
+check "which flake8" bash -c "which flake8 | grep /usr/local/py-utils/bin/flake8"
+check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
+check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
+check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
+check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
+
+# Report result
+reportResults
diff --git a/test/python/install_additional_jupyterlab_rhel_family.sh b/test/python/install_additional_jupyterlab_rhel_family.sh
new file mode 100644
index 000000000..58c4f7f54
--- /dev/null
+++ b/test/python/install_additional_jupyterlab_rhel_family.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Always run these checks as the non-root user
+user="$(whoami)"
+check "user" grep vscode <<< "$user"
+
+# Check for an installation of JupyterLab
+check "version" jupyter lab --version
+
+# Check location of JupyterLab installation
+packages="$(python3 -m pip list)"
+check "location" grep jupyter <<< "$packages"
+
+# Check for git extension
+check "jupyterlab_git" grep jupyterlab_git <<< "$packages"
+
+# Check for correct JupyterLab configuration
+check "config" grep ".*.allow_origin = '*'" /home/vscode/.jupyter/jupyter_server_config.py
+
+# Report result
+reportResults
diff --git a/test/python/install_additional_python_rhel_family.sh b/test/python/install_additional_python_rhel_family.sh
new file mode 100644
index 000000000..d584f4be9
--- /dev/null
+++ b/test/python/install_additional_python_rhel_family.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "python version 3.11 installed as default" bash -c "python --version | grep 3.11"
+check "python3 version 3.11 installed as default" bash -c "python3 --version | grep 3.11"
+check "python version 3.10.5 installed"  bash -c "ls -l /usr/local/python | grep 3.10.5"
+check "python version 3.8 installed"  bash -c "ls -l /usr/local/python | grep 3.8"
+check "python version 3.9.13 installed"  bash -c  "ls -l /usr/local/python | grep 3.9.13"
+
+# Check that tools can execute - make sure something didn't get messed up in this scenario
+check "autopep8" autopep8 --version
+check "black" black --version
+check "yapf" yapf --version
+check "bandit" bandit --version
+check "flake8" flake8 --version
+check "mypy" mypy --version
+check "pycodestyle" pycodestyle --version
+check "pydocstyle" pydocstyle --version
+check "pylint" pylint --version
+check "pytest" pytest --version
+
+# Check paths in settings
+check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
+check "current symlink works" /usr/local/python/current/bin/python --version
+check "which autopep8" bash -c "which autopep8 | grep /usr/local/py-utils/bin/autopep8"
+check "which black" bash -c "which black | grep /usr/local/py-utils/bin/black"
+check "which yapf" bash -c "which yapf | grep /usr/local/py-utils/bin/yapf"
+check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit"
+check "which flake8" bash -c "which flake8 | grep /usr/local/py-utils/bin/flake8"
+check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
+check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
+check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
+check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
+
+# Report result
+reportResults
diff --git a/test/python/install_alternate_tools.sh b/test/python/install_alternate_tools.sh
new file mode 100755
index 000000000..b98d70997
--- /dev/null
+++ b/test/python/install_alternate_tools.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" python  --version
+check "pip is installed" pip --version
+check "pip is installed" pip3 --version
+
+# Check that tools can execute
+check "bandit" bandit --version
+check "mypy" mypy --version
+check "pipenv" pipenv --version
+check "pytest" pytest --version
+check "ruff" ruff --version
+check "virtualenv" virtualenv --version
+
+# Check paths in settings
+check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
+check "current symlink works" /usr/local/python/current/bin/python --version
+check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit"
+check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
+check "which pipenv" bash -c "which pipenv | grep /usr/local/py-utils/bin/pipenv"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
+check "which ruff" bash -c "which ruff | grep /usr/local/py-utils/bin/ruff"
+check "which virtualenv" bash -c "which virtualenv | grep /usr/local/py-utils/bin/virtualenv"
+
+# Report result
+reportResults
diff --git a/test/python/install_alternate_tools_rhel_family.sh b/test/python/install_alternate_tools_rhel_family.sh
new file mode 100644
index 000000000..b98d70997
--- /dev/null
+++ b/test/python/install_alternate_tools_rhel_family.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" python  --version
+check "pip is installed" pip --version
+check "pip is installed" pip3 --version
+
+# Check that tools can execute
+check "bandit" bandit --version
+check "mypy" mypy --version
+check "pipenv" pipenv --version
+check "pytest" pytest --version
+check "ruff" ruff --version
+check "virtualenv" virtualenv --version
+
+# Check paths in settings
+check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
+check "current symlink works" /usr/local/python/current/bin/python --version
+check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit"
+check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
+check "which pipenv" bash -c "which pipenv | grep /usr/local/py-utils/bin/pipenv"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
+check "which ruff" bash -c "which ruff | grep /usr/local/py-utils/bin/ruff"
+check "which virtualenv" bash -c "which virtualenv | grep /usr/local/py-utils/bin/virtualenv"
+
+# Report result
+reportResults
diff --git a/test/python/install_jupyterlab_rhel_family.sh b/test/python/install_jupyterlab_rhel_family.sh
new file mode 100644
index 000000000..58c4f7f54
--- /dev/null
+++ b/test/python/install_jupyterlab_rhel_family.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Always run these checks as the non-root user
+user="$(whoami)"
+check "user" grep vscode <<< "$user"
+
+# Check for an installation of JupyterLab
+check "version" jupyter lab --version
+
+# Check location of JupyterLab installation
+packages="$(python3 -m pip list)"
+check "location" grep jupyter <<< "$packages"
+
+# Check for git extension
+check "jupyterlab_git" grep jupyterlab_git <<< "$packages"
+
+# Check for correct JupyterLab configuration
+check "config" grep ".*.allow_origin = '*'" /home/vscode/.jupyter/jupyter_server_config.py
+
+# Report result
+reportResults
diff --git a/test/python/install_os_provided_python.sh b/test/python/install_os_provided_python_deb.sh
similarity index 100%
rename from test/python/install_os_provided_python.sh
rename to test/python/install_os_provided_python_deb.sh
diff --git a/test/python/install_os_provided_python_mariner.sh b/test/python/install_os_provided_python_mariner.sh
new file mode 100755
index 000000000..e39b51412
--- /dev/null
+++ b/test/python/install_os_provided_python_mariner.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "python3 is installed" python3 --version
+check "python is installed" python --version
+check "pip is installed" pip --version
+check "pip is installed" pip3 --version
+
+# Check that tools can execute
+check "autopep8" autopep8 --version
+check "black" black --version
+check "yapf" yapf --version
+check "bandit" bandit --version
+check "flake8" flake8 --version
+check "mypy" mypy --version
+check "pycodestyle" pycodestyle --version
+check "pydocstyle" pydocstyle --version
+check "pylint" pylint --version
+check "pytest" pytest --version
+
+# Check paths in settings
+check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
+check "current symlink works" /usr/local/python/current/bin/python --version
+check "which autopep8" bash -c "which autopep8 | grep /usr/local/py-utils/bin/autopep8"
+check "which black" bash -c "which black | grep /usr/local/py-utils/bin/black"
+check "which yapf" bash -c "which yapf | grep /usr/local/py-utils/bin/yapf"
+check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit"
+check "which flake8" bash -c "which flake8 | grep /usr/local/py-utils/bin/flake8"
+check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
+check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
+check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
+check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
+
+# Report result
+reportResults
diff --git a/test/python/install_os_provided_python_rhel_family.sh b/test/python/install_os_provided_python_rhel_family.sh
new file mode 100644
index 000000000..e39b51412
--- /dev/null
+++ b/test/python/install_os_provided_python_rhel_family.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "python3 is installed" python3 --version
+check "python is installed" python --version
+check "pip is installed" pip --version
+check "pip is installed" pip3 --version
+
+# Check that tools can execute
+check "autopep8" autopep8 --version
+check "black" black --version
+check "yapf" yapf --version
+check "bandit" bandit --version
+check "flake8" flake8 --version
+check "mypy" mypy --version
+check "pycodestyle" pycodestyle --version
+check "pydocstyle" pydocstyle --version
+check "pylint" pylint --version
+check "pytest" pytest --version
+
+# Check paths in settings
+check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
+check "current symlink works" /usr/local/python/current/bin/python --version
+check "which autopep8" bash -c "which autopep8 | grep /usr/local/py-utils/bin/autopep8"
+check "which black" bash -c "which black | grep /usr/local/py-utils/bin/black"
+check "which yapf" bash -c "which yapf | grep /usr/local/py-utils/bin/yapf"
+check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit"
+check "which flake8" bash -c "which flake8 | grep /usr/local/py-utils/bin/flake8"
+check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
+check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
+check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
+check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
+
+# Report result
+reportResults
diff --git a/test/python/install_python310_setuptools_vulnerability.sh b/test/python/install_python310_setuptools_vulnerability.sh
index d6f68f1fb..0e065b1b3 100644
--- a/test/python/install_python310_setuptools_vulnerability.sh
+++ b/test/python/install_python310_setuptools_vulnerability.sh
@@ -78,10 +78,6 @@ checkVulnerableDir()
     fi
 }
 
-bash -c "echo -e -n '\n'";
-bash -c "echo -e 'Files/Folders related to setuptools :-'"; 
-bash -c "find / -name \"*setuptools*\";" 
-
 # only for 3.10
 checkVulnerableDir "/usr/local/py-utils/shared/lib/python3.10/site-packages/setuptools-65.5.0.dist-info" "3.10"
 
diff --git a/test/python/install_python311_setuptools_vulnerability.sh b/test/python/install_python311_setuptools_vulnerability.sh
index b1e3983d2..04a10948b 100644
--- a/test/python/install_python311_setuptools_vulnerability.sh
+++ b/test/python/install_python311_setuptools_vulnerability.sh
@@ -79,10 +79,6 @@ checkVulnerableDir()
     fi
 }
 
-bash -c "echo -e -n '\n'";
-bash -c "echo -e 'Files/Folders related to setuptools :-'"; 
-bash -c "find / -name \"*setuptools*\";" 
-
 # only for 3.11
 checkVulnerableDir "/usr/local/py-utils/shared/lib/python3.11/site-packages/setuptools-65.5.0.dist-info" "3.11"
 
diff --git a/test/python/install_python_shared_lib_deb.sh b/test/python/install_python_shared_lib_deb.sh
new file mode 100755
index 000000000..ee16c436a
--- /dev/null
+++ b/test/python/install_python_shared_lib_deb.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" python  --version
+check "pip is installed" pip --version
+check "pip is installed" pip3 --version
+
+# Check that tools can execute
+check "autopep8" autopep8 --version
+check "black" black --version
+check "yapf" yapf --version
+check "bandit" bandit --version
+check "flake8" flake8 --version
+check "mypy" mypy --version
+check "pycodestyle" pycodestyle --version
+check "pydocstyle" pydocstyle --version
+check "pylint" pylint --version
+check "pytest" pytest --version
+
+# Check paths in settings
+check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
+check "current symlink works" /usr/local/python/current/bin/python --version
+check "which autopep8" bash -c "which autopep8 | grep /usr/local/py-utils/bin/autopep8"
+check "which black" bash -c "which black | grep /usr/local/py-utils/bin/black"
+check "which yapf" bash -c "which yapf | grep /usr/local/py-utils/bin/yapf"
+check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit"
+check "which flake8" bash -c "which flake8 | grep /usr/local/py-utils/bin/flake8"
+check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
+check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
+check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
+check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
+
+# Check compiled with "--enable-shared" -- python truth is opposite of the shells
+#   therefore we negate the check to get a '0' exit code when the python
+#   has been compiled with --enable-shared
+check "python enable shared" /usr/local/python/current/bin/python -c 'import sys; import sysconfig; sys.exit(sysconfig.get_config_vars("Py_ENABLE_SHARED") != [1])'
+
+# Report result
+reportResults
diff --git a/test/python/install_python_shared_lib_rhel_family.sh b/test/python/install_python_shared_lib_rhel_family.sh
new file mode 100755
index 000000000..ee16c436a
--- /dev/null
+++ b/test/python/install_python_shared_lib_rhel_family.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" python  --version
+check "pip is installed" pip --version
+check "pip is installed" pip3 --version
+
+# Check that tools can execute
+check "autopep8" autopep8 --version
+check "black" black --version
+check "yapf" yapf --version
+check "bandit" bandit --version
+check "flake8" flake8 --version
+check "mypy" mypy --version
+check "pycodestyle" pycodestyle --version
+check "pydocstyle" pydocstyle --version
+check "pylint" pylint --version
+check "pytest" pytest --version
+
+# Check paths in settings
+check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
+check "current symlink works" /usr/local/python/current/bin/python --version
+check "which autopep8" bash -c "which autopep8 | grep /usr/local/py-utils/bin/autopep8"
+check "which black" bash -c "which black | grep /usr/local/py-utils/bin/black"
+check "which yapf" bash -c "which yapf | grep /usr/local/py-utils/bin/yapf"
+check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit"
+check "which flake8" bash -c "which flake8 | grep /usr/local/py-utils/bin/flake8"
+check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
+check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
+check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
+check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
+
+# Check compiled with "--enable-shared" -- python truth is opposite of the shells
+#   therefore we negate the check to get a '0' exit code when the python
+#   has been compiled with --enable-shared
+check "python enable shared" /usr/local/python/current/bin/python -c 'import sys; import sysconfig; sys.exit(sysconfig.get_config_vars("Py_ENABLE_SHARED") != [1])'
+
+# Report result
+reportResults
diff --git a/test/python/scenarios.json b/test/python/scenarios.json
index 493f99f1f..d574c84e8 100644
--- a/test/python/scenarios.json
+++ b/test/python/scenarios.json
@@ -26,6 +26,15 @@
             }
         }
     },
+    "install_additional_python_rhel_family": {
+        "image": "almalinux:8",
+        "features": {
+            "python": {
+                "version": "3.11",
+                "additionalVersions": "3.8,3.9.13,3.10.5"
+            }
+        }
+    },
     "install_jupyterlab": {
         "image": "mcr.microsoft.com/devcontainers/base:focal",
         "remoteUser": "vscode",
@@ -37,6 +46,20 @@
             }
         }
     },
+    "install_jupyterlab_rhel_family": {
+        "image": "almalinux:8",
+        "remoteUser": "vscode",
+        "features": {
+            "common-utils": {
+                "username": "vscode"
+            },
+            "python": {
+                "version": "latest",
+                "installJupyterlab": true,
+                "configureJupyterlabAllowOrigin": "*"
+            }
+        }
+    },
     "install_additional_jupyterlab": {
         "image": "mcr.microsoft.com/devcontainers/base:focal",
         "remoteUser": "vscode",
@@ -49,12 +72,39 @@
             }
         }
     },
-    "install_os_provided_python": {
+    "install_additional_jupyterlab_rhel_family": {
+        "image": "almalinux:8",
+        "remoteUser": "vscode",
+        "features": {
+            "common-utils": {
+                "username": "vscode"
+            },
+            "python": {
+                "version": "latest",
+                "additionalVersions": "3.9",
+                "installJupyterlab": true,
+                "configureJupyterlabAllowOrigin": "*"
+            }
+        }
+    },
+    "install_os_provided_python_deb": {
         "image": "mcr.microsoft.com/devcontainers/base:1-bullseye",
         "features": {
             "python": "os-provided"
         }
     },
+    "install_os_provided_python_rhel_family": {
+        "image": "almalinux:8",
+        "features": {
+            "python": "os-provided"
+        }
+    },
+    "install_os_provided_python_mariner": {
+        "image": "mcr.microsoft.com/cbl-mariner/base/core:2.0",
+        "features": {
+            "python": "os-provided"
+        }
+    },
     "install_jupyterlab_from_python_image": {
         "image": "mcr.microsoft.com/devcontainers/python:3.10-bullseye",
         "remoteUser": "vscode",
@@ -99,5 +149,89 @@
                 "version": "3.12"
             }
         }
+    },
+    "install_alternate_tools": {
+        "image": "mcr.microsoft.com/devcontainers/base:1-ubuntu-22.04",
+        "features": {
+            "python": {
+                "version": "3.12",
+                "toolsToInstall": "ruff,mypy,bandit,pipenv,virtualenv,pytest"
+            }
+        }
+    },
+    "install_alternate_tools_rhel_family": {
+        "image": "almalinux:8",
+        "features": {
+            "python": {
+                "version": "3.12",
+                "toolsToInstall": "ruff,mypy,bandit,pipenv,virtualenv,pytest"
+            }
+        }
+    },
+    "centos-7": {
+        "image": "centos:centos7",
+        "features": {
+            "python": {
+                "version": "3.11"
+            }
+        }
+    },
+    "alma-8": {
+        "image": "almalinux:8",
+        "features": {
+            "python": {
+                "version": "3.11"
+            }
+        }
+    },
+    "alma-8-minimal": {
+        "image": "almalinux:8-minimal",
+        "features": {
+            "python": {
+                "version": "3.11"
+            }
+        }
+    },
+    "alma-9": {
+        "image": "almalinux:9",
+        "features": {
+            "python": {
+                "version": "3.11"
+            }
+        }
+    },
+    "alma-9-minimal": {
+        "image": "almalinux:9-minimal",
+        "features": {
+            "python": {
+                "version": "3.11"
+            }
+        }
+    },
+    "fedora": {
+        "image": "fedora",
+        "features": {
+            "python": {
+                "version": "3.11"
+            }
+        }
+    },
+    "install_python_shared_lib_deb": {
+        "image": "ubuntu:focal",
+        "features": {
+            "python": {
+                "version": "3.11",
+                "enableShared": true
+            }
+        }
+    },
+    "install_python_shared_lib_rhel_family": {
+        "image": "almalinux:8",
+        "features": {
+            "python": {
+                "version": "3.11",
+                "enableShared": true
+            }
+        }
     }
-}
+}
\ No newline at end of file

From 42925ae702eca8c6b85c47ebb250cd92912e71a3 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Fri, 9 Feb 2024 12:23:29 -0800
Subject: [PATCH 220/478] Fix broken workflows ; adds permissions (#835)

---
 .github/workflows/release.yaml                     | 2 ++
 .github/workflows/update-documentation.yml         | 3 +++
 .github/workflows/update-dotnet-install-script.yml | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 485096b5f..a1ec773b9 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -9,6 +9,8 @@ jobs:
   deploy:
     if: ${{ github.ref == 'refs/heads/main' }}
     runs-on: ubuntu-latest
+    permissions:
+      packages: write
     steps:
       - uses: actions/checkout@v3
       
diff --git a/.github/workflows/update-documentation.yml b/.github/workflows/update-documentation.yml
index 6976e62ea..2452e0d71 100644
--- a/.github/workflows/update-documentation.yml
+++ b/.github/workflows/update-documentation.yml
@@ -9,6 +9,9 @@ jobs:
   generate:
     runs-on: ubuntu-latest
     environment: documentation
+    permissions:
+      contents: write
+      pull-requests: write
     if: "github.ref == 'refs/heads/main'"
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/update-dotnet-install-script.yml b/.github/workflows/update-dotnet-install-script.yml
index 72d06099b..ebd175cff 100644
--- a/.github/workflows/update-dotnet-install-script.yml
+++ b/.github/workflows/update-dotnet-install-script.yml
@@ -8,6 +8,9 @@ jobs:
   fetch-latest-dotnet-install:
     runs-on: ubuntu-latest
     environment: documentation # grants access to secrets.PAT, for creating pull requests
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
       - uses: actions/checkout@v3
 

From aa982d2d6cf866cc0c3008e97d46a48b66342931 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Fri, 9 Feb 2024 13:16:20 -0800
Subject: [PATCH 221/478] Automated documentation update (#836)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/python/README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/python/README.md b/src/python/README.md
index 2dd092ae7..db6ad1039 100644
--- a/src/python/README.md
+++ b/src/python/README.md
@@ -16,8 +16,10 @@ Installs the provided version of Python, as well as PIPX, and other common Pytho
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
 | version | Select a Python version to install. | string | os-provided |
-| installTools | Install common Python tools like pylint | boolean | true |
+| installTools | Flag indicating whether or not to install the tools specified via the 'toolsToInstall' option. Default is 'true'. | boolean | true |
+| toolsToInstall | Comma-separated list of tools to install when 'installTools' is true. Defaults to a set of common Python tools like pylint. | string | flake8,autopep8,black,yapf,mypy,pydocstyle,pycodestyle,bandit,pipenv,virtualenv,pytest,pylint |
 | optimize | Optimize Python for performance when compiled (slow) | boolean | false |
+| enableShared | Enable building a shared Python library | boolean | false |
 | installPath | The path where python will be installed. | string | /usr/local/python |
 | installJupyterlab | Install JupyterLab, a web-based interactive development environment for notebooks | boolean | false |
 | configureJupyterlabAllowOrigin | Configure JupyterLab to accept HTTP requests from the specified origin | string | - |
@@ -34,7 +36,7 @@ Installs the provided version of Python, as well as PIPX, and other common Pytho
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and RockyLinux distributions with the apt, yum, dnf, or microdnf package manager installed.
 
 `bash` is required to execute the `install.sh` script.
 

From 91ac77405725c0d6fcbc7a4cc15b7c94078540c1 Mon Sep 17 00:00:00 2001
From: Ben Menesini <ben.menesini@rover.com>
Date: Fri, 9 Feb 2024 16:43:13 -0800
Subject: [PATCH 222/478] Allow moby-buildx version to be specified in
 devcontainer.json (#838)

* Allow moby-buildx version to be specified in devcontainer.json

Fixes #837

* Revert changes to README.md

* Address code review feedback

- Specify mobyBuildxVersion in devcontainer-feature.json with pinned and commented default value
- Bump minor version
- Leverage default value in install.sh
- Only set buildx_version_suffix when installing moby

* Handle varying distributions

* Fix typo / remove extra line
---
 .../devcontainer-feature.json                 |  7 +++-
 src/docker-in-docker/install.sh               | 34 +++++++++++++++----
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 6b5c9840c..744bc1d81 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.8.1",
+    "version": "2.9.0",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
@@ -20,6 +20,11 @@
             "default": true,
             "description": "Install OSS Moby build instead of Docker CE"
         },
+        "mobyBuildxVersion": {
+            "type": "string",
+            "default": "0.12.0",
+            "description": "Install a specific version of moby-buildx when using Moby. (2024-02-09: Microsoft's Package Manifest has mismatching filesize and SHA for 0.12.1; default is last known good version)"
+        },
         "dockerDashComposeVersion": {
             "type": "string",
             "enum": [
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 8543b65dd..db3cefc6a 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -10,6 +10,7 @@
 
 DOCKER_VERSION="${VERSION:-"latest"}" # The Docker/Moby Engine + CLI should match in version
 USE_MOBY="${MOBY:-"true"}"
+MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION}"
 DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2 or none
 AZURE_DNS_AUTO_DETECTION="${AZUREDNSAUTODETECTION:-"true"}"
 DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL}"
@@ -81,7 +82,7 @@ find_version_from_git_tags() {
     local repository=$2
     local prefix=${3:-"tags/v"}
     local separator=${4:-"."}
-    local last_part_optional=${5:-"false"}    
+    local last_part_optional=${5:-"false"}
     if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
         local escaped_separator=${separator//./\\.}
         local last_part
@@ -198,6 +199,27 @@ else
     echo "cli_version_suffix ${cli_version_suffix}"
 fi
 
+# Version matching for moby-buildx
+if [ "${USE_MOBY}" = "true" ]; then
+    if [ "${MOBY_BUILDX_VERSION}" = "latest" ]; then
+        # Empty, meaning grab whatever "latest" is in apt repo
+        buildx_version_suffix=""
+    else
+        buildx_version_dot_escaped="${MOBY_BUILDX_VERSION//./\\.}"
+        buildx_version_dot_plus_escaped="${buildx_version_dot_escaped//+/\\+}"
+        buildx_version_regex="^(.+:)?${buildx_version_dot_plus_escaped}([\\.\\+ ~:-]|$)"
+        set +e
+            buildx_version_suffix="=$(apt-cache madison moby-buildx | awk -F"|" '{print $2}' | sed -e 's/^[ \t]*//' | grep -E -m 1 "${buildx_version_regex}")"
+        set -e
+        if [ -z "${buildx_version_suffix}" ] || [ "${buildx_version_suffix}" = "=" ]; then
+            err "No full or partial moby-buildx version match found for \"${MOBY_BUILDX_VERSION}\" on OS ${ID} ${VERSION_CODENAME} (${architecture}). Available versions:"
+            apt-cache madison moby-buildx | awk -F"|" '{print $2}' | grep -oP '^(.+:)?\K.+'
+            exit 1
+        fi
+        echo "buildx_version_suffix ${buildx_version_suffix}"
+    fi
+fi
+
 # Install Docker / Moby CLI if not already installed
 if type docker > /dev/null 2>&1 && type dockerd > /dev/null 2>&1; then
     echo "Docker / Moby CLI and Engine already installed."
@@ -205,7 +227,7 @@ else
     if [ "${USE_MOBY}" = "true" ]; then
         # Install engine
         set +e # Handle error gracefully
-            apt-get -y install --no-install-recommends moby-cli${cli_version_suffix} moby-buildx moby-engine${engine_version_suffix}
+            apt-get -y install --no-install-recommends moby-cli${cli_version_suffix} moby-buildx${buildx_version_suffix} moby-engine${engine_version_suffix}
             if [ $? -ne 0 ]; then
                 err "Packages for moby not available in OS ${ID} ${VERSION_CODENAME} (${architecture}). To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS version (eg: 'ubuntu-20.04')."
                 exit 1
@@ -399,7 +421,7 @@ dockerd_start="AZURE_DNS_AUTO_DETECTION=${AZURE_DNS_AUTO_DETECTION} DOCKER_DEFAU
 
             retry_cgroup_nesting=`expr $retry_cgroup_nesting + 1`
         set -e
-    done 
+    done
 
     # -- End: dind wrapper script --
 
@@ -442,7 +464,7 @@ retry_docker_start_count=0
 docker_ok="false"
 
 until [ "${docker_ok}" = "true"  ] || [ "${retry_docker_start_count}" -eq "5" ];
-do 
+do
     # Start using sudo if not invoked as root
     if [ "$(id -u)" -ne 0 ]; then
         sudo /bin/sh -c "${dockerd_start}"
@@ -460,7 +482,7 @@ do
 
         retry_count=`expr $retry_count + 1`
     done
-    
+
     if [ "${docker_ok}" != "true" ] && [ "${retry_docker_start_count}" != "4" ]; then
         echo "(*) Failed to start docker, retrying..."
         set +e
@@ -468,7 +490,7 @@ do
             sudo_if pkill containerd
         set -e
     fi
-    
+
     retry_docker_start_count=`expr $retry_docker_start_count + 1`
 done
 

From fc62e9abf47c5ea52e02de997c91c5d52a5edc3a Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Fri, 9 Feb 2024 16:47:43 -0800
Subject: [PATCH 223/478] Automated documentation update (#840)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/docker-in-docker/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index bfca77357..41004b7e1 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -17,6 +17,7 @@ Create child containers *inside* a container, independent from the host's docker
 |-----|-----|-----|-----|
 | version | Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.) | string | latest |
 | moby | Install OSS Moby build instead of Docker CE | boolean | true |
+| mobyBuildxVersion | Install a specific version of moby-buildx when using Moby. (2024-02-09: Microsoft's Package Manifest has mismatching filesize and SHA for 0.12.1; default is last known good version) | string | 0.12.0 |
 | dockerDashComposeVersion | Default version of Docker Compose (v1 or v2 or none) | string | v1 |
 | azureDnsAutoDetection | Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure | boolean | true |
 | dockerDefaultAddressPool | Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24 | string | - |

From e05b0b85ae9ff5fac24b021177e353721d265e15 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Mon, 12 Feb 2024 12:40:31 -0800
Subject: [PATCH 224/478] Docker-outside-of-docker: Fix moby-buildx errors
 (#843)

* Docker-outside-of-docker: Fix moby-buildx errors

* test debugging

* fix test

* nit
---
 .../devcontainer-feature.json                 |  7 +++++-
 src/docker-outside-of-docker/install.sh       | 24 ++++++++++++++++++-
 test/docker-outside-of-docker/docker_init.sh  |  3 ++-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 4e5eae721..78ad1162c 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.3.2",
+    "version": "1.4.0",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
@@ -20,6 +20,11 @@
             "default": true,
             "description": "Install OSS Moby build instead of Docker CE"
         },
+        "mobyBuildxVersion": {
+            "type": "string",
+            "default": "0.12.0",
+            "description": "Install a specific version of moby-buildx when using Moby. (2024-02-09: Microsoft's Package Manifest has mismatching filesize and SHA for 0.12.1; default is last known good version)"
+        },
         "dockerDashComposeVersion": {
             "type": "string",
             "enum": [
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 901dd7870..988b7e43c 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -9,6 +9,7 @@
 
 DOCKER_VERSION="${VERSION:-"latest"}"
 USE_MOBY="${MOBY:-"true"}"
+MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION}"
 DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2 or none
 
 ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"
@@ -170,6 +171,27 @@ else
     echo "cli_version_suffix ${cli_version_suffix}"
 fi
 
+# Version matching for moby-buildx
+if [ "${USE_MOBY}" = "true" ]; then
+    if [ "${MOBY_BUILDX_VERSION}" = "latest" ]; then
+        # Empty, meaning grab whatever "latest" is in apt repo
+        buildx_version_suffix=""
+    else
+        buildx_version_dot_escaped="${MOBY_BUILDX_VERSION//./\\.}"
+        buildx_version_dot_plus_escaped="${buildx_version_dot_escaped//+/\\+}"
+        buildx_version_regex="^(.+:)?${buildx_version_dot_plus_escaped}([\\.\\+ ~:-]|$)"
+        set +e
+            buildx_version_suffix="=$(apt-cache madison moby-buildx | awk -F"|" '{print $2}' | sed -e 's/^[ \t]*//' | grep -E -m 1 "${buildx_version_regex}")"
+        set -e
+        if [ -z "${buildx_version_suffix}" ] || [ "${buildx_version_suffix}" = "=" ]; then
+            err "No full or partial moby-buildx version match found for \"${MOBY_BUILDX_VERSION}\" on OS ${ID} ${VERSION_CODENAME} (${architecture}). Available versions:"
+            apt-cache madison moby-buildx | awk -F"|" '{print $2}' | grep -oP '^(.+:)?\K.+'
+            exit 1
+        fi
+        echo "buildx_version_suffix ${buildx_version_suffix}"
+    fi
+fi
+
 # Install Docker / Moby CLI if not already installed
 if type docker > /dev/null 2>&1; then
     echo "Docker / Moby CLI already installed."
@@ -177,7 +199,7 @@ else
     if [ "${USE_MOBY}" = "true" ]; then
         buildx=()
         if [ "${INSTALL_DOCKER_BUILDX}" = "true" ]; then
-            buildx=(moby-buildx)
+            buildx=(moby-buildx${buildx_version_suffix})
         fi
         apt-get -y install --no-install-recommends ${cli_package_name}${cli_version_suffix} "${buildx[@]}"
         apt-get -y install --no-install-recommends moby-compose || echo "(*) Package moby-compose (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
diff --git a/test/docker-outside-of-docker/docker_init.sh b/test/docker-outside-of-docker/docker_init.sh
index b47285ead..88153c1e0 100644
--- a/test/docker-outside-of-docker/docker_init.sh
+++ b/test/docker-outside-of-docker/docker_init.sh
@@ -12,7 +12,8 @@ check "docker-compose" bash -c "docker-compose --version"
 check "docker-init-exists" bash -c "ls /usr/local/share/docker-init.sh"
 check "log-exists" bash -c "ls /tmp/vscr-docker-from-docker.log"
 check "log-contents-for-success" bash -c "cat /tmp/vscr-docker-from-docker.log | grep 'Success'"
-check "log-contents" bash -c "cat /tmp/vscr-docker-from-docker.log | grep 'Proxying /var/run/docker-host.sock to /var/run/docker.sock for vscode'"
+
+check "log-contents" bash -c "cat /tmp/vscr-docker-from-docker.log | grep 'Ensuring vscode has access to /var/run/docker-host.sock via /var/run/docker.sock'"
 check "docker-ps" bash -c "docker ps >/dev/null"
 
 # Report result

From eea8ec3a3702057ce3c0c3e54bbb205ed580867b Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Mon, 12 Feb 2024 12:42:42 -0800
Subject: [PATCH 225/478] Automated documentation update (#844)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/docker-outside-of-docker/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/docker-outside-of-docker/README.md b/src/docker-outside-of-docker/README.md
index 74dca7ae4..7e352af05 100644
--- a/src/docker-outside-of-docker/README.md
+++ b/src/docker-outside-of-docker/README.md
@@ -19,6 +19,7 @@ Re-use the host docker socket, adding the Docker CLI to a container. Feature inv
 |-----|-----|-----|-----|
 | version | Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.) | string | latest |
 | moby | Install OSS Moby build instead of Docker CE | boolean | true |
+| mobyBuildxVersion | Install a specific version of moby-buildx when using Moby. (2024-02-09: Microsoft's Package Manifest has mismatching filesize and SHA for 0.12.1; default is last known good version) | string | 0.12.0 |
 | dockerDashComposeVersion | Compose version to use for docker-compose (v1 or v2 or none) | string | v2 |
 | installDockerBuildx | Install Docker Buildx | boolean | true |
 

From 28b69c5f97c77943efb71206f99afae8d62cc257 Mon Sep 17 00:00:00 2001
From: Jeff Putsch <150963136+jdputschadi@users.noreply.github.com>
Date: Wed, 14 Feb 2024 09:37:43 -0800
Subject: [PATCH 226/478] Add RHEL support to go feature (#846)

* Support RHEL with tests

* update per PR feedback

* Bump minor version

---------

Co-authored-by: Jeff Putsch <jputsch@analog.com>
---
 src/go/NOTES.md                               |   2 +-
 src/go/devcontainer-feature.json              |   4 +-
 src/go/install.sh                             | 175 ++++++++++++++----
 test/go/install_go_alma-8-minimal.sh          |  28 +++
 test/go/install_go_alma-8.sh                  |  28 +++
 test/go/install_go_alma-9-minimal.sh          |  28 +++
 test/go/install_go_alma-9.sh                  |  28 +++
 test/go/install_go_centos-7.sh                |  28 +++
 test/go/install_go_fedora.sh                  |  28 +++
 test/go/install_go_mariner.sh                 |  28 +++
 test/go/install_go_tool_in_postCreate_rhel.sh |  13 ++
 test/go/scenarios.json                        |  75 +++++++-
 12 files changed, 425 insertions(+), 40 deletions(-)
 create mode 100755 test/go/install_go_alma-8-minimal.sh
 create mode 100755 test/go/install_go_alma-8.sh
 create mode 100755 test/go/install_go_alma-9-minimal.sh
 create mode 100755 test/go/install_go_alma-9.sh
 create mode 100755 test/go/install_go_centos-7.sh
 create mode 100755 test/go/install_go_fedora.sh
 create mode 100755 test/go/install_go_mariner.sh
 create mode 100644 test/go/install_go_tool_in_postCreate_rhel.sh

diff --git a/src/go/NOTES.md b/src/go/NOTES.md
index 19fe92f31..79a308cf5 100644
--- a/src/go/NOTES.md
+++ b/src/go/NOTES.md
@@ -2,6 +2,6 @@
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and RockyLinux distributions with the apt, yum, dnf, or microdnf package manager installed.
 
 `bash` is required to execute the `install.sh` script.
diff --git a/src/go/devcontainer-feature.json b/src/go/devcontainer-feature.json
index 307ab217b..58415ce6b 100644
--- a/src/go/devcontainer-feature.json
+++ b/src/go/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "go",
-    "version": "1.2.2",
+    "version": "1.3.0",
     "name": "Go",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/go",
     "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.",
@@ -44,4 +44,4 @@
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
-}
+}
\ No newline at end of file
diff --git a/src/go/install.sh b/src/go/install.sh
index 90e0973f5..ca01d34f5 100755
--- a/src/go/install.sh
+++ b/src/go/install.sh
@@ -20,36 +20,60 @@ GO_GPG_KEY_URI="https://dl.google.com/linux/linux_signing_key.pub"
 
 set -e
 
-# Clean up
-rm -rf /var/lib/apt/lists/*
-
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
     exit 1
 fi
 
-# Ensure that login shells get the correct path if the user updated the PATH using ENV.
-rm -f /etc/profile.d/00-restore-env.sh
-echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
-chmod +x /etc/profile.d/00-restore-env.sh
-
-# Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
+# Bring in ID, ID_LIKE, VERSION_ID, VERSION_CODENAME
+. /etc/os-release
+# Get an adjusted ID independent of distro variants
+MAJOR_VERSION_ID=$(echo ${VERSION_ID} | cut -d . -f 1)
+if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
+    ADJUSTED_ID="debian"
+elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
+    ADJUSTED_ID="rhel"
+    if [[ "${ID}" = "rhel" ]] || [[ "${ID}" = *"alma"* ]] || [[ "${ID}" = *"rocky"* ]]; then
+        VERSION_CODENAME="rhel${MAJOR_VERSION_ID}"
+    else
+        VERSION_CODENAME="${ID}${MAJOR_VERSION_ID}"
     fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
+else
+    echo "Linux distro ${ID} not supported."
+    exit 1
 fi
 
+# Setup INSTALL_CMD & PKG_MGR_CMD
+if type apt-get > /dev/null 2>&1; then
+    PKG_MGR_CMD=apt-get
+    INSTALL_CMD="${PKG_MGR_CMD} -y install --no-install-recommends"
+elif type microdnf > /dev/null 2>&1; then
+    PKG_MGR_CMD=microdnf
+    INSTALL_CMD="${PKG_MGR_CMD} ${INSTALL_CMD_ADDL_REPOS} -y install --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0"
+elif type dnf > /dev/null 2>&1; then
+    PKG_MGR_CMD=dnf
+    INSTALL_CMD="${PKG_MGR_CMD} ${INSTALL_CMD_ADDL_REPOS} -y install --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0"
+else
+    PKG_MGR_CMD=yum
+    INSTALL_CMD="${PKG_MGR_CMD} ${INSTALL_CMD_ADDL_REPOS} -y install --noplugins --setopt=install_weak_deps=0"
+fi
+
+# Clean up
+clean_up() {
+    case ${ADJUSTED_ID} in
+        debian)
+            rm -rf /var/lib/apt/lists/*
+            ;;
+        rhel)
+            rm -rf /var/cache/dnf/* /var/cache/yum/*
+            rm -rf /tmp/yum.log
+            rm -rf ${GPG_INSTALL_PATH}
+            ;;
+    esac
+}
+clean_up
+
+
 # Figure out correct version of a three part version number is not passed
 find_version_from_git_tags() {
     local variable_name=$1
@@ -84,29 +108,108 @@ find_version_from_git_tags() {
     echo "${variable_name}=${!variable_name}"
 }
 
-apt_get_update()
-{
-    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
-        echo "Running apt-get update..."
-        apt-get update -y
-    fi
+pkg_mgr_update() {
+    case $ADJUSTED_ID in
+        debian)
+            if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+                echo "Running apt-get update..."
+                ${PKG_MGR_CMD} update -y
+            fi
+            ;;
+        rhel)
+            if [ ${PKG_MGR_CMD} = "microdnf" ]; then
+                if [ "$(ls /var/cache/yum/* 2>/dev/null | wc -l)" = 0 ]; then
+                    echo "Running ${PKG_MGR_CMD} makecache ..."
+                    ${PKG_MGR_CMD} makecache
+                fi
+            else
+                if [ "$(ls /var/cache/${PKG_MGR_CMD}/* 2>/dev/null | wc -l)" = 0 ]; then
+                    echo "Running ${PKG_MGR_CMD} check-update ..."
+                    set +e
+                    ${PKG_MGR_CMD} check-update
+                    rc=$?
+                    if [ $rc != 0 ] && [ $rc != 100 ]; then
+                        exit 1
+                    fi
+                    set -e
+                fi
+            fi
+            ;;
+    esac
 }
 
 # Checks if packages are installed and installs them if not
 check_packages() {
-    if ! dpkg -s "$@" > /dev/null 2>&1; then
-        apt_get_update
-        apt-get -y install --no-install-recommends "$@"
-    fi
+    case ${ADJUSTED_ID} in
+        debian)
+            if ! dpkg -s "$@" > /dev/null 2>&1; then
+                pkg_mgr_update
+                ${INSTALL_CMD} "$@"
+            fi
+            ;;
+        rhel)
+            if ! rpm -q "$@" > /dev/null 2>&1; then
+                pkg_mgr_update
+                ${INSTALL_CMD} "$@"
+            fi
+            ;;
+    esac
 }
 
+# Ensure that login shells get the correct path if the user updated the PATH using ENV.
+rm -f /etc/profile.d/00-restore-env.sh
+echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
+chmod +x /etc/profile.d/00-restore-env.sh
+
+# Some distributions do not install awk by default (e.g. Mariner)
+if ! type awk >/dev/null 2>&1; then
+    check_packages awk
+fi
+
+# Determine the appropriate non-root user
+if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
+    USERNAME=""
+    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
+    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
+        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            USERNAME=${CURRENT_USER}
+            break
+        fi
+    done
+    if [ "${USERNAME}" = "" ]; then
+        USERNAME=root
+    fi
+elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
+    USERNAME=root
+fi
+
 export DEBIAN_FRONTEND=noninteractive
 
-# Install curl, tar, git, other dependencies if missing
-check_packages curl ca-certificates gnupg2 tar g++ gcc libc6-dev make pkg-config
+check_packages ca-certificates gnupg2 tar gcc make pkg-config
+
+if [ $ADJUSTED_ID = "debian" ]; then
+    check_packages g++ libc6-dev
+else
+    check_packages gcc-c++ glibc-devel
+fi
+# Install curl, git, other dependencies if missing
+if ! type curl > /dev/null 2>&1; then
+    check_packages curl
+fi
 if ! type git > /dev/null 2>&1; then
     check_packages git
 fi
+# Some systems, e.g. Mariner, still a few more packages
+if ! type as > /dev/null 2>&1; then
+    check_packages binutils
+fi
+if ! [ -f /usr/include/linux/errno.h ]; then
+    check_packages kernel-headers
+fi
+# Minimal RHEL install may need findutils installed
+if ! [ -f /usr/bin/find ]; then
+    check_packages findutils
+fi
 
 # Get closest match for version number specified
 find_version_from_git_tags TARGET_GO_VERSION "https://go.googlesource.com/go" "tags/go" "." "true"
@@ -128,7 +231,7 @@ fi
 usermod -a -G golang "${USERNAME}"
 mkdir -p "${TARGET_GOROOT}" "${TARGET_GOPATH}"
 
-if [[ "${TARGET_GO_VERSION}" != "none" ]] && [[ "$(go version)" != *"${TARGET_GO_VERSION}"* ]]; then
+if [[ "${TARGET_GO_VERSION}" != "none" ]] && [[ "$(go version 2>/dev/null)" != *"${TARGET_GO_VERSION}"* ]]; then
     # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
@@ -230,6 +333,6 @@ find "${TARGET_GOROOT}" -type d -print0 | xargs -n 1 -0 chmod g+s
 find "${TARGET_GOPATH}" -type d -print0 | xargs -n 1 -0 chmod g+s
 
 # Clean up
-rm -rf /var/lib/apt/lists/*
+clean_up
 
 echo "Done!"
diff --git a/test/go/install_go_alma-8-minimal.sh b/test/go/install_go_alma-8-minimal.sh
new file mode 100755
index 000000000..33a95dd32
--- /dev/null
+++ b/test/go/install_go_alma-8-minimal.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# go
+check "version" go version
+
+# revive
+check "revive version" revive --version
+check "revive is installed at correct path" bash -c "type revive | grep /go/bin/revive"
+
+# gomodifytags
+check "gomodifytags is installed at correct path" bash -c "type gomodifytags | grep /go/bin/gomodifytags"
+
+# goplay
+check "goplay is installed at correct path" bash -c "type goplay | grep /go/bin/goplay"
+
+# gotests
+check "gotests is installed at correct path" bash -c "type gotests | grep /go/bin/gotests"
+
+# impl
+check "impl is installed at correct path" bash -c "type impl | grep /go/bin/impl"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/go/install_go_alma-8.sh b/test/go/install_go_alma-8.sh
new file mode 100755
index 000000000..33a95dd32
--- /dev/null
+++ b/test/go/install_go_alma-8.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# go
+check "version" go version
+
+# revive
+check "revive version" revive --version
+check "revive is installed at correct path" bash -c "type revive | grep /go/bin/revive"
+
+# gomodifytags
+check "gomodifytags is installed at correct path" bash -c "type gomodifytags | grep /go/bin/gomodifytags"
+
+# goplay
+check "goplay is installed at correct path" bash -c "type goplay | grep /go/bin/goplay"
+
+# gotests
+check "gotests is installed at correct path" bash -c "type gotests | grep /go/bin/gotests"
+
+# impl
+check "impl is installed at correct path" bash -c "type impl | grep /go/bin/impl"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/go/install_go_alma-9-minimal.sh b/test/go/install_go_alma-9-minimal.sh
new file mode 100755
index 000000000..33a95dd32
--- /dev/null
+++ b/test/go/install_go_alma-9-minimal.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# go
+check "version" go version
+
+# revive
+check "revive version" revive --version
+check "revive is installed at correct path" bash -c "type revive | grep /go/bin/revive"
+
+# gomodifytags
+check "gomodifytags is installed at correct path" bash -c "type gomodifytags | grep /go/bin/gomodifytags"
+
+# goplay
+check "goplay is installed at correct path" bash -c "type goplay | grep /go/bin/goplay"
+
+# gotests
+check "gotests is installed at correct path" bash -c "type gotests | grep /go/bin/gotests"
+
+# impl
+check "impl is installed at correct path" bash -c "type impl | grep /go/bin/impl"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/go/install_go_alma-9.sh b/test/go/install_go_alma-9.sh
new file mode 100755
index 000000000..33a95dd32
--- /dev/null
+++ b/test/go/install_go_alma-9.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# go
+check "version" go version
+
+# revive
+check "revive version" revive --version
+check "revive is installed at correct path" bash -c "type revive | grep /go/bin/revive"
+
+# gomodifytags
+check "gomodifytags is installed at correct path" bash -c "type gomodifytags | grep /go/bin/gomodifytags"
+
+# goplay
+check "goplay is installed at correct path" bash -c "type goplay | grep /go/bin/goplay"
+
+# gotests
+check "gotests is installed at correct path" bash -c "type gotests | grep /go/bin/gotests"
+
+# impl
+check "impl is installed at correct path" bash -c "type impl | grep /go/bin/impl"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/go/install_go_centos-7.sh b/test/go/install_go_centos-7.sh
new file mode 100755
index 000000000..33a95dd32
--- /dev/null
+++ b/test/go/install_go_centos-7.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# go
+check "version" go version
+
+# revive
+check "revive version" revive --version
+check "revive is installed at correct path" bash -c "type revive | grep /go/bin/revive"
+
+# gomodifytags
+check "gomodifytags is installed at correct path" bash -c "type gomodifytags | grep /go/bin/gomodifytags"
+
+# goplay
+check "goplay is installed at correct path" bash -c "type goplay | grep /go/bin/goplay"
+
+# gotests
+check "gotests is installed at correct path" bash -c "type gotests | grep /go/bin/gotests"
+
+# impl
+check "impl is installed at correct path" bash -c "type impl | grep /go/bin/impl"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/go/install_go_fedora.sh b/test/go/install_go_fedora.sh
new file mode 100755
index 000000000..33a95dd32
--- /dev/null
+++ b/test/go/install_go_fedora.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# go
+check "version" go version
+
+# revive
+check "revive version" revive --version
+check "revive is installed at correct path" bash -c "type revive | grep /go/bin/revive"
+
+# gomodifytags
+check "gomodifytags is installed at correct path" bash -c "type gomodifytags | grep /go/bin/gomodifytags"
+
+# goplay
+check "goplay is installed at correct path" bash -c "type goplay | grep /go/bin/goplay"
+
+# gotests
+check "gotests is installed at correct path" bash -c "type gotests | grep /go/bin/gotests"
+
+# impl
+check "impl is installed at correct path" bash -c "type impl | grep /go/bin/impl"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/go/install_go_mariner.sh b/test/go/install_go_mariner.sh
new file mode 100755
index 000000000..33a95dd32
--- /dev/null
+++ b/test/go/install_go_mariner.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# go
+check "version" go version
+
+# revive
+check "revive version" revive --version
+check "revive is installed at correct path" bash -c "type revive | grep /go/bin/revive"
+
+# gomodifytags
+check "gomodifytags is installed at correct path" bash -c "type gomodifytags | grep /go/bin/gomodifytags"
+
+# goplay
+check "goplay is installed at correct path" bash -c "type goplay | grep /go/bin/goplay"
+
+# gotests
+check "gotests is installed at correct path" bash -c "type gotests | grep /go/bin/gotests"
+
+# impl
+check "impl is installed at correct path" bash -c "type impl | grep /go/bin/impl"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/go/install_go_tool_in_postCreate_rhel.sh b/test/go/install_go_tool_in_postCreate_rhel.sh
new file mode 100644
index 000000000..dcd7311a6
--- /dev/null
+++ b/test/go/install_go_tool_in_postCreate_rhel.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "mkcert version" bash -c "mkcert --version | grep v1.4.2"
+check "mkcert is installed at correct path" bash -c "type mkcert | grep /go/bin/mkcert"
+check "golangci-lint version" bash -c "golangci-lint --version | grep 'golangci-lint has version 1.50.0'"
+
+# Report result
+reportResults
diff --git a/test/go/scenarios.json b/test/go/scenarios.json
index 86e127020..b6d8d1d0b 100644
--- a/test/go/scenarios.json
+++ b/test/go/scenarios.json
@@ -1,4 +1,67 @@
 {
+    "install_go_alma-8": {
+        "image": "almalinux:8",
+        "features": {
+            "go": {
+                "version": "latest",
+                "golangciLintVersion": "1.50.0"
+            }
+        }
+    },
+    "install_go_alma-8-minimal": {
+        "image": "almalinux:8-minimal",
+        "features": {
+            "go": {
+                "version": "latest",
+                "golangciLintVersion": "1.50.0"
+            }
+        }
+    },
+    "install_go_alma-9": {
+        "image": "almalinux:9",
+        "features": {
+            "go": {
+                "version": "latest",
+                "golangciLintVersion": "1.50.0"
+            }
+        }
+    },
+    "install_go_alma-9-minimal": {
+        "image": "almalinux:9-minimal",
+        "features": {
+            "go": {
+                "version": "latest",
+                "golangciLintVersion": "1.50.0"
+            }
+        }
+    },
+    "install_go_centos-7": {
+        "image": "centos:centos7",
+        "features": {
+            "go": {
+                "version": "latest",
+                "golangciLintVersion": "1.50.0"
+            }
+        }
+    },
+    "install_go_fedora": {
+        "image": "fedora",
+        "features": {
+            "go": {
+                "version": "latest",
+                "golangciLintVersion": "1.50.0"
+            }
+        }
+    },
+    "install_go_mariner": {
+        "image": "mcr.microsoft.com/cbl-mariner/base/core:2.0",
+        "features": {
+            "go": {
+                "version": "latest",
+                "golangciLintVersion": "1.50.0"
+            }
+        }
+    },
     "install_go_tool_in_postCreate": {
         "image": "ubuntu:focal",
         "features": {
@@ -9,6 +72,16 @@
         },
         "postCreateCommand": "go install filippo.io/mkcert@v1.4.2"
     },
+    "install_go_tool_in_postCreate_rhel": {
+        "image": "almalinux:8",
+        "features": {
+            "go": {
+                "version": "latest",
+                "golangciLintVersion": "1.50.0"
+            }
+        },
+        "postCreateCommand": "go install filippo.io/mkcert@v1.4.2"
+    },
     "install_go_twice": {
         "image": "mcr.microsoft.com/devcontainers/go:1.18",
         "features": {
@@ -17,4 +90,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

From f91ff3cd8de5d33a52d21887963ba7166600cc44 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Wed, 14 Feb 2024 09:42:15 -0800
Subject: [PATCH 227/478] Automated documentation update (#851)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/go/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/go/README.md b/src/go/README.md
index be035ee85..5f35da948 100644
--- a/src/go/README.md
+++ b/src/go/README.md
@@ -28,7 +28,7 @@ Installs Go and common Go utilities. Auto-detects latest version and installs ne
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and RockyLinux distributions with the apt, yum, dnf, or microdnf package manager installed.
 
 `bash` is required to execute the `install.sh` script.
 

From 7d807c2abcfaf54f1f7b9ab939cf4e79be01b416 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Wed, 21 Feb 2024 16:44:21 -0800
Subject: [PATCH 228/478] [Updates] Automated vendor dotnet-install script
 (#868)

* Automated dotnet-install script update

* Bump version

---------

Co-authored-by: github-actions <github-actions@github.com>
---
 src/dotnet/devcontainer-feature.json        | 2 +-
 src/dotnet/scripts/vendor/dotnet-install.sh | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index 7abfc2d30..878a95d3f 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.0.3",
+    "version": "2.0.4",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
diff --git a/src/dotnet/scripts/vendor/dotnet-install.sh b/src/dotnet/scripts/vendor/dotnet-install.sh
index 86a2d0bad..f6b08d1f8 100755
--- a/src/dotnet/scripts/vendor/dotnet-install.sh
+++ b/src/dotnet/scripts/vendor/dotnet-install.sh
@@ -303,6 +303,11 @@ get_machine_architecture() {
             return 0
             ;;
         aarch64|arm64)
+            if [ "$(getconf LONG_BIT)" -lt 64 ]; then
+                # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
+                echo "arm"
+                return 0
+            fi
             echo "arm64"
             return 0
             ;;

From 01aad64dbdcc2a02583d9ea1ca719f60661eced0 Mon Sep 17 00:00:00 2001
From: gauravsaini04 <147703805+gauravsaini04@users.noreply.github.com>
Date: Fri, 23 Feb 2024 01:23:44 +0530
Subject: [PATCH 229/478] [python]-setuptools-GHSA-r9hx-vwmv-q579-remove
 setuptools-65.5.0-py3-none-any.whl (#866)

* [python]-setuptools-GHSA-r9hx-vwmv-q579-remove setuptools-65.5.0-py3-none-any.whl

* changes based on comments on pr #866

* Tried to answer acc. to last comment

* Added tests to validate when skipVulnerabilityPatching=true
---
 src/python/devcontainer-feature.json          |   2 +-
 src/python/install.sh                         |  41 +++++-
 ...tall_python310_setuptools_vulnerability.sh |  51 ++++++--
 ...ython310_skipVulnerabilityPatching_true.sh | 117 ++++++++++++++++++
 ...tall_python311_setuptools_vulnerability.sh |  51 ++++++--
 test/python/scenarios.json                    |  16 ++-
 6 files changed, 247 insertions(+), 31 deletions(-)
 create mode 100644 test/python/install_python310_skipVulnerabilityPatching_true.sh

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 26f2e5a52..c14dd7b97 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/python/install.sh b/src/python/install.sh
index 9094191f3..fcec73b0c 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -9,6 +9,7 @@
 
 PYTHON_VERSION="${VERSION:-"latest"}" # 'system' or 'os-provided' checks the base image first, else installs 'latest'
 INSTALL_PYTHON_TOOLS="${INSTALLTOOLS:-"true"}"
+SKIP_VULNERABILITY_PATCHING="${SKIPVULNERABILITYPATCHING:-"false"}"
 OPTIMIZE_BUILD_FROM_SOURCE="${OPTIMIZE:-"false"}"
 ENABLE_SHARED_FROM_SOURCE="${ENABLESHARED:-"false"}"
 PYTHON_INSTALL_PATH="${INSTALLPATH:-"/usr/local/python"}"
@@ -750,12 +751,40 @@ if [[ "${INSTALL_PYTHON_TOOLS}" = "true" ]] && [[ -n "${PYTHON_SRC}" ]]; then
     done
     
     # Temporary: Removes “setup tools” metadata directory due to https://github.com/advisories/GHSA-r9hx-vwmv-q579
-
-    VULNERABLE_VERSIONS=("3.10" "3.11")
-    RUN_TIME_PY_VER_DETECT=$(${PYTHON_SRC} --version 2>&1)
-    PY_MAJOR_MINOR_VER=${RUN_TIME_PY_VER_DETECT:7:4};
-    if [[ ${VULNERABLE_VERSIONS[*]} =~ $PY_MAJOR_MINOR_VER ]]; then
-        rm -rf  ${PIPX_HOME}/shared/lib/"python${PY_MAJOR_MINOR_VER}"/site-packages/setuptools-65.5.0.dist-info
+    if [[ $SKIP_VULNERABILITY_PATCHING = "false" ]]; then 
+        VULNERABLE_VERSIONS=("3.10" "3.11")
+        RUN_TIME_PY_VER_DETECT=$(${PYTHON_SRC} --version 2>&1)
+        PY_MAJOR_MINOR_VER=${RUN_TIME_PY_VER_DETECT:7:4};
+        if [[ ${VULNERABLE_VERSIONS[*]} =~ $PY_MAJOR_MINOR_VER ]]; then
+            rm -rf  ${PIPX_HOME}/shared/lib/"python${PY_MAJOR_MINOR_VER}"/site-packages/setuptools-65.5.0.dist-info
+            if [[ -e "/usr/local/lib/python${PY_MAJOR_MINOR_VER}/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl" ]]; then 
+                # remove the vulnerable setuptools-65.5.0-py3-none-any.whl file
+                rm /usr/local/lib/python${PY_MAJOR_MINOR_VER}/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl
+                # create and change to the setuptools_downloaded directory
+                mkdir -p /tmp/setuptools_downloaded
+                cd /tmp/setuptools_downloaded
+                # download the source distribution for setuptools using pip 
+                pip download setuptools==65.5.1 --no-binary :all:
+                # extract the filename of the setuptools-*.tar.gz file
+                filename=$(find . -maxdepth 1 -type f)
+                # create a directory to store unpacked contents of the source distribution
+                mkdir -p /tmp/setuptools_src_dist
+                # extract the contents inside the new directory
+                tar -xzf $filename -C /tmp/setuptools_src_dist
+                # move to the setuptools-* directory inside /setuptools_src_dist
+                cd /tmp/setuptools_src_dist/setuptools-65.5.1/
+                # look for setup.py file in the current directory and create a wheel file
+                python setup.py bdist_wheel
+                # move inside the dist directory in pwd
+                cd dist
+                # copy this file to the ensurepip/_bundled directory 
+                cp setuptools-65.5.1-py3-none-any.whl /usr/local/lib/python${PY_MAJOR_MINOR_VER}/ensurepip/_bundled/
+                # replace the version in __init__.py file with the installed version
+                sed -i 's/_SETUPTOOLS_VERSION = \"65\.5\.0\"/_SETUPTOOLS_VERSION = "65.5.1"/g' /usr/local/lib/"python${PY_MAJOR_MINOR_VER}"/ensurepip/__init__.py
+                # cleanup created dir's
+                rm -rf /tmp/setuptools_downloaded /tmp/setuptools_src_dist
+            fi
+        fi
     fi
 
     rm -rf /tmp/pip-tmp
diff --git a/test/python/install_python310_setuptools_vulnerability.sh b/test/python/install_python310_setuptools_vulnerability.sh
index 0e065b1b3..d097f2113 100644
--- a/test/python/install_python310_setuptools_vulnerability.sh
+++ b/test/python/install_python310_setuptools_vulnerability.sh
@@ -64,22 +64,51 @@ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bi
 check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
 check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
 
-checkVulnerableDir() 
+checkVulnerableFile_OR_DIR()
 {
-    DIRECTORY=$1
-    VERSION=$2
-    
-    if [[ -d $DIRECTORY ]] ; then
-        echoStderr "❌ check for vulnerable setuptools version failed for python ${VERSION}."
-        return 1
+    for arg in "$@"; do
+        if [[ -e $arg ]]; then
+            echo -e "\n✅ Vulnerable:- ${arg} - exists in v3.10 as Vulnerability Patching has been skipped."
+        else
+            echo -e "\n❌ Vulnerable:- ${arg} - don't exist in v3.10 as Vulnerability Patching has not been skipped."
+        fi
+    done
+}
+
+# print setuptools
+check "Show All Files/Folders which include setuptools" bash -c 'find / -name "*setuptools*"'
+
+# only for 3.10
+checkVulnerableFile_OR_DIR "/usr/local/py-utils/shared/lib/python3.10/site-packages/setuptools-65.5.0.dist-info" "/usr/local/lib/python3.10/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl"
+
+# Function to check if a package is installed
+checkPackageInstalled() {
+    if python -c "import $1" &>/dev/null; then
+        echo -e "\n✅ Passed! \n$1 is installed"
     else
-        echo "✅ Passed! Either the container does not have vulnerable version or vulnerable version specific directory got removed."
-        return 0
+        echo -e "$1 is NOT installed\n"
+        echoStderr "❌ check failed."
     fi
 }
 
-# only for 3.10
-checkVulnerableDir "/usr/local/py-utils/shared/lib/python3.10/site-packages/setuptools-65.5.0.dist-info" "3.10"
+# Function to install a package using pip
+installPackage() {
+    python3 -m pip install "$1"
+}
+
+checkPipWorkingCorrectly() {
+    echo -e "\n🧪 Testing whether pip install works fine \n"
+    # List of packages to install via pip
+    packages=("numpy" "requests" "matplotlib")
+    # Install packages and check if installation was successful
+    for package in "${packages[@]}"; do
+        echo -e "\n🧪 Testing pip install $package\n"
+        installPackage "$package"
+        checkPackageInstalled "$package"
+    done
+}
+
+checkPipWorkingCorrectly
 
 # Report result
 reportResults
diff --git a/test/python/install_python310_skipVulnerabilityPatching_true.sh b/test/python/install_python310_skipVulnerabilityPatching_true.sh
new file mode 100644
index 000000000..a6d582e9d
--- /dev/null
+++ b/test/python/install_python310_skipVulnerabilityPatching_true.sh
@@ -0,0 +1,117 @@
+#!/bin/bash
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+FAILED=()
+
+echoStderr()
+{
+    echo "$@" 1>&2
+}
+
+check-version-ge() {
+    LABEL=$1
+    CURRENT_VERSION=$2
+    REQUIRED_VERSION=$3
+    shift
+    echo -e "\n🧪 Testing $LABEL: '$CURRENT_VERSION' is >= '$REQUIRED_VERSION'"
+    local GREATER_VERSION=$((echo ${CURRENT_VERSION}; echo ${REQUIRED_VERSION}) | sort -V | tail -1)
+    if [ "${CURRENT_VERSION}" == "${GREATER_VERSION}" ]; then
+        echo "✅  Passed!"
+        return 0
+    else
+        echoStderr "❌ $LABEL check failed."
+        FAILED+=("$LABEL")
+        return 1
+    fi
+}
+
+checkPythonPackageVersion()
+{
+    PACKAGE=$1
+    REQUIRED_VERSION=$2
+
+    current_version=$(python -c "import importlib.metadata; print(importlib.metadata.version('${PACKAGE}'))")
+    check-version-ge "${PACKAGE}-requirement" "${current_version}" "${REQUIRED_VERSION}"
+}
+
+checkPythonPackageVersion "setuptools" "65.5.1"
+
+# Check that tools can execute - make sure something didn't get messed up in this scenario
+check "autopep8" autopep8 --version
+check "black" black --version
+check "yapf" yapf --version
+check "bandit" bandit --version
+check "flake8" flake8 --version
+check "mypy" mypy --version
+check "pycodestyle" pycodestyle --version
+check "pydocstyle" pydocstyle --version
+check "pylint" pylint --version
+check "pytest" pytest --version
+check "setuptools" pip list | grep setuptools
+
+# Check paths in settings
+check "which autopep8" bash -c "which autopep8 | grep /usr/local/py-utils/bin/autopep8"
+check "which black" bash -c "which black | grep /usr/local/py-utils/bin/black"
+check "which yapf" bash -c "which yapf | grep /usr/local/py-utils/bin/yapf"
+check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit"
+check "which flake8" bash -c "which flake8 | grep /usr/local/py-utils/bin/flake8"
+check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy"
+check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle"
+check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle"
+check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
+check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
+
+HL="\033[1;33m"
+N="\033[0;37m"
+
+checkVulnerableFile_OR_DIR()
+{
+    for arg in "$@"; do
+        if [[ -e $arg ]]; then
+            echo -e "\n✅${HL} Vulnerable:- ${N}${arg} - ${HL}EXISTS ${N}in v3.10 as skipVulnerabilityPatching=true"
+        else
+            echo -e "\n❌${HL} Vulnerable:- ${arg} - ${N}don't ${HL}EXISTS ${N}in v3.10 as skipVulnerabilityPatching=false"
+        fi
+    done
+}
+
+# print setuptools
+check "Show All Files/Folders which include setuptools" bash -c 'find / -name "*setuptools*"'
+
+# only for 3.10
+checkVulnerableFile_OR_DIR "/usr/local/py-utils/shared/lib/python3.10/site-packages/setuptools-65.5.0.dist-info" "/usr/local/lib/python3.10/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl"
+
+# Function to check if a package is installed
+checkPackageInstalled() {
+    if python -c "import $1" &>/dev/null; then
+        echo -e "\n✅ Passed! \n$1 is installed"
+    else
+        echo -e "$1 is NOT installed\n"
+        echoStderr "❌ check failed."
+    fi
+}
+
+# Function to install a package using pip
+installPackage() {
+    python3 -m pip install "$1"
+}
+
+checkPipWorkingCorrectly() {
+    echo -e "\n🧪 Testing whether pip install works fine \n"
+    # List of packages to install via pip
+    packages=("numpy" "requests" "matplotlib")
+    # Install packages and check if installation was successful
+    for package in "${packages[@]}"; do
+        echo -e "\n🧪 Testing pip install $package\n"
+        installPackage "$package"
+        checkPackageInstalled "$package"
+    done
+}
+
+checkPipWorkingCorrectly
+
+# Report result
+reportResults
diff --git a/test/python/install_python311_setuptools_vulnerability.sh b/test/python/install_python311_setuptools_vulnerability.sh
index 04a10948b..969c0ba8d 100644
--- a/test/python/install_python311_setuptools_vulnerability.sh
+++ b/test/python/install_python311_setuptools_vulnerability.sh
@@ -65,22 +65,51 @@ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bi
 check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint"
 check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest"
 
-checkVulnerableDir() 
+checkVulnerableFile_OR_DIR()
 {
-    DIRECTORY=$1
-    VERSION=$2
-    
-    if [[ -d $DIRECTORY ]] ; then
-        echoStderr "❌ check for vulnerable setuptools version failed for python ${VERSION}."
-        return 1
+    for arg in "$@"; do
+        if [[ -e $arg ]]; then
+            echo -e "\n✅ Vulnerable:- ${arg} - exists in v3.11 as Vulnerability Patching has been skipped."
+        else
+            echo -e "\n❌ Vulnerable:- ${arg} - don't exist in v3.11 as Vulnerability Patching has not been skipped."
+        fi
+    done
+}
+
+# print setuptools
+check "Show All Files/Folders which include setuptools" bash -c 'find / -name "*setuptools*"'
+
+# only for 3.11
+checkVulnerableFile_OR_DIR "/usr/local/py-utils/shared/lib/python3.11/site-packages/setuptools-65.5.0.dist-info" "/usr/local/lib/python3.11/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl"
+
+# Function to check if a package is installed
+checkPackageInstalled() {
+    if python -c "import $1" &>/dev/null; then
+        echo -e "\n✅ Passed! \n$1 is installed"
     else
-        echo "✅ Passed! Either the container does not have vulnerable version or vulnerable version specific directory got removed."
-        return 0
+        echo -e "$1 is NOT installed\n"
+        echoStderr "❌ check failed."
     fi
 }
 
-# only for 3.11
-checkVulnerableDir "/usr/local/py-utils/shared/lib/python3.11/site-packages/setuptools-65.5.0.dist-info" "3.11"
+# Function to install a package using pip
+installPackage() {
+    python3 -m pip install "$1"
+}
+
+checkPipWorkingCorrectly() {
+    echo -e "\n🧪 Testing whether pip install works fine \n"
+    # List of packages to install via pip
+    packages=("numpy" "requests" "matplotlib")
+    # Install packages and check if installation was successful
+    for package in "${packages[@]}"; do
+        echo -e "\n🧪 Testing pip install $package\n"
+        installPackage "$package"
+        checkPackageInstalled "$package"
+    done
+}
+
+checkPipWorkingCorrectly
 
 # Report result
 reportResults
diff --git a/test/python/scenarios.json b/test/python/scenarios.json
index d574c84e8..920e4f541 100644
--- a/test/python/scenarios.json
+++ b/test/python/scenarios.json
@@ -1,10 +1,21 @@
 {
+    "install_python310_skipVulnerabilityPatching_true": {
+        "image": "python:3.10",
+        "features": {
+            "python": {
+                "version": "none",
+                "installTools": true,
+                "skipVulnerabilityPatching": true
+            }
+        }
+    },
     "install_python310_setuptools_vulnerability": {
         "image": "python:3.10",
         "features": {
             "python": {
                 "version": "none",
-                "installTools": true
+                "installTools": true,
+                "skipVulnerabilityPatching": false
             }
         }
     },
@@ -13,7 +24,8 @@
         "features": {
             "python": {
                 "version": "none",
-                "installTools": true
+                "installTools": true,
+                "skipVulnerabilityPatching": false
             }
         }
     },

From 403c8964de8b1ec123c23ccef95b2a449b13ab16 Mon Sep 17 00:00:00 2001
From: gauravsaini04 <147703805+gauravsaini04@users.noreply.github.com>
Date: Fri, 23 Feb 2024 05:27:16 +0530
Subject: [PATCH 230/478] [ docker-in-docker ] - buildx can fallback to
 previous version if latest artifact not found (#869)

* [ docker-in-docker ] - buildx fallback to prev. version

* corrected the command inside get_previous_version fn to get the second to latest version instead

* changes in response to comments by @samruddhikhandale

* minor change

* changes as requested in comments by @samruddhikhandale
---
 .../devcontainer-feature.json                 |  2 +-
 src/docker-in-docker/install.sh               | 30 +++++-
 .../docker_build_fallback_buildx.sh           | 95 +++++++++++++++++++
 test/docker-in-docker/scenarios.json          | 11 +++
 4 files changed, 133 insertions(+), 5 deletions(-)
 create mode 100644 test/docker-in-docker/docker_build_fallback_buildx.sh

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 744bc1d81..5c62a057d 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.9.0",
+    "version": "2.9.1",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index db3cefc6a..8943c91a6 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -139,7 +139,7 @@ else
 fi
 
 # Install dependencies
-check_packages apt-transport-https curl ca-certificates pigz iptables gnupg2 dirmngr wget
+check_packages apt-transport-https curl ca-certificates pigz iptables gnupg2 dirmngr wget jq
 if ! type git > /dev/null 2>&1; then
     check_packages git
 fi
@@ -332,14 +332,36 @@ fi
 
 usermod -aG docker ${USERNAME}
 
+# Function to fetch the version released prior to the latest version
+get_previous_version() {
+    repo_url=$1
+    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[1].tag_name' # this would del the assets key and then get the second encountered tag_name's value from the filtered array of objects
+}
+
+install_previous_version_artifacts() {
+    wget_exit_code=$?
+    if [ $wget_exit_code -eq 8 ]; then  # failure due to 404: Not Found.
+        echo -e "\n(!) Failed to fetch the latest artifacts for docker buildx v${buildx_version}..."
+        repo_url="https://api.github.com/repos/docker/buildx/releases" # GitHub repository URL
+        previous_version=$(get_previous_version "${repo_url}")
+        buildx_file_name="buildx-${previous_version}.linux-${architecture}"
+        echo -e "\nAttempting to install ${previous_version}"
+        wget https://github.com/docker/buildx/releases/download/${previous_version}/${buildx_file_name}
+    else
+        echo "(!) Failed to download docker buildx with exit code: $wget_exit_code"
+        exit 1
+    fi
+}
+ 
 if [ "${INSTALL_DOCKER_BUILDX}" = "true" ]; then
     buildx_version="latest"
     find_version_from_git_tags buildx_version "https://github.com/docker/buildx" "refs/tags/v"
-
     echo "(*) Installing buildx ${buildx_version}..."
     buildx_file_name="buildx-v${buildx_version}.linux-${architecture}"
-    cd /tmp && wget "https://github.com/docker/buildx/releases/download/v${buildx_version}/${buildx_file_name}"
-
+    
+    cd /tmp
+    wget https://github.com/docker/buildx/releases/download/v${buildx_version}/${buildx_file_name} || install_previous_version_artifacts
+    
     docker_home="/usr/libexec/docker"
     cli_plugins_dir="${docker_home}/cli-plugins"
 
diff --git a/test/docker-in-docker/docker_build_fallback_buildx.sh b/test/docker-in-docker/docker_build_fallback_buildx.sh
new file mode 100644
index 000000000..8d30d2a46
--- /dev/null
+++ b/test/docker-in-docker/docker_build_fallback_buildx.sh
@@ -0,0 +1,95 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests before test for fallback
+HL="\033[1;33m"
+N="\033[0;37m"
+echo -e "\n👉${HL} docker/buildx version as installed by docker-in-docker feature${N}"
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+check "docker-buildx" bash -c "docker buildx version"
+check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
+
+echo -e "\n👉${HL} Creating a scenario for fallback${N}\n"
+# Code to test the made up scenario when latest version of docker/buildx fails on wget command for fetching the artifacts
+repo_url="https://api.github.com/repos/docker/buildx/releases" # GitHub repository URL
+architecture="$(dpkg --print-architecture)"
+
+# Function to fetch the latest version of the plugin
+get_latest_version() {
+    curl -s "$repo_url/latest" | jq -r '.tag_name'
+}
+
+# Function to fetch the previous version of the plugin
+get_previous_version() {
+    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[1].tag_name' # this would del the assets key and then get the second encountered tag_name's value from the filtered array of objects
+}
+
+# Function to change the patch number in a semver version
+change_patch_number() {
+    local version="$1"  # Input version
+    local new_patch="$2"  # New patch number
+    # Extract major, minor, and current patch numbers
+    local major=$(echo "$version" | cut -d. -f1)
+    local minor=$(echo "$version" | cut -d. -f2)
+    local current_patch=$(echo "$version" | cut -d. -f3)
+    # Construct the new version with the updated patch number
+    local new_version="$major.$minor.$new_patch"
+    echo "$new_version"
+}
+
+change_version_to_fail() {
+    latest_version=$1
+    new_patch_number="xyz" # for testing a tag not found scenario for docker/buildx plugin
+    latest_version=$(get_latest_version)  # can take latest_version from fn get_latest_version
+    buildx_version_fallback_test=$(change_patch_number "$latest_version" "$new_patch_number") # for testing a tag not found scenario for docker/buildx plugin
+    echo "${buildx_version_fallback_test}"
+}
+
+install_previous_version_artifacts() {
+    wget_exit_code=$?
+    if [ $wget_exit_code -ne 0 ]; then # means wget command to fetch latest version failed
+        if [ $wget_exit_code -eq 8 ]; then  # failure due to 404: Not Found.
+            echo -e "\n(!) Failed to fetch the latest artifacts for docker buildx ${buildx_version}..."
+            previous_version=$(get_previous_version)
+            echo -e "\nAttempting to install ${previous_version}"
+            buildx_file_name="buildx-${previous_version}.linux-${architecture}"
+            wget https://github.com/docker/buildx/releases/download/${previous_version}/${buildx_file_name}
+        else
+            echo "(!) Failed to download docker buildx with exit code: $wget_exit_code"
+            exit 1
+        fi
+    fi
+}
+    
+test_version=$(change_version_to_fail "$(get_latest_version)")
+buildx_file_name="buildx-${test_version}.linux-${architecture}"
+buildx_version=$test_version
+
+# This wget command will fail as the wrong version won't fetch artifact
+wget https://github.com/docker/buildx/releases/download/${buildx_version}/${buildx_file_name} || install_previous_version_artifacts
+
+docker_home="/usr/libexec/docker"
+cli_plugins_dir="${docker_home}/cli-plugins"
+
+mkdir -p ${cli_plugins_dir}
+mv ${buildx_file_name} ${cli_plugins_dir}/docker-buildx
+chmod +x ${cli_plugins_dir}/docker-buildx
+
+chown -R "${USERNAME}:docker" "${docker_home}"
+chmod -R g+r+w "${docker_home}"
+find "${docker_home}" -type d -print0 | xargs -n 1 -0 chmod g+s
+
+# Definition specific tests after test for fallback
+echo -e "\n👉${HL} docker/buildx version as installed by test for fallback${N}"
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+check "docker-buildx" bash -c "docker buildx version"
+check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
+
+# Report result
+reportResults
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index 6de695555..df27d6c28 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -87,6 +87,17 @@
             }
         }
     },
+    "docker_build_fallback_buildx": {
+        "image": "ubuntu:focal",
+        "features": {
+            "docker-in-docker": {
+                "version": "latest",
+                "installDockerBuildx": true,
+                "moby": "false",
+                "dockerDashComposeVersion": "v2"
+            }
+        }
+    },
     // DO NOT REMOVE: This scenario is used by the docker-in-docker-stress-test workflow
     "docker_with_on_create_command": {
         "image": "mcr.microsoft.com/devcontainers/base:debian",

From c04ead01d2dd154dc782d3bb610e08e6d740b77c Mon Sep 17 00:00:00 2001
From: Nebula <40148908+nebula-it@users.noreply.github.com>
Date: Thu, 22 Feb 2024 16:51:04 -0800
Subject: [PATCH 231/478] Add support for including PowerShell profile (#804)

* Add support for including PowerShell profile

* Update version in devcontainer-feature.json

* Add powershellProfileURL  to options

* Update src/powershell/devcontainer-feature.json

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Update README.md

* Create testProfile.ps1

Added a Profile for testing

* Add powershell profile test

* Update install_modules.sh

* Undo README.md changes

* Update scenarios.json

* Delete test/powershell/testProfile.ps1

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
---
 src/powershell/devcontainer-feature.json | 9 +++++++--
 src/powershell/install.sh                | 7 +++++++
 test/powershell/install_modules.sh       | 1 +
 test/powershell/scenarios.json           | 3 ++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json
index c72923fdc..0c15b6888 100644
--- a/src/powershell/devcontainer-feature.json
+++ b/src/powershell/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "powershell",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "name": "PowerShell",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
     "description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -19,6 +19,11 @@
             "type": "string",
             "default": "",
             "description": "Optional comma separated list of PowerShell modules to install."
+        },
+        "powershellProfileURL ": {
+            "type": "string",
+            "default": "",
+            "description": "Optional (publicly accessible) URL to download PowerShell profile."
         }
     },
     "customizations": {
@@ -31,4 +36,4 @@
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
-}
\ No newline at end of file
+}
diff --git a/src/powershell/install.sh b/src/powershell/install.sh
index 666071f55..dadbc306f 100755
--- a/src/powershell/install.sh
+++ b/src/powershell/install.sh
@@ -14,6 +14,7 @@ rm -rf /var/lib/apt/lists/*
 
 POWERSHELL_VERSION=${VERSION:-"latest"}
 POWERSHELL_MODULES="${MODULES}"
+POWERSHELL_PROFILE_URL="${PROFILE_URL}"
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 POWERSHELL_ARCHIVE_ARCHITECTURES="amd64"
@@ -162,6 +163,12 @@ if [ ${#POWERSHELL_MODULES[@]} -gt 0 ]; then
     done
 fi
 
+# If URL for powershell profile is provided, download it to '/opt/microsoft/powershell/7/profile.ps1'
+if [ -n "$POWERSHELL_PROFILE_URL" ]; then
+    echo "Downloading PowerShell Profile from: $POWERSHELL_PROFILE_URL"
+    curl -sSL -o "/opt/microsoft/powershell/7/profile.ps1" "$POWERSHELL_PROFILE_URL"
+fi
+
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
diff --git a/test/powershell/install_modules.sh b/test/powershell/install_modules.sh
index 0bb0172e6..1415af2c1 100644
--- a/test/powershell/install_modules.sh
+++ b/test/powershell/install_modules.sh
@@ -8,6 +8,7 @@ source dev-container-features-test-lib
 # Extension-specific tests
 check "az.resources" pwsh -Command "(Get-Module -ListAvailable -Name Az.Resources).Version.ToString()"
 check "az.storage" pwsh -Command "(Get-Module -ListAvailable -Name Az.Storage).Version.ToString()"
+check "profile" pwsh -Command "(Get-Variable $env:ProfileLoaded).Value"
 
 # Report result
 reportResults
diff --git a/test/powershell/scenarios.json b/test/powershell/scenarios.json
index 8ced96498..b2659d7ad 100644
--- a/test/powershell/scenarios.json
+++ b/test/powershell/scenarios.json
@@ -3,7 +3,8 @@
     "image": "mcr.microsoft.com/devcontainers/base:jammy",
     "features": {
       "powershell": {
-        "modules": "az.resources, az.storage"
+        "modules": "az.resources, az.storage",
+        "powershellProfileURL": "https://raw.githubusercontent.com/codspace/powershell-profile/main/Test-Profile.ps1"
       }
     }
   }

From f4f492ce2b9c11afc441870424aef560de4f092c Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Thu, 22 Feb 2024 16:57:10 -0800
Subject: [PATCH 232/478] Automated documentation update (#874)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/powershell/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/powershell/README.md b/src/powershell/README.md
index 6112de79e..a44614604 100644
--- a/src/powershell/README.md
+++ b/src/powershell/README.md
@@ -17,6 +17,7 @@ Installs PowerShell along with needed dependencies. Useful for base Dockerfiles
 |-----|-----|-----|-----|
 | version | Select or enter a version of PowerShell. | string | latest |
 | modules | Optional comma separated list of PowerShell modules to install. | string | - |
+| powershellProfileURL  | Optional (publicly accessible) URL to download PowerShell profile. | string | - |
 
 ## Customizations
 

From 758b0322d412df9d43274a4ac882e312d56a2d1d Mon Sep 17 00:00:00 2001
From: Lucas Fernando Cardoso Nunes <lucasfc.nunes@gmail.com>
Date: Fri, 23 Feb 2024 16:42:24 -0300
Subject: [PATCH 233/478] sync `install.sh` to `devcontainer-feature.json`
 default values (#867)

* add default value to MOBYBUILDXVERSION

Signed-off-by: Lucas Fernando Cardoso Nunes <lucasfc.nunes@gmail.com>

* bump updated features patch versions

Signed-off-by: Lucas Fernando Cardoso Nunes <lucasfc.nunes@gmail.com>

* sync missing default values to `install.sh`

find `^[A-Z0-9_]+="\$\{[^:]+?\}`
on `install.sh` files

Signed-off-by: Lucas Fernando Cardoso Nunes <lucasfc.nunes@gmail.com>

---------

Signed-off-by: Lucas Fernando Cardoso Nunes <lucasfc.nunes@gmail.com>
---
 src/docker-in-docker/install.sh                        | 4 ++--
 src/docker-outside-of-docker/devcontainer-feature.json | 2 +-
 src/docker-outside-of-docker/install.sh                | 2 +-
 src/dotnet/devcontainer-feature.json                   | 2 +-
 src/dotnet/install.sh                                  | 6 +++---
 src/java/devcontainer-feature.json                     | 2 +-
 src/java/install.sh                                    | 2 +-
 src/powershell/devcontainer-feature.json               | 2 +-
 src/powershell/install.sh                              | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 8943c91a6..889d1dbb2 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -10,10 +10,10 @@
 
 DOCKER_VERSION="${VERSION:-"latest"}" # The Docker/Moby Engine + CLI should match in version
 USE_MOBY="${MOBY:-"true"}"
-MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION}"
+MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"0.12.0"}"
 DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2 or none
 AZURE_DNS_AUTO_DETECTION="${AZUREDNSAUTODETECTION:-"true"}"
-DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL}"
+DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL:-""}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 78ad1162c..a17757c06 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 988b7e43c..da936235c 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -9,7 +9,7 @@
 
 DOCKER_VERSION="${VERSION:-"latest"}"
 USE_MOBY="${MOBY:-"true"}"
-MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION}"
+MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"0.12.0"}"
 DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2 or none
 
 ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"
diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index 878a95d3f..78a061d23 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.0.4",
+    "version": "2.0.5",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh
index ff9244d3a..237a8a0be 100644
--- a/src/dotnet/install.sh
+++ b/src/dotnet/install.sh
@@ -7,9 +7,9 @@
 # Docs: https://github.com/devcontainers/features/tree/main/src/dotnet
 # Maintainer: The Dev Container spec maintainers
 DOTNET_VERSION="${VERSION:-"latest"}"
-ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS}"
-DOTNET_RUNTIME_VERSIONS="${DOTNETRUNTIMEVERSIONS}"
-ASPNETCORE_RUNTIME_VERSIONS="${ASPNETCORERUNTIMEVERSIONS}"
+ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
+DOTNET_RUNTIME_VERSIONS="${DOTNETRUNTIMEVERSIONS:-""}"
+ASPNETCORE_RUNTIME_VERSIONS="${ASPNETCORERUNTIMEVERSIONS:-""}"
 
 set -e
 
diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index f65a8f360..9ed72ad59 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "name": "Java (via SDKMAN!)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
diff --git a/src/java/install.sh b/src/java/install.sh
index 37cb9e52b..30b6cb10c 100644
--- a/src/java/install.sh
+++ b/src/java/install.sh
@@ -18,7 +18,7 @@ INSTALL_ANT="${INSTALLANT:-"false"}"
 ANT_VERSION="${ANTVERSION:-"latest"}"
 INSTALL_GROOVY="${INSTALLGROOVY:-"false"}"
 GROOVY_VERSION="${GROOVYVERSION:-"latest"}"
-JDK_DISTRO="${JDKDISTRO}"
+JDK_DISTRO="${JDKDISTRO:-"ms"}"
 
 export SDKMAN_DIR="${SDKMAN_DIR:-"/usr/local/sdkman"}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json
index 0c15b6888..5a831f7e3 100644
--- a/src/powershell/devcontainer-feature.json
+++ b/src/powershell/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "powershell",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "name": "PowerShell",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
     "description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/powershell/install.sh b/src/powershell/install.sh
index dadbc306f..2c052d7cd 100755
--- a/src/powershell/install.sh
+++ b/src/powershell/install.sh
@@ -13,7 +13,7 @@ set -e
 rm -rf /var/lib/apt/lists/*
 
 POWERSHELL_VERSION=${VERSION:-"latest"}
-POWERSHELL_MODULES="${MODULES}"
+POWERSHELL_MODULES="${MODULES:-""}"
 POWERSHELL_PROFILE_URL="${PROFILE_URL}"
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"

From a8dc2dbb5909de35662067bb9428a7aafc10d3fe Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Mon, 26 Feb 2024 09:28:00 -0800
Subject: [PATCH 234/478] Docker: Unpin "mobyBuildxVersion" (#877)

---
 .../devcontainer-feature.json                 |  6 +++---
 src/docker-in-docker/install.sh               | 14 +++++++------
 .../devcontainer-feature.json                 |  6 +++---
 src/docker-outside-of-docker/install.sh       |  2 +-
 .../docker_specific_moby_buildx.sh            | 20 +++++++++++++++++++
 test/docker-in-docker/scenarios.json          |  8 ++++++++
 test/docker-in-docker/test.sh                 |  1 +
 .../docker_specific_moby_buildx.sh            | 19 ++++++++++++++++++
 test/docker-outside-of-docker/scenarios.json  |  8 ++++++++
 test/docker-outside-of-docker/test.sh         |  1 +
 10 files changed, 72 insertions(+), 13 deletions(-)
 create mode 100755 test/docker-in-docker/docker_specific_moby_buildx.sh
 create mode 100755 test/docker-outside-of-docker/docker_specific_moby_buildx.sh

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 5c62a057d..d74f205a1 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.9.1",
+    "version": "2.9.2",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
@@ -22,8 +22,8 @@
         },
         "mobyBuildxVersion": {
             "type": "string",
-            "default": "0.12.0",
-            "description": "Install a specific version of moby-buildx when using Moby. (2024-02-09: Microsoft's Package Manifest has mismatching filesize and SHA for 0.12.1; default is last known good version)"
+            "default": "latest",
+            "description": "Install a specific version of moby-buildx when using Moby"
         },
         "dockerDashComposeVersion": {
             "type": "string",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 889d1dbb2..9f0e18cee 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -10,7 +10,7 @@
 
 DOCKER_VERSION="${VERSION:-"latest"}" # The Docker/Moby Engine + CLI should match in version
 USE_MOBY="${MOBY:-"true"}"
-MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"0.12.0"}"
+MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"latest"}"
 DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2 or none
 AZURE_DNS_AUTO_DETECTION="${AZUREDNSAUTODETECTION:-"true"}"
 DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL:-""}"
@@ -228,11 +228,13 @@ else
         # Install engine
         set +e # Handle error gracefully
             apt-get -y install --no-install-recommends moby-cli${cli_version_suffix} moby-buildx${buildx_version_suffix} moby-engine${engine_version_suffix}
-            if [ $? -ne 0 ]; then
-                err "Packages for moby not available in OS ${ID} ${VERSION_CODENAME} (${architecture}). To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS version (eg: 'ubuntu-20.04')."
-                exit 1
-            fi
-        set -e
+            exit_code=$?
+        set -e    
+        
+        if [ ${exit_code} -ne 0 ]; then
+            err "Packages for moby not available in OS ${ID} ${VERSION_CODENAME} (${architecture}). To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS version (eg: 'ubuntu-20.04')."
+            exit 1
+        fi
 
         # Install compose
         apt-get -y install --no-install-recommends moby-compose || err "Package moby-compose (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index a17757c06..d4c1447ba 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.4.1",
+    "version": "1.4.2",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
@@ -22,8 +22,8 @@
         },
         "mobyBuildxVersion": {
             "type": "string",
-            "default": "0.12.0",
-            "description": "Install a specific version of moby-buildx when using Moby. (2024-02-09: Microsoft's Package Manifest has mismatching filesize and SHA for 0.12.1; default is last known good version)"
+            "default": "latest",
+            "description": "Install a specific version of moby-buildx when using Moby"
         },
         "dockerDashComposeVersion": {
             "type": "string",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index da936235c..65424740e 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -9,7 +9,7 @@
 
 DOCKER_VERSION="${VERSION:-"latest"}"
 USE_MOBY="${MOBY:-"true"}"
-MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"0.12.0"}"
+MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"latest"}"
 DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2 or none
 
 ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"
diff --git a/test/docker-in-docker/docker_specific_moby_buildx.sh b/test/docker-in-docker/docker_specific_moby_buildx.sh
new file mode 100755
index 000000000..1ca2b20bd
--- /dev/null
+++ b/test/docker-in-docker/docker_specific_moby_buildx.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+# Definition specific tests
+check "moby-buildx" bash -c "dpkg-query -W moby-buildx  | grep -E '0.12.0'"
+
+check "docker-buildx" bash -c "docker buildx version"
+check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
+
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+
+check "installs docker-compose v1 install" bash -c "type docker-compose"
+check "installs compose-switch" bash -c "[[ -f /usr/local/bin/compose-switch ]]"
+
+# Report result
+reportResults
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index df27d6c28..ccf57b188 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -98,6 +98,14 @@
             }
         }
     },
+    "docker_specific_moby_buildx": {
+        "image": "ubuntu:focal",
+        "features": {
+            "docker-in-docker": {
+                "mobyBuildxVersion": "0.12.0"
+            }
+        }
+    },
     // DO NOT REMOVE: This scenario is used by the docker-in-docker-stress-test workflow
     "docker_with_on_create_command": {
         "image": "mcr.microsoft.com/devcontainers/base:debian",
diff --git a/test/docker-in-docker/test.sh b/test/docker-in-docker/test.sh
index e86a841c2..10a7232b6 100755
--- a/test/docker-in-docker/test.sh
+++ b/test/docker-in-docker/test.sh
@@ -12,6 +12,7 @@ check "docker-ps" bash -c "docker ps"
 check "log-exists" bash -c "ls /tmp/dockerd.log"
 check "log-for-completion" bash -c "cat /tmp/dockerd.log | grep 'Daemon has completed initialization'"
 check "log-contents" bash -c "cat /tmp/dockerd.log | grep 'API listen on /var/run/docker.sock'"
+check "moby-buildx" bash -c "dpkg-query -W moby-buildx"
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/docker-outside-of-docker/docker_specific_moby_buildx.sh b/test/docker-outside-of-docker/docker_specific_moby_buildx.sh
new file mode 100755
index 000000000..929fa6080
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_specific_moby_buildx.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+# Definition specific tests
+check "moby-buildx" bash -c "dpkg-query -W moby-buildx  | grep -E '0.12.0'"
+
+check "docker-buildx" bash -c "docker buildx version"
+check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
+
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+
+check "installs docker-compose v1 install" bash -c "type docker-compose"
+
+# Report result
+reportResults
diff --git a/test/docker-outside-of-docker/scenarios.json b/test/docker-outside-of-docker/scenarios.json
index 3b82c6cc5..61f1ab402 100644
--- a/test/docker-outside-of-docker/scenarios.json
+++ b/test/docker-outside-of-docker/scenarios.json
@@ -124,5 +124,13 @@
             }
         },
         "remoteUser": "node"
+    },
+    "docker_specific_moby_buildx": {
+        "image": "ubuntu:focal",
+        "features": {
+            "docker-outside-of-docker": {
+                "mobyBuildxVersion": "0.12.0"
+            }
+        }
     }
 }
diff --git a/test/docker-outside-of-docker/test.sh b/test/docker-outside-of-docker/test.sh
index fe9098e10..5206f5977 100644
--- a/test/docker-outside-of-docker/test.sh
+++ b/test/docker-outside-of-docker/test.sh
@@ -10,6 +10,7 @@ check "docker compose" bash -c "docker compose version"
 check "docker-compose" bash -c "docker-compose --version"
 
 check "docker-ps" bash -c "docker ps >/dev/null"
+check "moby-buildx" bash -c "dpkg-query -W moby-buildx"
 
 # Report result
 reportResults
\ No newline at end of file

From 979c12bd966bb4ded8e9ac74a2b656f3eeaa77d0 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Mon, 26 Feb 2024 09:30:24 -0800
Subject: [PATCH 235/478] Automated documentation update (#881)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/docker-in-docker/README.md         | 2 +-
 src/docker-outside-of-docker/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index 41004b7e1..2ab700118 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -17,7 +17,7 @@ Create child containers *inside* a container, independent from the host's docker
 |-----|-----|-----|-----|
 | version | Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.) | string | latest |
 | moby | Install OSS Moby build instead of Docker CE | boolean | true |
-| mobyBuildxVersion | Install a specific version of moby-buildx when using Moby. (2024-02-09: Microsoft's Package Manifest has mismatching filesize and SHA for 0.12.1; default is last known good version) | string | 0.12.0 |
+| mobyBuildxVersion | Install a specific version of moby-buildx when using Moby | string | latest |
 | dockerDashComposeVersion | Default version of Docker Compose (v1 or v2 or none) | string | v1 |
 | azureDnsAutoDetection | Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure | boolean | true |
 | dockerDefaultAddressPool | Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24 | string | - |
diff --git a/src/docker-outside-of-docker/README.md b/src/docker-outside-of-docker/README.md
index 7e352af05..18fe79573 100644
--- a/src/docker-outside-of-docker/README.md
+++ b/src/docker-outside-of-docker/README.md
@@ -19,7 +19,7 @@ Re-use the host docker socket, adding the Docker CLI to a container. Feature inv
 |-----|-----|-----|-----|
 | version | Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.) | string | latest |
 | moby | Install OSS Moby build instead of Docker CE | boolean | true |
-| mobyBuildxVersion | Install a specific version of moby-buildx when using Moby. (2024-02-09: Microsoft's Package Manifest has mismatching filesize and SHA for 0.12.1; default is last known good version) | string | 0.12.0 |
+| mobyBuildxVersion | Install a specific version of moby-buildx when using Moby | string | latest |
 | dockerDashComposeVersion | Compose version to use for docker-compose (v1 or v2 or none) | string | v2 |
 | installDockerBuildx | Install Docker Buildx | boolean | true |
 

From 0604e45e6bcc6f4fa0fa6b4ea5ab58f47b2acba8 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 27 Feb 2024 09:20:42 -0800
Subject: [PATCH 236/478] Oryx: Fix build failures ; pin to .NET 8.0.101 (#882)

* Oryx: Fix build failures ; pin to .NET 8.0.101

* fix build

* fix "install_dotnet_and_oryx"
---
 .../update-dotnet-install-script.yml          |    9 +
 src/oryx/devcontainer-feature.json            |    2 +-
 src/oryx/install.sh                           |   43 +-
 src/oryx/scripts/vendor/README.md             |   27 +
 src/oryx/scripts/vendor/dotnet-install.sh     | 1844 +++++++++++++++++
 5 files changed, 1921 insertions(+), 4 deletions(-)
 create mode 100644 src/oryx/scripts/vendor/README.md
 create mode 100755 src/oryx/scripts/vendor/dotnet-install.sh

diff --git a/.github/workflows/update-dotnet-install-script.yml b/.github/workflows/update-dotnet-install-script.yml
index ebd175cff..85a9ea4d8 100644
--- a/.github/workflows/update-dotnet-install-script.yml
+++ b/.github/workflows/update-dotnet-install-script.yml
@@ -25,6 +25,9 @@ jobs:
           set -e
           echo "Start."
 
+          # Update dotnet-install for Oryx Feature as well
+          cp src/dotnet/scripts/vendor/dotnet-install.sh src/oryx/scripts/vendor/dotnet-install.sh
+
           # Configure git and Push updates
           git config --global user.email github-actions@github.com
           git config --global user.name github-actions
@@ -36,12 +39,18 @@ jobs:
 
           # Add / update and commit
           git add src/dotnet/scripts/vendor/dotnet-install.sh
+          git add src/dotnet/scripts/vendor/dotnet-install.sh
+
           git commit -m 'Automated dotnet-install script update' || export NO_UPDATES=true
 
           # Bump version and push
           if [ "$NO_UPDATES" != "true" ] ; then
               echo "$(jq --indent 4 '.version = (.version | split(".") | map(tonumber) | .[2] += 1 | join("."))' src/dotnet/devcontainer-feature.json)"  > src/dotnet/devcontainer-feature.json 
               git add src/dotnet/devcontainer-feature.json
+
+              echo "$(jq --indent 4 '.version = (.version | split(".") | map(tonumber) | .[2] += 1 | join("."))' src/oryx/devcontainer-feature.json)"  > src/oryx/devcontainer-feature.json
+              git add src/oryx/devcontainer-feature.json
+
               git commit -m 'Bump version'
               git push origin "$branch"
               gh api \
diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index aae6d43db..fe13e2fcb 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "oryx",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "name": "Oryx",
     "description": "Installs the oryx CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
diff --git a/src/oryx/install.sh b/src/oryx/install.sh
index a16890bef..f4c547fb5 100755
--- a/src/oryx/install.sh
+++ b/src/oryx/install.sh
@@ -70,6 +70,25 @@ check_packages() {
     fi
 }
 
+install_dotnet_with_script()
+{
+    local version="$1"
+    CURRENT_DIR=$(dirname "${BASH_SOURCE[0]}")
+    DOTNET_INSTALL_SCRIPT="$CURRENT_DIR/scripts/vendor/dotnet-install.sh"
+    DOTNET_INSTALL_DIR='/usr/share/dotnet'
+
+    check_packages icu-devtools
+
+    "$DOTNET_INSTALL_SCRIPT" \
+        --version "$version" \
+        --install-dir "$DOTNET_INSTALL_DIR" \
+        --no-path
+
+    DOTNET_BINARY="dotnet"
+    export PATH="${PATH}:/usr/share/dotnet"
+    DOTNET_BINARY_INSTALLATION="/usr/share/dotnet/sdk/${version}"
+}
+
 install_dotnet_using_apt() {
     echo "Attempting to auto-install dotnet..."
     install_from_microsoft_feed=false
@@ -86,6 +105,7 @@ install_dotnet_using_apt() {
         DOTNET_SKIP_FIRST_TIME_EXPERIENCE="true" apt-get install -yq $DOTNET_INSTALLATION_PACKAGE
     fi
 
+    DOTNET_BINARY="/usr/bin/dotnet"
     echo -e "Finished attempt to install dotnet.  Sdks installed:\n"
     dotnet --list-sdks
 
@@ -126,6 +146,7 @@ usermod -a -G oryx "${USERNAME}"
 
 # Required to decide if we want to clean up dotnet later.
 DOTNET_INSTALLATION_PACKAGE=""
+DOTNET_BINARY_INSTALLATION=""
 DOTNET_BINARY=""
 
 if dotnet --version > /dev/null ; then
@@ -133,18 +154,23 @@ if dotnet --version > /dev/null ; then
 fi
 
 MAJOR_VERSION_ID=$(echo $(dotnet --version) | cut -d . -f 1)
+PATCH_VERSION_ID=$(echo $(dotnet --version) | cut -d . -f 3)
 
 # Oryx needs to be built with .NET 8
-if [[ "${DOTNET_BINARY}" = "" ]] || [[ $MAJOR_VERSION_ID != "8" ]] ; then
+if [[ "${DOTNET_BINARY}" = "" ]] || [[ $MAJOR_VERSION_ID != "8" ]] || [[ $MAJOR_VERSION_ID = "8" && ${PATCH_VERSION_ID} -ge "101" ]] ; then
     echo "'dotnet 8' was not detected. Attempting to install .NET 8 to build oryx."
-    install_dotnet_using_apt
+
+    # The oryx build fails with .Net 8.0.201, see https://github.com/devcontainers/images/issues/974
+    # Pinning it to a working version until the upstream Oryx repo updates the dependency
+    # install_dotnet_using_apt
+    PINNED_SDK_VERSION="8.0.101"
+    install_dotnet_with_script ${PINNED_SDK_VERSION}
 
     if ! dotnet --version > /dev/null ; then
         echo "(!) Please install Dotnet before installing Oryx"
         exit 1
     fi
 
-    DOTNET_BINARY="/usr/bin/dotnet"
 fi
 
 BUILD_SCRIPT_GENERATOR=/usr/local/buildscriptgen
@@ -156,6 +182,11 @@ mkdir -p ${ORYX}
 
 git clone --depth=1 https://github.com/microsoft/Oryx $GIT_ORYX
 
+if [[ "${DOTNET_BINARY_INSTALLATION}" != "" ]]; then
+    cd $GIT_ORYX
+    dotnet new globaljson --sdk-version ${PINNED_SDK_VERSION}
+fi
+
 SOLUTION_FILE_NAME="Oryx.sln"
 echo "Building solution '$SOLUTION_FILE_NAME'..."
 
@@ -203,6 +234,12 @@ if [[ "${DOTNET_INSTALLATION_PACKAGE}" != "" ]]; then
     apt purge -yq $DOTNET_INSTALLATION_PACKAGE
 fi
 
+if [[ "${DOTNET_BINARY_INSTALLATION}" != "" ]]; then
+    rm -f ${GIT_ORYX}/global.json
+    rm -rf ${DOTNET_BINARY_INSTALLATION}
+fi
+
+
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
diff --git a/src/oryx/scripts/vendor/README.md b/src/oryx/scripts/vendor/README.md
new file mode 100644
index 000000000..181b53781
--- /dev/null
+++ b/src/oryx/scripts/vendor/README.md
@@ -0,0 +1,27 @@
+### **IMPORTANT NOTE**
+
+Scripts in this directory are sourced externally and not maintained by the Dev Container spec maintainers. Do not make changes directly as they might be overwritten at any moment.
+
+## dotnet-install.sh
+
+`dotnet-install.sh` is a copy of <https://dot.net/v1/dotnet-install.sh>. ([Script reference](https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script))
+
+Quick options reminder for `dotnet-install.sh`:
+
+- `--version`: `"latest"` (default) or an exact version in the form A.B.C like `"6.0.413"`
+- `--channel`: `"LTS"` (default), `"STS"`, a two-part version in the form A.B like `"6.0"` or three-part form A.B.Cxx like `"6.0.1xx"`
+- `--quality`: `"daily"`, `"preview"` or `"GA"`
+- The channel option is only used when version is 'latest' because an exact version overrides the channel option
+- The quality option is only used when channel is 'A.B' or 'A.B.Cxx' because it can't be used with STS or LTS
+
+Examples
+
+```
+dotnet-install.sh [--version latest] [--channel LTS]
+dotnet-install.sh [--version latest] --channel STS
+dotnet-install.sh [--version latest] --channel 6.0 [--quality GA]
+dotnet-install.sh [--version latest] --channel 6.0.4xx [--quality GA]
+dotnet-install.sh [--version latest] --channel 8.0 --quality preview
+dotnet-install.sh [--version latest] --channel 8.0 --quality daily
+dotnet-install.sh --version 6.0.413
+```
\ No newline at end of file
diff --git a/src/oryx/scripts/vendor/dotnet-install.sh b/src/oryx/scripts/vendor/dotnet-install.sh
new file mode 100755
index 000000000..f6b08d1f8
--- /dev/null
+++ b/src/oryx/scripts/vendor/dotnet-install.sh
@@ -0,0 +1,1844 @@
+#!/usr/bin/env bash
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
+
+# Stop script on NZEC
+set -e
+# Stop script if unbound variable found (use ${var:-} if intentional)
+set -u
+# By default cmd1 | cmd2 returns exit code of cmd2 regardless of cmd1 success
+# This is causing it to fail
+set -o pipefail
+
+# Use in the the functions: eval $invocation
+invocation='say_verbose "Calling: ${yellow:-}${FUNCNAME[0]} ${green:-}$*${normal:-}"'
+
+# standard output may be used as a return value in the functions
+# we need a way to write text on the screen in the functions so that
+# it won't interfere with the return value.
+# Exposing stream 3 as a pipe to standard output of the script itself
+exec 3>&1
+
+# Setup some colors to use. These need to work in fairly limited shells, like the Ubuntu Docker container where there are only 8 colors.
+# See if stdout is a terminal
+if [ -t 1 ] && command -v tput > /dev/null; then
+    # see if it supports colors
+    ncolors=$(tput colors || echo 0)
+    if [ -n "$ncolors" ] && [ $ncolors -ge 8 ]; then
+        bold="$(tput bold       || echo)"
+        normal="$(tput sgr0     || echo)"
+        black="$(tput setaf 0   || echo)"
+        red="$(tput setaf 1     || echo)"
+        green="$(tput setaf 2   || echo)"
+        yellow="$(tput setaf 3  || echo)"
+        blue="$(tput setaf 4    || echo)"
+        magenta="$(tput setaf 5 || echo)"
+        cyan="$(tput setaf 6    || echo)"
+        white="$(tput setaf 7   || echo)"
+    fi
+fi
+
+say_warning() {
+    printf "%b\n" "${yellow:-}dotnet_install: Warning: $1${normal:-}" >&3
+}
+
+say_err() {
+    printf "%b\n" "${red:-}dotnet_install: Error: $1${normal:-}" >&2
+}
+
+say() {
+    # using stream 3 (defined in the beginning) to not interfere with stdout of functions
+    # which may be used as return value
+    printf "%b\n" "${cyan:-}dotnet-install:${normal:-} $1" >&3
+}
+
+say_verbose() {
+    if [ "$verbose" = true ]; then
+        say "$1"
+    fi
+}
+
+# This platform list is finite - if the SDK/Runtime has supported Linux distribution-specific assets,
+#   then and only then should the Linux distribution appear in this list.
+# Adding a Linux distribution to this list does not imply distribution-specific support.
+get_legacy_os_name_from_platform() {
+    eval $invocation
+
+    platform="$1"
+    case "$platform" in
+        "centos.7")
+            echo "centos"
+            return 0
+            ;;
+        "debian.8")
+            echo "debian"
+            return 0
+            ;;
+        "debian.9")
+            echo "debian.9"
+            return 0
+            ;;
+        "fedora.23")
+            echo "fedora.23"
+            return 0
+            ;;
+        "fedora.24")
+            echo "fedora.24"
+            return 0
+            ;;
+        "fedora.27")
+            echo "fedora.27"
+            return 0
+            ;;
+        "fedora.28")
+            echo "fedora.28"
+            return 0
+            ;;
+        "opensuse.13.2")
+            echo "opensuse.13.2"
+            return 0
+            ;;
+        "opensuse.42.1")
+            echo "opensuse.42.1"
+            return 0
+            ;;
+        "opensuse.42.3")
+            echo "opensuse.42.3"
+            return 0
+            ;;
+        "rhel.7"*)
+            echo "rhel"
+            return 0
+            ;;
+        "ubuntu.14.04")
+            echo "ubuntu"
+            return 0
+            ;;
+        "ubuntu.16.04")
+            echo "ubuntu.16.04"
+            return 0
+            ;;
+        "ubuntu.16.10")
+            echo "ubuntu.16.10"
+            return 0
+            ;;
+        "ubuntu.18.04")
+            echo "ubuntu.18.04"
+            return 0
+            ;;
+        "alpine.3.4.3")
+            echo "alpine"
+            return 0
+            ;;
+    esac
+    return 1
+}
+
+get_legacy_os_name() {
+    eval $invocation
+
+    local uname=$(uname)
+    if [ "$uname" = "Darwin" ]; then
+        echo "osx"
+        return 0
+    elif [ -n "$runtime_id" ]; then
+        echo $(get_legacy_os_name_from_platform "${runtime_id%-*}" || echo "${runtime_id%-*}")
+        return 0
+    else
+        if [ -e /etc/os-release ]; then
+            . /etc/os-release
+            os=$(get_legacy_os_name_from_platform "$ID${VERSION_ID:+.${VERSION_ID}}" || echo "")
+            if [ -n "$os" ]; then
+                echo "$os"
+                return 0
+            fi
+        fi
+    fi
+
+    say_verbose "Distribution specific OS name and version could not be detected: UName = $uname"
+    return 1
+}
+
+get_linux_platform_name() {
+    eval $invocation
+
+    if [ -n "$runtime_id" ]; then
+        echo "${runtime_id%-*}"
+        return 0
+    else
+        if [ -e /etc/os-release ]; then
+            . /etc/os-release
+            echo "$ID${VERSION_ID:+.${VERSION_ID}}"
+            return 0
+        elif [ -e /etc/redhat-release ]; then
+            local redhatRelease=$(</etc/redhat-release)
+            if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux "*" release 6."* ]]; then
+                echo "rhel.6"
+                return 0
+            fi
+        fi
+    fi
+
+    say_verbose "Linux specific platform name and version could not be detected: UName = $uname"
+    return 1
+}
+
+is_musl_based_distro() {
+    (ldd --version 2>&1 || true) | grep -q musl
+}
+
+get_current_os_name() {
+    eval $invocation
+
+    local uname=$(uname)
+    if [ "$uname" = "Darwin" ]; then
+        echo "osx"
+        return 0
+    elif [ "$uname" = "FreeBSD" ]; then
+        echo "freebsd"
+        return 0
+    elif [ "$uname" = "Linux" ]; then
+        local linux_platform_name=""
+        linux_platform_name="$(get_linux_platform_name)" || true
+
+        if [ "$linux_platform_name" = "rhel.6" ]; then
+            echo $linux_platform_name
+            return 0
+        elif is_musl_based_distro; then
+            echo "linux-musl"
+            return 0
+        elif [ "$linux_platform_name" = "linux-musl" ]; then
+            echo "linux-musl"
+            return 0
+        else
+            echo "linux"
+            return 0
+        fi
+    fi
+
+    say_err "OS name could not be detected: UName = $uname"
+    return 1
+}
+
+machine_has() {
+    eval $invocation
+
+    command -v "$1" > /dev/null 2>&1
+    return $?
+}
+
+check_min_reqs() {
+    local hasMinimum=false
+    if machine_has "curl"; then
+        hasMinimum=true
+    elif machine_has "wget"; then
+        hasMinimum=true
+    fi
+
+    if [ "$hasMinimum" = "false" ]; then
+        say_err "curl (recommended) or wget are required to download dotnet. Install missing prerequisite to proceed."
+        return 1
+    fi
+    return 0
+}
+
+# args:
+# input - $1
+to_lowercase() {
+    #eval $invocation
+
+    echo "$1" | tr '[:upper:]' '[:lower:]'
+    return 0
+}
+
+# args:
+# input - $1
+remove_trailing_slash() {
+    #eval $invocation
+
+    local input="${1:-}"
+    echo "${input%/}"
+    return 0
+}
+
+# args:
+# input - $1
+remove_beginning_slash() {
+    #eval $invocation
+
+    local input="${1:-}"
+    echo "${input#/}"
+    return 0
+}
+
+# args:
+# root_path - $1
+# child_path - $2 - this parameter can be empty
+combine_paths() {
+    eval $invocation
+
+    # TODO: Consider making it work with any number of paths. For now:
+    if [ ! -z "${3:-}" ]; then
+        say_err "combine_paths: Function takes two parameters."
+        return 1
+    fi
+
+    local root_path="$(remove_trailing_slash "$1")"
+    local child_path="$(remove_beginning_slash "${2:-}")"
+    say_verbose "combine_paths: root_path=$root_path"
+    say_verbose "combine_paths: child_path=$child_path"
+    echo "$root_path/$child_path"
+    return 0
+}
+
+get_machine_architecture() {
+    eval $invocation
+
+    if command -v uname > /dev/null; then
+        CPUName=$(uname -m)
+        case $CPUName in
+        armv*l)
+            echo "arm"
+            return 0
+            ;;
+        aarch64|arm64)
+            if [ "$(getconf LONG_BIT)" -lt 64 ]; then
+                # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
+                echo "arm"
+                return 0
+            fi
+            echo "arm64"
+            return 0
+            ;;
+        s390x)
+            echo "s390x"
+            return 0
+            ;;
+        ppc64le)
+            echo "ppc64le"
+            return 0
+            ;;
+        loongarch64)
+            echo "loongarch64"
+            return 0
+            ;;
+        esac
+    fi
+
+    # Always default to 'x64'
+    echo "x64"
+    return 0
+}
+
+# args:
+# architecture - $1
+get_normalized_architecture_from_architecture() {
+    eval $invocation
+
+    local architecture="$(to_lowercase "$1")"
+
+    if [[ $architecture == \<auto\> ]]; then
+        echo "$(get_machine_architecture)"
+        return 0
+    fi
+
+    case "$architecture" in
+        amd64|x64)
+            echo "x64"
+            return 0
+            ;;
+        arm)
+            echo "arm"
+            return 0
+            ;;
+        arm64)
+            echo "arm64"
+            return 0
+            ;;
+        s390x)
+            echo "s390x"
+            return 0
+            ;;
+        ppc64le)
+            echo "ppc64le"
+            return 0
+            ;;
+        loongarch64)
+            echo "loongarch64"
+            return 0
+            ;;
+    esac
+
+    say_err "Architecture \`$architecture\` not supported. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues"
+    return 1
+}
+
+# args:
+# version - $1
+# channel - $2
+# architecture - $3
+get_normalized_architecture_for_specific_sdk_version() {
+    eval $invocation
+
+    local is_version_support_arm64="$(is_arm64_supported "$1")"
+    local is_channel_support_arm64="$(is_arm64_supported "$2")"
+    local architecture="$3";
+    local osname="$(get_current_os_name)"
+
+    if [ "$osname" == "osx" ] && [ "$architecture" == "arm64" ] && { [ "$is_version_support_arm64" = false ] || [ "$is_channel_support_arm64" = false ]; }; then
+        #check if rosetta is installed
+        if [ "$(/usr/bin/pgrep oahd >/dev/null 2>&1;echo $?)" -eq 0 ]; then 
+            say_verbose "Changing user architecture from '$architecture' to 'x64' because .NET SDKs prior to version 6.0 do not support arm64." 
+            echo "x64"
+            return 0;
+        else
+            say_err "Architecture \`$architecture\` is not supported for .NET SDK version \`$version\`. Please install Rosetta to allow emulation of the \`$architecture\` .NET SDK on this platform"
+            return 1
+        fi
+    fi
+
+    echo "$architecture"
+    return 0
+}
+
+# args:
+# version or channel - $1
+is_arm64_supported() {
+    #any channel or version that starts with the specified versions
+    case "$1" in
+        ( "1"* | "2"* | "3"*  | "4"* | "5"*) 
+            echo false
+            return 0
+    esac
+
+    echo true
+    return 0
+}
+
+# args:
+# user_defined_os - $1
+get_normalized_os() {
+    eval $invocation
+
+    local osname="$(to_lowercase "$1")"
+    if [ ! -z "$osname" ]; then
+        case "$osname" in
+            osx | freebsd | rhel.6 | linux-musl | linux)
+                echo "$osname"
+                return 0
+                ;;
+            macos)
+                osname='osx'
+                echo "$osname"
+                return 0
+                ;;
+            *)
+                say_err "'$user_defined_os' is not a supported value for --os option, supported values are: osx, macos, linux, linux-musl, freebsd, rhel.6. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues."
+                return 1
+                ;;
+        esac
+    else
+        osname="$(get_current_os_name)" || return 1
+    fi
+    echo "$osname"
+    return 0
+}
+
+# args:
+# quality - $1
+get_normalized_quality() {
+    eval $invocation
+
+    local quality="$(to_lowercase "$1")"
+    if [ ! -z "$quality" ]; then
+        case "$quality" in
+            daily | signed | validated | preview)
+                echo "$quality"
+                return 0
+                ;;
+            ga)
+                #ga quality is available without specifying quality, so normalizing it to empty
+                return 0
+                ;;
+            *)
+                say_err "'$quality' is not a supported value for --quality option. Supported values are: daily, signed, validated, preview, ga. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues."
+                return 1
+                ;;
+        esac
+    fi
+    return 0
+}
+
+# args:
+# channel - $1
+get_normalized_channel() {
+    eval $invocation
+
+    local channel="$(to_lowercase "$1")"
+
+    if [[ $channel == current ]]; then
+        say_warning 'Value "Current" is deprecated for -Channel option. Use "STS" instead.'
+    fi
+
+    if [[ $channel == release/* ]]; then
+        say_warning 'Using branch name with -Channel option is no longer supported with newer releases. Use -Quality option with a channel in X.Y format instead.';
+    fi
+
+    if [ ! -z "$channel" ]; then
+        case "$channel" in
+            lts)
+                echo "LTS"
+                return 0
+                ;;
+            sts)
+                echo "STS"
+                return 0
+                ;;
+            current)
+                echo "STS"
+                return 0
+                ;;
+            *)
+                echo "$channel"
+                return 0
+                ;;
+        esac
+    fi
+
+    return 0
+}
+
+# args:
+# runtime - $1
+get_normalized_product() {
+    eval $invocation
+
+    local product=""
+    local runtime="$(to_lowercase "$1")"
+    if [[ "$runtime" == "dotnet" ]]; then
+        product="dotnet-runtime"
+    elif [[ "$runtime" == "aspnetcore" ]]; then
+        product="aspnetcore-runtime"
+    elif [ -z "$runtime" ]; then
+        product="dotnet-sdk"
+    fi
+    echo "$product"
+    return 0
+}
+
+# The version text returned from the feeds is a 1-line or 2-line string:
+# For the SDK and the dotnet runtime (2 lines):
+# Line 1: # commit_hash
+# Line 2: # 4-part version
+# For the aspnetcore runtime (1 line):
+# Line 1: # 4-part version
+
+# args:
+# version_text - stdin
+get_version_from_latestversion_file_content() {
+    eval $invocation
+
+    cat | tail -n 1 | sed 's/\r$//'
+    return 0
+}
+
+# args:
+# install_root - $1
+# relative_path_to_package - $2
+# specific_version - $3
+is_dotnet_package_installed() {
+    eval $invocation
+
+    local install_root="$1"
+    local relative_path_to_package="$2"
+    local specific_version="${3//[$'\t\r\n']}"
+
+    local dotnet_package_path="$(combine_paths "$(combine_paths "$install_root" "$relative_path_to_package")" "$specific_version")"
+    say_verbose "is_dotnet_package_installed: dotnet_package_path=$dotnet_package_path"
+
+    if [ -d "$dotnet_package_path" ]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+# args:
+# downloaded file - $1
+# remote_file_size - $2
+validate_remote_local_file_sizes() 
+{
+    eval $invocation
+
+    local downloaded_file="$1"
+    local remote_file_size="$2"
+    local file_size=''
+
+    if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+        file_size="$(stat -c '%s' "$downloaded_file")"
+    elif [[ "$OSTYPE" == "darwin"* ]]; then
+        # hardcode in order to avoid conflicts with GNU stat
+        file_size="$(/usr/bin/stat -f '%z' "$downloaded_file")"
+    fi  
+    
+    if [ -n "$file_size" ]; then
+        say "Downloaded file size is $file_size bytes."
+
+        if [ -n "$remote_file_size" ] && [ -n "$file_size" ]; then
+            if [ "$remote_file_size" -ne "$file_size" ]; then
+                say "The remote and local file sizes are not equal. The remote file size is $remote_file_size bytes and the local size is $file_size bytes. The local package may be corrupted."
+            else
+                say "The remote and local file sizes are equal."
+            fi
+        fi
+        
+    else
+        say "Either downloaded or local package size can not be measured. One of them may be corrupted."      
+    fi 
+}
+
+# args:
+# azure_feed - $1
+# channel - $2
+# normalized_architecture - $3
+get_version_from_latestversion_file() {
+    eval $invocation
+
+    local azure_feed="$1"
+    local channel="$2"
+    local normalized_architecture="$3"
+
+    local version_file_url=null
+    if [[ "$runtime" == "dotnet" ]]; then
+        version_file_url="$azure_feed/Runtime/$channel/latest.version"
+    elif [[ "$runtime" == "aspnetcore" ]]; then
+        version_file_url="$azure_feed/aspnetcore/Runtime/$channel/latest.version"
+    elif [ -z "$runtime" ]; then
+         version_file_url="$azure_feed/Sdk/$channel/latest.version"
+    else
+        say_err "Invalid value for \$runtime"
+        return 1
+    fi
+    say_verbose "get_version_from_latestversion_file: latest url: $version_file_url"
+
+    download "$version_file_url" || return $?
+    return 0
+}
+
+# args:
+# json_file - $1
+parse_globaljson_file_for_version() {
+    eval $invocation
+
+    local json_file="$1"
+    if [ ! -f "$json_file" ]; then
+        say_err "Unable to find \`$json_file\`"
+        return 1
+    fi
+
+    sdk_section=$(cat $json_file | tr -d "\r" | awk '/"sdk"/,/}/')
+    if [ -z "$sdk_section" ]; then
+        say_err "Unable to parse the SDK node in \`$json_file\`"
+        return 1
+    fi
+
+    sdk_list=$(echo $sdk_section | awk -F"[{}]" '{print $2}')
+    sdk_list=${sdk_list//[\" ]/}
+    sdk_list=${sdk_list//,/$'\n'}
+
+    local version_info=""
+    while read -r line; do
+      IFS=:
+      while read -r key value; do
+        if [[ "$key" == "version" ]]; then
+          version_info=$value
+        fi
+      done <<< "$line"
+    done <<< "$sdk_list"
+    if [ -z "$version_info" ]; then
+        say_err "Unable to find the SDK:version node in \`$json_file\`"
+        return 1
+    fi
+
+    unset IFS;
+    echo "$version_info"
+    return 0
+}
+
+# args:
+# azure_feed - $1
+# channel - $2
+# normalized_architecture - $3
+# version - $4
+# json_file - $5
+get_specific_version_from_version() {
+    eval $invocation
+
+    local azure_feed="$1"
+    local channel="$2"
+    local normalized_architecture="$3"
+    local version="$(to_lowercase "$4")"
+    local json_file="$5"
+
+    if [ -z "$json_file" ]; then
+        if [[ "$version" == "latest" ]]; then
+            local version_info
+            version_info="$(get_version_from_latestversion_file "$azure_feed" "$channel" "$normalized_architecture" false)" || return 1
+            say_verbose "get_specific_version_from_version: version_info=$version_info"
+            echo "$version_info" | get_version_from_latestversion_file_content
+            return 0
+        else
+            echo "$version"
+            return 0
+        fi
+    else
+        local version_info
+        version_info="$(parse_globaljson_file_for_version "$json_file")" || return 1
+        echo "$version_info"
+        return 0
+    fi
+}
+
+# args:
+# azure_feed - $1
+# channel - $2
+# normalized_architecture - $3
+# specific_version - $4
+# normalized_os - $5
+construct_download_link() {
+    eval $invocation
+
+    local azure_feed="$1"
+    local channel="$2"
+    local normalized_architecture="$3"
+    local specific_version="${4//[$'\t\r\n']}"
+    local specific_product_version="$(get_specific_product_version "$1" "$4")"
+    local osname="$5"
+
+    local download_link=null
+    if [[ "$runtime" == "dotnet" ]]; then
+        download_link="$azure_feed/Runtime/$specific_version/dotnet-runtime-$specific_product_version-$osname-$normalized_architecture.tar.gz"
+    elif [[ "$runtime" == "aspnetcore" ]]; then
+        download_link="$azure_feed/aspnetcore/Runtime/$specific_version/aspnetcore-runtime-$specific_product_version-$osname-$normalized_architecture.tar.gz"
+    elif [ -z "$runtime" ]; then
+        download_link="$azure_feed/Sdk/$specific_version/dotnet-sdk-$specific_product_version-$osname-$normalized_architecture.tar.gz"
+    else
+        return 1
+    fi
+
+    echo "$download_link"
+    return 0
+}
+
+# args:
+# azure_feed - $1
+# specific_version - $2
+# download link - $3 (optional)
+get_specific_product_version() {
+    # If we find a 'productVersion.txt' at the root of any folder, we'll use its contents
+    # to resolve the version of what's in the folder, superseding the specified version.
+    # if 'productVersion.txt' is missing but download link is already available, product version will be taken from download link
+    eval $invocation
+
+    local azure_feed="$1"
+    local specific_version="${2//[$'\t\r\n']}"
+    local package_download_link=""
+    if [ $# -gt 2  ]; then
+        local package_download_link="$3"
+    fi
+    local specific_product_version=null
+
+    # Try to get the version number, using the productVersion.txt file located next to the installer file.
+    local download_links=($(get_specific_product_version_url "$azure_feed" "$specific_version" true "$package_download_link")
+        $(get_specific_product_version_url "$azure_feed" "$specific_version" false "$package_download_link"))
+
+    for download_link in "${download_links[@]}"
+    do
+        say_verbose "Checking for the existence of $download_link"
+
+        if machine_has "curl"
+        then
+            if ! specific_product_version=$(curl -s --fail "${download_link}${feed_credential}" 2>&1); then
+                continue
+            else
+                echo "${specific_product_version//[$'\t\r\n']}"
+                return 0
+            fi
+
+        elif machine_has "wget"
+        then
+            specific_product_version=$(wget -qO- "${download_link}${feed_credential}" 2>&1)
+            if [ $? = 0 ]; then
+                echo "${specific_product_version//[$'\t\r\n']}"
+                return 0
+            fi
+        fi
+    done
+    
+    # Getting the version number with productVersion.txt has failed. Try parsing the download link for a version number.
+    say_verbose "Failed to get the version using productVersion.txt file. Download link will be parsed instead."
+    specific_product_version="$(get_product_specific_version_from_download_link "$package_download_link" "$specific_version")"
+    echo "${specific_product_version//[$'\t\r\n']}"
+    return 0
+}
+
+# args:
+# azure_feed - $1
+# specific_version - $2
+# is_flattened - $3
+# download link - $4 (optional)
+get_specific_product_version_url() {
+    eval $invocation
+
+    local azure_feed="$1"
+    local specific_version="$2"
+    local is_flattened="$3"
+    local package_download_link=""
+    if [ $# -gt 3  ]; then
+        local package_download_link="$4"
+    fi
+
+    local pvFileName="productVersion.txt"
+    if [ "$is_flattened" = true ]; then
+        if [ -z "$runtime" ]; then
+            pvFileName="sdk-productVersion.txt"
+        elif [[ "$runtime" == "dotnet" ]]; then
+            pvFileName="runtime-productVersion.txt"
+        else
+            pvFileName="$runtime-productVersion.txt"
+        fi
+    fi
+
+    local download_link=null
+
+    if [ -z "$package_download_link" ]; then
+        if [[ "$runtime" == "dotnet" ]]; then
+            download_link="$azure_feed/Runtime/$specific_version/${pvFileName}"
+        elif [[ "$runtime" == "aspnetcore" ]]; then
+            download_link="$azure_feed/aspnetcore/Runtime/$specific_version/${pvFileName}"
+        elif [ -z "$runtime" ]; then
+            download_link="$azure_feed/Sdk/$specific_version/${pvFileName}"
+        else
+            return 1
+        fi
+    else
+        download_link="${package_download_link%/*}/${pvFileName}"
+    fi
+
+    say_verbose "Constructed productVersion link: $download_link"
+    echo "$download_link"
+    return 0
+}
+
+# args:
+# download link - $1
+# specific version - $2
+get_product_specific_version_from_download_link()
+{
+    eval $invocation
+
+    local download_link="$1"
+    local specific_version="$2"
+    local specific_product_version="" 
+
+    if [ -z "$download_link" ]; then
+        echo "$specific_version"
+        return 0
+    fi
+
+    #get filename
+    filename="${download_link##*/}"
+
+    #product specific version follows the product name
+    #for filename 'dotnet-sdk-3.1.404-linux-x64.tar.gz': the product version is 3.1.404
+    IFS='-'
+    read -ra filename_elems <<< "$filename"
+    count=${#filename_elems[@]}
+    if [[ "$count" -gt 2 ]]; then
+        specific_product_version="${filename_elems[2]}"
+    else
+        specific_product_version=$specific_version
+    fi
+    unset IFS;
+    echo "$specific_product_version"
+    return 0
+}
+
+# args:
+# azure_feed - $1
+# channel - $2
+# normalized_architecture - $3
+# specific_version - $4
+construct_legacy_download_link() {
+    eval $invocation
+
+    local azure_feed="$1"
+    local channel="$2"
+    local normalized_architecture="$3"
+    local specific_version="${4//[$'\t\r\n']}"
+
+    local distro_specific_osname
+    distro_specific_osname="$(get_legacy_os_name)" || return 1
+
+    local legacy_download_link=null
+    if [[ "$runtime" == "dotnet" ]]; then
+        legacy_download_link="$azure_feed/Runtime/$specific_version/dotnet-$distro_specific_osname-$normalized_architecture.$specific_version.tar.gz"
+    elif [ -z "$runtime" ]; then
+        legacy_download_link="$azure_feed/Sdk/$specific_version/dotnet-dev-$distro_specific_osname-$normalized_architecture.$specific_version.tar.gz"
+    else
+        return 1
+    fi
+
+    echo "$legacy_download_link"
+    return 0
+}
+
+get_user_install_path() {
+    eval $invocation
+
+    if [ ! -z "${DOTNET_INSTALL_DIR:-}" ]; then
+        echo "$DOTNET_INSTALL_DIR"
+    else
+        echo "$HOME/.dotnet"
+    fi
+    return 0
+}
+
+# args:
+# install_dir - $1
+resolve_installation_path() {
+    eval $invocation
+
+    local install_dir=$1
+    if [ "$install_dir" = "<auto>" ]; then
+        local user_install_path="$(get_user_install_path)"
+        say_verbose "resolve_installation_path: user_install_path=$user_install_path"
+        echo "$user_install_path"
+        return 0
+    fi
+
+    echo "$install_dir"
+    return 0
+}
+
+# args:
+# relative_or_absolute_path - $1
+get_absolute_path() {
+    eval $invocation
+
+    local relative_or_absolute_path=$1
+    echo "$(cd "$(dirname "$1")" && pwd -P)/$(basename "$1")"
+    return 0
+}
+
+# args:
+# input_files - stdin
+# root_path - $1
+# out_path - $2
+# override - $3
+copy_files_or_dirs_from_list() {
+    eval $invocation
+
+    local root_path="$(remove_trailing_slash "$1")"
+    local out_path="$(remove_trailing_slash "$2")"
+    local override="$3"
+    local osname="$(get_current_os_name)"
+    local override_switch=$(
+        if [ "$override" = false ]; then
+            if [ "$osname" = "linux-musl" ]; then
+                printf -- "-u";
+            else
+                printf -- "-n";
+            fi
+        fi)
+
+    cat | uniq | while read -r file_path; do
+        local path="$(remove_beginning_slash "${file_path#$root_path}")"
+        local target="$out_path/$path"
+        if [ "$override" = true ] || (! ([ -d "$target" ] || [ -e "$target" ])); then
+            mkdir -p "$out_path/$(dirname "$path")"
+            if [ -d "$target" ]; then
+                rm -rf "$target"
+            fi
+            cp -R $override_switch "$root_path/$path" "$target"
+        fi
+    done
+}
+
+# args:
+# zip_uri - $1
+get_remote_file_size() {
+    local zip_uri="$1"
+
+    if machine_has "curl"; then
+        file_size=$(curl -sI  "$zip_uri" | grep -i content-length | awk '{ num = $2 + 0; print num }')
+    elif machine_has "wget"; then
+        file_size=$(wget --spider --server-response -O /dev/null "$zip_uri" 2>&1 | grep -i 'Content-Length:' | awk '{ num = $2 + 0; print num }')
+    else
+        say "Neither curl nor wget is available on this system."
+        return
+    fi
+
+    if [ -n "$file_size" ]; then
+        say "Remote file $zip_uri size is $file_size bytes."
+        echo "$file_size"
+    else
+        say_verbose "Content-Length header was not extracted for $zip_uri."
+        echo ""
+    fi
+}
+
+# args:
+# zip_path - $1
+# out_path - $2
+# remote_file_size - $3
+extract_dotnet_package() {
+    eval $invocation
+
+    local zip_path="$1"
+    local out_path="$2"
+    local remote_file_size="$3"
+
+    local temp_out_path="$(mktemp -d "$temporary_file_template")"
+
+    local failed=false
+    tar -xzf "$zip_path" -C "$temp_out_path" > /dev/null || failed=true
+
+    local folders_with_version_regex='^.*/[0-9]+\.[0-9]+[^/]+/'
+    find "$temp_out_path" -type f | grep -Eo "$folders_with_version_regex" | sort | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" false
+    find "$temp_out_path" -type f | grep -Ev "$folders_with_version_regex" | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" "$override_non_versioned_files"
+    
+    validate_remote_local_file_sizes "$zip_path" "$remote_file_size"
+    
+    rm -rf "$temp_out_path"
+    if [ -z ${keep_zip+x} ]; then
+        rm -f "$zip_path" && say_verbose "Temporary zip file $zip_path was removed"
+    fi
+
+    if [ "$failed" = true ]; then
+        say_err "Extraction failed"
+        return 1
+    fi
+    return 0
+}
+
+# args:
+# remote_path - $1
+# disable_feed_credential - $2
+get_http_header()
+{
+    eval $invocation
+    local remote_path="$1"
+    local disable_feed_credential="$2"
+
+    local failed=false
+    local response
+    if machine_has "curl"; then
+        get_http_header_curl $remote_path $disable_feed_credential || failed=true
+    elif machine_has "wget"; then
+        get_http_header_wget $remote_path $disable_feed_credential || failed=true
+    else
+        failed=true
+    fi
+    if [ "$failed" = true ]; then
+        say_verbose "Failed to get HTTP header: '$remote_path'."
+        return 1
+    fi
+    return 0
+}
+
+# args:
+# remote_path - $1
+# disable_feed_credential - $2
+get_http_header_curl() {
+    eval $invocation
+    local remote_path="$1"
+    local disable_feed_credential="$2"
+
+    remote_path_with_credential="$remote_path"
+    if [ "$disable_feed_credential" = false ]; then
+        remote_path_with_credential+="$feed_credential"
+    fi
+
+    curl_options="-I -sSL --retry 5 --retry-delay 2 --connect-timeout 15 "
+    curl $curl_options "$remote_path_with_credential" 2>&1 || return 1
+    return 0
+}
+
+# args:
+# remote_path - $1
+# disable_feed_credential - $2
+get_http_header_wget() {
+    eval $invocation
+    local remote_path="$1"
+    local disable_feed_credential="$2"
+    local wget_options="-q -S --spider --tries 5 "
+
+    local wget_options_extra=''
+
+    # Test for options that aren't supported on all wget implementations.
+    if [[ $(wget -h 2>&1 | grep -E 'waitretry|connect-timeout') ]]; then
+        wget_options_extra="--waitretry 2 --connect-timeout 15 "
+    else
+        say "wget extra options are unavailable for this environment"
+    fi
+
+    remote_path_with_credential="$remote_path"
+    if [ "$disable_feed_credential" = false ]; then
+        remote_path_with_credential+="$feed_credential"
+    fi
+
+    wget $wget_options $wget_options_extra "$remote_path_with_credential" 2>&1
+
+    return $?
+}
+
+# args:
+# remote_path - $1
+# [out_path] - $2 - stdout if not provided
+download() {
+    eval $invocation
+
+    local remote_path="$1"
+    local out_path="${2:-}"
+
+    if [[ "$remote_path" != "http"* ]]; then
+        cp "$remote_path" "$out_path"
+        return $?
+    fi
+
+    local failed=false
+    local attempts=0
+    while [ $attempts -lt 3 ]; do
+        attempts=$((attempts+1))
+        failed=false
+        if machine_has "curl"; then
+            downloadcurl "$remote_path" "$out_path" || failed=true
+        elif machine_has "wget"; then
+            downloadwget "$remote_path" "$out_path" || failed=true
+        else
+            say_err "Missing dependency: neither curl nor wget was found."
+            exit 1
+        fi
+
+        if [ "$failed" = false ] || [ $attempts -ge 3 ] || { [ ! -z $http_code ] && [ $http_code = "404" ]; }; then
+            break
+        fi
+
+        say "Download attempt #$attempts has failed: $http_code $download_error_msg"
+        say "Attempt #$((attempts+1)) will start in $((attempts*10)) seconds."
+        sleep $((attempts*10))
+    done
+
+    if [ "$failed" = true ]; then
+        say_verbose "Download failed: $remote_path"
+        return 1
+    fi
+    return 0
+}
+
+# Updates global variables $http_code and $download_error_msg
+downloadcurl() {
+    eval $invocation
+    unset http_code
+    unset download_error_msg
+    local remote_path="$1"
+    local out_path="${2:-}"
+    # Append feed_credential as late as possible before calling curl to avoid logging feed_credential
+    # Avoid passing URI with credentials to functions: note, most of them echoing parameters of invocation in verbose output.
+    local remote_path_with_credential="${remote_path}${feed_credential}"
+    local curl_options="--retry 20 --retry-delay 2 --connect-timeout 15 -sSL -f --create-dirs "
+    local curl_exit_code=0;
+    if [ -z "$out_path" ]; then
+        curl $curl_options "$remote_path_with_credential" 2>&1
+        curl_exit_code=$?
+    else
+        curl $curl_options -o "$out_path" "$remote_path_with_credential" 2>&1
+        curl_exit_code=$?
+    fi
+    
+    if [ $curl_exit_code -gt 0 ]; then
+        download_error_msg="Unable to download $remote_path."
+        # Check for curl timeout codes
+        if [[ $curl_exit_code == 7 || $curl_exit_code == 28 ]]; then
+            download_error_msg+=" Failed to reach the server: connection timeout."
+        else
+            local disable_feed_credential=false
+            local response=$(get_http_header_curl $remote_path $disable_feed_credential)
+            http_code=$( echo "$response" | awk '/^HTTP/{print $2}' | tail -1 )
+            if  [[ ! -z $http_code && $http_code != 2* ]]; then
+                download_error_msg+=" Returned HTTP status code: $http_code."
+            fi
+        fi
+        say_verbose "$download_error_msg"
+        return 1
+    fi
+    return 0
+}
+
+
+# Updates global variables $http_code and $download_error_msg
+downloadwget() {
+    eval $invocation
+    unset http_code
+    unset download_error_msg
+    local remote_path="$1"
+    local out_path="${2:-}"
+    # Append feed_credential as late as possible before calling wget to avoid logging feed_credential
+    local remote_path_with_credential="${remote_path}${feed_credential}"
+    local wget_options="--tries 20 "
+
+    local wget_options_extra=''
+    local wget_result=''
+
+    # Test for options that aren't supported on all wget implementations.
+    if [[ $(wget -h 2>&1 | grep -E 'waitretry|connect-timeout') ]]; then
+        wget_options_extra="--waitretry 2 --connect-timeout 15 "
+    else
+        say "wget extra options are unavailable for this environment"
+    fi
+
+    if [ -z "$out_path" ]; then
+        wget -q $wget_options $wget_options_extra -O - "$remote_path_with_credential" 2>&1
+        wget_result=$?
+    else
+        wget $wget_options $wget_options_extra -O "$out_path" "$remote_path_with_credential" 2>&1
+        wget_result=$?
+    fi
+
+    if [[ $wget_result != 0 ]]; then
+        local disable_feed_credential=false
+        local response=$(get_http_header_wget $remote_path $disable_feed_credential)
+        http_code=$( echo "$response" | awk '/^  HTTP/{print $2}' | tail -1 )
+        download_error_msg="Unable to download $remote_path."
+        if  [[ ! -z $http_code && $http_code != 2* ]]; then
+            download_error_msg+=" Returned HTTP status code: $http_code."
+        # wget exit code 4 stands for network-issue
+        elif [[ $wget_result == 4 ]]; then
+            download_error_msg+=" Failed to reach the server: connection timeout."
+        fi
+        say_verbose "$download_error_msg"
+        return 1
+    fi
+
+    return 0
+}
+
+get_download_link_from_aka_ms() {
+    eval $invocation
+
+    #quality is not supported for LTS or STS channel
+    #STS maps to current
+    if [[ ! -z "$normalized_quality"  && ("$normalized_channel" == "LTS" || "$normalized_channel" == "STS") ]]; then
+        normalized_quality=""
+        say_warning "Specifying quality for STS or LTS channel is not supported, the quality will be ignored."
+    fi
+
+    say_verbose "Retrieving primary payload URL from aka.ms for channel: '$normalized_channel', quality: '$normalized_quality', product: '$normalized_product', os: '$normalized_os', architecture: '$normalized_architecture'." 
+
+    #construct aka.ms link
+    aka_ms_link="https://aka.ms/dotnet"
+    if  [ "$internal" = true ]; then
+        aka_ms_link="$aka_ms_link/internal"
+    fi
+    aka_ms_link="$aka_ms_link/$normalized_channel"
+    if [[ ! -z "$normalized_quality" ]]; then
+        aka_ms_link="$aka_ms_link/$normalized_quality"
+    fi
+    aka_ms_link="$aka_ms_link/$normalized_product-$normalized_os-$normalized_architecture.tar.gz"
+    say_verbose "Constructed aka.ms link: '$aka_ms_link'."
+
+    #get HTTP response
+    #do not pass credentials as a part of the $aka_ms_link and do not apply credentials in the get_http_header function
+    #otherwise the redirect link would have credentials as well
+    #it would result in applying credentials twice to the resulting link and thus breaking it, and in echoing credentials to the output as a part of redirect link
+    disable_feed_credential=true
+    response="$(get_http_header $aka_ms_link $disable_feed_credential)"
+
+    say_verbose "Received response: $response"
+    # Get results of all the redirects.
+    http_codes=$( echo "$response" | awk '$1 ~ /^HTTP/ {print $2}' )
+    # They all need to be 301, otherwise some links are broken (except for the last, which is not a redirect but 200 or 404).
+    broken_redirects=$( echo "$http_codes" | sed '$d' | grep -v '301' )
+
+    # All HTTP codes are 301 (Moved Permanently), the redirect link exists.
+    if [[ -z "$broken_redirects" ]]; then
+        aka_ms_download_link=$( echo "$response" | awk '$1 ~ /^Location/{print $2}' | tail -1 | tr -d '\r')
+
+        if [[ -z "$aka_ms_download_link" ]]; then
+            say_verbose "The aka.ms link '$aka_ms_link' is not valid: failed to get redirect location."
+            return 1
+        fi
+
+        say_verbose "The redirect location retrieved: '$aka_ms_download_link'."
+        return 0
+    else
+        say_verbose "The aka.ms link '$aka_ms_link' is not valid: received HTTP code: $(echo "$broken_redirects" | paste -sd "," -)."
+        return 1
+    fi
+}
+
+get_feeds_to_use()
+{
+    feeds=(
+    "https://dotnetcli.azureedge.net/dotnet"
+    "https://dotnetbuilds.azureedge.net/public"
+    )
+
+    if [[ -n "$azure_feed" ]]; then
+        feeds=("$azure_feed")
+    fi
+
+    if [[ "$no_cdn" == "true" ]]; then
+        feeds=(
+        "https://dotnetcli.blob.core.windows.net/dotnet"
+        "https://dotnetbuilds.blob.core.windows.net/public"
+        )
+
+        if [[ -n "$uncached_feed" ]]; then
+            feeds=("$uncached_feed")
+        fi
+    fi
+}
+
+# THIS FUNCTION MAY EXIT (if the determined version is already installed).
+generate_download_links() {
+
+    download_links=()
+    specific_versions=()
+    effective_versions=()
+    link_types=()
+
+    # If generate_akams_links returns false, no fallback to old links. Just terminate.
+    # This function may also 'exit' (if the determined version is already installed).
+    generate_akams_links || return
+
+    # Check other feeds only if we haven't been able to find an aka.ms link.
+    if [[ "${#download_links[@]}" -lt 1 ]]; then
+        for feed in ${feeds[@]}
+        do
+            # generate_regular_links may also 'exit' (if the determined version is already installed).
+            generate_regular_links $feed || return
+        done
+    fi
+
+    if [[ "${#download_links[@]}" -eq 0 ]]; then
+        say_err "Failed to resolve the exact version number."
+        return 1
+    fi
+
+    say_verbose "Generated ${#download_links[@]} links."
+    for link_index in ${!download_links[@]}
+    do
+        say_verbose "Link $link_index: ${link_types[$link_index]}, ${effective_versions[$link_index]}, ${download_links[$link_index]}"
+    done
+}
+
+# THIS FUNCTION MAY EXIT (if the determined version is already installed).
+generate_akams_links() {
+    local valid_aka_ms_link=true;
+
+    normalized_version="$(to_lowercase "$version")"
+    if [[ "$normalized_version" != "latest" ]] && [ -n "$normalized_quality" ]; then
+        say_err "Quality and Version options are not allowed to be specified simultaneously. See https://learn.microsoft.com/dotnet/core/tools/dotnet-install-script#options for details."
+        return 1
+    fi
+
+    if [[ -n "$json_file" || "$normalized_version" != "latest" ]]; then
+        # aka.ms links are not needed when exact version is specified via command or json file
+        return
+    fi
+
+    get_download_link_from_aka_ms || valid_aka_ms_link=false
+
+    if [[ "$valid_aka_ms_link" == true ]]; then
+        say_verbose "Retrieved primary payload URL from aka.ms link: '$aka_ms_download_link'."
+        say_verbose "Downloading using legacy url will not be attempted."
+
+        download_link=$aka_ms_download_link
+
+        #get version from the path
+        IFS='/'
+        read -ra pathElems <<< "$download_link"
+        count=${#pathElems[@]}
+        specific_version="${pathElems[count-2]}"
+        unset IFS;
+        say_verbose "Version: '$specific_version'."
+
+        #Retrieve effective version
+        effective_version="$(get_specific_product_version "$azure_feed" "$specific_version" "$download_link")"
+
+        # Add link info to arrays
+        download_links+=($download_link)
+        specific_versions+=($specific_version)
+        effective_versions+=($effective_version)
+        link_types+=("aka.ms")
+
+        #  Check if the SDK version is already installed.
+        if [[ "$dry_run" != true ]] && is_dotnet_package_installed "$install_root" "$asset_relative_path" "$effective_version"; then
+            say "$asset_name with version '$effective_version' is already installed."
+            exit 0
+        fi
+
+        return 0
+    fi
+
+    # if quality is specified - exit with error - there is no fallback approach
+    if [ ! -z "$normalized_quality" ]; then
+        say_err "Failed to locate the latest version in the channel '$normalized_channel' with '$normalized_quality' quality for '$normalized_product', os: '$normalized_os', architecture: '$normalized_architecture'."
+        say_err "Refer to: https://aka.ms/dotnet-os-lifecycle for information on .NET Core support."
+        return 1
+    fi
+    say_verbose "Falling back to latest.version file approach."
+}
+
+# THIS FUNCTION MAY EXIT (if the determined version is already installed)
+# args:
+# feed - $1
+generate_regular_links() {
+    local feed="$1"
+    local valid_legacy_download_link=true
+
+    specific_version=$(get_specific_version_from_version "$feed" "$channel" "$normalized_architecture" "$version" "$json_file") || specific_version='0'
+
+    if [[ "$specific_version" == '0' ]]; then
+        say_verbose "Failed to resolve the specific version number using feed '$feed'"
+        return
+    fi
+
+    effective_version="$(get_specific_product_version "$feed" "$specific_version")"
+    say_verbose "specific_version=$specific_version"
+
+    download_link="$(construct_download_link "$feed" "$channel" "$normalized_architecture" "$specific_version" "$normalized_os")"
+    say_verbose "Constructed primary named payload URL: $download_link"
+
+    # Add link info to arrays
+    download_links+=($download_link)
+    specific_versions+=($specific_version)
+    effective_versions+=($effective_version)
+    link_types+=("primary")
+
+    legacy_download_link="$(construct_legacy_download_link "$feed" "$channel" "$normalized_architecture" "$specific_version")" || valid_legacy_download_link=false
+
+    if [ "$valid_legacy_download_link" = true ]; then
+        say_verbose "Constructed legacy named payload URL: $legacy_download_link"
+    
+        download_links+=($legacy_download_link)
+        specific_versions+=($specific_version)
+        effective_versions+=($effective_version)
+        link_types+=("legacy")
+    else
+        legacy_download_link=""
+        say_verbose "Cound not construct a legacy_download_link; omitting..."
+    fi
+
+    #  Check if the SDK version is already installed.
+    if [[ "$dry_run" != true ]] && is_dotnet_package_installed "$install_root" "$asset_relative_path" "$effective_version"; then
+        say "$asset_name with version '$effective_version' is already installed."
+        exit 0
+    fi
+}
+
+print_dry_run() {
+
+    say "Payload URLs:"
+
+    for link_index in "${!download_links[@]}"
+        do
+            say "URL #$link_index - ${link_types[$link_index]}: ${download_links[$link_index]}"
+    done
+
+    resolved_version=${specific_versions[0]}
+    repeatable_command="./$script_name --version "\""$resolved_version"\"" --install-dir "\""$install_root"\"" --architecture "\""$normalized_architecture"\"" --os "\""$normalized_os"\"""
+    
+    if [ ! -z "$normalized_quality" ]; then
+        repeatable_command+=" --quality "\""$normalized_quality"\"""
+    fi
+
+    if [[ "$runtime" == "dotnet" ]]; then
+        repeatable_command+=" --runtime "\""dotnet"\"""
+    elif [[ "$runtime" == "aspnetcore" ]]; then
+        repeatable_command+=" --runtime "\""aspnetcore"\"""
+    fi
+
+    repeatable_command+="$non_dynamic_parameters"
+
+    if [ -n "$feed_credential" ]; then
+        repeatable_command+=" --feed-credential "\""<feed_credential>"\"""
+    fi
+
+    say "Repeatable invocation: $repeatable_command"
+}
+
+calculate_vars() {
+    eval $invocation
+
+    script_name=$(basename "$0")
+    normalized_architecture="$(get_normalized_architecture_from_architecture "$architecture")"
+    say_verbose "Normalized architecture: '$normalized_architecture'."
+    normalized_os="$(get_normalized_os "$user_defined_os")"
+    say_verbose "Normalized OS: '$normalized_os'."
+    normalized_quality="$(get_normalized_quality "$quality")"
+    say_verbose "Normalized quality: '$normalized_quality'."
+    normalized_channel="$(get_normalized_channel "$channel")"
+    say_verbose "Normalized channel: '$normalized_channel'."
+    normalized_product="$(get_normalized_product "$runtime")"
+    say_verbose "Normalized product: '$normalized_product'."
+    install_root="$(resolve_installation_path "$install_dir")"
+    say_verbose "InstallRoot: '$install_root'."
+
+    normalized_architecture="$(get_normalized_architecture_for_specific_sdk_version "$version" "$normalized_channel" "$normalized_architecture")"
+
+    if [[ "$runtime" == "dotnet" ]]; then
+        asset_relative_path="shared/Microsoft.NETCore.App"
+        asset_name=".NET Core Runtime"
+    elif [[ "$runtime" == "aspnetcore" ]]; then
+        asset_relative_path="shared/Microsoft.AspNetCore.App"
+        asset_name="ASP.NET Core Runtime"
+    elif [ -z "$runtime" ]; then
+        asset_relative_path="sdk"
+        asset_name=".NET Core SDK"
+    fi
+
+    get_feeds_to_use
+}
+
+install_dotnet() {
+    eval $invocation
+    local download_failed=false
+    local download_completed=false
+    local remote_file_size=0
+
+    mkdir -p "$install_root"
+    zip_path="${zip_path:-$(mktemp "$temporary_file_template")}"
+    say_verbose "Zip path: $zip_path"
+
+    for link_index in "${!download_links[@]}"
+    do
+        download_link="${download_links[$link_index]}"
+        specific_version="${specific_versions[$link_index]}"
+        effective_version="${effective_versions[$link_index]}"
+        link_type="${link_types[$link_index]}"
+
+        say "Attempting to download using $link_type link $download_link"
+
+        # The download function will set variables $http_code and $download_error_msg in case of failure.
+        download_failed=false
+        download "$download_link" "$zip_path" 2>&1 || download_failed=true
+
+        if [ "$download_failed" = true ]; then
+            case $http_code in
+            404)
+                say "The resource at $link_type link '$download_link' is not available."
+                ;;
+            *)
+                say "Failed to download $link_type link '$download_link': $download_error_msg"
+                ;;
+            esac
+            rm -f "$zip_path" 2>&1 && say_verbose "Temporary zip file $zip_path was removed"
+        else
+            download_completed=true
+            break
+        fi
+    done
+
+    if [[ "$download_completed" == false ]]; then
+        say_err "Could not find \`$asset_name\` with version = $specific_version"
+        say_err "Refer to: https://aka.ms/dotnet-os-lifecycle for information on .NET Core support"
+        return 1
+    fi
+
+    remote_file_size="$(get_remote_file_size "$download_link")"
+
+    say "Extracting zip from $download_link"
+    extract_dotnet_package "$zip_path" "$install_root" "$remote_file_size" || return 1
+
+    #  Check if the SDK version is installed; if not, fail the installation.
+    # if the version contains "RTM" or "servicing"; check if a 'release-type' SDK version is installed.
+    if [[ $specific_version == *"rtm"* || $specific_version == *"servicing"* ]]; then
+        IFS='-'
+        read -ra verArr <<< "$specific_version"
+        release_version="${verArr[0]}"
+        unset IFS;
+        say_verbose "Checking installation: version = $release_version"
+        if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$release_version"; then
+            say "Installed version is $effective_version"
+            return 0
+        fi
+    fi
+
+    #  Check if the standard SDK version is installed.
+    say_verbose "Checking installation: version = $effective_version"
+    if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$effective_version"; then
+        say "Installed version is $effective_version"
+        return 0
+    fi
+
+    # Version verification failed. More likely something is wrong either with the downloaded content or with the verification algorithm.
+    say_err "Failed to verify the version of installed \`$asset_name\`.\nInstallation source: $download_link.\nInstallation location: $install_root.\nReport the bug at https://github.com/dotnet/install-scripts/issues."
+    say_err "\`$asset_name\` with version = $effective_version failed to install with an error."
+    return 1
+}
+
+args=("$@")
+
+local_version_file_relative_path="/.version"
+bin_folder_relative_path=""
+temporary_file_template="${TMPDIR:-/tmp}/dotnet.XXXXXXXXX"
+
+channel="LTS"
+version="Latest"
+json_file=""
+install_dir="<auto>"
+architecture="<auto>"
+dry_run=false
+no_path=false
+no_cdn=false
+azure_feed=""
+uncached_feed=""
+feed_credential=""
+verbose=false
+runtime=""
+runtime_id=""
+quality=""
+internal=false
+override_non_versioned_files=true
+non_dynamic_parameters=""
+user_defined_os=""
+
+while [ $# -ne 0 ]
+do
+    name="$1"
+    case "$name" in
+        -c|--channel|-[Cc]hannel)
+            shift
+            channel="$1"
+            ;;
+        -v|--version|-[Vv]ersion)
+            shift
+            version="$1"
+            ;;
+        -q|--quality|-[Qq]uality)
+            shift
+            quality="$1"
+            ;;
+        --internal|-[Ii]nternal)
+            internal=true
+            non_dynamic_parameters+=" $name"
+            ;;
+        -i|--install-dir|-[Ii]nstall[Dd]ir)
+            shift
+            install_dir="$1"
+            ;;
+        --arch|--architecture|-[Aa]rch|-[Aa]rchitecture)
+            shift
+            architecture="$1"
+            ;;
+        --os|-[Oo][SS])
+            shift
+            user_defined_os="$1"
+            ;;
+        --shared-runtime|-[Ss]hared[Rr]untime)
+            say_warning "The --shared-runtime flag is obsolete and may be removed in a future version of this script. The recommended usage is to specify '--runtime dotnet'."
+            if [ -z "$runtime" ]; then
+                runtime="dotnet"
+            fi
+            ;;
+        --runtime|-[Rr]untime)
+            shift
+            runtime="$1"
+            if [[ "$runtime" != "dotnet" ]] && [[ "$runtime" != "aspnetcore" ]]; then
+                say_err "Unsupported value for --runtime: '$1'. Valid values are 'dotnet' and 'aspnetcore'."
+                if [[ "$runtime" == "windowsdesktop" ]]; then
+                    say_err "WindowsDesktop archives are manufactured for Windows platforms only."
+                fi
+                exit 1
+            fi
+            ;;
+        --dry-run|-[Dd]ry[Rr]un)
+            dry_run=true
+            ;;
+        --no-path|-[Nn]o[Pp]ath)
+            no_path=true
+            non_dynamic_parameters+=" $name"
+            ;;
+        --verbose|-[Vv]erbose)
+            verbose=true
+            non_dynamic_parameters+=" $name"
+            ;;
+        --no-cdn|-[Nn]o[Cc]dn)
+            no_cdn=true
+            non_dynamic_parameters+=" $name"
+            ;;
+        --azure-feed|-[Aa]zure[Ff]eed)
+            shift
+            azure_feed="$1"
+            non_dynamic_parameters+=" $name "\""$1"\"""
+            ;;
+        --uncached-feed|-[Uu]ncached[Ff]eed)
+            shift
+            uncached_feed="$1"
+            non_dynamic_parameters+=" $name "\""$1"\"""
+            ;;
+        --feed-credential|-[Ff]eed[Cc]redential)
+            shift
+            feed_credential="$1"
+            #feed_credential should start with "?", for it to be added to the end of the link.
+            #adding "?" at the beginning of the feed_credential if needed.
+            [[ -z "$(echo $feed_credential)" ]] || [[ $feed_credential == \?* ]] || feed_credential="?$feed_credential"
+            ;;
+        --runtime-id|-[Rr]untime[Ii]d)
+            shift
+            runtime_id="$1"
+            non_dynamic_parameters+=" $name "\""$1"\"""
+            say_warning "Use of --runtime-id is obsolete and should be limited to the versions below 2.1. To override architecture, use --architecture option instead. To override OS, use --os option instead."
+            ;;
+        --jsonfile|-[Jj][Ss]on[Ff]ile)
+            shift
+            json_file="$1"
+            ;;
+        --skip-non-versioned-files|-[Ss]kip[Nn]on[Vv]ersioned[Ff]iles)
+            override_non_versioned_files=false
+            non_dynamic_parameters+=" $name"
+            ;;
+        --keep-zip|-[Kk]eep[Zz]ip)
+            keep_zip=true
+            non_dynamic_parameters+=" $name"
+            ;;
+        --zip-path|-[Zz]ip[Pp]ath)
+            shift
+            zip_path="$1"
+            ;;
+        -?|--?|-h|--help|-[Hh]elp)
+            script_name="$(basename "$0")"
+            echo ".NET Tools Installer"
+            echo "Usage:"
+            echo "       # Install a .NET SDK of a given Quality from a given Channel"
+            echo "       $script_name [-c|--channel <CHANNEL>] [-q|--quality <QUALITY>]"
+            echo "       # Install a .NET SDK of a specific public version"
+            echo "       $script_name [-v|--version <VERSION>]"
+            echo "       $script_name -h|-?|--help"
+            echo ""
+            echo "$script_name is a simple command line interface for obtaining dotnet cli."
+            echo "    Note that the intended use of this script is for Continuous Integration (CI) scenarios, where:"
+            echo "    - The SDK needs to be installed without user interaction and without admin rights."
+            echo "    - The SDK installation doesn't need to persist across multiple CI runs."
+            echo "    To set up a development environment or to run apps, use installers rather than this script. Visit https://dotnet.microsoft.com/download to get the installer."
+            echo ""
+            echo "Options:"
+            echo "  -c,--channel <CHANNEL>         Download from the channel specified, Defaults to \`$channel\`."
+            echo "      -Channel"
+            echo "          Possible values:"
+            echo "          - STS - the most recent Standard Term Support release"
+            echo "          - LTS - the most recent Long Term Support release"
+            echo "          - 2-part version in a format A.B - represents a specific release"
+            echo "              examples: 2.0; 1.0"
+            echo "          - 3-part version in a format A.B.Cxx - represents a specific SDK release"
+            echo "              examples: 5.0.1xx, 5.0.2xx."
+            echo "              Supported since 5.0 release"
+            echo "          Warning: Value 'Current' is deprecated for the Channel parameter. Use 'STS' instead."
+            echo "          Note: The version parameter overrides the channel parameter when any version other than 'latest' is used."
+            echo "  -v,--version <VERSION>         Use specific VERSION, Defaults to \`$version\`."
+            echo "      -Version"
+            echo "          Possible values:"
+            echo "          - latest - the latest build on specific channel"
+            echo "          - 3-part version in a format A.B.C - represents specific version of build"
+            echo "              examples: 2.0.0-preview2-006120; 1.1.0"
+            echo "  -q,--quality <quality>         Download the latest build of specified quality in the channel."
+            echo "      -Quality"
+            echo "          The possible values are: daily, signed, validated, preview, GA."
+            echo "          Works only in combination with channel. Not applicable for STS and LTS channels and will be ignored if those channels are used." 
+            echo "          For SDK use channel in A.B.Cxx format. Using quality for SDK together with channel in A.B format is not supported." 
+            echo "          Supported since 5.0 release." 
+            echo "          Note: The version parameter overrides the channel parameter when any version other than 'latest' is used, and therefore overrides the quality."
+            echo "  --internal,-Internal               Download internal builds. Requires providing credentials via --feed-credential parameter."
+            echo "  --feed-credential <FEEDCREDENTIAL> Token to access Azure feed. Used as a query string to append to the Azure feed."
+            echo "      -FeedCredential                This parameter typically is not specified."
+            echo "  -i,--install-dir <DIR>             Install under specified location (see Install Location below)"
+            echo "      -InstallDir"
+            echo "  --architecture <ARCHITECTURE>      Architecture of dotnet binaries to be installed, Defaults to \`$architecture\`."
+            echo "      --arch,-Architecture,-Arch"
+            echo "          Possible values: x64, arm, arm64, s390x, ppc64le and loongarch64"
+            echo "  --os <system>                    Specifies operating system to be used when selecting the installer."
+            echo "          Overrides the OS determination approach used by the script. Supported values: osx, linux, linux-musl, freebsd, rhel.6."
+            echo "          In case any other value is provided, the platform will be determined by the script based on machine configuration."
+            echo "          Not supported for legacy links. Use --runtime-id to specify platform for legacy links."
+            echo "          Refer to: https://aka.ms/dotnet-os-lifecycle for more information."
+            echo "  --runtime <RUNTIME>                Installs a shared runtime only, without the SDK."
+            echo "      -Runtime"
+            echo "          Possible values:"
+            echo "          - dotnet     - the Microsoft.NETCore.App shared runtime"
+            echo "          - aspnetcore - the Microsoft.AspNetCore.App shared runtime"
+            echo "  --dry-run,-DryRun                  Do not perform installation. Display download link."
+            echo "  --no-path, -NoPath                 Do not set PATH for the current process."
+            echo "  --verbose,-Verbose                 Display diagnostics information."
+            echo "  --azure-feed,-AzureFeed            For internal use only."
+            echo "                                     Allows using a different storage to download SDK archives from."
+            echo "                                     This parameter is only used if --no-cdn is false."
+            echo "  --uncached-feed,-UncachedFeed      For internal use only."
+            echo "                                     Allows using a different storage to download SDK archives from."
+            echo "                                     This parameter is only used if --no-cdn is true."
+            echo "  --skip-non-versioned-files         Skips non-versioned files if they already exist, such as the dotnet executable."
+            echo "      -SkipNonVersionedFiles"
+            echo "  --no-cdn,-NoCdn                    Disable downloading from the Azure CDN, and use the uncached feed directly."
+            echo "  --jsonfile <JSONFILE>              Determines the SDK version from a user specified global.json file."
+            echo "                                     Note: global.json must have a value for 'SDK:Version'"
+            echo "  --keep-zip,-KeepZip                If set, downloaded file is kept."
+            echo "  --zip-path, -ZipPath               If set, downloaded file is stored at the specified path."
+            echo "  -?,--?,-h,--help,-Help             Shows this help message"
+            echo ""
+            echo "Install Location:"
+            echo "  Location is chosen in following order:"
+            echo "    - --install-dir option"
+            echo "    - Environmental variable DOTNET_INSTALL_DIR"
+            echo "    - $HOME/.dotnet"
+            exit 0
+            ;;
+        *)
+            say_err "Unknown argument \`$name\`"
+            exit 1
+            ;;
+    esac
+
+    shift
+done
+
+say_verbose "Note that the intended use of this script is for Continuous Integration (CI) scenarios, where:"
+say_verbose "- The SDK needs to be installed without user interaction and without admin rights."
+say_verbose "- The SDK installation doesn't need to persist across multiple CI runs."
+say_verbose "To set up a development environment or to run apps, use installers rather than this script. Visit https://dotnet.microsoft.com/download to get the installer.\n"
+
+if [ "$internal" = true ] && [ -z "$(echo $feed_credential)" ]; then
+    message="Provide credentials via --feed-credential parameter."
+    if [ "$dry_run" = true ]; then
+        say_warning "$message"
+    else
+        say_err "$message"
+        exit 1
+    fi
+fi
+
+check_min_reqs
+calculate_vars
+# generate_regular_links call below will 'exit' if the determined version is already installed.
+generate_download_links
+
+if [[ "$dry_run" = true ]]; then
+    print_dry_run
+    exit 0
+fi
+
+install_dotnet
+
+bin_path="$(get_absolute_path "$(combine_paths "$install_root" "$bin_folder_relative_path")")"
+if [ "$no_path" = false ]; then
+    say "Adding to current process PATH: \`$bin_path\`. Note: This change will be visible only when sourcing script."
+    export PATH="$bin_path":"$PATH"
+else
+    say "Binaries of dotnet can be found in $bin_path"
+fi
+
+say "Note that the script does not resolve dependencies during installation."
+say "To check the list of dependencies, go to https://learn.microsoft.com/dotnet/core/install, select your operating system and check the \"Dependencies\" section."
+say "Installation finished successfully."

From 4db22d38c6f04996de99ff7062555e0eb2f66b9c Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 27 Feb 2024 12:49:38 -0800
Subject: [PATCH 237/478] Docker-in-docker: Updates default value for
 "dockerDashComposeVersion" to "latest (#873)

* Set v2 by default ; draft

* Fix edge case: compose switch

* Update description

* validate "compose-switch" installation

* fix test
---
 .../devcontainer-feature.json                 |  13 +-
 src/docker-in-docker/install.sh               | 113 +++++++++---------
 test/docker-in-docker/docker_build.sh         |   4 +-
 test/docker-in-docker/docker_compose_v1.sh    |  13 ++
 test/docker-in-docker/docker_compose_v2.sh    |  16 +++
 test/docker-in-docker/scenarios.json          |  20 ++++
 6 files changed, 119 insertions(+), 60 deletions(-)
 create mode 100755 test/docker-in-docker/docker_compose_v1.sh
 create mode 100755 test/docker-in-docker/docker_compose_v2.sh

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index d74f205a1..ab26a5e11 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.9.2",
+    "version": "2.10.0",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
@@ -29,11 +29,11 @@
             "type": "string",
             "enum": [
                 "none",
-                "v1",
+                "latest",
                 "v2"
             ],
-            "default": "v1",
-            "description": "Default version of Docker Compose (v1 or v2 or none)"
+            "default": "latest",
+            "description": "Default version of Docker Compose (latest, v2 or none)"
         },
         "azureDnsAutoDetection": {
             "type": "boolean",
@@ -50,6 +50,11 @@
             "type": "boolean",
             "default": true,
             "description": "Install Docker Buildx"
+        },
+        "installDockerComposeSwitch": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
         }
     },
     "entrypoint": "/usr/local/share/docker-init.sh",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 9f0e18cee..2a27f5c9c 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -11,11 +11,12 @@
 DOCKER_VERSION="${VERSION:-"latest"}" # The Docker/Moby Engine + CLI should match in version
 USE_MOBY="${MOBY:-"true"}"
 MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"latest"}"
-DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2 or none
+DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"latest"}" #latest, v2 or none
 AZURE_DNS_AUTO_DETECTION="${AZUREDNSAUTODETECTION:-"true"}"
 DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL:-""}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
+INSTALL_DOCKER_COMPOSE_SWITCH="${INSTALLDOCKERCOMPOSESWITCH:-"true"}"
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal jammy"
 DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal hirsute impish jammy"
@@ -247,75 +248,77 @@ fi
 
 echo "Finished installing docker / moby!"
 
+docker_home="/usr/libexec/docker"
+cli_plugins_dir="${docker_home}/cli-plugins"
+
 # If 'docker-compose' command is to be included
 if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
-    # Install Docker Compose if not already installed and is on a supported architecture
-    if type docker-compose > /dev/null 2>&1; then
-        echo "Docker Compose v1 already installed."
-    else
-        target_compose_arch="${architecture}"
-        if [ "${target_compose_arch}" = "amd64" ]; then
-            target_compose_arch="x86_64"
-        fi
-        # https://github.com/devcontainers/features/issues/832
-        if [ "${target_compose_arch}" != "x86_64" ] && [ "${VERSION_CODENAME}" != "bookworm" ]; then
-            # Use pip to get a version that runs on this architecture
-            check_packages python3-minimal python3-pip libffi-dev python3-venv
-            export PIPX_HOME=/usr/local/pipx
-            mkdir -p ${PIPX_HOME}
-            export PIPX_BIN_DIR=/usr/local/bin
-            export PYTHONUSERBASE=/tmp/pip-tmp
-            export PIP_CACHE_DIR=/tmp/pip-tmp/cache
-            pipx_bin=pipx
-            if ! type pipx > /dev/null 2>&1; then
-                pip3 install --disable-pip-version-check --no-cache-dir --user pipx
-                pipx_bin=/tmp/pip-tmp/bin/pipx
-            fi
-
-            set +e
-                ${pipx_bin} install --pip-args '--no-cache-dir --force-reinstall' docker-compose
-                exit_code=$?
-            set -e
-
-            if [ ${exit_code} -ne 0 ]; then
-                # Temporary: https://github.com/devcontainers/features/issues/616
-                # See https://github.com/yaml/pyyaml/issues/601
-                echo "(*) Failed to install docker-compose via pipx. Trying via pip3..."
-
-                export PYTHONUSERBASE=/usr/local
-                pip3 install --disable-pip-version-check --no-cache-dir --user "Cython<3.0" pyyaml wheel docker-compose --no-build-isolation
-            fi
+    case "${architecture}" in
+        amd64) target_compose_arch=x86_64 ;;
+        arm64) target_compose_arch=aarch64 ;;
+        *)
+            echo "(!) Docker in docker does not support machine architecture '$architecture'. Please use an x86-64 or ARM64 machine."
+            exit 1
+    esac
 
-            rm -rf /tmp/pip-tmp
+    docker_compose_path="/usr/local/bin/docker-compose"
+    if [ "${DOCKER_DASH_COMPOSE_VERSION}" = "v1" ]; then
+        err "The final Compose V1 release, version 1.29.2, was May 10, 2021. These packages haven't received any security updates since then. Use at your own risk."
+        INSTALL_DOCKER_COMPOSE_SWITCH="false"
+
+        if [ "${target_compose_arch}" = "x86_64" ]; then
+            echo "(*) Installing docker compose v1..."
+            curl -fsSL "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64" -o ${docker_compose_path}
+            chmod +x ${docker_compose_path}
+
+            # Download the SHA256 checksum
+            DOCKER_COMPOSE_SHA256="$(curl -sSL "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64.sha256" | awk '{print $1}')"
+            echo "${DOCKER_COMPOSE_SHA256}  ${docker_compose_path}" > docker-compose.sha256sum
+            sha256sum -c docker-compose.sha256sum --ignore-missing
+        elif [ "${VERSION_CODENAME}" = "bookworm" ]; then
+            err "Docker compose v1 is unavailable for 'bookworm' on Arm64. Kindly switch to use v2"
+            exit 1
         else
-            compose_v1_version="1"
-            find_version_from_git_tags compose_v1_version "https://github.com/docker/compose" "tags/"
-            echo "(*) Installing docker-compose ${compose_v1_version}..."
-            curl -fsSL "https://github.com/docker/compose/releases/download/${compose_v1_version}/docker-compose-Linux-x86_64" -o /usr/local/bin/docker-compose
-            chmod +x /usr/local/bin/docker-compose
+            # Use pip to get a version that runs on this architecture
+            check_packages python3-minimal python3-pip libffi-dev python3-venv
+            echo "(*) Installing docker compose v1 via pip..."
+            export PYTHONUSERBASE=/usr/local
+            pip3 install --disable-pip-version-check --no-cache-dir --user "Cython<3.0" pyyaml wheel docker-compose --no-build-isolation
         fi
+    else
+        compose_version=${DOCKER_DASH_COMPOSE_VERSION#v}
+        find_version_from_git_tags compose_version "https://github.com/docker/compose" "tags/v"
+        echo "(*) Installing docker-compose ${compose_version}..."
+        curl -L "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path}
+        chmod +x ${docker_compose_path}
+
+        # Download the SHA256 checksum
+        DOCKER_COMPOSE_SHA256="$(curl -sSL "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}.sha256" | awk '{print $1}')"
+        echo "${DOCKER_COMPOSE_SHA256}  ${docker_compose_path}" > docker-compose.sha256sum
+        sha256sum -c docker-compose.sha256sum --ignore-missing
+
+        mkdir -p ${cli_plugins_dir}
+        cp ${docker_compose_path} ${cli_plugins_dir}
     fi
+fi
 
-    # Install docker-compose switch if not already installed - https://github.com/docker/compose-switch#manual-installation
-    current_v1_compose_path="$(which docker-compose)"
-    target_v1_compose_path="$(dirname "${current_v1_compose_path}")/docker-compose-v1"
-    if ! type compose-switch > /dev/null 2>&1; then
+# Install docker-compose switch if not already installed - https://github.com/docker/compose-switch#manual-installation
+if [ "${INSTALL_DOCKER_COMPOSE_SWITCH}" = "true" ] && ! type compose-switch > /dev/null 2>&1; then
+    if type docker-compose > /dev/null 2>&1; then
         echo "(*) Installing compose-switch..."
+        current_compose_path="$(which docker-compose)"
+        target_compose_path="$(dirname "${current_compose_path}")/docker-compose-v1"
         compose_switch_version="latest"
         find_version_from_git_tags compose_switch_version "https://github.com/docker/compose-switch"
         curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/compose-switch
         chmod +x /usr/local/bin/compose-switch
         # TODO: Verify checksum once available: https://github.com/docker/compose-switch/issues/11
-
         # Setup v1 CLI as alternative in addition to compose-switch (which maps to v2)
-        mv "${current_v1_compose_path}" "${target_v1_compose_path}"
-        update-alternatives --install /usr/local/bin/docker-compose docker-compose /usr/local/bin/compose-switch 99
-        update-alternatives --install /usr/local/bin/docker-compose docker-compose "${target_v1_compose_path}" 1
-    fi
-    if [ "${DOCKER_DASH_COMPOSE_VERSION}" = "v1" ]; then
-        update-alternatives --set docker-compose "${target_v1_compose_path}"
+        mv "${current_compose_path}" "${target_compose_path}"
+        update-alternatives --install ${docker_compose_path} docker-compose /usr/local/bin/compose-switch 99
+        update-alternatives --install ${docker_compose_path} docker-compose "${target_compose_path}" 1
     else
-        update-alternatives --set docker-compose /usr/local/bin/compose-switch
+        err "Skipping installation of compose-switch as docker compose is unavailable..."
     fi
 fi
 
diff --git a/test/docker-in-docker/docker_build.sh b/test/docker-in-docker/docker_build.sh
index 7e71be8a1..322a819fc 100755
--- a/test/docker-in-docker/docker_build.sh
+++ b/test/docker-in-docker/docker_build.sh
@@ -9,8 +9,10 @@ source dev-container-features-test-lib
 check "docker-buildx" docker buildx version
 check "docker-build" docker build ./
 
-check "installs docker-compose v1 install" bash -c "type docker-compose"
 check "installs compose-switch" bash -c "[[ -f /usr/local/bin/compose-switch ]]"
+check "docker compose" bash -c "docker compose version | grep -E '2.[0-9]+.[0-9]+'"
+check "docker-compose" bash -c "docker-compose --version | grep -E '2.[0-9]+.[0-9]+'"
+
 check "docker-buildx" bash -c "docker buildx version"
 check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
 
diff --git a/test/docker-in-docker/docker_compose_v1.sh b/test/docker-in-docker/docker_compose_v1.sh
new file mode 100755
index 000000000..3f7453c83
--- /dev/null
+++ b/test/docker-in-docker/docker_compose_v1.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+
+check "docker-compose" bash -c "docker-compose version | grep -E '1.[0-9]+.[0-9]+'"
+
+# Report result
+reportResults
diff --git a/test/docker-in-docker/docker_compose_v2.sh b/test/docker-in-docker/docker_compose_v2.sh
new file mode 100755
index 000000000..5a512d2c5
--- /dev/null
+++ b/test/docker-in-docker/docker_compose_v2.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+
+check "docker compose" bash -c "docker compose version | grep -E '2.[0-9]+.[0-9]+'"
+check "docker-compose" bash -c "docker-compose --version | grep -E '2.[0-9]+.[0-9]+'"
+check "installs compose-switch as docker-compose" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
+check "installs compose-switch" bash -c "[[ -f /usr/local/bin/compose-switch ]]"
+
+# Report result
+reportResults
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index ccf57b188..e209f3453 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -87,6 +87,26 @@
             }
         }
     },
+    "docker_compose_v1": {
+        "image": "mcr.microsoft.com/devcontainers/base:focal",
+        "features": {
+            "docker-in-docker": {
+                "moby": true,
+                "installDockerBuildx": true,
+                "dockerDashComposeVersion": "v1"
+            }
+        }
+    },
+    "docker_compose_v2": {
+        "image": "mcr.microsoft.com/devcontainers/base:focal",
+        "features": {
+            "docker-in-docker": {
+                "moby": true,
+                "installDockerBuildx": true,
+                "dockerDashComposeVersion": "v2"
+            }
+        }
+    },
     "docker_build_fallback_buildx": {
         "image": "ubuntu:focal",
         "features": {

From 03806caa7b6747489311e1f4d8f912ee456039e6 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Tue, 27 Feb 2024 12:50:57 -0800
Subject: [PATCH 238/478] Automated documentation update (#886)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/docker-in-docker/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index 2ab700118..b913fa45f 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -18,10 +18,11 @@ Create child containers *inside* a container, independent from the host's docker
 | version | Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.) | string | latest |
 | moby | Install OSS Moby build instead of Docker CE | boolean | true |
 | mobyBuildxVersion | Install a specific version of moby-buildx when using Moby | string | latest |
-| dockerDashComposeVersion | Default version of Docker Compose (v1 or v2 or none) | string | v1 |
+| dockerDashComposeVersion | Default version of Docker Compose (latest, v2 or none) | string | latest |
 | azureDnsAutoDetection | Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure | boolean | true |
 | dockerDefaultAddressPool | Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24 | string | - |
 | installDockerBuildx | Install Docker Buildx | boolean | true |
+| installDockerComposeSwitch | Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter. | boolean | true |
 
 ## Customizations
 

From 5ca92d26ce59ba17e9c5c67fb265b3694c4f18c3 Mon Sep 17 00:00:00 2001
From: gauravsaini04 <147703805+gauravsaini04@users.noreply.github.com>
Date: Thu, 29 Feb 2024 00:25:54 +0530
Subject: [PATCH 239/478] [kubectl-helm-minikube]: Handle failing build with
 fallback to prev. version for helm (#875)

* [kubectl-helm-minikube]: Handle failing build with fallback to prev. version

* changes acc. to comments and added tests

* only to add fallback mechanism for helm and removed for kubectl & minikube

* bump the patch version

* changes for last comments by @samruddhikhandale

* changes for suggestions
---
 .../devcontainer-feature.json                 |   2 +-
 src/kubectl-helm-minikube/install.sh          |  28 +++-
 .../install_only_helm_fallback.sh             | 124 ++++++++++++++++++
 test/kubectl-helm-minikube/scenarios.json     |  10 ++
 4 files changed, 159 insertions(+), 5 deletions(-)
 create mode 100644 test/kubectl-helm-minikube/install_only_helm_fallback.sh

diff --git a/src/kubectl-helm-minikube/devcontainer-feature.json b/src/kubectl-helm-minikube/devcontainer-feature.json
index fa8ea6138..16472205f 100644
--- a/src/kubectl-helm-minikube/devcontainer-feature.json
+++ b/src/kubectl-helm-minikube/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "kubectl-helm-minikube",
-    "version": "1.1.6",
+    "version": "1.1.7",
     "name": "Kubectl, Helm, and Minikube",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
     "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
diff --git a/src/kubectl-helm-minikube/install.sh b/src/kubectl-helm-minikube/install.sh
index 5deb377c3..69d4e0237 100755
--- a/src/kubectl-helm-minikube/install.sh
+++ b/src/kubectl-helm-minikube/install.sh
@@ -155,6 +155,21 @@ if [ ${KUBECTL_VERSION} != "none" ]; then
     fi
 fi
 
+# Function to fetch the version released prior to the latest version
+get_previous_version() {
+    repo_url=$1
+    # this would del the assets key and then get the second encountered tag_name's value from the filtered array of objects
+    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[1].tag_name' 
+}
+
+get_helm() {
+    HELM_VERSION=$1
+    helm_filename="helm-${HELM_VERSION}-linux-${architecture}.tar.gz"
+    tmp_helm_filename="/tmp/helm/${helm_filename}"
+    curl -sSL "https://get.helm.sh/${helm_filename}" -o "${tmp_helm_filename}"
+    curl -sSL "https://github.com/helm/helm/releases/download/${HELM_VERSION}/${helm_filename}.asc" -o "${tmp_helm_filename}.asc"
+}
+
 if [ ${HELM_VERSION} != "none" ]; then
     # Install Helm, verify signature and checksum
     echo "Downloading Helm..."
@@ -163,10 +178,15 @@ if [ ${HELM_VERSION} != "none" ]; then
         HELM_VERSION="v${HELM_VERSION}"
     fi
     mkdir -p /tmp/helm
-    helm_filename="helm-${HELM_VERSION}-linux-${architecture}.tar.gz"
-    tmp_helm_filename="/tmp/helm/${helm_filename}"
-    curl -sSL "https://get.helm.sh/${helm_filename}" -o "${tmp_helm_filename}"
-    curl -sSL "https://github.com/helm/helm/releases/download/${HELM_VERSION}/${helm_filename}.asc" -o "${tmp_helm_filename}.asc"
+    get_helm "${HELM_VERSION}"
+    if grep -q "BlobNotFound" "${tmp_helm_filename}"; then
+        echo -e "\n(!) Failed to fetch the latest artifacts for helm ${HELM_VERSION}..."
+        repo_url=https://api.github.com/repos/helm/helm/releases
+        requested_version=$(get_previous_version "${repo_url}")
+        echo -e "\nAttempting to install ${requested_version}"
+        HELM_VERSION=${requested_version}
+        get_helm "${HELM_VERSION}"
+    fi
     export GNUPGHOME="/tmp/helm/gnupg"
     mkdir -p "${GNUPGHOME}"
     chmod 700 ${GNUPGHOME}
diff --git a/test/kubectl-helm-minikube/install_only_helm_fallback.sh b/test/kubectl-helm-minikube/install_only_helm_fallback.sh
new file mode 100644
index 000000000..58ed137de
--- /dev/null
+++ b/test/kubectl-helm-minikube/install_only_helm_fallback.sh
@@ -0,0 +1,124 @@
+#!/bin/bash
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+HL="\033[1;33m"
+N="\033[0;37m"
+echo -e "\n👉${HL} helm version as installed by kubectl-helm-minikube feature${N}:"
+
+set +e
+    check "helm version" helm version
+set -e
+
+# Function to handle errors
+handle_error() {
+    local exit_code=$?
+    local line_number=$1
+    local command=$2
+    echo "Error occurred at line $line_number with exit code $exit_code in command $command"
+    exit $exit_code
+}
+trap 'handle_error $LINENO ${BASH_COMMAND%% *}' ERR
+echo "This is line $LINENO"
+
+## Check for fallback version installation instead of latest ( when artifact not found )
+architecture="$(uname -m)"
+case $architecture in
+    x86_64) architecture="amd64";;
+    aarch64 | armv8*) architecture="arm64";;
+    aarch32 | armv7* | armvhf*) architecture="arm";;
+    i?86) architecture="386";;
+    *) echo "(!) Architecture $architecture unsupported"; exit 1 ;;
+esac
+HELM_SHA256="${HELM_SHA256:-"automatic"}"
+HELM_GPG_KEYS_URI="https://raw.githubusercontent.com/helm/helm/main/KEYS"
+
+repo_url=https://api.github.com/repos/helm/helm/releases
+
+# Function to fetch the latest version of the plugin
+get_latest_version() {
+    curl -s "$repo_url/latest" | jq -r '.tag_name'
+}
+
+# Function to change the patch number in a semver version
+change_patch_number() {
+    local version="$1"  # Input version
+    local new_patch="$2"  # New patch number
+    # Extract major, minor, and current patch numbers
+    local major=$(echo "$version" | cut -d. -f1)
+    local minor=$(echo "$version" | cut -d. -f2)
+    local current_patch=$(echo "$version" | cut -d. -f3)
+    # Construct the new version with the updated patch number
+    local new_version="$major.$minor.$new_patch"
+    echo "$new_version"
+}
+
+# Function to fetch the previous version of the plugin
+get_previous_version() {
+    # this would del the assets key and then get the second encountered tag_name's value from the filtered array of objects
+    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[1].tag_name' 
+}
+
+get_helm() {
+    HELM_VERSION=$1
+    helm_filename="helm-${HELM_VERSION}-linux-${architecture}.tar.gz"
+    tmp_helm_filename="/tmp/helm/${helm_filename}"
+    sudo curl -sSL "https://get.helm.sh/${helm_filename}" -o "${tmp_helm_filename}"
+    sudo curl -sSL "https://github.com/helm/helm/releases/download/${HELM_VERSION}/${helm_filename}.asc" -o "${tmp_helm_filename}.asc"
+}
+
+latest_version=$(get_latest_version)
+NON_EXISTING_PATCH_VERSION="xyz"
+HELM_VERSION="$(change_patch_number ${latest_version} ${NON_EXISTING_PATCH_VERSION})"
+echo -e "\n👉${HL} Trying to install HELM_VERSION = ${HELM_VERSION}${N}"; 
+sudo mkdir -p /tmp/helm
+get_helm "${HELM_VERSION}"
+if grep -q "BlobNotFound" "/tmp/helm/${helm_filename}"; then
+    echo -e "\n(!) Failed to fetch the latest artifacts for helm ${HELM_VERSION}..."
+    requested_version=$(get_previous_version)
+    echo -e "\nAttempting to install ${requested_version}"
+    HELM_VERSION=${requested_version}
+    get_helm "${HELM_VERSION}"
+fi
+export GNUPGHOME="/tmp/helm/gnupg"
+sudo mkdir -p "${GNUPGHOME}"
+sudo chmod 700 ${GNUPGHOME}
+sudo curl -sSL "${HELM_GPG_KEYS_URI}" -o /tmp/helm/KEYS
+sudo echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" | sudo tee ${GNUPGHOME}/dirmngr.conf >/dev/null
+sudo gpg -q --import "/tmp/helm/KEYS"
+if ! sudo gpg --verify "${tmp_helm_filename}.asc" | sudo tee ${GNUPGHOME}/verify.log 2>&1; then
+    echo "Verification failed!"
+    sudo cat /tmp/helm/gnupg/verify.log
+    exit 1
+fi
+
+if [ "${HELM_SHA256}" = "automatic" ]; then
+    sudo curl -sSL "https://get.helm.sh/${helm_filename}.sha256" -o "${tmp_helm_filename}.sha256"
+    sudo curl -sSL "https://github.com/helm/helm/releases/download/${HELM_VERSION}/${helm_filename}.sha256.asc" -o "${tmp_helm_filename}.sha256.asc"
+    if ! sudo gpg --verify "${tmp_helm_filename}.sha256.asc" | sudo tee /tmp/helm/gnupg/verify.log 2>&1; then
+        echo "Verification failed!"
+        sudo cat /tmp/helm/gnupg/verify.log
+        exit 1
+    fi
+    HELM_SHA256="$(sudo cat "${tmp_helm_filename}.sha256")"
+fi
+
+([ "${HELM_SHA256}" = "dev-mode" ] || (sudo echo "${HELM_SHA256} *${tmp_helm_filename}" | sha256sum -c -))
+sudo tar xf "${tmp_helm_filename}" -C /tmp/helm
+sudo mv -f "/tmp/helm/linux-${architecture}/helm" /usr/local/bin/
+sudo chmod 0755 /usr/local/bin/helm
+sudo rm -rf /tmp/helm
+if ! type helm > /dev/null 2>&1; then
+    echo '(!) Helm installation failed!'
+    exit 1
+fi
+
+echo -e "\n👉${HL} helm version as installed by test for fallback${N}:"
+
+set +e
+    check "helm version" helm version
+set -e
+
+# Report result
+reportResults
diff --git a/test/kubectl-helm-minikube/scenarios.json b/test/kubectl-helm-minikube/scenarios.json
index 08ff8cc79..b82a9966e 100644
--- a/test/kubectl-helm-minikube/scenarios.json
+++ b/test/kubectl-helm-minikube/scenarios.json
@@ -8,5 +8,15 @@
                 "minikube": "none"
             }
         }
+    },
+    "install_only_helm_fallback": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "features": {
+            "kubectl-helm-minikube": {
+                "version": "none",
+                "helm": "latest",
+                "minikube": "none"
+            }
+        }
     }
 }

From 025cae18394696e5684251fbf72710e523c4bb65 Mon Sep 17 00:00:00 2001
From: Nebula <40148908+nebula-it@users.noreply.github.com>
Date: Thu, 29 Feb 2024 17:13:15 -0800
Subject: [PATCH 240/478] Fix profile not downloading (#876)

* Fix profile not downloading

Since the powershell folder is owned by root, the profile download fails without becoming sudo first.
```
ls -l /opt/microsoft/powershell/
total 0
drwxr-xr-x. 1 root root 22 Feb 23 08:37 7
```

* Update install.sh

* Update install.sh

* Fix: Add missing quote

* Update install.sh

* Update src/powershell/install.sh

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Update install.sh

* Update patch version in devcontainer-feature.json

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/powershell/devcontainer-feature.json |  2 +-
 src/powershell/install.sh                | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json
index 5a831f7e3..289bd33f0 100644
--- a/src/powershell/devcontainer-feature.json
+++ b/src/powershell/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "powershell",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "name": "PowerShell",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
     "description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/powershell/install.sh b/src/powershell/install.sh
index 2c052d7cd..27e5d8a27 100755
--- a/src/powershell/install.sh
+++ b/src/powershell/install.sh
@@ -12,6 +12,8 @@ set -e
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+
 POWERSHELL_VERSION=${VERSION:-"latest"}
 POWERSHELL_MODULES="${MODULES:-""}"
 POWERSHELL_PROFILE_URL="${PROFILE_URL}"
@@ -163,10 +165,26 @@ if [ ${#POWERSHELL_MODULES[@]} -gt 0 ]; then
     done
 fi
 
+ # Determine the appropriate non-root user 
+ if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then 
+     USERNAME="" 
+     POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") 
+     for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do 
+         if id -u ${CURRENT_USER} > /dev/null 2>&1; then 
+             USERNAME=${CURRENT_USER} 
+             break 
+         fi 
+     done 
+     if [ "${USERNAME}" = "" ]; then 
+         USERNAME=root 
+     fi 
+ elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then 
+     USERNAME=root 
+ fi 
 # If URL for powershell profile is provided, download it to '/opt/microsoft/powershell/7/profile.ps1'
 if [ -n "$POWERSHELL_PROFILE_URL" ]; then
     echo "Downloading PowerShell Profile from: $POWERSHELL_PROFILE_URL"
-    curl -sSL -o "/opt/microsoft/powershell/7/profile.ps1" "$POWERSHELL_PROFILE_URL"
+    su ${USERNAME} -c "curl -sSL -o '/opt/microsoft/powershell/7/profile.ps1' '$POWERSHELL_PROFILE_URL'"
 fi
 
 # Clean up

From 084df810aed51ae4a3de9b352a57a9890d5e967d Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Mon, 4 Mar 2024 11:36:03 -0800
Subject: [PATCH 241/478] Oryx: Clean up additional installation of .NET (#892)

---
 src/oryx/devcontainer-feature.json   |  2 +-
 src/oryx/install.sh                  | 14 +++++++++-----
 test/oryx/install_dotnet_and_oryx.sh |  3 +++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index fe13e2fcb..a075096bf 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "oryx",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "name": "Oryx",
     "description": "Installs the oryx CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
diff --git a/src/oryx/install.sh b/src/oryx/install.sh
index f4c547fb5..407406141 100755
--- a/src/oryx/install.sh
+++ b/src/oryx/install.sh
@@ -86,7 +86,6 @@ install_dotnet_with_script()
 
     DOTNET_BINARY="dotnet"
     export PATH="${PATH}:/usr/share/dotnet"
-    DOTNET_BINARY_INSTALLATION="/usr/share/dotnet/sdk/${version}"
 }
 
 install_dotnet_using_apt() {
@@ -146,7 +145,6 @@ usermod -a -G oryx "${USERNAME}"
 
 # Required to decide if we want to clean up dotnet later.
 DOTNET_INSTALLATION_PACKAGE=""
-DOTNET_BINARY_INSTALLATION=""
 DOTNET_BINARY=""
 
 if dotnet --version > /dev/null ; then
@@ -156,6 +154,7 @@ fi
 MAJOR_VERSION_ID=$(echo $(dotnet --version) | cut -d . -f 1)
 PATCH_VERSION_ID=$(echo $(dotnet --version) | cut -d . -f 3)
 
+PINNED_SDK_VERSION=""
 # Oryx needs to be built with .NET 8
 if [[ "${DOTNET_BINARY}" = "" ]] || [[ $MAJOR_VERSION_ID != "8" ]] || [[ $MAJOR_VERSION_ID = "8" && ${PATCH_VERSION_ID} -ge "101" ]] ; then
     echo "'dotnet 8' was not detected. Attempting to install .NET 8 to build oryx."
@@ -182,7 +181,7 @@ mkdir -p ${ORYX}
 
 git clone --depth=1 https://github.com/microsoft/Oryx $GIT_ORYX
 
-if [[ "${DOTNET_BINARY_INSTALLATION}" != "" ]]; then
+if [[ "${PINNED_SDK_VERSION}" != "" ]]; then
     cd $GIT_ORYX
     dotnet new globaljson --sdk-version ${PINNED_SDK_VERSION}
 fi
@@ -234,9 +233,14 @@ if [[ "${DOTNET_INSTALLATION_PACKAGE}" != "" ]]; then
     apt purge -yq $DOTNET_INSTALLATION_PACKAGE
 fi
 
-if [[ "${DOTNET_BINARY_INSTALLATION}" != "" ]]; then
+if [[ "${PINNED_SDK_VERSION}" != "" ]]; then
     rm -f ${GIT_ORYX}/global.json
-    rm -rf ${DOTNET_BINARY_INSTALLATION}
+    rm -rf /usr/share/dotnet/sdk/$PINNED_SDK_VERSION
+
+    # Extract the major, minor version and the first digit of the patch version
+    MAJOR_MINOR_PATCH1_VERSION=${PINNED_SDK_VERSION%??}
+    rm -rf /usr/share/dotnet/shared/Microsoft.NETCore.App/$MAJOR_MINOR_PATCH1_VERSION
+    rm -rf /usr/share/dotnet/shared/Microsoft.AspNetCore.App/$MAJOR_MINOR_PATCH1_VERSION
 fi
 
 
diff --git a/test/oryx/install_dotnet_and_oryx.sh b/test/oryx/install_dotnet_and_oryx.sh
index da0a9162d..670d7565a 100644
--- a/test/oryx/install_dotnet_and_oryx.sh
+++ b/test/oryx/install_dotnet_and_oryx.sh
@@ -5,6 +5,9 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Runtimes are listed twice due to 'Microsoft.NETCore.App' and 'Microsoft.AspNetCore.App'
+check "two versions of dotnet runtimes are present" bash -c "[ $(dotnet --list-runtimes | wc -l) -eq 4 ]"
+
 check "Oryx version" oryx --version
 check "Dotnet is not removed if it is not installed by the Oryx Feature" dotnet --version
 

From 4d2e62e4ed458469fd81b71ad3f4d8e1c5596b6f Mon Sep 17 00:00:00 2001
From: Nebula <40148908+nebula-it@users.noreply.github.com>
Date: Mon, 4 Mar 2024 16:07:37 -0800
Subject: [PATCH 242/478] Fix PowerShell profile not loading (#889)

* Update devcontainer-feature.json

* Fix profile loading

* Update devcontainer-feature.json

* Update devcontainer-feature.json

* Add -E to sudo so it inherits environment
---
 src/powershell/devcontainer-feature.json |  4 ++--
 src/powershell/install.sh                | 25 +++++-------------------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json
index 289bd33f0..86314be64 100644
--- a/src/powershell/devcontainer-feature.json
+++ b/src/powershell/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "powershell",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "name": "PowerShell",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
     "description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -20,7 +20,7 @@
             "default": "",
             "description": "Optional comma separated list of PowerShell modules to install."
         },
-        "powershellProfileURL ": {
+        "powershellProfileURL": {
             "type": "string",
             "default": "",
             "description": "Optional (publicly accessible) URL to download PowerShell profile."
diff --git a/src/powershell/install.sh b/src/powershell/install.sh
index 27e5d8a27..0ce63c95d 100755
--- a/src/powershell/install.sh
+++ b/src/powershell/install.sh
@@ -12,11 +12,9 @@ set -e
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
-USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
-
 POWERSHELL_VERSION=${VERSION:-"latest"}
 POWERSHELL_MODULES="${MODULES:-""}"
-POWERSHELL_PROFILE_URL="${PROFILE_URL}"
+POWERSHELL_PROFILE_URL="${POWERSHELLPROFILEURL}"
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 POWERSHELL_ARCHIVE_ARCHITECTURES="amd64"
@@ -165,26 +163,13 @@ if [ ${#POWERSHELL_MODULES[@]} -gt 0 ]; then
     done
 fi
 
- # Determine the appropriate non-root user 
- if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then 
-     USERNAME="" 
-     POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") 
-     for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do 
-         if id -u ${CURRENT_USER} > /dev/null 2>&1; then 
-             USERNAME=${CURRENT_USER} 
-             break 
-         fi 
-     done 
-     if [ "${USERNAME}" = "" ]; then 
-         USERNAME=root 
-     fi 
- elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then 
-     USERNAME=root 
- fi 
+
 # If URL for powershell profile is provided, download it to '/opt/microsoft/powershell/7/profile.ps1'
 if [ -n "$POWERSHELL_PROFILE_URL" ]; then
     echo "Downloading PowerShell Profile from: $POWERSHELL_PROFILE_URL"
-    su ${USERNAME} -c "curl -sSL -o '/opt/microsoft/powershell/7/profile.ps1' '$POWERSHELL_PROFILE_URL'"
+    # Get profile path from currently installed pwsh
+    profilePath=$(pwsh -noni -c '$PROFILE.AllUsersAllHosts')
+    sudo -E curl -sSL -o "$profilePath" "$POWERSHELL_PROFILE_URL"
 fi
 
 # Clean up

From d9e12f33552f81f52218e1701f69f00e86467bd5 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Mon, 4 Mar 2024 16:18:49 -0800
Subject: [PATCH 243/478] Automated documentation update (#893)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/powershell/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/powershell/README.md b/src/powershell/README.md
index a44614604..f018778c0 100644
--- a/src/powershell/README.md
+++ b/src/powershell/README.md
@@ -17,7 +17,7 @@ Installs PowerShell along with needed dependencies. Useful for base Dockerfiles
 |-----|-----|-----|-----|
 | version | Select or enter a version of PowerShell. | string | latest |
 | modules | Optional comma separated list of PowerShell modules to install. | string | - |
-| powershellProfileURL  | Optional (publicly accessible) URL to download PowerShell profile. | string | - |
+| powershellProfileURL | Optional (publicly accessible) URL to download PowerShell profile. | string | - |
 
 ## Customizations
 

From 58ab1a1a6d3bad632c147447b1a9107183c8d43a Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 5 Mar 2024 11:25:53 -0800
Subject: [PATCH 244/478] [Git-Lfs] - Install previous version if current tags
 are missing artifacts (#894)

* [Git-Lfs] - Install previous version if current tags are missing artifacts

* fix test

* fix debian:23 test
---
 src/git-lfs/devcontainer-feature.json |  7 ++++-
 src/git-lfs/install.sh                | 37 +++++++++++++++++++++------
 test/git-lfs/scenarios.json           | 10 ++++++++
 test/git-lfs/use_github.sh            | 10 ++++++++
 4 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 test/git-lfs/use_github.sh

diff --git a/src/git-lfs/devcontainer-feature.json b/src/git-lfs/devcontainer-feature.json
index 998b0b50e..ccdd99950 100644
--- a/src/git-lfs/devcontainer-feature.json
+++ b/src/git-lfs/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git-lfs",
-    "version": "1.1.1",
+    "version": "1.2.0",
     "name": "Git Large File Support (LFS)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git-lfs",
     "description": "Installs Git Large File Support (Git LFS) along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like git and curl.",
@@ -18,6 +18,11 @@
             "type": "boolean",
             "default": true,
             "description": "Automatically pull LFS files when creating the container.  When false, running 'git lfs pull' in the container will have the same effect."
+        },
+        "installDirectlyFromGitHubRelease": {
+            "type": "boolean",
+            "default": false,
+            "description": "Installs 'git-lfs' from GitHub releases instead of package manager feeds"
         }
     },
     "postCreateCommand": "/usr/local/share/pull-git-lfs-artifacts.sh",
diff --git a/src/git-lfs/install.sh b/src/git-lfs/install.sh
index 3f9aa2fff..2259cef59 100755
--- a/src/git-lfs/install.sh
+++ b/src/git-lfs/install.sh
@@ -9,6 +9,7 @@
 
 GIT_LFS_VERSION=${VERSION:-"latest"}
 AUTO_PULL=${AUTOPULL:="true"}
+INSTALL_WITH_GITHUB=${INSTALLDIRECTLYFROMGITHUBRELEASE:="false"}
 
 GIT_LFS_ARCHIVE_GPG_KEY_URI="https://packagecloud.io/github/git-lfs/gpgkey"
 GIT_LFS_ARCHIVE_ARCHITECTURES="amd64 arm64"
@@ -130,14 +131,34 @@ install_using_apt() {
     git-lfs install --skip-repo
 }
 
+# Function to fetch the version released prior to the latest version
+get_previous_version() {
+    repo_url=$1
+    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[0].tag_name'
+}
+
+install_from_release() {
+    git_lfs_filename="git-lfs-linux-${architecture}-v${GIT_LFS_VERSION}.tar.gz"
+    echo "Looking for release artfact: ${git_lfs_filename}"
+    curl -sSL -o "${git_lfs_filename}" "https://github.com/git-lfs/git-lfs/releases/download/v${GIT_LFS_VERSION}/${git_lfs_filename}"
+}
+
 install_using_github() {
     echo "(*) No apt package for ${VERSION_CODENAME} ${architecture}. Installing manually."
     mkdir -p /tmp/git-lfs
     cd /tmp/git-lfs
     find_version_from_git_tags GIT_LFS_VERSION "https://github.com/git-lfs/git-lfs"
-    git_lfs_filename="git-lfs-linux-${architecture}-v${GIT_LFS_VERSION}.tar.gz"
-    echo "Looking for release artfact: ${git_lfs_filename}"
-    curl -sSL -o "${git_lfs_filename}" "https://github.com/git-lfs/git-lfs/releases/download/v${GIT_LFS_VERSION}/${git_lfs_filename}"
+    install_from_release
+
+    if grep -q "Not Found" "${git_lfs_filename}"; then
+        echo -e "\n(!) Failed to fetch the latest artifacts for Git lfs v${GIT_LFS_VERSION}..."
+        repo_url=https://api.github.com/repos/git-lfs/git-lfs/releases
+        requested_version=$(get_previous_version "${repo_url}")
+        echo -e "\nAttempting to install ${requested_version}"
+        GIT_LFS_VERSION=${requested_version#v}
+        install_from_release
+    fi
+
     # Verify file
     curl -sSL -o "sha256sums.asc" "https://github.com/git-lfs/git-lfs/releases/download/v${GIT_LFS_VERSION}/sha256sums.asc"
     receive_gpg_keys GIT_LFS_CHECKSUM_GPG_KEYS
@@ -165,7 +186,7 @@ export DEBIAN_FRONTEND=noninteractive
 
 # Install git, curl, gpg, dirmngr and debian-archive-keyring if missing
 . /etc/os-release
-check_packages curl ca-certificates gnupg2 dirmngr apt-transport-https
+check_packages curl ca-certificates gnupg2 dirmngr apt-transport-https jq
 if ! type git > /dev/null 2>&1; then
     check_packages git
 fi
@@ -176,14 +197,14 @@ fi
 # Install Git LFS
 echo "Installing Git LFS..."
 architecture="$(dpkg --print-architecture)"
-if [[ "${GIT_LFS_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[  "${GIT_LFS_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
-    install_using_apt || use_github="true"
+if [[ "${GIT_LFS_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[  "${GIT_LFS_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]] && [[ "${INSTALL_WITH_GITHUB}" = "false" ]]; then
+    install_using_apt || INSTALL_WITH_GITHUB="true"
 else
-    use_github="true"
+    INSTALL_WITH_GITHUB="true"
 fi
 
 # If no archive exists or apt install fails, try direct from github
-if [ "${use_github}" = "true" ]; then
+if [ "${INSTALL_WITH_GITHUB}" = "true" ]; then
     install_using_github
 fi
 
diff --git a/test/git-lfs/scenarios.json b/test/git-lfs/scenarios.json
index 6cc3c24a5..009dfbb64 100644
--- a/test/git-lfs/scenarios.json
+++ b/test/git-lfs/scenarios.json
@@ -18,5 +18,15 @@
                 "autoPull": false
             }
         }
+    },
+    "use_github": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "remoteUser": "vscode",
+        "features": {
+            "git-lfs": {
+                "version": "latest",
+                "installDirectlyFromGitHubRelease": true
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/test/git-lfs/use_github.sh b/test/git-lfs/use_github.sh
new file mode 100644
index 000000000..458066f77
--- /dev/null
+++ b/test/git-lfs/use_github.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "git-lfs" bash -c "git-lfs --version"
+
+reportResults
\ No newline at end of file

From 3c3a270a3703bb2b24857399f5e1d65120cb9152 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Tue, 5 Mar 2024 11:33:50 -0800
Subject: [PATCH 245/478] Automated documentation update (#895)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/git-lfs/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/git-lfs/README.md b/src/git-lfs/README.md
index 9a9a06659..07f671755 100644
--- a/src/git-lfs/README.md
+++ b/src/git-lfs/README.md
@@ -17,6 +17,7 @@ Installs Git Large File Support (Git LFS) along with needed dependencies. Useful
 |-----|-----|-----|-----|
 | version | Select version of Git LFS to install | string | latest |
 | autoPull | Automatically pull LFS files when creating the container.  When false, running 'git lfs pull' in the container will have the same effect. | boolean | true |
+| installDirectlyFromGitHubRelease | Installs 'git-lfs' from GitHub releases instead of package manager feeds | boolean | false |
 
 
 

From 965e12010f31baea61c7a9389082b19cfe498207 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 5 Mar 2024 17:20:49 -0800
Subject: [PATCH 246/478] [docker] - Install previous version if current tags
 are missing artifacts (#897)

[docker-in-docker] - Install previous version if current tags are missing artifacts
---
 .../devcontainer-feature.json                 |  2 +-
 src/docker-in-docker/install.sh               | 31 ++++++++++++++-----
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index ab26a5e11..671f4e2ed 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.10.0",
+    "version": "2.10.1",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 2a27f5c9c..dbe34e2ea 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -109,6 +109,20 @@ find_version_from_git_tags() {
     echo "${variable_name}=${!variable_name}"
 }
 
+# Function to fetch the version released prior to the latest version
+get_previous_version() {
+    repo_url=$1
+    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[0].tag_name'
+}
+
+install_compose_switch_fallback() {
+    echo -e "\n(!) Failed to fetch the latest artifacts for compose-switch v${compose_switch_version}..."
+    previous_version=$(get_previous_version "https://api.github.com/repos/docker/compose-switch/releases")
+    echo -e "\nAttempting to install ${previous_version}"
+    compose_switch_version=${previous_version#v}
+    curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/compose-switch
+}
+
 ###########################################
 # Start docker-in-docker installation
 ###########################################
@@ -290,6 +304,15 @@ if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
         find_version_from_git_tags compose_version "https://github.com/docker/compose" "tags/v"
         echo "(*) Installing docker-compose ${compose_version}..."
         curl -L "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path}
+
+        if grep -q "Not Found" "${docker_compose_path}"; then
+            echo -e "\n(!) Failed to fetch the latest artifacts for docker-compose v${compose_version}..."
+            previous_version=$(get_previous_version "https://api.github.com/repos/docker/compose/releases")
+            echo -e "\nAttempting to install ${previous_version}"
+            compose_version=${previous_version#v}
+            curl -L "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path}
+        fi
+
         chmod +x ${docker_compose_path}
 
         # Download the SHA256 checksum
@@ -310,7 +333,7 @@ if [ "${INSTALL_DOCKER_COMPOSE_SWITCH}" = "true" ] && ! type compose-switch > /d
         target_compose_path="$(dirname "${current_compose_path}")/docker-compose-v1"
         compose_switch_version="latest"
         find_version_from_git_tags compose_switch_version "https://github.com/docker/compose-switch"
-        curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/compose-switch
+        curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/compose-switch || install_compose_switch_fallback
         chmod +x /usr/local/bin/compose-switch
         # TODO: Verify checksum once available: https://github.com/docker/compose-switch/issues/11
         # Setup v1 CLI as alternative in addition to compose-switch (which maps to v2)
@@ -337,12 +360,6 @@ fi
 
 usermod -aG docker ${USERNAME}
 
-# Function to fetch the version released prior to the latest version
-get_previous_version() {
-    repo_url=$1
-    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[1].tag_name' # this would del the assets key and then get the second encountered tag_name's value from the filtered array of objects
-}
-
 install_previous_version_artifacts() {
     wget_exit_code=$?
     if [ $wget_exit_code -eq 8 ]; then  # failure due to 404: Not Found.

From 8af4ce3dea3cdc2ea96062a47b3363b59aa9f1a2 Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:44:02 +0530
Subject: [PATCH 247/478] [docker-outside-of-docker] compose-switch can
 fallback to previous version (#901)

* compose-switch fallback previous version

* changes required
---
 .../devcontainer-feature.json                 |  2 +-
 src/docker-outside-of-docker/install.sh       | 18 +++++++++-
 .../docker_build_compose_fallback.sh          | 36 +++++++++++++++++++
 test/docker-outside-of-docker/scenarios.json  | 10 ++++++
 4 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 test/docker-outside-of-docker/docker_build_compose_fallback.sh

diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index d4c1447ba..54fca5ec1 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.4.2",
+    "version": "1.4.3",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 65424740e..dd39e1f68 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -99,6 +99,22 @@ find_version_from_git_tags() {
     echo "${variable_name}=${!variable_name}"
 }
 
+# Function to fetch the previous version of the plugin
+get_previous_version() {
+    repo_url=$1
+    # this would del the assets key and then get the second encountered tag_name's value from the filtered array of objects
+    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[0].tag_name' 
+}
+
+
+install_compose_switch_fallback() {
+    echo -e "\n(!) Failed to fetch the latest artifacts for compose-switch v${compose_switch_version}..."
+    previous_version=$(get_previous_version "https://api.github.com/repos/docker/compose-switch/releases")
+    echo -e "\nAttempting to install ${previous_version}"
+    compose_switch_version=${previous_version#v}
+    curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/docker-compose
+}
+
 # Ensure apt is in non-interactive to avoid prompts
 export DEBIAN_FRONTEND=noninteractive
 
@@ -255,7 +271,7 @@ if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
         echo "(*) Installing compose-switch as docker-compose..."
         compose_switch_version="latest"
         find_version_from_git_tags compose_switch_version "https://github.com/docker/compose-switch"
-        curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/docker-compose
+        curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/docker-compose || install_compose_switch_fallback
         chmod +x /usr/local/bin/docker-compose
         # TODO: Verify checksum once available: https://github.com/docker/compose-switch/issues/11
     fi
diff --git a/test/docker-outside-of-docker/docker_build_compose_fallback.sh b/test/docker-outside-of-docker/docker_build_compose_fallback.sh
new file mode 100644
index 000000000..e1c0885e6
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_build_compose_fallback.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "installs compose-switch as docker-compose" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
+
+# Fetch host/container arch.
+architecture="$(dpkg --print-architecture)"
+
+repo_url="https://api.github.com/repos/docker/compose-switch/releases"
+
+# Function to fetch the previous version of the plugin
+get_previous_version() {
+    sudo curl -s "$repo_url" | jq -r 'del(.[].assets) | .[0].tag_name' # this would del the assets key and then get the second encountered tag_name's value from the filtered array of objects
+}
+
+install_compose_switch_fallback() {
+    echo -e "\n(!) Failed to fetch the latest artifacts for compose-switch ${test_compose_switch_version}..."
+    previous_version=$(get_previous_version)
+    echo -e "\nAttempting to install ${previous_version}"
+    compose_switch_version=${previous_version}
+    sudo curl -fsSL "https://github.com/docker/compose-switch/releases/download/${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/docker-compose
+}
+
+install_compose-switch_as_docker-compose() {
+    echo "(*) Installing compose-switch as docker-compose..."
+    test_compose_switch_version="1.2.xyz"
+    echo -e "\nTesting with $test_compose_switch_version..."
+    sudo curl -fsSL "https://github.com/docker/compose-switch/releases/download/${test_compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/docker-compose || install_compose_switch_fallback
+    sudo chmod +x /usr/local/bin/docker-compose
+}
+
+install_compose-switch_as_docker-compose
+
+check "installs compose-switch as docker-compose" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
\ No newline at end of file
diff --git a/test/docker-outside-of-docker/scenarios.json b/test/docker-outside-of-docker/scenarios.json
index 61f1ab402..6239a1ada 100644
--- a/test/docker-outside-of-docker/scenarios.json
+++ b/test/docker-outside-of-docker/scenarios.json
@@ -1,4 +1,14 @@
 {
+    "docker_build_compose_fallback": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "features": {
+            "docker-outside-of-docker": {
+                "moby": false,
+                "dockerDashComposeVersion": "latest"
+            }
+        },
+        "containerUser": "vscode"
+    },
     "docker_init_moby": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
         "features": {

From 460684dd971cb341b65d46fa2bd445f352bf75a2 Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Wed, 13 Mar 2024 02:34:13 +0530
Subject: [PATCH 248/478] [Node] - nvm - fallback to previous version - code
 fix (#904)

* [node] - nvm - added fallback to prev. version - if latest version tag released but binary not found

* bumped patch version
---
 src/node/devcontainer-feature.json |  2 +-
 src/node/install.sh                |  7 +++++--
 test/node/nvm_test_fallback.sh     | 27 +++++++++++++++++++++++++++
 test/node/scenarios.json           |  8 ++++++++
 4 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 test/node/nvm_test_fallback.sh

diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index a93f75ace..f15ae4a4d 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "name": "Node.js (via nvm), yarn and pnpm",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
diff --git a/src/node/install.sh b/src/node/install.sh
index 493166d84..11a123534 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -293,8 +293,11 @@ set -e
 umask 0002
 # Do not update profile - we'll do this manually
 export PROFILE=/dev/null
-curl -so- "https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh" | bash
-
+curl -so- "https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh" | bash ||  {
+    PREV_NVM_VERSION=$(curl -s https://api.github.com/repos/nvm-sh/nvm/releases/latest | grep '"tag_name"' | sed -E 's/.*"([^"]+)".*/\1/')
+    curl -so- "https://raw.githubusercontent.com/nvm-sh/nvm/\${PREV_NVM_VERSION}/install.sh" | bash
+    NVM_VERSION="\${PREV_NVM_VERSION}"
+}
 source "${NVM_DIR}/nvm.sh"
 if [ "${NODE_VERSION}" != "" ]; then
     nvm alias default "${NODE_VERSION}"
diff --git a/test/node/nvm_test_fallback.sh b/test/node/nvm_test_fallback.sh
new file mode 100644
index 000000000..68e4071ac
--- /dev/null
+++ b/test/node/nvm_test_fallback.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+set -e
+
+trap 'echo "Error occurred at line $LINENO"; exit 1' ERR
+source /usr/local/share/nvm/nvm.sh
+#check nvm version
+echo -e "\n✅ nvm version as installed by feature = v$(nvm --version)"; 
+NVM_DIR="/usr/local/share/nvm"
+NODE_VERSION="lts"
+FAKE_NVM_VERSION="1.2.XYZ"
+curl -so- "https://raw.githubusercontent.com/nvm-sh/nvm/v${FAKE_NVM_VERSION}/install.sh" | bash ||  {
+    PREV_NVM_VERSION=$(curl -s https://api.github.com/repos/nvm-sh/nvm/releases/latest | grep '"tag_name"' | sed -E 's/.*"([^"]+)".*/\1/')
+    curl -so- "https://raw.githubusercontent.com/nvm-sh/nvm/${PREV_NVM_VERSION}/install.sh" | bash
+    NVM_VERSION="${PREV_NVM_VERSION}"
+}
+
+#check nvm version
+echo -e "\n✅ nvm version as installed by test = v$(nvm --version)"; 
+
+# Report result
+reportResults
diff --git a/test/node/scenarios.json b/test/node/scenarios.json
index 262fba8ea..954c2c2e9 100644
--- a/test/node/scenarios.json
+++ b/test/node/scenarios.json
@@ -1,4 +1,12 @@
 {
+    "nvm_test_fallback": {
+        "image": "debian:11",
+        "features": {
+            "node": {
+                "version": "lts"
+            }
+        }
+    },
     "install_additional_node": {
         "image": "debian:11",
         "features": {

From a674273c8602df49e03d3f74d7a0ccd5eea07cea Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Wed, 13 Mar 2024 02:36:34 +0530
Subject: [PATCH 249/478] [Powershell] - Fallback to prev. version - fix (#906)

* [Powershell] - Fallback to prev. version - fix

* patch version updated
---
 src/powershell/devcontainer-feature.json      |  2 +-
 src/powershell/install.sh                     | 33 ++++++-
 .../install_powershell_fallback_test.sh       | 97 +++++++++++++++++++
 test/powershell/scenarios.json                |  9 ++
 4 files changed, 135 insertions(+), 6 deletions(-)
 create mode 100644 test/powershell/install_powershell_fallback_test.sh

diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json
index 86314be64..dd7a96b90 100644
--- a/src/powershell/devcontainer-feature.json
+++ b/src/powershell/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "powershell",
-    "version": "1.3.3",
+    "version": "1.3.4",
     "name": "PowerShell",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
     "description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/powershell/install.sh b/src/powershell/install.sh
index 0ce63c95d..4ba8bcf5c 100755
--- a/src/powershell/install.sh
+++ b/src/powershell/install.sh
@@ -106,6 +106,29 @@ install_using_apt() {
     apt-get install -yq powershell${version_suffix} || return 1
 }
 
+# Function to fetch the version released prior to the latest version
+get_previous_version() {
+    repo_url=$1
+    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[0].tag_name'
+}
+
+install_prev_pwsh() {
+    echo -e "\n(!) Failed to fetch the latest artifacts for powershell v${POWERSHELL_VERSION}..."
+    previous_version=$(get_previous_version "https://api.github.com/repos/PowerShell/PowerShell/releases")
+    echo -e "\nAttempting to install ${previous_version}"
+    POWERSHELL_VERSION="${previous_version#v}"
+    install_pwsh "${POWERSHELL_VERSION}"
+}
+
+install_pwsh() {
+    POWERSHELL_VERSION=$1
+    powershell_filename="powershell-${POWERSHELL_VERSION}-linux-${architecture}.tar.gz"
+    powershell_target_path="/opt/microsoft/powershell/$(echo ${POWERSHELL_VERSION} | grep -oE '[^\.]+' | head -n 1)"
+    mkdir -p /tmp/pwsh "${powershell_target_path}"
+    cd /tmp/pwsh
+    curl -sSL -o "${powershell_filename}" "https://github.com/PowerShell/PowerShell/releases/download/v${POWERSHELL_VERSION}/${powershell_filename}"
+}
+
 install_using_github() {
     # Fall back on direct download if no apt package exists in microsoft pool
     check_packages curl ca-certificates gnupg2 dirmngr libc6 libgcc1 libgssapi-krb5-2 libstdc++6 libunwind8 libuuid1 zlib1g libicu[0-9][0-9]
@@ -116,11 +139,11 @@ install_using_github() {
         architecture="x64"
     fi
     find_version_from_git_tags POWERSHELL_VERSION https://github.com/PowerShell/PowerShell
-    powershell_filename="powershell-${POWERSHELL_VERSION}-linux-${architecture}.tar.gz"
-    powershell_target_path="/opt/microsoft/powershell/$(echo ${POWERSHELL_VERSION} | grep -oE '[^\.]+' | head -n 1)"
-    mkdir -p /tmp/pwsh "${powershell_target_path}"
-    cd /tmp/pwsh
-    curl -sSL -o "${powershell_filename}" "https://github.com/PowerShell/PowerShell/releases/download/v${POWERSHELL_VERSION}/${powershell_filename}"
+    install_pwsh "${POWERSHELL_VERSION}"
+    if grep -q "Not Found" "${powershell_filename}"; then 
+        install_prev_pwsh
+    fi
+
     # Ugly - but only way to get sha256 is to parse release HTML. Remove newlines and tags, then look for filename followed by 64 hex characters.
     curl -sSL -o "release.html" "https://github.com/PowerShell/PowerShell/releases/tag/v${POWERSHELL_VERSION}"
     powershell_archive_sha256="$(cat release.html | tr '\n' ' ' | sed 's|<[^>]*>||g' | grep -oP "${powershell_filename}\s+\K[0-9a-fA-F]{64}" || echo '')"
diff --git a/test/powershell/install_powershell_fallback_test.sh b/test/powershell/install_powershell_fallback_test.sh
new file mode 100644
index 000000000..852d7d103
--- /dev/null
+++ b/test/powershell/install_powershell_fallback_test.sh
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Extension-specific tests
+check "az.resources" pwsh -Command "(Get-Module -ListAvailable -Name Az.Resources).Version.ToString()"
+check "az.storage" pwsh -Command "(Get-Module -ListAvailable -Name Az.Storage).Version.ToString()"
+check "profile" pwsh -Command "(Get-Variable $env:ProfileLoaded).Value"
+
+check "Powershell version as installed by feature" bash -c "pwsh --version"
+
+. /etc/os-release
+architecture="$(dpkg --print-architecture)"
+
+get_previous_version() {
+    repo_url=$1
+    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[0].tag_name'
+}
+
+install_prev_pwsh() {
+    echo -e "\n(!) Failed to fetch the latest artifacts for powershell v${POWERSHELL_VERSION}..."
+    previous_version=$(get_previous_version "https://api.github.com/repos/PowerShell/PowerShell/releases")
+    echo -e "\nAttempting to install ${previous_version}"
+    POWERSHELL_VERSION="${previous_version#v}"
+    install_pwsh "${POWERSHELL_VERSION}"
+}
+
+install_pwsh() {
+    POWERSHELL_VERSION=$1
+    powershell_filename="powershell-${POWERSHELL_VERSION}-linux-${architecture}.tar.gz"
+    powershell_target_path="/opt/microsoft/powershell/$(echo ${POWERSHELL_VERSION} | grep -oE '[^\.]+' | head -n 1)"
+    sudo mkdir -p /tmp/pwsh "${powershell_target_path}"
+    cd /tmp/pwsh
+    sudo curl -sSL -o "${powershell_filename}" "https://github.com/PowerShell/PowerShell/releases/download/v${POWERSHELL_VERSION}/${powershell_filename}"
+}
+
+apt_get_update()
+{
+    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+        echo "Running apt-get update..."
+        sudo apt-get update -y
+    fi
+}
+
+check_packages() {
+    if ! dpkg -s "$@" > /dev/null 2>&1; then
+        sudo chmod +x /var/lib/apt/lists/
+        sudo mkdir -p /var/lib/apt/lists/partial
+        sudo chmod +rx /var/lib/dpkg/lock-frontend
+        apt_get_update
+        sudo apt-get -y install --no-install-recommends "$@"
+    fi
+}
+
+install_using_github() {
+    # Fall back on direct download if no apt package exists in microsoft pool
+    check_packages curl ca-certificates gnupg2 dirmngr libc6 libgcc1 libgssapi-krb5-2 libstdc++6 libunwind8 libuuid1 zlib1g libicu[0-9][0-9]
+    if ! type git > /dev/null 2>&1; then
+        check_packages git
+    fi
+    if [ "${architecture}" = "amd64" ]; then
+        architecture="x64"
+    fi
+
+    echo -e "\nTrying to install a non-existing version for Powershell..."
+    
+    POWERSHELL_VERSION="1.2.XYZ"
+    install_pwsh "${POWERSHELL_VERSION}"
+
+    if grep -q "Not Found" "${powershell_filename}"; then 
+        install_prev_pwsh
+    fi
+
+    echo -e "\n" $POWERSHELL_VERSION "=powershell_version\n";
+    # Ugly - but only way to get sha256 is to parse release HTML. Remove newlines and tags, then look for filename followed by 64 hex characters.
+    sudo curl -sSL -o "release.html" "https://github.com/PowerShell/PowerShell/releases/tag/v${POWERSHELL_VERSION}"
+    powershell_archive_sha256="$(cat release.html | tr '\n' ' ' | sed 's|<[^>]*>||g' | grep -oP "${powershell_filename}\s+\K[0-9a-fA-F]{64}" || echo '')"
+    if [ -z "${powershell_archive_sha256}" ]; then
+        echo "(!) WARNING: Failed to retrieve SHA256 for archive. Skipping validaiton."
+    else
+        echo "SHA256: ${powershell_archive_sha256}"
+        echo "${powershell_archive_sha256} *${powershell_filename}" | sha256sum -c -
+    fi
+    sudo tar xf "${powershell_filename}" -C "${powershell_target_path}"
+    sudo ln -s "${powershell_target_path}/pwsh" /usr/local/bin/pwsh
+    sudo rm -rf /tmp/pwsh
+}
+
+install_using_github
+
+check "Powershell version as installed by test" bash -c "pwsh --version"
+
+# Report result
+reportResults
diff --git a/test/powershell/scenarios.json b/test/powershell/scenarios.json
index b2659d7ad..6a810b0c9 100644
--- a/test/powershell/scenarios.json
+++ b/test/powershell/scenarios.json
@@ -7,5 +7,14 @@
         "powershellProfileURL": "https://raw.githubusercontent.com/codspace/powershell-profile/main/Test-Profile.ps1"
       }
     }
+  },
+  "install_powershell_fallback_test": {
+    "image": "mcr.microsoft.com/devcontainers/base:jammy",
+    "features": {
+      "powershell": {
+        "modules": "az.resources, az.storage",
+        "powershellProfileURL": "https://raw.githubusercontent.com/codspace/powershell-profile/main/Test-Profile.ps1"
+      }
+    }
   }
 }

From 5ad3f6fbbf63096917622ac3da72266ad377c984 Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Thu, 14 Mar 2024 03:59:50 +0530
Subject: [PATCH 250/478] [python] - cpython - prev. version fallback - fix
 (#907)

* [python] - cpython - prev. version fallback - fix

* according to comments
---
 src/python/devcontainer-feature.json          |   2 +-
 src/python/install.sh                         |  94 ++++-
 ...tall_cpython_fallback_prev_version_test.sh | 355 ++++++++++++++++++
 test/python/scenarios.json                    |  10 +
 4 files changed, 441 insertions(+), 20 deletions(-)
 create mode 100644 test/python/install_cpython_fallback_prev_version_test.sh

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index c14dd7b97..9f211244f 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/python/install.sh b/src/python/install.sh
index fcec73b0c..e8a9d24e1 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -248,6 +248,48 @@ find_version_from_git_tags() {
     echo "${variable_name}=${!variable_name}"
 }
 
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
+
 # Use Oryx to install something using a partial version match
 oryx_install() {
     local platform=$1
@@ -368,6 +410,29 @@ install_openssl3() {
     rm -rf /tmp/openssl3
 }
 
+install_prev_vers_cpython() {
+    VERSION=$1
+    echo -e "\n(!) Failed to fetch the latest artifacts for cpython ${VERSION}..."
+    find_prev_version_from_git_tags VERSION https://github.com/python/cpython
+    echo -e "\nAttempting to install ${VERSION}"
+    install_cpython "${VERSION}"
+}
+
+install_cpython() {
+    VERSION=$1
+    INSTALL_PATH="${PYTHON_INSTALL_PATH}/${VERSION}"
+    if [ -d "${INSTALL_PATH}" ]; then
+        echo "(!) Python version ${VERSION} already exists."
+        exit 1
+    fi
+    mkdir -p /tmp/python-src ${INSTALL_PATH}
+    cd /tmp/python-src
+    cpython_tgz_filename="Python-${VERSION}.tgz"
+    cpython_tgz_url="https://www.python.org/ftp/python/${VERSION}/${cpython_tgz_filename}"
+    echo "Downloading ${cpython_tgz_filename}..."
+    curl -sSL -o "/tmp/python-src/${cpython_tgz_filename}" "${cpython_tgz_url}"
+}
+
 install_from_source() {
     VERSION=$1  
     echo "(*) Building Python ${VERSION} from source..."
@@ -378,13 +443,6 @@ install_from_source() {
     # Find version using soft match
     find_version_from_git_tags VERSION "https://github.com/python/cpython"
 
-    INSTALL_PATH="${PYTHON_INSTALL_PATH}/${VERSION}"
-    
-    if [ -d "${INSTALL_PATH}" ]; then
-        echo "(!) Python version ${VERSION} already exists."
-        exit 1
-    fi
-
     # Some platforms/os versions need modern versions of openssl installed
     # via common package repositories, for now rhel-7 family, use case statement to 
     # make it easy to expand
@@ -396,23 +454,21 @@ install_from_source() {
             ;;
     esac
 
-    # Download tgz of source
-    mkdir -p /tmp/python-src ${INSTALL_PATH}
-    cd /tmp/python-src
-    local tgz_filename="Python-${VERSION}.tgz"
-    local tgz_url="https://www.python.org/ftp/python/${VERSION}/${tgz_filename}"
-    echo "Downloading ${tgz_filename}..."
-    curl -sSL -o "/tmp/python-src/${tgz_filename}" "${tgz_url}"
-
+    install_cpython "${VERSION}"
+    if [ -f "/tmp/python-src/${cpython_tgz_filename}" ]; then 
+        if grep -q "404 Not Found" "/tmp/python-src/${cpython_tgz_filename}"; then
+            install_prev_vers_cpython "${VERSION}"
+        fi
+    fi;
     # Verify signature
     if [[ ${VERSION_CODENAME} = "centos7" ]] || [[ ${VERSION_CODENAME} = "rhel7" ]]; then
         receive_gpg_keys_centos7 PYTHON_SOURCE_GPG_KEYS
     else
         receive_gpg_keys PYTHON_SOURCE_GPG_KEYS
     fi
-    echo "Downloading ${tgz_filename}.asc..."
-    curl -sSL -o "/tmp/python-src/${tgz_filename}.asc" "${tgz_url}.asc"
-    gpg --verify "${tgz_filename}.asc"
+    echo "Downloading ${cpython_tgz_filename}.asc..."
+    curl -sSL -o "/tmp/python-src/${cpython_tgz_filename}.asc" "${cpython_tgz_url}.asc"
+    gpg --verify "${cpython_tgz_filename}.asc"
 
     # Update min protocol for testing only - https://bugs.python.org/issue41561
     if [ -f /etc/pki/tls/openssl.cnf ]; then
@@ -424,7 +480,7 @@ install_from_source() {
     export OPENSSL_CONF=/tmp/python-src/openssl.cnf
 
     # Untar and build
-    tar -xzf "/tmp/python-src/${tgz_filename}" -C "/tmp/python-src" --strip-components=1
+    tar -xzf "/tmp/python-src/${cpython_tgz_filename}" -C "/tmp/python-src" --strip-components=1
     local config_args=""
     if [ "${OPTIMIZE_BUILD_FROM_SOURCE}" = "true" ]; then
         config_args="${config_args} --enable-optimizations"
diff --git a/test/python/install_cpython_fallback_prev_version_test.sh b/test/python/install_cpython_fallback_prev_version_test.sh
new file mode 100644
index 000000000..7056dba0c
--- /dev/null
+++ b/test/python/install_cpython_fallback_prev_version_test.sh
@@ -0,0 +1,355 @@
+#!/bin/bash
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "Python version as installed by Feature" bash -c "python3 -V"
+
+PYTHON_INSTALL_PATH="/usr/local/python"
+OPTIMIZE_BUILD_FROM_SOURCE="false"
+OVERRIDE_DEFAULT_VERSION="true"
+ENABLESHARED="false"
+if [ "$(id -u)" -ne 0 ]; then
+    echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
+    exit 1
+fi
+# Bring in ID, ID_LIKE, VERSION_ID, VERSION_CODENAME
+. /etc/os-release
+# Get an adjusted ID independent of distro variants
+MAJOR_VERSION_ID=$(echo ${VERSION_ID} | cut -d . -f 1)
+if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
+    ADJUSTED_ID="debian"
+elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
+    ADJUSTED_ID="rhel"
+    if [[ "${ID}" = "rhel" ]] || [[ "${ID}" = *"alma"* ]] || [[ "${ID}" = *"rocky"* ]]; then
+        VERSION_CODENAME="rhel${MAJOR_VERSION_ID}"
+    else
+        VERSION_CODENAME="${ID}${MAJOR_VERSION_ID}"
+    fi
+else
+    echo "Linux distro ${ID} not supported."
+    exit 1
+fi
+
+# Setup INSTALL_CMD & PKG_MGR_CMD
+if type apt-get > /dev/null 2>&1; then
+    PKG_MGR_CMD=apt-get
+    INSTALL_CMD="${PKG_MGR_CMD} -y install --no-install-recommends"
+elif type microdnf > /dev/null 2>&1; then
+    PKG_MGR_CMD=microdnf
+    INSTALL_CMD="${PKG_MGR_CMD} ${INSTALL_CMD_ADDL_REPOS} -y install --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0"
+elif type dnf > /dev/null 2>&1; then
+    PKG_MGR_CMD=dnf
+    INSTALL_CMD="${PKG_MGR_CMD} ${INSTALL_CMD_ADDL_REPOS} -y install --refresh --best --nodocs --noplugins --setopt=install_weak_deps=0"
+else
+    PKG_MGR_CMD=yum
+    INSTALL_CMD="${PKG_MGR_CMD} ${INSTALL_CMD_ADDL_REPOS} -y install --noplugins --setopt=install_weak_deps=0"
+fi
+
+pkg_mgr_update() {
+    case $ADJUSTED_ID in
+        debian)
+            if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+                echo "Running apt-get update..."
+                ${PKG_MGR_CMD} update -y
+            fi
+            ;;
+        rhel)
+            if [ ${PKG_MGR_CMD} = "microdnf" ]; then
+                if [ "$(ls /var/cache/yum/* 2>/dev/null | wc -l)" = 0 ]; then
+                    echo "Running ${PKG_MGR_CMD} makecache ..."
+                    ${PKG_MGR_CMD} makecache
+                fi
+            else
+                if [ "$(ls /var/cache/${PKG_MGR_CMD}/* 2>/dev/null | wc -l)" = 0 ]; then
+                    echo "Running ${PKG_MGR_CMD} check-update ..."
+                    set +e
+                    ${PKG_MGR_CMD} check-update
+                    rc=$?
+                    if [ $rc != 0 ] && [ $rc != 100 ]; then
+                        exit 1
+                    fi
+                    set -e
+                fi
+            fi
+            ;;
+    esac
+}
+
+check_packages() {
+    case ${ADJUSTED_ID} in
+        debian)
+            if ! dpkg -s "$@" > /dev/null 2>&1; then
+                pkg_mgr_update
+                ${INSTALL_CMD} "$@"
+            fi
+            ;;
+        rhel)
+            if ! rpm -q "$@" > /dev/null 2>&1; then
+                pkg_mgr_update
+                ${INSTALL_CMD} "$@"
+            fi
+            ;;
+    esac
+}
+
+# Import the specified key in a variable name passed in as 
+receive_gpg_keys() {
+    local keys=${!1}
+    local keyring_args=""
+    local gpg_cmd="gpg"
+    if [ ! -z "$2" ]; then
+        mkdir -p "$(dirname \"$2\")"
+        keyring_args="--no-default-keyring --keyring $2"
+    fi
+    if [ ! -z "${KEYSERVER_PROXY}" ]; then
+        keyring_args="${keyring_args} --keyserver-options http-proxy=${KEYSERVER_PROXY}"
+    fi
+
+    # Use a temporary location for gpg keys to avoid polluting image
+    export GNUPGHOME="/tmp/tmp-gnupg"
+    mkdir -p ${GNUPGHOME}
+    chmod 700 ${GNUPGHOME}
+    echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" > ${GNUPGHOME}/dirmngr.conf
+    # GPG key download sometimes fails for some reason and retrying fixes it.
+    local retry_count=0
+    local gpg_ok="false"
+    set +e
+    until [ "${gpg_ok}" = "true" ] || [ "${retry_count}" -eq "5" ]; 
+    do
+        echo "(*) Downloading GPG key..."
+        ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys) 2>&1 && gpg_ok="true"
+        if [ "${gpg_ok}" != "true" ]; then
+            echo "(*) Failed getting key, retring in 10s..."
+            (( retry_count++ ))
+            sleep 10s
+        fi
+    done
+    set -e
+    if [ "${gpg_ok}" = "false" ]; then
+        echo "(!) Failed to get gpg key."
+        exit 1
+    fi
+}
+# RHEL7/CentOS7 has an older gpg that does not have dirmngr
+# Iterate through keyservers until we have all the keys downloaded
+receive_gpg_keys_centos7() {
+    local keys=${!1}
+    local keyring_args=""
+    local gpg_cmd="gpg"
+    if [ ! -z "$2" ]; then
+        mkdir -p "$(dirname \"$2\")"
+        keyring_args="--no-default-keyring --keyring $2"
+    fi
+    if [ ! -z "${KEYSERVER_PROXY}" ]; then
+        keyring_args="${keyring_args} --keyserver-options http-proxy=${KEYSERVER_PROXY}"
+    fi
+
+    # Use a temporary location for gpg keys to avoid polluting image
+    export GNUPGHOME="/tmp/tmp-gnupg"
+    mkdir -p ${GNUPGHOME}
+    chmod 700 ${GNUPGHOME}
+    # GPG key download sometimes fails for some reason and retrying fixes it.
+    local retry_count=0
+    local gpg_ok="false"
+    num_keys=$(echo ${keys} | wc -w)
+    set +e
+        echo "(*) Downloading GPG keys..."
+        until [ "${gpg_ok}" = "true" ] || [ "${retry_count}" -eq "5" ]; do
+            for keyserver in $(echo "${GPG_KEY_SERVERS}" | sed 's/keyserver //'); do
+                ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys --keyserver=${keyserver} ) 2>&1
+                downloaded_keys=$(gpg --list-keys | grep ^pub | wc -l)
+                if [[ ${num_keys} = ${downloaded_keys} ]]; then
+                    gpg_ok="true"
+                    break
+                fi
+            done
+            if [ "${gpg_ok}" != "true" ]; then
+                echo "(*) Failed getting key, retring in 10s..."
+                (( retry_count++ ))
+                sleep 10s
+            fi
+        done
+    set -e
+    if [ "${gpg_ok}" = "false" ]; then
+        echo "(!) Failed to get gpg key."
+        exit 1
+    fi
+}
+
+
+# Figure out correct version of a three part version number is not passed
+find_version_from_git_tags() {
+    local variable_name=$1
+    local requested_version=${!variable_name}
+    if [ "${requested_version}" = "none" ]; then return; fi
+    local repository=$2
+    local prefix=${3:-"tags/v"}
+    local separator=${4:-"."}
+    local last_part_optional=${5:-"false"}    
+    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
+        local escaped_separator=${separator//./\\.}
+        local last_part
+        if [ "${last_part_optional}" = "true" ]; then
+            last_part="(${escaped_separator}[0-9]+)?"
+        else
+            last_part="${escaped_separator}[0-9]+"
+        fi
+        local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
+        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
+            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+        else
+            set +e
+            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            set -e
+        fi
+    fi
+    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
+        echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
+        exit 1
+    fi
+    echo "${variable_name}=${!variable_name}"
+}
+
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
+add_symlink() {
+    CURRENT_PATH="${PYTHON_INSTALL_PATH}/current"
+    if [[ ! -d "${CURRENT_PATH}" ]]; then
+        ln -s -r "${INSTALL_PATH}" "${CURRENT_PATH}" 
+    fi
+
+    if [ "${OVERRIDE_DEFAULT_VERSION}" = "true" ]; then
+        if [[ $(ls -l ${CURRENT_PATH}) != *"-> ${INSTALL_PATH}"* ]] ; then
+            rm "${CURRENT_PATH}"
+            ln -s -r "${INSTALL_PATH}" "${CURRENT_PATH}" 
+        fi
+    fi
+}
+
+install_prev_vers_cpython() {
+    VERSION=$1
+    echo -e "\n(!) Failed to fetch the latest artifacts for cpython ${VERSION}..."
+    find_prev_version_from_git_tags VERSION https://github.com/python/cpython
+    echo -e "\nAttempting to install ${VERSION}"
+    install_cpython "${VERSION}"
+}
+
+install_cpython() {
+    VERSION=$1
+    INSTALL_PATH="${PYTHON_INSTALL_PATH}/${VERSION}"
+    mkdir -p /tmp/python-src ${INSTALL_PATH}
+    cd /tmp/python-src
+    cpython_tgz_filename="Python-${VERSION}.tgz"
+    cpython_tgz_url="https://www.python.org/ftp/python/${VERSION}/${cpython_tgz_filename}"
+    echo "Downloading ${cpython_tgz_filename}..."
+    curl -sSL -o "/tmp/python-src/${cpython_tgz_filename}" "${cpython_tgz_url}"
+}
+
+install_from_source() {
+    VERSION=$1  
+    echo "(*) Building Python ${VERSION} from source..."
+    echo "(*) Building Python ${VERSION} from source..."
+    if ! type git > /dev/null 2>&1; then
+        check_packages git
+    fi
+
+    echo -e "\nTrying to Install a fake version whose source binary wouldn't exist"
+    VERSION="3.12.xyz"
+
+    install_cpython "${VERSION}"
+    if [ -f "/tmp/python-src/${cpython_tgz_filename}" ]; then
+        if grep -q "404 Not Found" "/tmp/python-src/${cpython_tgz_filename}"; then
+            # Use grep to search for "404 Not Found" in the file
+            echo "\"404 Not Found\" found in /tmp/python-src/${cpython_tgz_filename}. Not able to create source binary"
+            install_prev_vers_cpython "${VERSION}"
+        fi
+    fi;
+    
+    # Verify signature
+    if [[ ${VERSION_CODENAME} = "centos7" ]] || [[ ${VERSION_CODENAME} = "rhel7" ]]; then
+        receive_gpg_keys_centos7 PYTHON_SOURCE_GPG_KEYS
+    else
+        receive_gpg_keys PYTHON_SOURCE_GPG_KEYS
+    fi
+
+    echo "Downloading ${cpython_tgz_filename}.asc..."
+    curl -sSL -o "/tmp/python-src/${cpython_tgz_filename}.asc" "${cpython_tgz_url}.asc"
+
+    # Untar and build
+    tar -xzf "/tmp/python-src/${cpython_tgz_filename}" -C "/tmp/python-src" --strip-components=1
+    local config_args=""
+ 
+    if [ "${OPTIMIZE_BUILD_FROM_SOURCE}" = "true" ]; then
+        config_args="${config_args} --enable-optimizations"
+    fi
+    if [ "${ENABLESHARED}" = "true" ]; then
+        config_args=" ${config_args} --enable-shared"
+        # need double-$: LDFLAGS ends up in Makefile $$ becomes $ when evaluated.
+        # backslash needed for shell that Make calls escape the $.
+        export LDFLAGS="${LDFLAGS} -Wl,-rpath="'\$$ORIGIN'"/../lib"
+    fi
+    if [ -n "${ADDL_CONFIG_ARGS}" ]; then
+        config_args="${config_args} ${ADDL_CONFIG_ARGS}"
+    fi
+
+    ./configure --prefix="${INSTALL_PATH}" --with-ensurepip=install ${config_args}
+    make -j 8
+    make install
+
+    cd /tmp
+    rm -rf /tmp/python-src ${GNUPGHOME} /tmp/vscdc-settings.env
+
+    ln -s "${INSTALL_PATH}/bin/python3" "${INSTALL_PATH}/bin/python"
+    ln -s "${INSTALL_PATH}/bin/pip3" "${INSTALL_PATH}/bin/pip"
+    ln -s "${INSTALL_PATH}/bin/idle3" "${INSTALL_PATH}/bin/idle"
+    ln -s "${INSTALL_PATH}/bin/pydoc3" "${INSTALL_PATH}/bin/pydoc"
+    ln -s "${INSTALL_PATH}/bin/python3-config" "${INSTALL_PATH}/bin/python-config"
+
+    add_symlink
+
+}
+
+install_from_source
+
+check "Python version as installed by Fallback Test" bash -c "python3 -V"
\ No newline at end of file
diff --git a/test/python/scenarios.json b/test/python/scenarios.json
index 920e4f541..be37869df 100644
--- a/test/python/scenarios.json
+++ b/test/python/scenarios.json
@@ -1,4 +1,14 @@
 {
+    "install_cpython_fallback_prev_version_test": {
+        "image": "python:3.12",
+        "features": {
+            "python": {
+                "version": "3.12",
+                "installTools": false,
+                "skipVulnerabilityPatching": true
+            }
+        }
+    },
     "install_python310_skipVulnerabilityPatching_true": {
         "image": "python:3.10",
         "features": {

From 2495879eade0b514aafc2ef253db93755883f552 Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Fri, 15 Mar 2024 23:11:12 +0530
Subject: [PATCH 251/478] Reverting get_previous_version logic to get the first
 tag_name's value from json (#902)

* changes as requested

* changes acc. to comments
---
 src/kubectl-helm-minikube/devcontainer-feature.json      | 2 +-
 src/kubectl-helm-minikube/install.sh                     | 4 ++--
 test/docker-in-docker/docker_build_fallback_buildx.sh    | 3 ++-
 test/kubectl-helm-minikube/install_only_helm_fallback.sh | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/kubectl-helm-minikube/devcontainer-feature.json b/src/kubectl-helm-minikube/devcontainer-feature.json
index 16472205f..41a8b8b68 100644
--- a/src/kubectl-helm-minikube/devcontainer-feature.json
+++ b/src/kubectl-helm-minikube/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "kubectl-helm-minikube",
-    "version": "1.1.7",
+    "version": "1.1.8",
     "name": "Kubectl, Helm, and Minikube",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
     "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
diff --git a/src/kubectl-helm-minikube/install.sh b/src/kubectl-helm-minikube/install.sh
index 69d4e0237..d7de3984f 100755
--- a/src/kubectl-helm-minikube/install.sh
+++ b/src/kubectl-helm-minikube/install.sh
@@ -158,8 +158,8 @@ fi
 # Function to fetch the version released prior to the latest version
 get_previous_version() {
     repo_url=$1
-    # this would del the assets key and then get the second encountered tag_name's value from the filtered array of objects
-    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[1].tag_name' 
+    # this would del the assets key and then get the first encountered tag_name's value from the filtered array of objects
+    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[0].tag_name' 
 }
 
 get_helm() {
diff --git a/test/docker-in-docker/docker_build_fallback_buildx.sh b/test/docker-in-docker/docker_build_fallback_buildx.sh
index 8d30d2a46..707e0a68a 100644
--- a/test/docker-in-docker/docker_build_fallback_buildx.sh
+++ b/test/docker-in-docker/docker_build_fallback_buildx.sh
@@ -26,7 +26,8 @@ get_latest_version() {
 
 # Function to fetch the previous version of the plugin
 get_previous_version() {
-    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[1].tag_name' # this would del the assets key and then get the second encountered tag_name's value from the filtered array of objects
+    # this would del the assets key and then get the first encountered tag_name's value from the filtered array of objects
+    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[0].tag_name' 
 }
 
 # Function to change the patch number in a semver version
diff --git a/test/kubectl-helm-minikube/install_only_helm_fallback.sh b/test/kubectl-helm-minikube/install_only_helm_fallback.sh
index 58ed137de..b8071a0b5 100644
--- a/test/kubectl-helm-minikube/install_only_helm_fallback.sh
+++ b/test/kubectl-helm-minikube/install_only_helm_fallback.sh
@@ -57,7 +57,7 @@ change_patch_number() {
 # Function to fetch the previous version of the plugin
 get_previous_version() {
     # this would del the assets key and then get the second encountered tag_name's value from the filtered array of objects
-    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[1].tag_name' 
+    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[0].tag_name' 
 }
 
 get_helm() {

From 5baf166f67683d6801c327d1c084d15f737947cd Mon Sep 17 00:00:00 2001
From: Leobaldo Alcantara Neto <leobaldoneto@gmail.com>
Date: Tue, 26 Mar 2024 14:05:35 -0300
Subject: [PATCH 252/478] Update DOCKER_DASH_COMPOSE_VERSION default to v2
 (#920)

* Update DOCKER_DASH_COMPOSE_VERSION default to v2

Changed it because devcontainer-feature.json documentation indicates that it's the default version.

* Update devcontainer-feature.json version to 1.4.4
---
 src/docker-outside-of-docker/devcontainer-feature.json | 2 +-
 src/docker-outside-of-docker/install.sh                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 54fca5ec1..2a55fdbca 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.4.3",
+    "version": "1.4.4",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index dd39e1f68..6b63469f9 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -10,7 +10,7 @@
 DOCKER_VERSION="${VERSION:-"latest"}"
 USE_MOBY="${MOBY:-"true"}"
 MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"latest"}"
-DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v1"}" # v1 or v2 or none
+DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v2"}" # v1 or v2 or none
 
 ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"
 SOURCE_SOCKET="${SOURCE_SOCKET:-"/var/run/docker-host.sock"}"

From 0100f66138e2082cd76b92c30826cbb4544755a3 Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Wed, 27 Mar 2024 05:25:37 +0530
Subject: [PATCH 253/478] [docker-in-docker]-docker_compose-fallback-github api
 (#914)

* [docker-in-docker]-docker_compose-fallback-github api

* changes misc.

* misc. change

* changes as required in review comments

* changes miscellaneous

* suggested changes

* changes as requested by review comments on pr

* Minor changes as suggested...
---
 .../devcontainer-feature.json                 |   2 +-
 src/docker-in-docker/install.sh               | 142 +++++++++---
 .../docker_build_fallback_buildx.sh           | 206 +++++++++++++-----
 .../docker_build_fallback_compose.sh          | 174 +++++++++++++++
 test/docker-in-docker/scenarios.json          |  13 +-
 5 files changed, 442 insertions(+), 95 deletions(-)
 create mode 100644 test/docker-in-docker/docker_build_fallback_compose.sh

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 671f4e2ed..812db444c 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.10.1",
+    "version": "2.10.2",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index dbe34e2ea..0dc9e52d1 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -109,18 +109,73 @@ find_version_from_git_tags() {
     echo "${variable_name}=${!variable_name}"
 }
 
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
 # Function to fetch the version released prior to the latest version
 get_previous_version() {
-    repo_url=$1
-    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[0].tag_name'
+    local url=$1
+    local repo_url=$2
+    local variable_name=$3
+    prev_version=${!variable_name}
+    
+    output=$(curl -s "$repo_url");
+    message=$(echo "$output" | jq -r '.message')
+    
+    if [[ $message == "API rate limit exceeded"* ]]; then
+        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
+        echo -e "\nAttempting to find latest version using GitHub tags."
+        find_prev_version_from_git_tags prev_version "$url" "tags/v"
+        declare -g ${variable_name}="${prev_version}"
+    else 
+        echo -e "\nAttempting to find latest version using GitHub Api."
+        version=$(echo "$output" | jq -r '.tag_name')
+        declare -g ${variable_name}="${version#v}"
+    fi  
+    echo "${variable_name}=${!variable_name}"
 }
 
-install_compose_switch_fallback() {
-    echo -e "\n(!) Failed to fetch the latest artifacts for compose-switch v${compose_switch_version}..."
-    previous_version=$(get_previous_version "https://api.github.com/repos/docker/compose-switch/releases")
-    echo -e "\nAttempting to install ${previous_version}"
-    compose_switch_version=${previous_version#v}
-    curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/compose-switch
+get_github_api_repo_url() {
+    local url=$1
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
 }
 
 ###########################################
@@ -265,6 +320,16 @@ echo "Finished installing docker / moby!"
 docker_home="/usr/libexec/docker"
 cli_plugins_dir="${docker_home}/cli-plugins"
 
+# fallback for docker-compose
+fallback_compose(){
+    local url=$1
+    local repo_url=$(get_github_api_repo_url "$url")
+    echo -e "\n(!) Failed to fetch the latest artifacts for docker-compose v${compose_version}..."
+    get_previous_version "${url}" "${repo_url}" compose_version
+    echo -e "\nAttempting to install v${compose_version}"
+    curl -fsSL "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path}
+}
+
 # If 'docker-compose' command is to be included
 if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
     case "${architecture}" in
@@ -301,17 +366,16 @@ if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
         fi
     else
         compose_version=${DOCKER_DASH_COMPOSE_VERSION#v}
-        find_version_from_git_tags compose_version "https://github.com/docker/compose" "tags/v"
+        docker_compose_url="https://github.com/docker/compose"
+        find_version_from_git_tags compose_version "$docker_compose_url" "tags/v"
         echo "(*) Installing docker-compose ${compose_version}..."
-        curl -L "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path}
-
-        if grep -q "Not Found" "${docker_compose_path}"; then
-            echo -e "\n(!) Failed to fetch the latest artifacts for docker-compose v${compose_version}..."
-            previous_version=$(get_previous_version "https://api.github.com/repos/docker/compose/releases")
-            echo -e "\nAttempting to install ${previous_version}"
-            compose_version=${previous_version#v}
-            curl -L "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path}
-        fi
+        curl -fsSL "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path} || {
+            if [[ $DOCKER_DASH_COMPOSE_VERSION == "latest" ]]; then 
+                fallback_compose "$docker_compose_url"
+            else
+                echo -e "Error: Failed to install docker-compose v${compose_version}" 
+            fi
+        }
 
         chmod +x ${docker_compose_path}
 
@@ -325,6 +389,16 @@ if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
     fi
 fi
 
+# fallback method for compose-switch
+fallback_compose-switch() {
+    local url=$1
+    local repo_url=$(get_github_api_repo_url "$url")
+    echo -e "\n(!) Failed to fetch the latest artifacts for compose-switch v${compose_switch_version}..."
+    get_previous_version "$url" "$repo_url" compose_switch_version
+    echo -e "\nAttempting to install v${compose_switch_version}"
+    curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/compose-switch
+}
+
 # Install docker-compose switch if not already installed - https://github.com/docker/compose-switch#manual-installation
 if [ "${INSTALL_DOCKER_COMPOSE_SWITCH}" = "true" ] && ! type compose-switch > /dev/null 2>&1; then
     if type docker-compose > /dev/null 2>&1; then
@@ -332,8 +406,9 @@ if [ "${INSTALL_DOCKER_COMPOSE_SWITCH}" = "true" ] && ! type compose-switch > /d
         current_compose_path="$(which docker-compose)"
         target_compose_path="$(dirname "${current_compose_path}")/docker-compose-v1"
         compose_switch_version="latest"
-        find_version_from_git_tags compose_switch_version "https://github.com/docker/compose-switch"
-        curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/compose-switch || install_compose_switch_fallback
+        compose_switch_url="https://github.com/docker/compose-switch"
+        find_version_from_git_tags compose_switch_version "$compose_switch_url"
+        curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/compose-switch || fallback_compose-switch "$compose_switch_url"
         chmod +x /usr/local/bin/compose-switch
         # TODO: Verify checksum once available: https://github.com/docker/compose-switch/issues/11
         # Setup v1 CLI as alternative in addition to compose-switch (which maps to v2)
@@ -360,29 +435,26 @@ fi
 
 usermod -aG docker ${USERNAME}
 
-install_previous_version_artifacts() {
-    wget_exit_code=$?
-    if [ $wget_exit_code -eq 8 ]; then  # failure due to 404: Not Found.
-        echo -e "\n(!) Failed to fetch the latest artifacts for docker buildx v${buildx_version}..."
-        repo_url="https://api.github.com/repos/docker/buildx/releases" # GitHub repository URL
-        previous_version=$(get_previous_version "${repo_url}")
-        buildx_file_name="buildx-${previous_version}.linux-${architecture}"
-        echo -e "\nAttempting to install ${previous_version}"
-        wget https://github.com/docker/buildx/releases/download/${previous_version}/${buildx_file_name}
-    else
-        echo "(!) Failed to download docker buildx with exit code: $wget_exit_code"
-        exit 1
-    fi
+# fallback for docker/buildx
+fallback_buildx() {
+    local url=$1
+    local repo_url=$(get_github_api_repo_url "$url")
+    echo -e "\n(!) Failed to fetch the latest artifacts for docker buildx v${buildx_version}..."
+    get_previous_version "$url" "$repo_url" buildx_version
+    buildx_file_name="buildx-v${buildx_version}.linux-${architecture}"
+    echo -e "\nAttempting to install v${buildx_version}"
+    wget https://github.com/docker/buildx/releases/download/v${buildx_version}/${buildx_file_name}
 }
  
 if [ "${INSTALL_DOCKER_BUILDX}" = "true" ]; then
     buildx_version="latest"
-    find_version_from_git_tags buildx_version "https://github.com/docker/buildx" "refs/tags/v"
+    docker_buildx_url="https://github.com/docker/buildx"
+    find_version_from_git_tags buildx_version "$docker_buildx_url" "refs/tags/v"
     echo "(*) Installing buildx ${buildx_version}..."
     buildx_file_name="buildx-v${buildx_version}.linux-${architecture}"
     
     cd /tmp
-    wget https://github.com/docker/buildx/releases/download/v${buildx_version}/${buildx_file_name} || install_previous_version_artifacts
+    wget https://github.com/docker/buildx/releases/download/v${buildx_version}/${buildx_file_name} || fallback_buildx "$docker_buildx_url"
     
     docker_home="/usr/libexec/docker"
     cli_plugins_dir="${docker_home}/cli-plugins"
diff --git a/test/docker-in-docker/docker_build_fallback_buildx.sh b/test/docker-in-docker/docker_build_fallback_buildx.sh
index 707e0a68a..e139613a0 100644
--- a/test/docker-in-docker/docker_build_fallback_buildx.sh
+++ b/test/docker-in-docker/docker_build_fallback_buildx.sh
@@ -14,83 +14,177 @@ check "docker-build" docker build ./
 check "docker-buildx" bash -c "docker buildx version"
 check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
 
-echo -e "\n👉${HL} Creating a scenario for fallback${N}\n"
 # Code to test the made up scenario when latest version of docker/buildx fails on wget command for fetching the artifacts
-repo_url="https://api.github.com/repos/docker/buildx/releases" # GitHub repository URL
 architecture="$(dpkg --print-architecture)"
+case "${architecture}" in
+    amd64) target_compose_arch=x86_64 ;;
+    arm64) target_compose_arch=aarch64 ;;
+    *)
+        echo "(!) Docker in docker does not support machine architecture '$architecture'. Please use an x86-64 or ARM64 machine."
+        exit 1
+esac
 
-# Function to fetch the latest version of the plugin
-get_latest_version() {
-    curl -s "$repo_url/latest" | jq -r '.tag_name'
+docker_home="/usr/libexec/docker"
+cli_plugins_dir="${docker_home}/cli-plugins"
+
+# Figure out correct version of a three part version number is not passed
+find_version_from_git_tags() {
+    local variable_name=$1
+    local requested_version=${!variable_name}
+    if [ "${requested_version}" = "none" ]; then return; fi
+    local repository=$2
+    local prefix=${3:-"tags/v"}
+    local separator=${4:-"."}
+    local last_part_optional=${5:-"false"}
+    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
+        local escaped_separator=${separator//./\\.}
+        local last_part
+        if [ "${last_part_optional}" = "true" ]; then
+            last_part="(${escaped_separator}[0-9]+)?"
+        else
+            last_part="${escaped_separator}[0-9]+"
+        fi
+        local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
+        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
+            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+        else
+            set +e
+                declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            set -e
+        fi
+    fi
+    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
+        err "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
+        exit 1
+    fi
+    echo "${variable_name}=${!variable_name}"
 }
 
-# Function to fetch the previous version of the plugin
-get_previous_version() {
-    # this would del the assets key and then get the first encountered tag_name's value from the filtered array of objects
-    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[0].tag_name' 
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
 }
 
-# Function to change the patch number in a semver version
-change_patch_number() {
-    local version="$1"  # Input version
-    local new_patch="$2"  # New patch number
-    # Extract major, minor, and current patch numbers
-    local major=$(echo "$version" | cut -d. -f1)
-    local minor=$(echo "$version" | cut -d. -f2)
-    local current_patch=$(echo "$version" | cut -d. -f3)
-    # Construct the new version with the updated patch number
-    local new_version="$major.$minor.$new_patch"
-    echo "$new_version"
+# Function to fetch the version released prior to the latest version
+get_previous_version() {
+    local url=$1
+    local repo_url=$2
+    local variable_name=$3
+    local mode=$4
+    prev_version=${!variable_name}
+    
+    echo -e "\nAttempting to find latest version using Github Api."
+
+    output=$(curl -s "$repo_url");
+    message=$(echo "$output" | jq -r '.message')
+
+    if [[ $mode != "install_from_github_api_valid" ]]; then 
+        message="API rate limit exceeded"
+    fi
+    
+    if [[ $message == "API rate limit exceeded"* ]]; then
+        echo -e "\nAttempting to find latest version using Github Api Failed. Exceeded API Rate Limit."
+        echo -e "\nAttempting to find latest version using Github Tags."
+        find_prev_version_from_git_tags prev_version "$url" "tags/v"
+        declare -g ${variable_name}="${prev_version}"
+    else 
+        echo -e "\nAttempting to find latest version using Github Api Succeeded."
+        version=$(echo "$output" | jq -r '.tag_name')
+        declare -g ${variable_name}="${version#v}"
+    fi  
+    echo "${variable_name}=${!variable_name}"
 }
 
-change_version_to_fail() {
-    latest_version=$1
-    new_patch_number="xyz" # for testing a tag not found scenario for docker/buildx plugin
-    latest_version=$(get_latest_version)  # can take latest_version from fn get_latest_version
-    buildx_version_fallback_test=$(change_patch_number "$latest_version" "$new_patch_number") # for testing a tag not found scenario for docker/buildx plugin
-    echo "${buildx_version_fallback_test}"
+get_github_api_repo_url() {
+    local url=$1
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
 }
 
-install_previous_version_artifacts() {
-    wget_exit_code=$?
-    if [ $wget_exit_code -ne 0 ]; then # means wget command to fetch latest version failed
-        if [ $wget_exit_code -eq 8 ]; then  # failure due to 404: Not Found.
-            echo -e "\n(!) Failed to fetch the latest artifacts for docker buildx ${buildx_version}..."
-            previous_version=$(get_previous_version)
-            echo -e "\nAttempting to install ${previous_version}"
-            buildx_file_name="buildx-${previous_version}.linux-${architecture}"
-            wget https://github.com/docker/buildx/releases/download/${previous_version}/${buildx_file_name}
-        else
-            echo "(!) Failed to download docker buildx with exit code: $wget_exit_code"
-            exit 1
-        fi
-    fi
+install_using_get_previous_version() {
+    local url=$1
+    local mode=$2
+    local repo_url=$(get_github_api_repo_url "$url")
+    echo -e "\n(!) Failed to fetch the latest artifacts for docker buildx v${buildx_version}..."
+    get_previous_version "${url}" "${repo_url}" buildx_version "${mode}"
+    buildx_file_name="buildx-v${buildx_version}.linux-${architecture}"
+    echo -e "\nAttempting to install v${buildx_version}"
+    wget https://github.com/docker/buildx/releases/download/v${buildx_version}/${buildx_file_name}
 }
     
-test_version=$(change_version_to_fail "$(get_latest_version)")
-buildx_file_name="buildx-${test_version}.linux-${architecture}"
-buildx_version=$test_version
+install_docker_buildx() {
+    mode=$1
+    echo -e "\n${HL} Creating a scenario for fallback${N}\n"
 
-# This wget command will fail as the wrong version won't fetch artifact
-wget https://github.com/docker/buildx/releases/download/${buildx_version}/${buildx_file_name} || install_previous_version_artifacts
+    buildx_version="0.13.xyz"
+    echo "(*) Installing buildx ${buildx_version}..."
+    buildx_file_name="buildx-v${buildx_version}.linux-${architecture}"
+    cd /tmp
 
-docker_home="/usr/libexec/docker"
-cli_plugins_dir="${docker_home}/cli-plugins"
+    docker_buildx_url="https://github.com/docker/buildx"
+    wget https://github.com/docker/buildx/releases/download/v${buildx_version}/${buildx_file_name} || install_using_get_previous_version "${docker_buildx_url}" "${mode}"
+    
+    docker_home="/usr/libexec/docker"
+    cli_plugins_dir="${docker_home}/cli-plugins"
 
-mkdir -p ${cli_plugins_dir}
-mv ${buildx_file_name} ${cli_plugins_dir}/docker-buildx
-chmod +x ${cli_plugins_dir}/docker-buildx
+    mkdir -p ${cli_plugins_dir}
+    mv ${buildx_file_name} ${cli_plugins_dir}/docker-buildx
+    chmod +x ${cli_plugins_dir}/docker-buildx
 
-chown -R "${USERNAME}:docker" "${docker_home}"
-chmod -R g+r+w "${docker_home}"
-find "${docker_home}" -type d -print0 | xargs -n 1 -0 chmod g+s
+    chown -R "${USERNAME}:docker" "${docker_home}"
+    chmod -R g+r+w "${docker_home}"
+    find "${docker_home}" -type d -print0 | xargs -n 1 -0 chmod g+s
+}
+
+echo -e "\n👉${HL} docker-buildx version as installed by docker-in-docker test ( installing by github api ) ${N}"
+install_docker_buildx "install_from_github_api_valid"
+
+# Definition specific tests after test for fallback
+check "docker-buildx" docker buildx version
+check "docker-buildx" bash -c "docker buildx version"
+
+echo -e "\n👉${HL} docker-buildx version as installed by docker-in-docker test ( installing by find_prev_version_from_git_tags ) ${N}"
+install_docker_buildx
 
 # Definition specific tests after test for fallback
-echo -e "\n👉${HL} docker/buildx version as installed by test for fallback${N}"
 check "docker-buildx" docker buildx version
-check "docker-build" docker build ./
 check "docker-buildx" bash -c "docker buildx version"
-check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
 
 # Report result
 reportResults
diff --git a/test/docker-in-docker/docker_build_fallback_compose.sh b/test/docker-in-docker/docker_build_fallback_compose.sh
new file mode 100644
index 000000000..4a18640f0
--- /dev/null
+++ b/test/docker-in-docker/docker_build_fallback_compose.sh
@@ -0,0 +1,174 @@
+#!/bin/bash
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Setup STDERR.
+err() {
+    echo "(!) $*" >&2
+}
+
+HL="\033[1;33m"
+N="\033[0;37m"
+echo -e "\n👉${HL} docker-compose version as installed by docker-in-docker feature${N}"
+check "docker-compose" bash -c "docker-compose version"
+
+architecture="$(dpkg --print-architecture)"
+case "${architecture}" in
+    amd64) target_compose_arch=x86_64 ;;
+    arm64) target_compose_arch=aarch64 ;;
+    *)
+        echo "(!) Docker in docker does not support machine architecture '$architecture'. Please use an x86-64 or ARM64 machine."
+        exit 1
+esac
+
+docker_compose_path="/usr/local/bin/docker-compose"
+cli_plugins_dir="${docker_home}/cli-plugins"
+
+# Figure out correct version of a three part version number is not passed
+find_version_from_git_tags() {
+    local variable_name=$1
+    local requested_version=${!variable_name}
+    if [ "${requested_version}" = "none" ]; then return; fi
+    local repository=$2
+    local prefix=${3:-"tags/v"}
+    local separator=${4:-"."}
+    local last_part_optional=${5:-"false"}
+    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
+        local escaped_separator=${separator//./\\.}
+        local last_part
+        if [ "${last_part_optional}" = "true" ]; then
+            last_part="(${escaped_separator}[0-9]+)?"
+        else
+            last_part="${escaped_separator}[0-9]+"
+        fi
+        local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
+        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
+            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+        else
+            set +e
+                declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            set -e
+        fi
+    fi
+    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
+        err "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
+        exit 1
+    fi
+    echo "${variable_name}=${!variable_name}"
+}
+
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
+# Function to fetch the version released prior to the latest version
+get_previous_version() {
+    local url=$1
+    local repo_url=$2
+    local variable_name=$3
+    local mode=$4
+    prev_version=${!variable_name}
+    
+    echo -e "\nAttempting to find latest version using Github Api."
+
+    output=$(curl -s "$repo_url");
+    message=$(echo "$output" | jq -r '.message')
+
+    if [[ $mode != "install_from_github_api_valid" ]]; then 
+        message="API rate limit exceeded"
+    fi
+    
+    if [[ $message == "API rate limit exceeded"* ]]; then
+        echo -e "\nAttempting to find latest version using Github Api Failed. Exceeded API Rate Limit."
+        echo -e "\nAttempting to find latest version using Github Tags."
+        find_prev_version_from_git_tags prev_version "$url" "tags/v"
+        declare -g ${variable_name}="${prev_version}"
+    else 
+        echo -e "\nAttempting to find latest version using Github Api Succeeded."
+        version=$(echo "$output" | jq -r '.tag_name')
+        declare -g ${variable_name}="${version#v}"
+    fi  
+    echo "${variable_name}=${!variable_name}"
+}
+
+get_github_api_repo_url() {
+    local url=$1
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
+}
+
+install_using_get_previous_version() {
+    local url=$1
+    local mode=$2
+    local repo_url=$(get_github_api_repo_url "$url")
+    echo -e "\n(!) Failed to fetch the latest artifacts for docker-compose v${compose_version}..."
+    get_previous_version "$url" "$repo_url" compose_version "$mode"
+    echo -e "\nAttempting to install v${compose_version}"
+    curl -fsSL "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path}
+}
+
+install_docker_compose() {
+    mode=$1
+    compose_version="2.25.xyz"
+    docker_compose_url="https://github.com/docker/compose"
+    echo "(*) Installing docker-compose ${compose_version}..."
+    curl -fsSL "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path} || install_using_get_previous_version "$docker_compose_url" "$mode"
+}
+
+chmod +x ${docker_compose_path}
+
+# Download the SHA256 checksum
+DOCKER_COMPOSE_SHA256="$(curl -sSL "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}.sha256" | awk '{print $1}')"
+echo "${DOCKER_COMPOSE_SHA256}  ${docker_compose_path}" > docker-compose.sha256sum
+sha256sum -c docker-compose.sha256sum --ignore-missing
+
+mkdir -p ${cli_plugins_dir}
+cp ${docker_compose_path} ${cli_plugins_dir}
+
+echo -e "\n👉${HL} docker-compose version as installed by docker-in-docker test ( installing by github api ) ${N}"
+install_docker_compose "install_from_github_api_valid"
+
+check "docker-compose" bash -c "docker-compose version"
+
+echo -e "\n👉${HL} docker-compose version as installed by docker-in-docker test ( installing by find_prev_version_from_git_tags ) ${N}"
+install_docker_compose
+
+check "docker-compose" bash -c "docker-compose version"
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index e209f3453..33333583d 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -1,4 +1,13 @@
 {
+    "docker_build_fallback_compose": {
+        "image": "ubuntu:focal",
+        "features": {
+            "docker-in-docker": {
+                "version": "latest",
+                "dockerDashComposeVersion": "latest"
+            }
+        }
+    },
     "dockerDefaultAddressPool": {
         "image": "mcr.microsoft.com/vscode/devcontainers/javascript-node:0-18",
         "remoteUser": "node",
@@ -112,9 +121,7 @@
         "features": {
             "docker-in-docker": {
                 "version": "latest",
-                "installDockerBuildx": true,
-                "moby": "false",
-                "dockerDashComposeVersion": "v2"
+                "installDockerBuildx": true
             }
         }
     },

From 0a4fa18e1db577a60f569f7684dde62430a3179d Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Thu, 28 Mar 2024 03:30:20 +0530
Subject: [PATCH 254/478] [azure-cli] - python3.12 - feature broken due to
 distutils module removed - code fix (#909)

* [azure-cli] - python3.12 - feature broken due to distutils module removed - fix

* update default for installUsingPython

* removed the installUsingPython=true flag from the building scenario

* bump update the patch version

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/azure-cli/devcontainer-feature.json       |  2 +-
 src/azure-cli/install.sh                      |  8 +++----
 .../install_with_python_3_12_bookworm.sh      | 21 +++++++++++++++++++
 test/azure-cli/scenarios.json                 |  9 ++++++++
 4 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 test/azure-cli/install_with_python_3_12_bookworm.sh

diff --git a/src/azure-cli/devcontainer-feature.json b/src/azure-cli/devcontainer-feature.json
index 136b03fdc..f25e5f9a2 100644
--- a/src/azure-cli/devcontainer-feature.json
+++ b/src/azure-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "azure-cli",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "name": "Azure CLI",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/azure-cli",
   "description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/azure-cli/install.sh b/src/azure-cli/install.sh
index 6d3426699..7f4c4ff1c 100755
--- a/src/azure-cli/install.sh
+++ b/src/azure-cli/install.sh
@@ -15,10 +15,10 @@ rm -rf /var/lib/apt/lists/*
 AZ_VERSION=${VERSION:-"latest"}
 AZ_EXTENSIONS=${EXTENSIONS}
 AZ_INSTALLBICEP=${INSTALLBICEP:-false}
-INSTALL_USING_PYTHON=${INSTALL_USING_PYTHON:-true}
+INSTALL_USING_PYTHON=${INSTALL_USING_PYTHON:-false}
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
-AZCLI_ARCHIVE_ARCHITECTURES="amd64"
-AZCLI_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal jammy"
+AZCLI_ARCHIVE_ARCHITECTURES="amd64 arm64"
+AZCLI_ARCHIVE_VERSION_CODENAMES="stretch bookworm buster bullseye bionic focal jammy"
 
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
@@ -183,7 +183,7 @@ install_with_complete_python_installation() {
 
 export DEBIAN_FRONTEND=noninteractive
 
-# See if we're on x86_64 and if so, install via apt-get, otherwise use pip3
+# See if we're on x86_64 or AARCH64 and if so, install via apt-get, otherwise use pip3
 echo "(*) Installing Azure CLI..."
 . /etc/os-release
 architecture="$(dpkg --print-architecture)"
diff --git a/test/azure-cli/install_with_python_3_12_bookworm.sh b/test/azure-cli/install_with_python_3_12_bookworm.sh
new file mode 100644
index 000000000..074876148
--- /dev/null
+++ b/test/azure-cli/install_with_python_3_12_bookworm.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+check "version" az  --version
+
+echo -e "\n\n🔄 Testing 'O.S'"
+if cat /etc/os-release | grep -q 'PRETTY_NAME="Debian GNU/Linux 12 (bookworm)"'; then
+    echo -e "\n\n✅ Passed 'O.S is Linux 12 (bookworm)'!"
+else
+    echo -e "\n\n❌ Failed 'O.S is other than Linux 12 (bookworm)'!"
+fi
+
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/azure-cli/scenarios.json b/test/azure-cli/scenarios.json
index b7a732395..041f50731 100644
--- a/test/azure-cli/scenarios.json
+++ b/test/azure-cli/scenarios.json
@@ -38,5 +38,14 @@
         "installUsingPython": true
       }
     }
+  },
+  "install_with_python_3_12_bookworm": {
+    "image": "mcr.microsoft.com/devcontainers/python:1-3.12-bookworm",
+    "user": "vscode",
+    "features": {
+      "azure-cli": {
+        "version": "latest"
+      }
+    }
   }
 }
\ No newline at end of file

From 988cdd2bb9eb9a96cf16ed30e2bfba32c68ad81c Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Thu, 28 Mar 2024 22:41:51 +0530
Subject: [PATCH 255/478] [Terraform] feature fallback fix (#912)

* implementation of fallback logic for cosign, terraform

* tflint, terragrunt - wrote fallback logic for these

* misc change

* [Terraform] - fallback - apply

* changes as requested by review comments

* misc change

* misc change

* 2-step fallback implemented in install.sh, test cases yet to be updated

* install jq for ubuntu:focal, jammy & debian:11, 12

* test for terraform_docs updated

* tfsec test updated

* terraform fallback test updated

* misc change

* added tflint fallback test file

* terragrunt fallback test file added

* minor change in tfsec test file

* few more changes to cosign, terragrunt installations..

* changes to test files for terragrunt & cosign

* Changes acc. to review comments for pr

* changes requested

* changes as requested in review comments !
---
 src/terraform/devcontainer-feature.json       |   2 +-
 src/terraform/install.sh                      | 192 ++++++++++--
 test/terraform/scenarios.json                 |  40 +++
 .../terraform/terraform_docs_fallback_test.sh | 220 ++++++++++++++
 test/terraform/terraform_fallback_test.sh     | 206 +++++++++++++
 test/terraform/terragrunt_fallback_test.sh    | 219 +++++++++++++
 test/terraform/tflint_fallback_test.sh        | 287 ++++++++++++++++++
 test/terraform/tfsec_fallback_test.sh         | 224 ++++++++++++++
 8 files changed, 1372 insertions(+), 18 deletions(-)
 create mode 100644 test/terraform/terraform_docs_fallback_test.sh
 create mode 100644 test/terraform/terraform_fallback_test.sh
 create mode 100644 test/terraform/terragrunt_fallback_test.sh
 create mode 100644 test/terraform/tflint_fallback_test.sh
 create mode 100644 test/terraform/tfsec_fallback_test.sh

diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index 51fb9a27a..5c9c042cc 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index c1a382597..dc7aef8c3 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -137,6 +137,47 @@ find_version_from_git_tags() {
     echo "${variable_name}=${!variable_name}"
 }
 
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
 find_sentinel_version_from_url() {
     local variable_name=$1
     local requested_version=${!variable_name}
@@ -177,6 +218,73 @@ check_packages() {
     fi
 }
 
+# Function to fetch the version released prior to the latest version
+get_previous_version() {
+    local url=$1
+    local repo_url=$2
+    local variable_name=$3
+    prev_version=${!variable_name}
+    
+    output=$(curl -s "$repo_url");
+
+    # install jq
+    check_packages jq
+    
+    message=$(echo "$output" | jq -r '.message')
+    
+    if [[ $message == "API rate limit exceeded"* ]]; then
+        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
+        echo -e "\nAttempting to find latest version using GitHub tags."
+        find_prev_version_from_git_tags prev_version "$url" "tags/v"
+        declare -g ${variable_name}="${prev_version}"
+    else
+        echo -e "\nAttempting to find latest version using GitHub Api."
+        version=$(echo "$output" | jq -r '.tag_name')
+        declare -g ${variable_name}="${version#v}"
+    fi  
+    echo "${variable_name}=${!variable_name}"
+}
+
+get_github_api_repo_url() {
+    local url=$1
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
+}
+
+install_previous_version() {
+    given_version=$1
+    requested_version=${!given_version}
+    local URL=$2
+    INSTALLER_FN=$3
+    local REPO_URL=$(get_github_api_repo_url "$URL")
+    local PKG_NAME=$(get_pkg_name "${given_version}")
+    echo -e "\n(!) Failed to fetch the latest artifacts for ${PKG_NAME} v${requested_version}..."
+    get_previous_version "$URL" "$REPO_URL" requested_version
+    echo -e "\nAttempting to install ${requested_version}"
+    declare -g ${given_version}="${requested_version#v}"
+    $INSTALLER_FN "${!given_version}"
+    echo "${given_version}=${!given_version}"
+}
+
+install_cosign() {
+    COSIGN_VERSION=$1
+    local URL=$2
+    cosign_filename="/tmp/cosign_${COSIGN_VERSION}_${architecture}.deb"
+    cosign_url="https://github.com/sigstore/cosign/releases/latest/download/cosign_${COSIGN_VERSION}_${architecture}.deb"
+    curl -L "${cosign_url}" -o $cosign_filename
+    if grep -q "Not Found" "$cosign_filename"; then
+        echo -e "\n(!) Failed to fetch the latest artifacts for cosign v${COSIGN_VERSION}..."
+        REPO_URL=$(get_github_api_repo_url "$URL")
+        get_previous_version "$URL" "$REPO_URL" COSIGN_VERSION
+        echo -e "\nAttempting to install ${COSIGN_VERSION}"
+        cosign_filename="/tmp/cosign_${COSIGN_VERSION}_${architecture}.deb"
+        cosign_url="https://github.com/sigstore/cosign/releases/latest/download/cosign_${COSIGN_VERSION}_${architecture}.deb"
+        curl -L "${cosign_url}" -o $cosign_filename
+    fi
+    dpkg -i $cosign_filename
+    rm $cosign_filename
+    echo "Installation of cosign succeeded with ${COSIGN_VERSION}."
+}
+
 # Install 'cosign' for validating signatures
 # https://docs.sigstore.dev/cosign/overview/
 ensure_cosign() {
@@ -184,12 +292,10 @@ ensure_cosign() {
 
     if ! type cosign > /dev/null 2>&1; then
         echo "Installing cosign..."
-        LATEST_COSIGN_VERSION="latest"
-        find_version_from_git_tags LATEST_COSIGN_VERSION 'https://github.com/sigstore/cosign'
-        curl -L "https://github.com/sigstore/cosign/releases/latest/download/cosign_${LATEST_COSIGN_VERSION}_${architecture}.deb" -o /tmp/cosign_${LATEST_COSIGN_VERSION}_${architecture}.deb
-        
-        dpkg -i /tmp/cosign_${LATEST_COSIGN_VERSION}_${architecture}.deb
-        rm /tmp/cosign_${LATEST_COSIGN_VERSION}_${architecture}.deb
+        COSIGN_VERSION="latest"
+        cosign_url='https://github.com/sigstore/cosign'
+        find_version_from_git_tags COSIGN_VERSION "${cosign_url}"
+        install_cosign "${COSIGN_VERSION}" "${cosign_url}"
     fi
     if ! type cosign > /dev/null 2>&1; then
         echo "(!) Failed to install cosign."
@@ -207,18 +313,30 @@ if ! type git > /dev/null 2>&1; then
     check_packages git
 fi
 
+terraform_url='https://github.com/hashicorp/terraform'
+tflint_url='https://github.com/terraform-linters/tflint'
+terragrunt_url='https://github.com/gruntwork-io/terragrunt'
 # Verify requested version is available, convert latest
-find_version_from_git_tags TERRAFORM_VERSION 'https://github.com/hashicorp/terraform'
-find_version_from_git_tags TFLINT_VERSION 'https://github.com/terraform-linters/tflint'
-find_version_from_git_tags TERRAGRUNT_VERSION 'https://github.com/gruntwork-io/terragrunt'
+find_version_from_git_tags TERRAFORM_VERSION "$terraform_url"
+find_version_from_git_tags TFLINT_VERSION "$tflint_url"
+find_version_from_git_tags TERRAGRUNT_VERSION "$terragrunt_url"
+
+install_terraform() {
+    local TERRAFORM_VERSION=$1
+    terraform_filename="terraform_${TERRAFORM_VERSION}_linux_${architecture}.zip"
+    curl -sSL -o ${terraform_filename} "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/${terraform_filename}"
+}
 
 mkdir -p /tmp/tf-downloads
 cd /tmp/tf-downloads
-
 # Install Terraform, tflint, Terragrunt
 echo "Downloading terraform..."
 terraform_filename="terraform_${TERRAFORM_VERSION}_linux_${architecture}.zip"
-curl -sSL -o ${terraform_filename} "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/${terraform_filename}"
+install_terraform "$TERRAFORM_VERSION"
+if grep -q "The specified key does not exist." "${terraform_filename}"; then
+    install_previous_version TERRAFORM_VERSION $terraform_url "install_terraform"
+    terraform_filename="terraform_${TERRAFORM_VERSION}_linux_${architecture}.zip"
+fi
 if [ "${TERRAFORM_SHA256}" != "dev-mode" ]; then
     if [ "${TERRAFORM_SHA256}" = "automatic" ]; then
         receive_gpg_keys TERRAFORM_GPG_KEY
@@ -233,10 +351,18 @@ fi
 unzip ${terraform_filename}
 mv -f terraform /usr/local/bin/
 
+install_tflint() {
+    TFLINT_VERSION=$1
+    curl -sSL -o /tmp/tf-downloads/${TFLINT_FILENAME} https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/${TFLINT_FILENAME}
+}
+
 if [ "${TFLINT_VERSION}" != "none" ]; then
     echo "Downloading tflint..."
     TFLINT_FILENAME="tflint_linux_${architecture}.zip"
-    curl -sSL -o /tmp/tf-downloads/${TFLINT_FILENAME} https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/${TFLINT_FILENAME}
+    install_tflint "$TFLINT_VERSION"
+    if grep -q "Not Found" "/tmp/tf-downloads/${TFLINT_FILENAME}"; then 
+        install_previous_version TFLINT_VERSION "$tflint_url" "install_tflint"
+    fi
     if [ "${TFLINT_SHA256}" != "dev-mode" ]; then
 
         if [ "${TFLINT_SHA256}" != "automatic" ]; then
@@ -277,10 +403,20 @@ if [ "${TFLINT_VERSION}" != "none" ]; then
     unzip /tmp/tf-downloads/${TFLINT_FILENAME}
     mv -f tflint /usr/local/bin/
 fi
+
+install_terragrunt() {
+    TERRAGRUNT_VERSION=$1
+    curl -sSL -o /tmp/tf-downloads/${terragrunt_filename} https://github.com/gruntwork-io/terragrunt/releases/download/v${TERRAGRUNT_VERSION}/${terragrunt_filename}
+}
+
 if [ "${TERRAGRUNT_VERSION}" != "none" ]; then
     echo "Downloading Terragrunt..."
     terragrunt_filename="terragrunt_linux_${architecture}"
-    curl -sSL -o /tmp/tf-downloads/${terragrunt_filename} https://github.com/gruntwork-io/terragrunt/releases/download/v${TERRAGRUNT_VERSION}/${terragrunt_filename}
+    install_terragrunt "$TERRAGRUNT_VERSION"
+    output=$(cat "/tmp/tf-downloads/${terragrunt_filename}")
+    if [[ $output == "Not Found" ]]; then
+        install_previous_version TERRAGRUNT_VERSION $terragrunt_url "install_terragrunt"
+    fi
     if [ "${TERRAGRUNT_SHA256}" != "dev-mode" ]; then
         if [ "${TERRAGRUNT_SHA256}" = "automatic" ]; then
             curl -sSL -o terragrunt_SHA256SUMS https://github.com/gruntwork-io/terragrunt/releases/download/v${TERRAGRUNT_VERSION}/SHA256SUMS
@@ -318,12 +454,23 @@ if [ "${INSTALL_SENTINEL}" = "true" ]; then
     mv -f /tmp/tf-downloads/sentinel /usr/local/bin/sentinel
 fi
 
+install_tfsec() {
+    local TFSEC_VERSION=$1
+    tfsec_filename="tfsec_${TFSEC_VERSION}_linux_${architecture}.tar.gz"
+    curl -sSL -o /tmp/tf-downloads/${tfsec_filename} https://github.com/aquasecurity/tfsec/releases/download/v${TFSEC_VERSION}/${tfsec_filename}
+}
+
 if [ "${INSTALL_TFSEC}" = "true" ]; then
     TFSEC_VERSION="latest"
-    find_version_from_git_tags TFSEC_VERSION 'https://github.com/aquasecurity/tfsec'
+    tfsec_url='https://github.com/aquasecurity/tfsec'
+    find_version_from_git_tags TFSEC_VERSION $tfsec_url
     tfsec_filename="tfsec_${TFSEC_VERSION}_linux_${architecture}.tar.gz"
     echo "(*) Downloading TFSec... ${tfsec_filename}"
-    curl -sSL -o /tmp/tf-downloads/${tfsec_filename} https://github.com/aquasecurity/tfsec/releases/download/v${TFSEC_VERSION}/${tfsec_filename}
+    install_tfsec "$TFSEC_VERSION"
+    if grep -q "Not Found" "/tmp/tf-downloads/${tfsec_filename}"; then 
+        install_previous_version TFSEC_VERSION $tfsec_url "install_tfsec"
+        tfsec_filename="tfsec_${TFSEC_VERSION}_linux_${architecture}.tar.gz"
+    fi
     if [ "${TFSEC_SHA256}" != "dev-mode" ]; then
         if [ "${TFSEC_SHA256}" = "automatic" ]; then
             curl -sSL -o tfsec_SHA256SUMS https://github.com/aquasecurity/tfsec/releases/download/v${TFSEC_VERSION}/tfsec_${TFSEC_VERSION}_checksums.txt
@@ -338,12 +485,23 @@ if [ "${INSTALL_TFSEC}" = "true" ]; then
     mv -f /tmp/tf-downloads/tfsec/tfsec /usr/local/bin/tfsec
 fi
 
+install_terraform_docs() {
+    local TERRAFORM_DOCS_VERSION=$1
+    tfdocs_filename="terraform-docs-v${TERRAFORM_DOCS_VERSION}-linux-${architecture}.tar.gz"
+    curl -sSL -o /tmp/tf-downloads/${tfdocs_filename} https://github.com/terraform-docs/terraform-docs/releases/download/v${TERRAFORM_DOCS_VERSION}/${tfdocs_filename}
+}
+
 if [ "${INSTALL_TERRAFORM_DOCS}" = "true" ]; then
     TERRAFORM_DOCS_VERSION="latest"
-    find_version_from_git_tags TERRAFORM_DOCS_VERSION 'https://github.com/terraform-docs/terraform-docs'
+    terraform_docs_url='https://github.com/terraform-docs/terraform-docs'
+    find_version_from_git_tags TERRAFORM_DOCS_VERSION $terraform_docs_url
     tfdocs_filename="terraform-docs-v${TERRAFORM_DOCS_VERSION}-linux-${architecture}.tar.gz"
     echo "(*) Downloading Terraform docs... ${tfdocs_filename}"
-    curl -sSL -o /tmp/tf-downloads/${tfdocs_filename} https://github.com/terraform-docs/terraform-docs/releases/download/v${TERRAFORM_DOCS_VERSION}/${tfdocs_filename}
+    install_terraform_docs "$TERRAFORM_DOCS_VERSION"
+    if grep -q "Not Found" "/tmp/tf-downloads/${tfdocs_filename}"; then
+        install_previous_version TERRAFORM_DOCS_VERSION $terraform_docs_url "install_terraform_docs"
+        tfdocs_filename="terraform-docs-v${TERRAFORM_DOCS_VERSION}-linux-${architecture}.tar.gz"
+    fi
     if [ "${TERRAFORM_DOCS_SHA256}" != "dev-mode" ]; then
         if [ "${TERRAFORM_DOCS_SHA256}" = "automatic" ]; then
             curl -sSL -o tfdocs_SHA256SUMS https://github.com/terraform-docs/terraform-docs/releases/download/v${TERRAFORM_DOCS_VERSION}/terraform-docs-v${TERRAFORM_DOCS_VERSION}.sha256sum
diff --git a/test/terraform/scenarios.json b/test/terraform/scenarios.json
index 0a4d8956c..04693666c 100644
--- a/test/terraform/scenarios.json
+++ b/test/terraform/scenarios.json
@@ -15,6 +15,14 @@
             }
         }
     },
+    "tfsec_fallback_test": {
+        "image": "mcr.microsoft.com/devcontainers/base:jammy",
+        "features": {
+            "terraform": {
+                "installTFsec": true
+            }
+        }
+    },
     "install_terraform_docs": {
         "image": "mcr.microsoft.com/devcontainers/base:jammy",
         "features": {
@@ -23,6 +31,38 @@
             }
         }
     },
+    "terraform_docs_fallback_test": {
+        "image": "mcr.microsoft.com/devcontainers/base:jammy",
+        "features": {
+            "terraform": {
+                "installTerraformDocs": true
+            }
+        }
+    },
+    "terraform_fallback_test": {
+        "image": "mcr.microsoft.com/devcontainers/base:jammy",
+        "features": {
+            "terraform": {
+                "version": "latest"
+            }
+        }
+    },
+    "terragrunt_fallback_test": {
+        "image": "mcr.microsoft.com/devcontainers/base:jammy",
+        "features": {
+            "terraform": {
+                "terragrunt": "latest"
+            }
+        }
+    },
+    "tflint_fallback_test": {
+        "image": "mcr.microsoft.com/devcontainers/base:jammy",
+        "features": {
+            "terraform": {
+                "tflint": "latest"
+            }
+        }
+    },
     "older_tflint": {
         "image": "mcr.microsoft.com/devcontainers/base:jammy",
         "features": {
diff --git a/test/terraform/terraform_docs_fallback_test.sh b/test/terraform/terraform_docs_fallback_test.sh
new file mode 100644
index 000000000..256ef2f85
--- /dev/null
+++ b/test/terraform/terraform_docs_fallback_test.sh
@@ -0,0 +1,220 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+# Terraform Docs specific tests
+check "terraform-docs version as installed by feature" terraform-docs --version
+
+TERRAFORM_DOCS_SHA256="automatic"
+
+set_error_handler() {
+    echo "Error occurred on line: $LINENO"
+}
+
+# Register the error handler function to be triggered on ERR signal
+trap 'set_error_handler' ERR
+
+architecture="$(uname -m)"
+case ${architecture} in
+    x86_64) architecture="amd64";;
+    aarch64 | armv8*) architecture="arm64";;
+    aarch32 | armv7* | armvhf*) architecture="arm";;
+    i?86) architecture="386";;
+    *) echo "(!) Architecture ${architecture} unsupported"; exit 1 ;;
+esac
+
+# Figure out correct version of a three part version number is not passed
+find_version_from_git_tags() {
+    local variable_name=$1
+    local requested_version=${!variable_name}
+    if [ "${requested_version}" = "none" ]; then return; fi
+    local repository=$2
+    local prefix=${3:-"tags/v"}
+    local separator=${4:-"."}
+    local last_part_optional=${5:-"false"}    
+    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
+        local escaped_separator=${separator//./\\.}
+        local last_part
+        if [ "${last_part_optional}" = "true" ]; then
+            last_part="(${escaped_separator}[0-9]+)?"
+        else
+            last_part="${escaped_separator}[0-9]+"
+        fi
+        local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
+        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
+            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+        else
+            set +e
+            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            set -e
+        fi
+    fi
+    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
+        echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
+        exit 1
+    fi
+    echo "${variable_name}=${!variable_name}"
+}
+
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
+apt_get_update()
+{
+    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+        echo "Running apt-get update..."
+        apt-get update -y
+    fi
+}
+
+# Checks if packages are installed and installs them if not
+check_packages() {
+    if ! dpkg -s "$@" > /dev/null 2>&1; then
+        apt_get_update
+        apt-get -y install --no-install-recommends "$@"
+    fi
+}
+
+# Function to fetch the version released prior to the latest version
+get_previous_version() {
+    local url=$1
+    local repo_url=$2
+    local variable_name=$3
+    local mode=$4
+    prev_version=${!variable_name}
+    
+    output=$(curl -s "$repo_url");
+
+    # install jq
+    check_packages jq
+    
+    message=$(echo "$output" | jq -r '.message')
+    if [[ "$mode" == "mode1" ]]; then
+        message="API rate limit exceeded";
+    elif [[ "$mode" == "mode2" ]]; then
+        message=""
+    fi 
+    if [[ $message == "API rate limit exceeded"* ]]; then
+        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
+        echo -e "\nAttempting to find latest version using GitHub tags."
+        find_prev_version_from_git_tags prev_version "$url" "tags/v"
+        declare -g ${variable_name}="${prev_version}"
+    else
+        echo -e "\nAttempting to find latest version using GitHub Api."
+        version=$(echo "$output" | jq -r '.tag_name')
+        declare -g ${variable_name}="${version#v}"
+    fi  
+    echo "${variable_name}=${!variable_name}"
+}
+
+get_github_api_repo_url() {
+    local url=$1
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
+}
+
+install_previous_version() {
+    given_version=$1
+    requested_version=${!given_version}
+    local URL=$2
+    local mode=$3
+    INSTALLER_FN=$4
+    local REPO_URL=$(get_github_api_repo_url "$URL")
+    local PKG_NAME=$(get_pkg_name "${given_version}")
+    echo -e "\n(!) Failed to fetch the latest artifacts for ${PKG_NAME} v${requested_version}..."
+    get_previous_version "$URL" "$REPO_URL" requested_version $mode
+    echo -e "\nAttempting to install ${requested_version}"
+    declare -g ${given_version}="${requested_version#v}"
+    $INSTALLER_FN "${!given_version}"
+    echo "${given_version}=${!given_version}"
+}
+
+install_terraform_docs() {
+    local TERRAFORM_DOCS_VERSION=$1
+    tfdocs_filename="terraform-docs-v${TERRAFORM_DOCS_VERSION}-linux-${architecture}.tar.gz"
+    curl -sSL -o /tmp/tf-downloads/${tfdocs_filename} https://github.com/terraform-docs/terraform-docs/releases/download/v${TERRAFORM_DOCS_VERSION}/${tfdocs_filename}
+}
+
+
+try_install_terraform_docs_dummy_version() {
+    mode=$1
+    mkdir -p /tmp/tf-downloads
+    cd /tmp/tf-downloads
+    TERRAFORM_DOCS_VERSION="0.17.xyz"
+    echo -e "\nInstalling TERRAFORM_DOCS dummy version.." v${TERRAFORM_DOCS_VERSION}
+    terraform_docs_url='https://github.com/terraform-docs/terraform-docs'
+    tfdocs_filename="terraform-docs-v${TERRAFORM_DOCS_VERSION}-linux-${architecture}.tar.gz"
+    echo "(*) Downloading Terraform docs... ${tfdocs_filename}"
+    install_terraform_docs "$TERRAFORM_DOCS_VERSION"
+    if grep -q "Not Found" "/tmp/tf-downloads/${tfdocs_filename}"; then
+        install_previous_version TERRAFORM_DOCS_VERSION $terraform_docs_url $mode "install_terraform_docs"
+        tfdocs_filename="terraform-docs-v${TERRAFORM_DOCS_VERSION}-linux-${architecture}.tar.gz"
+    fi
+    if [ "${TERRAFORM_DOCS_SHA256}" != "dev-mode" ]; then
+        if [ "${TERRAFORM_DOCS_SHA256}" = "automatic" ]; then
+            curl -sSL -o tfdocs_SHA256SUMS https://github.com/terraform-docs/terraform-docs/releases/download/v${TERRAFORM_DOCS_VERSION}/terraform-docs-v${TERRAFORM_DOCS_VERSION}.sha256sum
+        else
+            echo "${TERRAFORM_DOCS_SHA256} *${tfsec_filename}" > tfdocs_SHA256SUMS
+        fi
+        sha256sum --ignore-missing -c tfdocs_SHA256SUMS
+    fi
+    mkdir -p /tmp/tf-downloads/tfdocs
+    tar -xzf /tmp/tf-downloads/${tfdocs_filename} -C /tmp/tf-downloads/tfdocs
+    sudo chmod a+x /tmp/tf-downloads/tfdocs/terraform-docs
+    sudo mv -f /tmp/tf-downloads/tfdocs/terraform-docs /usr/local/bin/terraform-docs
+}
+
+try_install_terraform_docs_dummy_version "mode1"
+
+check "terraform-docs version as installed by test (mode 1: install using find_prev_version_from_git_tags)" terraform-docs --version
+
+try_install_terraform_docs_dummy_version "mode2"
+
+check "terraform-docs version as installed by test (mode 2: install using GitHub Api)" terraform-docs --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/terraform/terraform_fallback_test.sh b/test/terraform/terraform_fallback_test.sh
new file mode 100644
index 000000000..a5193daa4
--- /dev/null
+++ b/test/terraform/terraform_fallback_test.sh
@@ -0,0 +1,206 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+set_error_handler() {
+    echo "Error occurred on line: $LINENO"
+}
+
+# Register the error handler function to be triggered on ERR signal
+trap 'set_error_handler' ERR
+
+check "terraform version as installed by feature" terraform --version
+
+architecture="$(uname -m)"
+case ${architecture} in
+    x86_64) architecture="amd64";;
+    aarch64 | armv8*) architecture="arm64";;
+    aarch32 | armv7* | armvhf*) architecture="arm";;
+    i?86) architecture="386";;
+    *) echo "(!) Architecture ${architecture} unsupported"; exit 1 ;;
+esac
+
+# Figure out correct version of a three part version number is not passed
+find_version_from_git_tags() {
+    local variable_name=$1
+    local requested_version=${!variable_name}
+    if [ "${requested_version}" = "none" ]; then return; fi
+    local repository=$2
+    local prefix=${3:-"tags/v"}
+    local separator=${4:-"."}
+    local last_part_optional=${5:-"false"}    
+    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
+        local escaped_separator=${separator//./\\.}
+        local last_part
+        if [ "${last_part_optional}" = "true" ]; then
+            last_part="(${escaped_separator}[0-9]+)?"
+        else
+            last_part="${escaped_separator}[0-9]+"
+        fi
+        local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
+        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
+            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+        else
+            set +e
+            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            set -e
+        fi
+    fi
+    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
+        echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
+        exit 1
+    fi
+    echo "${variable_name}=${!variable_name}"
+}
+
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
+apt_get_update()
+{
+    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+        echo "Running apt-get update..."
+        apt-get update -y
+    fi
+}
+
+# Checks if packages are installed and installs them if not
+check_packages() {
+    if ! dpkg -s "$@" > /dev/null 2>&1; then
+        apt_get_update
+        apt-get -y install --no-install-recommends "$@"
+    fi
+}
+
+# Function to fetch the version released prior to the latest version
+get_previous_version() {
+    local url=$1
+    local repo_url=$2
+    local variable_name=$3
+    local mode=$4
+    prev_version=${!variable_name}
+    
+    output=$(curl -s "$repo_url");
+
+    # install jq
+    check_packages jq
+
+    message=$(echo "$output" | jq -r '.message')
+    if [[ "$mode" == "mode1" ]]; then
+        message="API rate limit exceeded";
+    elif [[ "$mode" == "mode2" ]]; then
+        message=""
+    fi 
+    if [[ $message == "API rate limit exceeded"* ]]; then
+        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
+        echo -e "\nAttempting to find latest version using GitHub tags."
+        find_prev_version_from_git_tags prev_version "$url" "tags/v"
+        declare -g ${variable_name}="${prev_version}"
+    else
+        echo -e "\nAttempting to find latest version using GitHub Api."
+        version=$(echo "$output" | jq -r '.tag_name')
+        declare -g ${variable_name}="${version#v}"
+    fi  
+    echo "${variable_name}=${!variable_name}"
+}
+
+get_github_api_repo_url() {
+    local url=$1
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
+}
+
+install_previous_version() {
+    given_version=$1
+    requested_version=${!given_version}
+    local URL=$2
+    local mode=$3
+    INSTALLER_FN=$4
+    local REPO_URL=$(get_github_api_repo_url "$URL")
+    local PKG_NAME=$(get_pkg_name "${given_version}")
+    echo -e "\n(!) Failed to fetch the latest artifacts for ${PKG_NAME} v${requested_version}..."
+    get_previous_version "$URL" "$REPO_URL" requested_version $mode
+    echo -e "\nAttempting to install ${requested_version}"
+    declare -g ${given_version}="${requested_version#v}"
+    $INSTALLER_FN "${!given_version}"
+    echo "${given_version}=${!given_version}"
+}
+
+install_terraform() {
+    local TERRAFORM_VERSION=$1
+    terraform_filename="terraform_${TERRAFORM_VERSION}_linux_${architecture}.zip"
+    curl -sSL -o ${terraform_filename} "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/${terraform_filename}"
+}
+
+try_install_dummy_terraform_version() {
+    mode=$1
+    mkdir -p /tmp/tf-downloads
+    cd /tmp/tf-downloads
+    terraform_url='https://github.com/hashicorp/terraform'
+    TERRAFORM_VERSION="1.7.xyz"
+    echo -e "\nAttempting to install dummy version for Terraform v${TERRAFORM_VERSION}..."
+    terraform_filename="terraform_${TERRAFORM_VERSION}_linux_${architecture}.zip"
+    install_terraform "$TERRAFORM_VERSION"
+    if grep -q "The specified key does not exist." "${terraform_filename}"; then
+        install_previous_version TERRAFORM_VERSION $terraform_url $mode "install_terraform"
+        terraform_filename="terraform_${TERRAFORM_VERSION}_linux_${architecture}.zip"
+    fi
+    unzip ${terraform_filename}
+    sudo mv -f terraform /usr/local/bin/
+}
+
+try_install_dummy_terraform_version "mode1"
+
+check "terraform version as installed by test after fallbacking from the dummy version (mode 1: install using find_prev_version_from_git_tags)" terraform --version
+
+try_install_dummy_terraform_version "mode2"
+
+check "terraform version as installed by test after fallbacking from the dummy version (mode 2: install using GitHub Api)" terraform --version
+
+# Report result
+reportResults
+
diff --git a/test/terraform/terragrunt_fallback_test.sh b/test/terraform/terragrunt_fallback_test.sh
new file mode 100644
index 000000000..83289380f
--- /dev/null
+++ b/test/terraform/terragrunt_fallback_test.sh
@@ -0,0 +1,219 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+set_error_handler() {
+    echo "Error occurred on line: $LINENO"
+}
+
+# Register the error handler function to be triggered on ERR signal
+trap 'set_error_handler' ERR
+
+check "terragrunt version as installed by feature" terragrunt --version
+
+TERRAGRUNT_SHA256="automatic"
+
+architecture="$(uname -m)"
+case ${architecture} in
+    x86_64) architecture="amd64";;
+    aarch64 | armv8*) architecture="arm64";;
+    aarch32 | armv7* | armvhf*) architecture="arm";;
+    i?86) architecture="386";;
+    *) echo "(!) Architecture ${architecture} unsupported"; exit 1 ;;
+esac
+
+# Figure out correct version of a three part version number is not passed
+find_version_from_git_tags() {
+    local variable_name=$1
+    local requested_version=${!variable_name}
+    if [ "${requested_version}" = "none" ]; then return; fi
+    local repository=$2
+    local prefix=${3:-"tags/v"}
+    local separator=${4:-"."}
+    local last_part_optional=${5:-"false"}    
+    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
+        local escaped_separator=${separator//./\\.}
+        local last_part
+        if [ "${last_part_optional}" = "true" ]; then
+            last_part="(${escaped_separator}[0-9]+)?"
+        else
+            last_part="${escaped_separator}[0-9]+"
+        fi
+        local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
+        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
+            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+        else
+            set +e
+            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            set -e
+        fi
+    fi
+    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
+        echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
+        exit 1
+    fi
+    echo "${variable_name}=${!variable_name}"
+}
+
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
+apt_get_update()
+{
+    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+        echo "Running apt-get update..."
+        apt-get update -y
+    fi
+}
+
+# Checks if packages are installed and installs them if not
+check_packages() {
+    if ! dpkg -s "$@" > /dev/null 2>&1; then
+        apt_get_update
+        apt-get -y install --no-install-recommends "$@"
+    fi
+}
+
+
+# Function to fetch the version released prior to the latest version
+get_previous_version() {
+    local url=$1
+    local repo_url=$2
+    local variable_name=$3
+    local mode=$4
+    prev_version=${!variable_name}
+    
+    output=$(curl -s "$repo_url");
+
+    # install jq
+    check_packages jq
+
+    message=$(echo "$output" | jq -r '.message')
+    if [[ "$mode" == "mode1" ]]; then
+        message="API rate limit exceeded";
+    elif [[ "$mode" == "mode2" ]]; then
+        message=""
+    fi 
+    if [[ $message == "API rate limit exceeded"* ]]; then
+        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
+        echo -e "\nAttempting to find latest version using GitHub tags."
+        find_prev_version_from_git_tags prev_version "$url" "tags/v"
+        declare -g ${variable_name}="${prev_version}"
+    else
+        echo -e "\nAttempting to find latest version using GitHub Api."
+        version=$(echo "$output" | jq -r '.tag_name')
+        declare -g ${variable_name}="${version#v}"
+    fi  
+    echo "${variable_name}=${!variable_name}"
+}
+
+get_github_api_repo_url() {
+    local url=$1
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
+}
+
+install_previous_version() {
+    given_version=$1
+    requested_version=${!given_version}
+    local URL=$2
+    local mode=$3
+    INSTALLER_FN=$4
+    local REPO_URL=$(get_github_api_repo_url "$URL")
+    local PKG_NAME=$(get_pkg_name "${given_version}")
+    echo -e "\n(!) Failed to fetch the latest artifacts for ${PKG_NAME} v${requested_version}..."
+    get_previous_version "$URL" "$REPO_URL" requested_version $mode
+    echo -e "\nAttempting to install ${requested_version}"
+    declare -g ${given_version}="${requested_version#v}"
+    $INSTALLER_FN "${!given_version}"
+    echo "${given_version}=${!given_version}"
+}
+
+
+install_terragrunt() {
+    TERRAGRUNT_VERSION=$1
+    curl -sSL -o /tmp/tf-downloads/${terragrunt_filename} https://github.com/gruntwork-io/terragrunt/releases/download/v${TERRAGRUNT_VERSION}/${terragrunt_filename}
+}
+
+
+try_install_dummy_terragrunt_version() {
+    mode=$1
+    mkdir -p /tmp/tf-downloads
+    cd /tmp/tf-downloads
+    terragrunt_url='https://github.com/gruntwork-io/terragrunt'
+    TERRAGRUNT_VERSION="0.55.xyz"
+    echo -e "\nAttempting to install terragrunt dummy v${TERRAGRUNT_VERSION}"
+    echo "Downloading Terragrunt... v${TERRAGRUNT_VERSION}"
+    terragrunt_filename="terragrunt_linux_${architecture}"
+    install_terragrunt "$TERRAGRUNT_VERSION"
+    output=$(cat "/tmp/tf-downloads/${terragrunt_filename}")
+    if [[ $output == "Not Found" ]]; then
+        install_previous_version TERRAGRUNT_VERSION $terragrunt_url $mode "install_terragrunt"
+    fi
+    if [ "${TERRAGRUNT_SHA256}" != "dev-mode" ]; then
+        if [ "${TERRAGRUNT_SHA256}" = "automatic" ]; then
+            curl -sSL -o terragrunt_SHA256SUMS https://github.com/gruntwork-io/terragrunt/releases/download/v${TERRAGRUNT_VERSION}/SHA256SUMS
+        else
+            echo "${TERRAGRUNT_SHA256} *${terragrunt_filename}" > terragrunt_SHA256SUMS
+        fi
+        sha256sum --ignore-missing -c terragrunt_SHA256SUMS
+    fi
+    sudo chmod a+x /tmp/tf-downloads/${terragrunt_filename}
+    sudo mv -f /tmp/tf-downloads/${terragrunt_filename} /usr/local/bin/terragrunt
+}
+
+try_install_dummy_terragrunt_version "mode1"
+
+check "terragrunt version as installed by test after fallbacking from the dummy version (mode 1: install using find_prev_version_from_git_tags)" terragrunt --version
+
+try_install_dummy_terragrunt_version "mode2"
+
+check "terragrunt version as installed by test after fallbacking from the dummy version (mode 2: install using GitHub Api)" terragrunt --version
+
+# Report result
+reportResults
+
diff --git a/test/terraform/tflint_fallback_test.sh b/test/terraform/tflint_fallback_test.sh
new file mode 100644
index 000000000..5619ff4fb
--- /dev/null
+++ b/test/terraform/tflint_fallback_test.sh
@@ -0,0 +1,287 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+set_error_handler() {
+    echo "Error occurred on line: $LINENO"
+}
+
+# Register the error handler function to be triggered on ERR signal
+trap 'set_error_handler' ERR
+
+TFLINT_SHA256="automatic"
+
+GPG_KEY_SERVERS="keyserver hkps://keyserver.ubuntu.com
+keyserver hkps://keys.openpgp.org
+keyserver hkps://keyserver.pgp.com"
+
+check "tflint version as installed by feature" tflint --version
+check "cosign version as installed by feature" cosign version
+
+architecture="$(uname -m)"
+case ${architecture} in
+    x86_64) architecture="amd64";;
+    aarch64 | armv8*) architecture="arm64";;
+    aarch32 | armv7* | armvhf*) architecture="arm";;
+    i?86) architecture="386";;
+    *) echo "(!) Architecture ${architecture} unsupported"; exit 1 ;;
+esac
+
+# Figure out correct version of a three part version number is not passed
+find_version_from_git_tags() {
+    local variable_name=$1
+    local requested_version=${!variable_name}
+    if [ "${requested_version}" = "none" ]; then return; fi
+    local repository=$2
+    local prefix=${3:-"tags/v"}
+    local separator=${4:-"."}
+    local last_part_optional=${5:-"false"}    
+    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
+        local escaped_separator=${separator//./\\.}
+        local last_part
+        if [ "${last_part_optional}" = "true" ]; then
+            last_part="(${escaped_separator}[0-9]+)?"
+        else
+            last_part="${escaped_separator}[0-9]+"
+        fi
+        local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
+        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
+            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+        else
+            set +e
+            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            set -e
+        fi
+    fi
+    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
+        echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
+        exit 1
+    fi
+    echo "${variable_name}=${!variable_name}"
+}
+
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
+apt_get_update()
+{
+    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+        echo "Running apt-get update..."
+        apt-get update -y
+    fi
+}
+
+# Checks if packages are installed and installs them if not
+check_packages() {
+    if ! dpkg -s "$@" > /dev/null 2>&1; then
+        apt_get_update
+        apt-get -y install --no-install-recommends "$@"
+    fi
+}
+
+# Function to fetch the version released prior to the latest version
+get_previous_version() {
+    local url=$1
+    local repo_url=$2
+    local variable_name=$3
+    local mode=$4
+    prev_version=${!variable_name}
+    
+    output=$(curl -s "$repo_url");
+    
+    # install jq
+    check_packages jq
+
+    message=$(echo "$output" | jq -r '.message')
+    if [[ "$mode" == "mode1" ]]; then
+        message="API rate limit exceeded";
+    elif [[ "$mode" == "mode2" ]]; then
+        message=""
+    fi 
+    if [[ $message == "API rate limit exceeded"* ]]; then
+        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
+        echo -e "\nAttempting to find latest version using GitHub tags."
+        find_prev_version_from_git_tags prev_version "$url" "tags/v"
+        declare -g ${variable_name}="${prev_version}"
+    else
+        echo -e "\nAttempting to find latest version using GitHub Api."
+        version=$(echo "$output" | jq -r '.tag_name')
+        declare -g ${variable_name}="${version#v}"
+    fi  
+    echo "${variable_name}=${!variable_name}"
+}
+
+get_github_api_repo_url() {
+    local url=$1
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
+}
+
+install_previous_version() {
+    given_version=$1
+    requested_version=${!given_version}
+    local URL=$2
+    local mode=$3
+    INSTALLER_FN=$4
+    local REPO_URL=$(get_github_api_repo_url "$URL")
+    local PKG_NAME=$(get_pkg_name "${given_version}")
+    echo -e "\n(!) Failed to fetch the latest artifacts for ${PKG_NAME} v${requested_version}..."
+    get_previous_version "$URL" "$REPO_URL" requested_version $mode
+    echo -e "\nAttempting to install ${requested_version}"
+    declare -g ${given_version}="${requested_version#v}"
+    $INSTALLER_FN "${!given_version}"
+    echo "${given_version}=${!given_version}"
+}
+
+install_cosign() {
+    COSIGN_VERSION=$1
+    local URL=$2
+    local mode=$3
+    cosign_filename="/tmp/cosign_${COSIGN_VERSION}_${architecture}.deb"
+    cosign_url="https://github.com/sigstore/cosign/releases/latest/download/cosign_${COSIGN_VERSION}_${architecture}.deb"
+    curl -L "${cosign_url}" -o $cosign_filename
+    if grep -q "Not Found" "$cosign_filename"; then
+        echo -e "\n(!) Failed to fetch the latest artifacts for cosign v${COSIGN_VERSION}..."
+        REPO_URL=$(get_github_api_repo_url "$URL")
+        get_previous_version "$URL" "$REPO_URL" COSIGN_VERSION $mode
+        echo -e "\nAttempting to install ${COSIGN_VERSION}"
+        cosign_filename="/tmp/cosign_${COSIGN_VERSION}_${architecture}.deb"
+        cosign_url="https://github.com/sigstore/cosign/releases/latest/download/cosign_${COSIGN_VERSION}_${architecture}.deb"
+        curl -L "${cosign_url}" -o $cosign_filename
+    fi
+    dpkg -i $cosign_filename
+    rm $cosign_filename
+    echo "Installation of cosign succeeded with ${COSIGN_VERSION}."
+}
+
+# Install 'cosign' for validating signatures
+# https://docs.sigstore.dev/cosign/overview/
+ensure_cosign() {
+    mode=$1
+    if ! type cosign > /dev/null 2>&1; then
+        echo -e "\nAttempting to install dummy cosign version..."
+        COSIGN_VERSION="2.2.xyz"
+        echo "Installing cosign... v${COSIGN_VERSION}"
+        cosign_url='https://github.com/sigstore/cosign'
+        install_cosign "${COSIGN_VERSION}" "${cosign_url}" $mode
+    fi
+    if ! type cosign > /dev/null 2>&1; then
+        echo "(!) Failed to install cosign."
+        exit 1
+    fi
+    cosign version
+}
+
+install_tflint() {
+    TFLINT_VERSION=$1
+    curl -sSL -o /tmp/tf-downloads/${TFLINT_FILENAME} https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/${TFLINT_FILENAME}
+}
+
+
+try_install_dummy_tflint_cosign_version() {
+    mode=$1
+    tflint_url='https://github.com/terraform-linters/tflint'
+    mkdir -p /tmp/tf-downloads
+    cd /tmp/tf-downloads
+    echo -e "\nTrying to install dummy tflint version..."
+    TFLINT_VERSION="0.50.XYZ"
+    echo "Downloading tflint...v${TFLINT_VERSION}"
+    TFLINT_FILENAME="tflint_linux_${architecture}.zip"
+    install_tflint "$TFLINT_VERSION"
+    if grep -q "Not Found" "/tmp/tf-downloads/${TFLINT_FILENAME}"; then 
+        install_previous_version TFLINT_VERSION "$tflint_url" $mode "install_tflint"
+    fi
+    if [ "${TFLINT_SHA256}" != "dev-mode" ]; then
+
+        if [ "${TFLINT_SHA256}" != "automatic" ]; then
+            echo "${TFLINT_SHA256} *${TFLINT_FILENAME}" > tflint_checksums.txt
+            sha256sum --ignore-missing -c tflint_checksums.txt
+        else
+            curl -sSL -o tflint_checksums.txt https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt
+
+            set +e
+            curl -sSL -o checksums.txt.keyless.sig https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.keyless.sig
+            set -e
+            
+            # Check that checksums.txt.keyless.sig exists and is not empty
+            if [ -s checksums.txt.keyless.sig ]; then
+                # Validate checksums with cosign
+                curl -sSL -o checksums.txt.pem https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.pem
+                ensure_cosign $mode
+                cosign verify-blob \
+                    --certificate=/tmp/tf-downloads/checksums.txt.pem \
+                    --signature=/tmp/tf-downloads/checksums.txt.keyless.sig \
+                    --certificate-identity-regexp="^https://github.com/terraform-linters/tflint"  \
+                    --certificate-oidc-issuer=https://token.actions.githubusercontent.com \
+                    /tmp/tf-downloads/tflint_checksums.txt
+                # Ensure that checksums.txt has $TFLINT_FILENAME
+                grep ${TFLINT_FILENAME} /tmp/tf-downloads/tflint_checksums.txt
+                # Validate downloaded file
+                sha256sum --ignore-missing -c tflint_checksums.txt
+            else
+                # Fallback to older, GPG-based verification (pre-0.47.0 of tflint)
+                curl -sSL -o tflint_checksums.txt.sig https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.sig
+                curl -sSL -o tflint_key "${TFLINT_GPG_KEY_URI}"
+                gpg -q --import tflint_key
+                gpg --verify tflint_checksums.txt.sig tflint_checksums.txt
+            fi
+        fi
+    fi
+
+    unzip /tmp/tf-downloads/${TFLINT_FILENAME}
+    sudo mv -f tflint /usr/local/bin/
+}
+
+try_install_dummy_tflint_cosign_version "mode1"
+
+check "tflint version as installed when mode=1" tflint --version
+check "cosign version as installed when mode=1" cosign version
+
+try_install_dummy_tflint_cosign_version "mode2"
+
+check "tflint version as installed when mode=2" tflint --version
+check "cosign version as installed when mode=2" cosign version
\ No newline at end of file
diff --git a/test/terraform/tfsec_fallback_test.sh b/test/terraform/tfsec_fallback_test.sh
new file mode 100644
index 000000000..5c87d821e
--- /dev/null
+++ b/test/terraform/tfsec_fallback_test.sh
@@ -0,0 +1,224 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+set_error_handler() {
+    echo "Error occurred on line: $LINENO"
+}
+
+# Register the error handler function to be triggered on ERR signal
+trap 'set_error_handler' ERR
+
+# Trap errors and call the error handling function
+trap 'handle_error' ERR
+
+architecture="$(uname -m)"
+case ${architecture} in
+    x86_64) architecture="amd64";;
+    aarch64 | armv8*) architecture="arm64";;
+    aarch32 | armv7* | armvhf*) architecture="arm";;
+    i?86) architecture="386";;
+    *) echo "(!) Architecture ${architecture} unsupported"; exit 1 ;;
+esac
+
+TFSEC_SHA256="automatic"
+
+# TFSec specific tests
+check "tfsec version as installed by feature" tfsec --version
+
+# Figure out correct version of a three part version number is not passed
+find_version_from_git_tags() {
+    local variable_name=$1
+    local requested_version=${!variable_name}
+    if [ "${requested_version}" = "none" ]; then return; fi
+    local repository=$2
+    local prefix=${3:-"tags/v"}
+    local separator=${4:-"."}
+    local last_part_optional=${5:-"false"}    
+    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
+        local escaped_separator=${separator//./\\.}
+        local last_part
+        if [ "${last_part_optional}" = "true" ]; then
+            last_part="(${escaped_separator}[0-9]+)?"
+        else
+            last_part="${escaped_separator}[0-9]+"
+        fi
+        local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
+        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
+            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+        else
+            set +e
+            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            set -e
+        fi
+    fi
+    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
+        echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
+        exit 1
+    fi
+    echo "${variable_name}=${!variable_name}"
+}
+
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
+apt_get_update()
+{
+    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+        echo "Running apt-get update..."
+        apt-get update -y
+    fi
+}
+
+# Checks if packages are installed and installs them if not
+check_packages() {
+    if ! dpkg -s "$@" > /dev/null 2>&1; then
+        apt_get_update
+        apt-get -y install --no-install-recommends "$@"
+    fi
+}
+
+# Function to fetch the version released prior to the latest version
+get_previous_version() {
+    local url=$1
+    local repo_url=$2
+    local variable_name=$3
+    local mode=$4
+    prev_version=${!variable_name}
+    
+    output=$(curl -s "$repo_url");
+
+    # install jq
+    check_packages jq
+
+    message=$(echo "$output" | jq -r '.message')
+
+    if [[ "$mode" == "mode1" ]]; then
+        message="API rate limit exceeded";
+    elif [[ "$mode" == "mode2" ]]; then
+        message=""
+    fi 
+
+    if [[ $message == "API rate limit exceeded"* ]]; then
+        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
+        echo -e "\nAttempting to find latest version using GitHub tags."
+        find_prev_version_from_git_tags prev_version "$url" "tags/v"
+        declare -g ${variable_name}="${prev_version}"
+    else
+        echo -e "\nAttempting to find latest version using GitHub Api."
+        version=$(echo "$output" | jq -r '.tag_name')
+        declare -g ${variable_name}="${version#v}"
+    fi  
+    echo "${variable_name}=${!variable_name}"
+}
+
+get_github_api_repo_url() {
+    local url=$1
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
+}
+
+install_previous_version() {
+    given_version=$1
+    requested_version=${!given_version}
+    local URL=$2
+    local mode=$3
+    INSTALLER_FN=$4
+    local REPO_URL=$(get_github_api_repo_url "$URL")
+    local PKG_NAME=$(get_pkg_name "${given_version}")
+    echo -e "\n(!) Failed to fetch the latest artifacts for ${PKG_NAME} v${requested_version}..."
+    get_previous_version "$URL" "$REPO_URL" requested_version $mode
+    echo -e "\nAttempting to install ${requested_version}"
+    declare -g ${given_version}="${requested_version#v}"
+    $INSTALLER_FN "${!given_version}"
+    echo "${given_version}=${!given_version}"
+}
+
+install_tfsec() {
+    local TFSEC_VERSION=$1
+    tfsec_filename="tfsec_${TFSEC_VERSION}_linux_${architecture}.tar.gz"
+    curl -sSL -o /tmp/tf-downloads/${tfsec_filename} https://github.com/aquasecurity/tfsec/releases/download/v${TFSEC_VERSION}/${tfsec_filename}
+}
+
+try_install_tfsec_dummy_version() {
+    mode=$1
+    mkdir -p /tmp/tf-downloads
+    cd /tmp/tf-downloads
+    TFSEC_VERSION="1.28.XYZ"
+    echo -e "\nInstalling TFSEC dummy version.." v${TFSEC_VERSION}
+    tfsec_url='https://github.com/aquasecurity/tfsec'
+    tfsec_filename="tfsec_${TFSEC_VERSION}_linux_${architecture}.tar.gz"
+    echo "(*) Downloading TFSec... ${tfsec_filename}"
+    install_tfsec "$TFSEC_VERSION"
+    if grep -q "Not Found" "/tmp/tf-downloads/${tfsec_filename}"; then 
+        install_previous_version TFSEC_VERSION $tfsec_url $mode "install_tfsec"
+        tfsec_filename="tfsec_${TFSEC_VERSION}_linux_${architecture}.tar.gz"
+    fi
+    if [ "${TFSEC_SHA256}" != "dev-mode" ]; then
+        if [ "${TFSEC_SHA256}" = "automatic" ]; then
+            curl -sSL -o tfsec_SHA256SUMS https://github.com/aquasecurity/tfsec/releases/download/v${TFSEC_VERSION}/tfsec_${TFSEC_VERSION}_checksums.txt
+        else
+            echo "${TFSEC_SHA256} *${tfsec_filename}" > tfsec_SHA256SUMS
+        fi
+        sha256sum --ignore-missing -c tfsec_SHA256SUMS
+    fi
+    mkdir -p /tmp/tf-downloads/tfsec
+    tar -xzf /tmp/tf-downloads/${tfsec_filename} -C /tmp/tf-downloads/tfsec
+    chmod a+x /tmp/tf-downloads/tfsec/tfsec
+    sudo mv -f /tmp/tf-downloads/tfsec/tfsec /usr/local/bin/tfsec
+}
+
+try_install_tfsec_dummy_version "mode1"
+
+check "tfsec version as installed by test after fallbacking from the dummy version (mode 1: install using find_prev_version_from_git_tags)" tfsec --version
+
+try_install_tfsec_dummy_version "mode2"
+
+check "tfsec version as installed by test after fallbacking from the dummy version (mode 2: install using GitHub Api)" tfsec --version
+
+# Report result
+reportResults
\ No newline at end of file

From cf03551a529f39f4a50b37e39fac0964c7a579ca Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Thu, 28 Mar 2024 22:58:53 +0530
Subject: [PATCH 256/478] [kubectl-helm-minikube] - helm - alternative fallback
 method implemented (#923)

* [kubectl-helm-minikube] - helm - alternative fallback method implemented

* bump patch version
---
 .../devcontainer-feature.json                 |   2 +-
 src/kubectl-helm-minikube/install.sh          |  80 +++++++-
 .../install_only_helm_fallback.sh             | 192 ++++++++++++------
 3 files changed, 200 insertions(+), 74 deletions(-)

diff --git a/src/kubectl-helm-minikube/devcontainer-feature.json b/src/kubectl-helm-minikube/devcontainer-feature.json
index 41a8b8b68..8c5dfddc0 100644
--- a/src/kubectl-helm-minikube/devcontainer-feature.json
+++ b/src/kubectl-helm-minikube/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "kubectl-helm-minikube",
-    "version": "1.1.8",
+    "version": "1.1.9",
     "name": "Kubectl, Helm, and Minikube",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
     "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
diff --git a/src/kubectl-helm-minikube/install.sh b/src/kubectl-helm-minikube/install.sh
index d7de3984f..871a77ca1 100755
--- a/src/kubectl-helm-minikube/install.sh
+++ b/src/kubectl-helm-minikube/install.sh
@@ -88,6 +88,47 @@ find_version_from_git_tags() {
     echo "${variable_name}=${!variable_name}"
 }
 
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
 apt_get_update()
 {
     if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
@@ -157,9 +198,32 @@ fi
 
 # Function to fetch the version released prior to the latest version
 get_previous_version() {
-    repo_url=$1
-    # this would del the assets key and then get the first encountered tag_name's value from the filtered array of objects
-    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[0].tag_name' 
+    local url=$1
+    local repo_url=$2
+    local variable_name=$3
+    prev_version=${!variable_name#v}
+    
+    output=$(curl -s "$repo_url");
+
+    check_packages jq
+
+    message=$(echo "$output" | jq -r '.message')
+    if [[ $message == "API rate limit exceeded"* ]]; then
+        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
+        echo -e "\nAttempting to find latest version using GitHub tags."
+        find_prev_version_from_git_tags prev_version "$url" "tags/v"
+        declare -g ${variable_name}="v${prev_version}"
+    else 
+        echo -e "\nAttempting to find latest version using GitHub Api."
+        version=$(echo "$output" | jq -r '.tag_name')
+        declare -g ${variable_name}="${version}"
+    fi  
+    echo "${variable_name}=${!variable_name}"
+}
+
+get_github_api_repo_url() {
+    local url=$1
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
 }
 
 get_helm() {
@@ -173,7 +237,8 @@ get_helm() {
 if [ ${HELM_VERSION} != "none" ]; then
     # Install Helm, verify signature and checksum
     echo "Downloading Helm..."
-    find_version_from_git_tags HELM_VERSION "https://github.com/helm/helm"
+    helm_url="https://github.com/helm/helm"
+    find_version_from_git_tags HELM_VERSION "${helm_url}"
     if [ "${HELM_VERSION::1}" != 'v' ]; then
         HELM_VERSION="v${HELM_VERSION}"
     fi
@@ -181,10 +246,9 @@ if [ ${HELM_VERSION} != "none" ]; then
     get_helm "${HELM_VERSION}"
     if grep -q "BlobNotFound" "${tmp_helm_filename}"; then
         echo -e "\n(!) Failed to fetch the latest artifacts for helm ${HELM_VERSION}..."
-        repo_url=https://api.github.com/repos/helm/helm/releases
-        requested_version=$(get_previous_version "${repo_url}")
-        echo -e "\nAttempting to install ${requested_version}"
-        HELM_VERSION=${requested_version}
+        repo_url=$(get_github_api_repo_url "${helm_url}")
+        get_previous_version "${helm_url}" "${repo_url}" HELM_VERSION
+        echo -e "\nAttempting to install ${HELM_VERSION}"
         get_helm "${HELM_VERSION}"
     fi
     export GNUPGHOME="/tmp/helm/gnupg"
diff --git a/test/kubectl-helm-minikube/install_only_helm_fallback.sh b/test/kubectl-helm-minikube/install_only_helm_fallback.sh
index b8071a0b5..9f6a8e095 100644
--- a/test/kubectl-helm-minikube/install_only_helm_fallback.sh
+++ b/test/kubectl-helm-minikube/install_only_helm_fallback.sh
@@ -31,33 +31,118 @@ case $architecture in
     i?86) architecture="386";;
     *) echo "(!) Architecture $architecture unsupported"; exit 1 ;;
 esac
-HELM_SHA256="${HELM_SHA256:-"automatic"}"
-HELM_GPG_KEYS_URI="https://raw.githubusercontent.com/helm/helm/main/KEYS"
 
-repo_url=https://api.github.com/repos/helm/helm/releases
+helm_url="https://github.com/helm/helm"
 
-# Function to fetch the latest version of the plugin
-get_latest_version() {
-    curl -s "$repo_url/latest" | jq -r '.tag_name'
+# Figure out correct version of a three part version number is not passed
+find_version_from_git_tags() {
+    local variable_name=$1
+    local requested_version=${!variable_name}
+    if [ "${requested_version}" = "none" ]; then return; fi
+    local repository=$2
+    local prefix=${3:-"tags/v"}
+    local separator=${4:-"."}
+    local last_part_optional=${5:-"false"}    
+    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
+        local escaped_separator=${separator//./\\.}
+        local last_part
+        if [ "${last_part_optional}" = "true" ]; then
+            last_part="(${escaped_separator}[0-9]+)?"
+        else
+            last_part="${escaped_separator}[0-9]+"
+        fi
+        local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
+        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
+            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+        else
+            set +e
+            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            set -e
+        fi
+    fi
+    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
+        echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
+        exit 1
+    fi
+    echo "${variable_name}=${!variable_name}"
 }
 
-# Function to change the patch number in a semver version
-change_patch_number() {
-    local version="$1"  # Input version
-    local new_patch="$2"  # New patch number
-    # Extract major, minor, and current patch numbers
-    local major=$(echo "$version" | cut -d. -f1)
-    local minor=$(echo "$version" | cut -d. -f2)
-    local current_patch=$(echo "$version" | cut -d. -f3)
-    # Construct the new version with the updated patch number
-    local new_version="$major.$minor.$new_patch"
-    echo "$new_version"
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
 }
 
-# Function to fetch the previous version of the plugin
+# Function to fetch the version released prior to the latest version
 get_previous_version() {
-    # this would del the assets key and then get the second encountered tag_name's value from the filtered array of objects
-    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[0].tag_name' 
+    local url=$1
+    local repo_url=$2
+    local variable_name=$3
+    local mode=$4
+    prev_version=${!variable_name#v}
+    
+    output=$(curl -s "$repo_url");
+
+    message=$(echo "$output" | jq -r '.message')
+
+    if [ $mode == "mode1" ]; then
+        message="API rate limit exceeded"
+    else 
+        message=""
+    fi
+
+    if [[ $message == "API rate limit exceeded"* ]]; then
+        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
+        echo -e "\nAttempting to find latest version using GitHub tags."
+        find_prev_version_from_git_tags prev_version "$url" "tags/v"
+        declare -g ${variable_name}="v${prev_version}"
+    else 
+        echo -e "\nAttempting to find latest version using GitHub Api."
+        version=$(echo "$output" | jq -r '.tag_name')
+        declare -g ${variable_name}="${version}"
+    fi  
+    echo "${variable_name}=${!variable_name}"
+}
+
+get_github_api_repo_url() {
+    local url=$1
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
 }
 
 get_helm() {
@@ -68,53 +153,30 @@ get_helm() {
     sudo curl -sSL "https://github.com/helm/helm/releases/download/${HELM_VERSION}/${helm_filename}.asc" -o "${tmp_helm_filename}.asc"
 }
 
-latest_version=$(get_latest_version)
-NON_EXISTING_PATCH_VERSION="xyz"
-HELM_VERSION="$(change_patch_number ${latest_version} ${NON_EXISTING_PATCH_VERSION})"
-echo -e "\n👉${HL} Trying to install HELM_VERSION = ${HELM_VERSION}${N}"; 
-sudo mkdir -p /tmp/helm
-get_helm "${HELM_VERSION}"
-if grep -q "BlobNotFound" "/tmp/helm/${helm_filename}"; then
-    echo -e "\n(!) Failed to fetch the latest artifacts for helm ${HELM_VERSION}..."
-    requested_version=$(get_previous_version)
-    echo -e "\nAttempting to install ${requested_version}"
-    HELM_VERSION=${requested_version}
+install_helm() {
+    mode=$1
+    HELM_VERSION="v3.14.xyz"
+    echo -e "\n👉Trying to install HELM_VERSION = ${HELM_VERSION}"; 
+    sudo mkdir -p /tmp/helm
     get_helm "${HELM_VERSION}"
-fi
-export GNUPGHOME="/tmp/helm/gnupg"
-sudo mkdir -p "${GNUPGHOME}"
-sudo chmod 700 ${GNUPGHOME}
-sudo curl -sSL "${HELM_GPG_KEYS_URI}" -o /tmp/helm/KEYS
-sudo echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" | sudo tee ${GNUPGHOME}/dirmngr.conf >/dev/null
-sudo gpg -q --import "/tmp/helm/KEYS"
-if ! sudo gpg --verify "${tmp_helm_filename}.asc" | sudo tee ${GNUPGHOME}/verify.log 2>&1; then
-    echo "Verification failed!"
-    sudo cat /tmp/helm/gnupg/verify.log
-    exit 1
-fi
-
-if [ "${HELM_SHA256}" = "automatic" ]; then
-    sudo curl -sSL "https://get.helm.sh/${helm_filename}.sha256" -o "${tmp_helm_filename}.sha256"
-    sudo curl -sSL "https://github.com/helm/helm/releases/download/${HELM_VERSION}/${helm_filename}.sha256.asc" -o "${tmp_helm_filename}.sha256.asc"
-    if ! sudo gpg --verify "${tmp_helm_filename}.sha256.asc" | sudo tee /tmp/helm/gnupg/verify.log 2>&1; then
-        echo "Verification failed!"
-        sudo cat /tmp/helm/gnupg/verify.log
-        exit 1
+    if grep -q "BlobNotFound" "/tmp/helm/${helm_filename}"; then
+        echo -e "\n(!) Failed to fetch the latest artifacts for helm ${HELM_VERSION}..."
+        repo_url=$(get_github_api_repo_url "${helm_url}")
+        get_previous_version "${helm_url}" "${repo_url}" HELM_VERSION $mode
+        echo -e "\nAttempting to install ${HELM_VERSION}"
+        get_helm "${HELM_VERSION}"
     fi
-    HELM_SHA256="$(sudo cat "${tmp_helm_filename}.sha256")"
-fi
-
-([ "${HELM_SHA256}" = "dev-mode" ] || (sudo echo "${HELM_SHA256} *${tmp_helm_filename}" | sha256sum -c -))
-sudo tar xf "${tmp_helm_filename}" -C /tmp/helm
-sudo mv -f "/tmp/helm/linux-${architecture}/helm" /usr/local/bin/
-sudo chmod 0755 /usr/local/bin/helm
-sudo rm -rf /tmp/helm
-if ! type helm > /dev/null 2>&1; then
-    echo '(!) Helm installation failed!'
-    exit 1
-fi
-
-echo -e "\n👉${HL} helm version as installed by test for fallback${N}:"
+}
+
+echo -e "\n👉${HL} helm version as installed by test for fallback${N}: (mode1: installation using find_prev_version_using_git_tags() fn)"
+install_helm "mode1"
+
+set +e
+    check "helm version" helm version
+set -e
+
+echo -e "\n👉${HL} helm version as installed by test for fallback${N}: (mode2: installation using GitHub api)"
+install_helm "mode2"
 
 set +e
     check "helm version" helm version

From 32d2b5baf8071f00297fa0cb9fcfd79b9f238387 Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Thu, 28 Mar 2024 23:00:49 +0530
Subject: [PATCH 257/478] [docker-outside-of-docker] - alternative fallback
 implementation (#924)

---
 .../devcontainer-feature.json                 |   2 +-
 src/docker-outside-of-docker/install.sh       |  84 ++++++++-
 .../docker_build_compose_fallback.sh          | 161 ++++++++++++++++--
 3 files changed, 224 insertions(+), 23 deletions(-)

diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 2a55fdbca..2506031ae 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.4.4",
+    "version": "1.4.5",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 6b63469f9..16ad15f60 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -99,19 +99,84 @@ find_version_from_git_tags() {
     echo "${variable_name}=${!variable_name}"
 }
 
-# Function to fetch the previous version of the plugin
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
+# Function to fetch the version released prior to the latest version
 get_previous_version() {
-    repo_url=$1
-    # this would del the assets key and then get the second encountered tag_name's value from the filtered array of objects
-    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[0].tag_name' 
+    local url=$1
+    local repo_url=$2
+    local variable_name=$3
+    prev_version=${!variable_name}
+    
+    output=$(curl -s "$repo_url");
+
+    check_packages jq
+
+    message=$(echo "$output" | jq -r '.message')
+    
+    if [[ $message == "API rate limit exceeded"* ]]; then
+        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
+        echo -e "\nAttempting to find latest version using GitHub tags."
+        find_prev_version_from_git_tags prev_version "$url" "tags/v"
+        declare -g ${variable_name}="${prev_version}"
+    else 
+        echo -e "\nAttempting to find latest version using GitHub Api."
+        version=$(echo "$output" | jq -r '.tag_name')
+        declare -g ${variable_name}="${version#v}"
+    fi  
+    echo "${variable_name}=${!variable_name}"
 }
 
+get_github_api_repo_url() {
+    local url=$1
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
+}
 
 install_compose_switch_fallback() {
+    compose_switch_url=$1
+    repo_url=$(get_github_api_repo_url "${compose_switch_url}")
     echo -e "\n(!) Failed to fetch the latest artifacts for compose-switch v${compose_switch_version}..."
-    previous_version=$(get_previous_version "https://api.github.com/repos/docker/compose-switch/releases")
-    echo -e "\nAttempting to install ${previous_version}"
-    compose_switch_version=${previous_version#v}
+    get_previous_version "${compose_switch_url}" "${repo_url}" compose_switch_version
+    echo -e "\nAttempting to install v${compose_switch_version}"
     curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/docker-compose
 }
 
@@ -270,8 +335,9 @@ if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
     else
         echo "(*) Installing compose-switch as docker-compose..."
         compose_switch_version="latest"
-        find_version_from_git_tags compose_switch_version "https://github.com/docker/compose-switch"
-        curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/docker-compose || install_compose_switch_fallback
+        compose_switch_url="https://github.com/docker/compose-switch"
+        find_version_from_git_tags compose_switch_version "${compose_switch_url}"
+        curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/docker-compose || install_compose_switch_fallback "${compose_switch_url}"
         chmod +x /usr/local/bin/docker-compose
         # TODO: Verify checksum once available: https://github.com/docker/compose-switch/issues/11
     fi
diff --git a/test/docker-outside-of-docker/docker_build_compose_fallback.sh b/test/docker-outside-of-docker/docker_build_compose_fallback.sh
index e1c0885e6..193d79d28 100644
--- a/test/docker-outside-of-docker/docker_build_compose_fallback.sh
+++ b/test/docker-outside-of-docker/docker_build_compose_fallback.sh
@@ -3,34 +3,169 @@
 # Optional: Import test library
 source dev-container-features-test-lib
 
+echo -e "\n👉 Checking version of compose-switch installed as docker-compose as installed by feature";
 check "installs compose-switch as docker-compose" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
 
+trap 'echo "Last executed command failed at line ${LINENO}"' ERR
+
 # Fetch host/container arch.
 architecture="$(dpkg --print-architecture)"
 
-repo_url="https://api.github.com/repos/docker/compose-switch/releases"
+sudo mkdir -p /usr/local/bin/docker-compose
+sudo chmod +x /usr/local/bin/docker-compose
+
+apt_get_update()
+{
+    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+        echo "Running apt-get update..."
+        apt-get update -y
+    fi
+}
+
+# Checks if packages are installed and installs them if not
+check_packages() {
+    if ! dpkg -s "$@" > /dev/null 2>&1; then
+        apt_get_update
+        apt-get -y install --no-install-recommends "$@"
+    fi
+}
+
+# Figure out correct version of a three part version number is not passed
+find_version_from_git_tags() {
+    local variable_name=$1
+    local requested_version=${!variable_name}
+    if [ "${requested_version}" = "none" ]; then return; fi
+    local repository=$2
+    local prefix=${3:-"tags/v"}
+    local separator=${4:-"."}
+    local last_part_optional=${5:-"false"}
+    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
+        local escaped_separator=${separator//./\\.}
+        local last_part
+        if [ "${last_part_optional}" = "true" ]; then
+            last_part="(${escaped_separator}[0-9]+)?"
+        else
+            last_part="${escaped_separator}[0-9]+"
+        fi
+        local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
+        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
+            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+        else
+            set +e
+            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            set -e
+        fi
+    fi
+    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
+        echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
+        exit 1
+    fi
+    echo "${variable_name}=${!variable_name}"
+}
+
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
 
-# Function to fetch the previous version of the plugin
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
+# Function to fetch the version released prior to the latest version
 get_previous_version() {
-    sudo curl -s "$repo_url" | jq -r 'del(.[].assets) | .[0].tag_name' # this would del the assets key and then get the second encountered tag_name's value from the filtered array of objects
+    local url=$1
+    local repo_url=$2
+    local variable_name=$3
+    local mode=$4
+    prev_version=${!variable_name}
+    
+    output=$(curl -s "$repo_url");
+
+    check_packages jq
+
+    message=$(echo "$output" | jq -r '.message')
+
+    if [[ $mode == 'mode1' ]]; then
+        message="API rate limit exceeded"
+    else 
+        message=""
+    fi
+    
+    if [[ $message == "API rate limit exceeded"* ]]; then
+        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
+        echo -e "\nAttempting to find latest version using GitHub tags."
+        find_prev_version_from_git_tags prev_version "$url" "tags/v"
+        declare -g ${variable_name}="${prev_version}"
+    else 
+        echo -e "\nAttempting to find latest version using GitHub Api."
+        version=$(echo "$output" | jq -r '.tag_name')
+        declare -g ${variable_name}="${version#v}"
+    fi  
+    echo "${variable_name}=${!variable_name}"
+}
+
+get_github_api_repo_url() {
+    local url=$1
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
 }
 
 install_compose_switch_fallback() {
-    echo -e "\n(!) Failed to fetch the latest artifacts for compose-switch ${test_compose_switch_version}..."
-    previous_version=$(get_previous_version)
-    echo -e "\nAttempting to install ${previous_version}"
-    compose_switch_version=${previous_version}
-    sudo curl -fsSL "https://github.com/docker/compose-switch/releases/download/${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/docker-compose
+    compose_switch_url=$1
+    mode=$2
+    repo_url=$(get_github_api_repo_url "${compose_switch_url}")
+    echo -e "\n(!) Failed to fetch the latest artifacts for compose-switch v${compose_switch_version}..."
+    get_previous_version "${compose_switch_url}" "${repo_url}" compose_switch_version $mode
+    echo -e "\nAttempting to install v${compose_switch_version}"
+    sudo curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/docker-compose
 }
 
 install_compose-switch_as_docker-compose() {
+    mode=$1
     echo "(*) Installing compose-switch as docker-compose..."
-    test_compose_switch_version="1.2.xyz"
-    echo -e "\nTesting with $test_compose_switch_version..."
-    sudo curl -fsSL "https://github.com/docker/compose-switch/releases/download/${test_compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/docker-compose || install_compose_switch_fallback
+    compose_switch_version="1.0.6"
+    compose_switch_url="https://github.com/docker/compose-switch"
+    sudo curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/docker-compose || install_compose_switch_fallback "${compose_switch_url}" $mode
     sudo chmod +x /usr/local/bin/docker-compose
 }
 
-install_compose-switch_as_docker-compose
+echo -e "\n👉 Trying to install compose-switch as docker-compose using mode 1 ( find_prev_version_from_git_tags method )";
+install_compose-switch_as_docker-compose "mode1"
+check "installs compose-switch as docker-compose mode 1" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
 
-check "installs compose-switch as docker-compose" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
\ No newline at end of file
+echo -e "\n👉 Trying to install compose-switch as docker-compose using mode 2 ( GitHub Api )";
+install_compose-switch_as_docker-compose "mode2"
+check "installs compose-switch as docker-compose mode 2" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
\ No newline at end of file

From 55dbe138fc159c462a6c4554b4619db3ff3b04ab Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Tue, 2 Apr 2024 06:05:32 +0530
Subject: [PATCH 258/478] [PowerShell]- Fallback method with
 find_prev_vers_frm_git_tags() implemented (#926)

* [PowerShell]- Fallback method with find_prev_vers_frm_git_tags() done

* bumped the feature version
---
 src/powershell/devcontainer-feature.json      |   2 +-
 src/powershell/install.sh                     |  81 ++++++++-
 .../install_powershell_fallback_test.sh       | 164 ++++++++++++++----
 3 files changed, 201 insertions(+), 46 deletions(-)

diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json
index dd7a96b90..82ef39a30 100644
--- a/src/powershell/devcontainer-feature.json
+++ b/src/powershell/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "powershell",
-    "version": "1.3.4",
+    "version": "1.3.5",
     "name": "PowerShell",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
     "description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/powershell/install.sh b/src/powershell/install.sh
index 4ba8bcf5c..533da6f37 100755
--- a/src/powershell/install.sh
+++ b/src/powershell/install.sh
@@ -106,17 +106,83 @@ install_using_apt() {
     apt-get install -yq powershell${version_suffix} || return 1
 }
 
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
 # Function to fetch the version released prior to the latest version
 get_previous_version() {
-    repo_url=$1
-    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[0].tag_name'
+    local url=$1
+    local repo_url=$2
+    local variable_name=$3
+    prev_version=${!variable_name}
+    
+    output=$(curl -s "$repo_url");
+    check_packages jq
+    message=$(echo "$output" | jq -r '.message')
+    
+    if [[ $message == "API rate limit exceeded"* ]]; then
+        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
+        echo -e "\nAttempting to find latest version using GitHub tags."
+        find_prev_version_from_git_tags prev_version "$url" "tags/v"
+        declare -g ${variable_name}="${prev_version}"
+    else 
+        echo -e "\nAttempting to find latest version using GitHub Api."
+        version=$(echo "$output" | jq -r '.tag_name')
+        declare -g ${variable_name}="${version#v}"
+    fi  
+    echo "${variable_name}=${!variable_name}"
 }
 
+get_github_api_repo_url() {
+    local url=$1
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
+}
+
+
 install_prev_pwsh() {
+    pwsh_url=$1
+    repo_url=$(get_github_api_repo_url $pwsh_url)
     echo -e "\n(!) Failed to fetch the latest artifacts for powershell v${POWERSHELL_VERSION}..."
-    previous_version=$(get_previous_version "https://api.github.com/repos/PowerShell/PowerShell/releases")
-    echo -e "\nAttempting to install ${previous_version}"
-    POWERSHELL_VERSION="${previous_version#v}"
+    get_previous_version $pwsh_url $repo_url POWERSHELL_VERSION
+    echo -e "\nAttempting to install v${POWERSHELL_VERSION}"
     install_pwsh "${POWERSHELL_VERSION}"
 }
 
@@ -138,10 +204,11 @@ install_using_github() {
     if [ "${architecture}" = "amd64" ]; then
         architecture="x64"
     fi
-    find_version_from_git_tags POWERSHELL_VERSION https://github.com/PowerShell/PowerShell
+    pwsh_url="https://github.com/PowerShell/PowerShell"
+    find_version_from_git_tags POWERSHELL_VERSION $pwsh_url
     install_pwsh "${POWERSHELL_VERSION}"
     if grep -q "Not Found" "${powershell_filename}"; then 
-        install_prev_pwsh
+        install_prev_pwsh $pwsh_url
     fi
 
     # Ugly - but only way to get sha256 is to parse release HTML. Remove newlines and tags, then look for filename followed by 64 hex characters.
diff --git a/test/powershell/install_powershell_fallback_test.sh b/test/powershell/install_powershell_fallback_test.sh
index 852d7d103..39c8bc49e 100644
--- a/test/powershell/install_powershell_fallback_test.sh
+++ b/test/powershell/install_powershell_fallback_test.sh
@@ -15,16 +15,125 @@ check "Powershell version as installed by feature" bash -c "pwsh --version"
 . /etc/os-release
 architecture="$(dpkg --print-architecture)"
 
+sudo mkdir -p /var/lib/apt/lists/
+
+# Figure out correct version of a three part version number is not passed
+find_version_from_git_tags() {
+    local variable_name=$1
+    local requested_version=${!variable_name}
+    if [ "${requested_version}" = "none" ]; then return; fi
+    local repository=$2
+    local prefix=${3:-"tags/v"}
+    local separator=${4:-"."}
+    local last_part_optional=${5:-"false"}    
+    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
+        local escaped_separator=${separator//./\\.}
+        local last_part
+        if [ "${last_part_optional}" = "true" ]; then
+            last_part="(${escaped_separator}[0-9]+)?"
+        else
+            last_part="${escaped_separator}[0-9]+"
+        fi
+        local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
+        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
+            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+        else
+            set +e
+            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            set -e
+        fi
+    fi
+    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
+        echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
+        exit 1
+    fi
+    echo "${variable_name}=${!variable_name}"
+}
+
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
+# Function to fetch the version released prior to the latest version
 get_previous_version() {
-    repo_url=$1
-    curl -s "$repo_url" | jq -r 'del(.[].assets) | .[0].tag_name'
+    local url=$1
+    local repo_url=$2
+    local variable_name=$3
+    local mode=$4
+    prev_version=${!variable_name}
+
+    output=$(curl -s "$repo_url");
+    message=$(echo "$output" | jq -r '.message')
+    
+    if [ $mode == "mode1" ]; then
+        message="API rate limit exceeded"
+    else 
+        message=""
+    fi
+
+    if [[ $message == "API rate limit exceeded"* ]]; then
+        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
+        echo -e "\nAttempting to find latest version using GitHub tags."
+        find_prev_version_from_git_tags prev_version "$url" "tags/v"
+        declare -g ${variable_name}="${prev_version}"
+    else 
+        echo -e "\nAttempting to find latest version using GitHub Api."
+        version=$(echo "$output" | jq -r '.tag_name')
+        declare -g ${variable_name}="${version#v}"
+    fi  
+    echo "${variable_name}=${!variable_name}"
+}
+
+get_github_api_repo_url() {
+    local url=$1
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
 }
 
 install_prev_pwsh() {
+    local pwsh_url=$1
+    local mode=$2
+    local repo_url=$(get_github_api_repo_url $pwsh_url)
     echo -e "\n(!) Failed to fetch the latest artifacts for powershell v${POWERSHELL_VERSION}..."
-    previous_version=$(get_previous_version "https://api.github.com/repos/PowerShell/PowerShell/releases")
-    echo -e "\nAttempting to install ${previous_version}"
-    POWERSHELL_VERSION="${previous_version#v}"
+    get_previous_version $pwsh_url $repo_url POWERSHELL_VERSION $mode
+    echo -e "\nAttempting to install v${POWERSHELL_VERSION}"
     install_pwsh "${POWERSHELL_VERSION}"
 }
 
@@ -37,44 +146,18 @@ install_pwsh() {
     sudo curl -sSL -o "${powershell_filename}" "https://github.com/PowerShell/PowerShell/releases/download/v${POWERSHELL_VERSION}/${powershell_filename}"
 }
 
-apt_get_update()
-{
-    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
-        echo "Running apt-get update..."
-        sudo apt-get update -y
-    fi
-}
-
-check_packages() {
-    if ! dpkg -s "$@" > /dev/null 2>&1; then
-        sudo chmod +x /var/lib/apt/lists/
-        sudo mkdir -p /var/lib/apt/lists/partial
-        sudo chmod +rx /var/lib/dpkg/lock-frontend
-        apt_get_update
-        sudo apt-get -y install --no-install-recommends "$@"
-    fi
-}
-
 install_using_github() {
-    # Fall back on direct download if no apt package exists in microsoft pool
-    check_packages curl ca-certificates gnupg2 dirmngr libc6 libgcc1 libgssapi-krb5-2 libstdc++6 libunwind8 libuuid1 zlib1g libicu[0-9][0-9]
-    if ! type git > /dev/null 2>&1; then
-        check_packages git
-    fi
+    mode=$1
     if [ "${architecture}" = "amd64" ]; then
         architecture="x64"
     fi
-
-    echo -e "\nTrying to install a non-existing version for Powershell..."
-    
-    POWERSHELL_VERSION="1.2.XYZ"
+    pwsh_url="https://github.com/PowerShell/PowerShell"
+    POWERSHELL_VERSION="7.4.xyz"
     install_pwsh "${POWERSHELL_VERSION}"
-
     if grep -q "Not Found" "${powershell_filename}"; then 
-        install_prev_pwsh
+        install_prev_pwsh $pwsh_url $mode
     fi
 
-    echo -e "\n" $POWERSHELL_VERSION "=powershell_version\n";
     # Ugly - but only way to get sha256 is to parse release HTML. Remove newlines and tags, then look for filename followed by 64 hex characters.
     sudo curl -sSL -o "release.html" "https://github.com/PowerShell/PowerShell/releases/tag/v${POWERSHELL_VERSION}"
     powershell_archive_sha256="$(cat release.html | tr '\n' ' ' | sed 's|<[^>]*>||g' | grep -oP "${powershell_filename}\s+\K[0-9a-fA-F]{64}" || echo '')"
@@ -86,12 +169,17 @@ install_using_github() {
     fi
     sudo tar xf "${powershell_filename}" -C "${powershell_target_path}"
     sudo ln -s "${powershell_target_path}/pwsh" /usr/local/bin/pwsh
-    sudo rm -rf /tmp/pwsh
+    sudo rm -rf /tmp/pwsh /usr/local/bin/pwsh
+
 }
 
-install_using_github
+echo -e "\nInstalling Powershell with find_prev_version_from_git_tags() fn 👈🏻"
+install_using_github "mode1"
+check "Powershell version as installed by test (find_prev_version_from_git_tags() fn)" bash -c "pwsh --version"
 
-check "Powershell version as installed by test" bash -c "pwsh --version"
+echo -e "\nInstalling Powershell with GitHub Api 👈🏻"
+install_using_github "mode2"
+check "Powershell version as installed by test (GitHub Api)" bash -c "pwsh --version"
 
 # Report result
 reportResults

From a7c8c9a83b3ce0f7f0c546537d814009f9e48590 Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Wed, 3 Apr 2024 03:06:19 +0530
Subject: [PATCH 259/478] [Php] - fallback to previous version - code fix
 (#908)

* [php]- php fallback to prev. version - fix

* update patch version for php feature

* few changes..

* small change

* test completes successfully pointing at the new fallbacked php version

* changes acc. to review comments..
---
 src/php/devcontainer-feature.json |   2 +-
 src/php/install.sh                |  69 +++++++++-
 test/php/scenarios.json           |   8 ++
 test/php/test_php_fallback.sh     | 201 ++++++++++++++++++++++++++++++
 4 files changed, 274 insertions(+), 6 deletions(-)
 create mode 100644 test/php/test_php_fallback.sh

diff --git a/src/php/devcontainer-feature.json b/src/php/devcontainer-feature.json
index 77fcf9812..a4edcca95 100644
--- a/src/php/devcontainer-feature.json
+++ b/src/php/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "php",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "name": "PHP",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/php",
     "options": {
diff --git a/src/php/install.sh b/src/php/install.sh
index 48140e1b3..357395e88 100755
--- a/src/php/install.sh
+++ b/src/php/install.sh
@@ -121,6 +121,46 @@ find_version_from_git_tags() {
     echo "${variable_name}=${!variable_name}"
 }
 
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
 # Install PHP Composer
 addcomposer() {
     "${PHP_SRC}" -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
@@ -130,8 +170,7 @@ addcomposer() {
     "${PHP_SRC}" -r "unlink('composer-setup.php');"
 }
 
-install_php() {
-    PHP_VERSION="$1"
+init_php_install() {
     PHP_INSTALL_DIR="${PHP_DIR}/${PHP_VERSION}"
     if [ -d "${PHP_INSTALL_DIR}" ]; then
         echo "(!) PHP version ${PHP_VERSION} already exists."
@@ -142,7 +181,6 @@ install_php() {
         groupadd -r php
     fi
     usermod -a -G php "${USERNAME}"
-
     PHP_URL="https://www.php.net/distributions/php-${PHP_VERSION}.tar.gz"
 
     PHP_INI_DIR="${PHP_INSTALL_DIR}/ini"
@@ -155,7 +193,26 @@ install_php() {
     PHP_SRC_DIR="/usr/src/php"
     mkdir -p $PHP_SRC_DIR
     cd $PHP_SRC_DIR
-    wget -O php.tar.xz "$PHP_URL"
+}
+
+install_previous_version() {
+    PHP_VERSION=$1
+    if [[ "$ORIGINAL_PHP_VERSION" == "latest" ]]; then
+        find_prev_version_from_git_tags PHP_VERSION https://github.com/php/php-src "tags/php-"
+        echo -e "\nAttempting to install previous version v${PHP_VERSION}"
+        init_php_install
+        wget -O php.tar.xz "$PHP_URL"
+    else 
+        echo -e "\nFailed to install v$PHP_VERSION"
+    fi
+}
+
+install_php() {
+    PHP_VERSION="$1"
+
+    init_php_install
+    
+    wget -O php.tar.xz "$PHP_URL" || install_previous_version "$PHP_VERSION"
 
     tar -xf $PHP_SRC_DIR/php.tar.xz -C "$PHP_SRC_DIR" --strip-components=1
     cd $PHP_SRC_DIR;
@@ -195,7 +252,7 @@ install_php() {
 
 if [ "${PHP_VERSION}" != "none" ]; then
     # Persistent / runtime dependencies
-    RUNTIME_DEPS="wget ca-certificates git build-essential xz-utils"
+    RUNTIME_DEPS="wget ca-certificates git build-essential xz-utils curl"
 
     # PHP dependencies
     PHP_DEPS="libssl-dev libcurl4-openssl-dev libedit-dev libsqlite3-dev libxml2-dev zlib1g-dev libsodium-dev libonig-dev"
@@ -214,6 +271,8 @@ if [ "${PHP_VERSION}" != "none" ]; then
     # Install dependencies
     check_packages $RUNTIME_DEPS $PHP_DEPS $PHPIZE_DEPS
 
+    # storing value of PHP_VERSION before it changes
+    ORIGINAL_PHP_VERSION=$PHP_VERSION
     find_version_from_git_tags PHP_VERSION https://github.com/php/php-src "tags/php-"
     install_php "${PHP_VERSION}"
 
diff --git a/test/php/scenarios.json b/test/php/scenarios.json
index 1e4df063d..e53bb67ce 100644
--- a/test/php/scenarios.json
+++ b/test/php/scenarios.json
@@ -32,5 +32,13 @@
                 "installComposer": true
             }
         }
+    },
+    "test_php_fallback": {
+        "image": "ubuntu:focal",
+        "features": {
+            "php": {
+                "version": "latest"
+            }
+        }
     }
 }
diff --git a/test/php/test_php_fallback.sh b/test/php/test_php_fallback.sh
new file mode 100644
index 000000000..84ed83d77
--- /dev/null
+++ b/test/php/test_php_fallback.sh
@@ -0,0 +1,201 @@
+#!/bin/bash
+
+echo -e "\nInstalled PHP Version by Feature: 👇 "; php -v;
+
+USERNAME="root"
+PHP_DIR="/usr/local/php"
+
+# Figure out correct version of a three part version number is not passed
+find_version_from_git_tags() {
+    local variable_name=$1
+    local requested_version=${!variable_name}
+    if [ "${requested_version}" = "none" ]; then return; fi
+    local repository=$2
+    local prefix=${3:-"tags/v"}
+    local separator=${4:-"."}
+    local last_part_optional=${5:-"false"}    
+    echo "${!variable_name}"
+    echo "$(echo "${requested_version}" | grep -o "." | wc -l)"
+    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
+        local escaped_separator=${separator//./\\.}
+        local last_part
+        if [ "${last_part_optional}" = "true" ]; then
+            last_part="(${escaped_separator}[0-9]+)?"
+        else
+            last_part="${escaped_separator}[0-9]+"
+        fi
+        local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
+        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
+            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+        else
+            set +e
+            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            set -e
+        fi
+    fi
+    echo "${!variable_name}"
+    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
+        echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
+        exit 1
+    fi
+    echo "${variable_name}=${!variable_name}"
+}
+
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
+init_php_install() {
+    PHP_INSTALL_DIR="${PHP_DIR}/${PHP_VERSION}"
+    if [ -d "${PHP_INSTALL_DIR}" ]; then
+        echo "(!) PHP version ${PHP_VERSION} already exists."
+        exit 1
+    fi
+
+    if ! cat /etc/group | grep -e "^php:" > /dev/null 2>&1; then
+        groupadd -r php
+    fi
+    usermod -a -G php "${USERNAME}"
+
+    PHP_URL="https://www.php.net/distributions/php-${PHP_VERSION}.tar.gz"
+
+    PHP_INI_DIR="${PHP_INSTALL_DIR}/ini"
+    CONF_DIR="${PHP_INI_DIR}/conf.d"
+    mkdir -p "${CONF_DIR}";
+
+    PHP_EXT_DIR="${PHP_INSTALL_DIR}/extensions"
+    mkdir -p "${PHP_EXT_DIR}"
+
+    PHP_SRC_DIR="/usr/src/php"
+    mkdir -p $PHP_SRC_DIR
+    cd $PHP_SRC_DIR
+}
+
+install_previous_version() {
+    echo -e "\nInstalling Previous Version..."
+    find_prev_version_from_git_tags PHP_VERSION https://github.com/php/php-src "tags/php-"
+    echo -e "\nNow installing this version as a fallback previous version: ${PHP_VERSION} 🤞🏻"
+    init_php_install
+    wget -O php.tar.xz "$PHP_URL"
+}
+
+install_php() {  
+    # trying to install with a possible new tag not having a released source binary yet
+    PHP_VERSION="8.3.xyz"
+
+    init_php_install
+
+    wget -O php.tar.xz "$PHP_URL" || install_previous_version
+    
+    tar -xf $PHP_SRC_DIR/php.tar.xz -C "$PHP_SRC_DIR" --strip-components=1
+    cd $PHP_SRC_DIR;
+
+    # PHP 7.4+, the pecl/pear installers are officially deprecated and are removed in PHP 8+
+    # Thus, requiring an explicit "--with-pear"
+    IFS="."
+    read -a versions <<< "${PHP_VERSION}"
+    PHP_MAJOR_VERSION=${versions[0]}
+    PHP_MINOR_VERSION=${versions[1]}
+
+    VERSION_CONFIG=""
+    if (( $(($PHP_MAJOR_VERSION)) >= 8 )) || (( $(($PHP_MAJOR_VERSION)) == 7 && $(($PHP_MINOR_VERSION)) >= 4 )); then 
+        VERSION_CONFIG="--with-pear"
+    fi
+
+    ./configure --prefix="${PHP_INSTALL_DIR}" --with-config-file-path="$PHP_INI_DIR" --with-config-file-scan-dir="$CONF_DIR" --enable-option-checking=fatal --with-curl --with-libedit --enable-mbstring --with-openssl --with-zlib --with-password-argon2 --with-sodium=shared "$VERSION_CONFIG" EXTENSION_DIR="$PHP_EXT_DIR";
+
+    make -j "$(nproc)"
+    find -type f -name '*.a' -delete
+    make install
+    find "${PHP_INSTALL_DIR}" -type f -executable -exec strip --strip-all '{}' + || true
+    make clean
+
+    cp -v $PHP_SRC_DIR/php.ini-* "$PHP_INI_DIR/";
+    cp "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+
+    # Install xdebug
+    "${PHP_INSTALL_DIR}/bin/pecl" install xdebug
+    XDEBUG_INI="${CONF_DIR}/xdebug.ini"
+
+    echo "zend_extension=${PHP_EXT_DIR}/xdebug.so" > "${XDEBUG_INI}"
+    echo "xdebug.mode = debug" >> "${XDEBUG_INI}"
+    echo "xdebug.start_with_request = yes" >> "${XDEBUG_INI}"
+    echo "xdebug.client_port = 9003" >> "${XDEBUG_INI}"
+}
+
+apt-get purge php.*
+PHP_DIR="/usr/local/php"
+PHP_INSTALL_DIR="${PHP_DIR}/${PHP_VERSION}"
+PHP_SRC_DIR="/usr/src/php"
+
+install_php
+PHP_SRC="${PHP_INSTALL_DIR}/bin/php"
+
+updaterc() {
+    echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
+    if [[ "$(cat /etc/bash.bashrc)" != *"$1"* ]]; then
+        echo -e "$1" >> /etc/bash.bashrc
+    fi
+    if [ -f "/etc/zsh/zshrc" ] && [[ "$(cat /etc/zsh/zshrc)" != *"$1"* ]]; then
+        echo -e "$1" >> /etc/zsh/zshrc
+    fi
+}
+
+if [ "${PHP_VERSION}" != "none" ]; then
+    CURRENT_DIR="${PHP_DIR}/current"
+    if [[ ! -d "${CURRENT_DIR}" ]]; then
+        ln -s -r "${PHP_INSTALL_DIR}" ${CURRENT_DIR}
+    fi
+
+    if [[ $(ls -l ${CURRENT_DIR}) != *"-> ${PHP_INSTALL_DIR}"* ]] ; then
+        rm "${CURRENT_DIR}"
+        ln -s -r "${PHP_INSTALL_DIR}" "${CURRENT_DIR}"
+    fi
+
+    rm -rf "${PHP_SRC_DIR}"
+    updaterc "if [[ \"\${PATH}\" != *\"${CURRENT_DIR}\"* ]]; then export PATH=\"${CURRENT_DIR}/bin:\${PATH}\"; fi"
+
+    chown -R "${USERNAME}:php" "${PHP_DIR}"
+    chmod -R g+r+w "${PHP_DIR}"
+    find "${PHP_DIR}" -type d -print0 | xargs -n 1 -0 chmod g+s
+fi
+
+echo -e "\nInstalled PHP Version by Test: 👇 "; php -v;
+

From 9ccc19e1378ba3b569784236bbb32499dcea138e Mon Sep 17 00:00:00 2001
From: WarrenS <contact@warrensnipes.dev>
Date: Tue, 2 Apr 2024 17:42:58 -0400
Subject: [PATCH 260/478] Added versions 1.71-1.76 to Rust feature version
 (#929)

* Update devcontainer-feature.json

* Updated version
---
 src/rust/devcontainer-feature.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index 7ee455f3f..c4a7dd5b9 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "rust",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "name": "Rust",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
     "description": "Installs Rust, common Rust utilities, and their required dependencies",
@@ -10,6 +10,12 @@
             "proposals": [
                 "latest",
                 "none",
+                "1.76",
+                "1.75",
+                "1.74",
+                "1.73",
+                "1.72",
+                "1.71",
                 "1.70",
                 "1.69",
                 "1.68",

From 203dc3f5bde1a8ca25525234757ac54e9b8da64c Mon Sep 17 00:00:00 2001
From: Prathamesh Zarkar <159782310+prathameshzarkar9@users.noreply.github.com>
Date: Fri, 5 Apr 2024 04:23:20 +0530
Subject: [PATCH 261/478] oryx dotnet 8.0.1 cleanup (#927)

---
 src/oryx/devcontainer-feature.json | 2 +-
 src/oryx/install.sh                | 1 +
 test/oryx/test_python_project.sh   | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index a075096bf..41bd1f759 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "oryx",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "name": "Oryx",
     "description": "Installs the oryx CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
diff --git a/src/oryx/install.sh b/src/oryx/install.sh
index 407406141..6c193f863 100755
--- a/src/oryx/install.sh
+++ b/src/oryx/install.sh
@@ -241,6 +241,7 @@ if [[ "${PINNED_SDK_VERSION}" != "" ]]; then
     MAJOR_MINOR_PATCH1_VERSION=${PINNED_SDK_VERSION%??}
     rm -rf /usr/share/dotnet/shared/Microsoft.NETCore.App/$MAJOR_MINOR_PATCH1_VERSION
     rm -rf /usr/share/dotnet/shared/Microsoft.AspNetCore.App/$MAJOR_MINOR_PATCH1_VERSION
+    rm -rf /usr/share/dotnet/templates/$MAJOR_MINOR_PATCH1_VERSION
 fi
 
 
diff --git a/test/oryx/test_python_project.sh b/test/oryx/test_python_project.sh
index a0d5eef08..610a9687e 100644
--- a/test/oryx/test_python_project.sh
+++ b/test/oryx/test_python_project.sh
@@ -28,5 +28,7 @@ check "oryx-build-python" oryx build --property python_version="${pythonVersion}
 check "oryx-build-python-installed" python3 -m pip list | grep mpmath
 check "oryx-build-python-result" python3 ./src/solve.py
 
+check "templates/8.0.1-does-not-exist" test ! -d "/usr/share/dotnet/templates/8.0.1"
+
 # Report result
 reportResults

From 760f2bf10b30340e55a2cdd9862a994262f13d81 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Louazel <jlouazel@users.noreply.github.com>
Date: Thu, 11 Apr 2024 18:40:05 +0200
Subject: [PATCH 262/478] Set `DEBIAN_FRONTEND=noninteractive` for nvidia-cuda
 feature (#933)

* Set DEBIAN_FRONTEND to noninteractive

Signed-off-by: Jean-Baptiste Louazel <jb@flex.ai>

* Bump nvidia-cuda to 1.1.1

Signed-off-by: Jean-Baptiste Louazel <jb@flex.ai>

* Install `liburcu6`

Signed-off-by: Jean-Baptiste Louazel <jb@flex.ai>

* Revert "Install `liburcu6`"

This reverts commit b7b2931f8bed57826f2019ea884cbe2440e6c9e8.

---------

Signed-off-by: Jean-Baptiste Louazel <jb@flex.ai>
---
 src/nvidia-cuda/devcontainer-feature.json | 2 +-
 src/nvidia-cuda/install.sh                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/nvidia-cuda/devcontainer-feature.json b/src/nvidia-cuda/devcontainer-feature.json
index 78ad10cd9..bb63ae1c7 100644
--- a/src/nvidia-cuda/devcontainer-feature.json
+++ b/src/nvidia-cuda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "nvidia-cuda",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "name": "NVIDIA CUDA",
   "description": "Installs shared libraries for NVIDIA CUDA.",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nvidia-cuda",
diff --git a/src/nvidia-cuda/install.sh b/src/nvidia-cuda/install.sh
index cb66d3955..d8658964e 100644
--- a/src/nvidia-cuda/install.sh
+++ b/src/nvidia-cuda/install.sh
@@ -33,6 +33,8 @@ check_packages() {
     fi
 }
 
+export DEBIAN_FRONTEND=noninteractive
+
 check_packages wget ca-certificates
 
 # Add NVIDIA's package repository to apt so that we can download packages

From e7dd9fafd9aeede11d0a59a0ace819e3b774de2a Mon Sep 17 00:00:00 2001
From: Prathamesh Zarkar <159782310+prathameshzarkar9@users.noreply.github.com>
Date: Fri, 12 Apr 2024 23:33:24 +0530
Subject: [PATCH 263/478] cp command to follow symlink for systemctl (#937)

---
 src/common-utils/devcontainer-feature.json | 2 +-
 src/common-utils/main.sh                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index a058864af..308e256ef 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.4.2",
+    "version": "2.4.3",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 8b74830cc..5d7592cfc 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -564,7 +564,7 @@ chmod +rx /usr/local/bin/code
 
 # systemctl shim for Debian/Ubuntu - tells people to use 'service' if systemd is not running
 if [ "${ADJUSTED_ID}" = "debian" ]; then
-    cp -f "${FEATURE_DIR}/bin/systemctl" /usr/local/bin/systemctl
+    cp -fL "${FEATURE_DIR}/bin/systemctl" /usr/local/bin/systemctl
     chmod +rx /usr/local/bin/systemctl
 fi
 

From b98f5a164be78317af27118e9491d38c17eb16a4 Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Wed, 17 Apr 2024 04:28:57 +0530
Subject: [PATCH 264/478] [az-cli] - To separate the two methods of
 installation - using apt, using python (#922)

* [az-cli] - To separate the two methods of installation - apt & python

* bump patch version

* changes as requested by review comments

* no need to keep

* added test script missing

* changes for review comment
---
 src/azure-cli/devcontainer-feature.json       |  2 +-
 src/azure-cli/install.sh                      | 10 +++++----
 ..._using_python_with_python_3_11_bullseye.sh | 21 +++++++++++++++++++
 .../install_with_python_3_12_bookworm.sh      | 12 +++++------
 test/azure-cli/scenarios.json                 | 10 +++++++++
 5 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 test/azure-cli/install_using_python_with_python_3_11_bullseye.sh

diff --git a/src/azure-cli/devcontainer-feature.json b/src/azure-cli/devcontainer-feature.json
index f25e5f9a2..6b26ef6fc 100644
--- a/src/azure-cli/devcontainer-feature.json
+++ b/src/azure-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "azure-cli",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "name": "Azure CLI",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/azure-cli",
   "description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/azure-cli/install.sh b/src/azure-cli/install.sh
index 7f4c4ff1c..a1b254779 100755
--- a/src/azure-cli/install.sh
+++ b/src/azure-cli/install.sh
@@ -15,7 +15,7 @@ rm -rf /var/lib/apt/lists/*
 AZ_VERSION=${VERSION:-"latest"}
 AZ_EXTENSIONS=${EXTENSIONS}
 AZ_INSTALLBICEP=${INSTALLBICEP:-false}
-INSTALL_USING_PYTHON=${INSTALL_USING_PYTHON:-false}
+INSTALL_USING_PYTHON=${INSTALLUSINGPYTHON:-false}
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 AZCLI_ARCHIVE_ARCHITECTURES="amd64 arm64"
 AZCLI_ARCHIVE_VERSION_CODENAMES="stretch bookworm buster bullseye bionic focal jammy"
@@ -188,13 +188,15 @@ echo "(*) Installing Azure CLI..."
 . /etc/os-release
 architecture="$(dpkg --print-architecture)"
 CACHED_AZURE_VERSION="${AZ_VERSION}" # In case we need to fallback to pip and the apt path has modified the AZ_VERSION variable.
-if [[ "${AZCLI_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[  "${AZCLI_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
-    install_using_apt || use_pip="true"
+if [ "${INSTALL_USING_PYTHON}" != "true" ]; then
+    if [[ "${AZCLI_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[  "${AZCLI_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
+        install_using_apt || use_pip="true"
+    fi
 else
     use_pip="true"
 fi
 
-if [ "${use_pip}" = "true" ]; then
+if [ "${use_pip}" = "true" ]; then 
     AZ_VERSION=${CACHED_AZURE_VERSION}
     install_using_pip_strategy
 
diff --git a/test/azure-cli/install_using_python_with_python_3_11_bullseye.sh b/test/azure-cli/install_using_python_with_python_3_11_bullseye.sh
new file mode 100644
index 000000000..b9957843e
--- /dev/null
+++ b/test/azure-cli/install_using_python_with_python_3_11_bullseye.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+check "version" az  --version
+
+echo -e "\n\n🔄 Testing 'O.S'"
+if cat /etc/os-release | grep -q 'PRETTY_NAME="Debian GNU/Linux 11 (bullseye)"'; then
+    echo -e "\n\n✅ Passed 'O.S is Linux 11 (bullseye)'!"
+else
+    echo -e "\n\n❌ Failed 'O.S is other than Linux 11 (bullseye)'!"
+fi
+
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/azure-cli/install_with_python_3_12_bookworm.sh b/test/azure-cli/install_with_python_3_12_bookworm.sh
index 074876148..2c8e1fd72 100644
--- a/test/azure-cli/install_with_python_3_12_bookworm.sh
+++ b/test/azure-cli/install_with_python_3_12_bookworm.sh
@@ -5,17 +5,17 @@ set -e
 # Import test library for `check` command
 source dev-container-features-test-lib
 
-# Check to make sure the user is vscode
-check "user is vscode" whoami | grep vscode
-check "version" az  --version
 
-echo -e "\n\n🔄 Testing 'O.S'"
+echo -e "\n🔄 Testing 'O.S'"
 if cat /etc/os-release | grep -q 'PRETTY_NAME="Debian GNU/Linux 12 (bookworm)"'; then
-    echo -e "\n\n✅ Passed 'O.S is Linux 12 (bookworm)'!"
+    echo -e "\n✅ Passed 'O.S is Linux 12 (bookworm)'!\n"
 else
-    echo -e "\n\n❌ Failed 'O.S is other than Linux 12 (bookworm)'!"
+    echo -e "\n❌ Failed 'O.S is other than Linux 12 (bookworm)'!\n"
 fi
 
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+check "version" az  --version
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/azure-cli/scenarios.json b/test/azure-cli/scenarios.json
index 041f50731..3ec910399 100644
--- a/test/azure-cli/scenarios.json
+++ b/test/azure-cli/scenarios.json
@@ -47,5 +47,15 @@
         "version": "latest"
       }
     }
+  },
+  "install_using_python_with_python_3_11_bullseye": {
+    "image": "mcr.microsoft.com/devcontainers/python:1-3.11-bullseye",
+    "user": "vscode",
+    "features": {
+      "azure-cli": {
+        "version": "latest",
+        "installUsingPython": "true"
+      }
+    }
   }
 }
\ No newline at end of file

From 6f4e59866169405c7b7a8ff65e3f2ac3ced6a26e Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Wed, 17 Apr 2024 04:35:23 +0530
Subject: [PATCH 265/478] [Ruby]- rvm - fallback code fix (#931)

* [Ruby] - Install using fallback - draft

* [Ruby] - Rvm - fallback logic implementation

* misc changes

* changes for review comments..
---
 src/ruby/devcontainer-feature.json |   2 +-
 src/ruby/install.sh                | 129 ++++++++++++--
 test/ruby/ruby_fallback_test.sh    | 277 +++++++++++++++++++++++++++++
 test/ruby/scenarios.json           |   8 +
 4 files changed, 396 insertions(+), 20 deletions(-)
 create mode 100644 test/ruby/ruby_fallback_test.sh

diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json
index 73bcbcced..3722cab06 100644
--- a/src/ruby/devcontainer-feature.json
+++ b/src/ruby/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "name": "Ruby (via rvm)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
     "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
diff --git a/src/ruby/install.sh b/src/ruby/install.sh
index 7e4514bba..8f95829da 100755
--- a/src/ruby/install.sh
+++ b/src/ruby/install.sh
@@ -140,6 +140,47 @@ find_version_from_git_tags() {
     echo "${variable_name}=${!variable_name}"
 }
 
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
 apt_get_update()
 {
     if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
@@ -173,25 +214,46 @@ if ! type git > /dev/null 2>&1; then
     check_packages git
 fi
 
+# Function to fetch the version released prior to the latest version
+get_previous_version() {
+    local url=$1
+    local repo_url=$2
+    variable_name=$3
+    prev_version=${!variable_name}
+    
+    output=$(curl -s "$repo_url");
+
+    #install jq
+    check_packages jq
+
+    message=$(echo "$output" | jq -r '.message')
+
+    if [[ $message == "API rate limit exceeded"* ]]; then
+        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
+        echo -e "\nAttempting to find latest version using GitHub tags."
+        find_prev_version_from_git_tags prev_version "$url" "tags/v" "_"
+        declare -g ${variable_name}="${prev_version}"
+    else 
+        echo -e "\nAttempting to find latest version using GitHub Api."
+        version=$(echo "$output" | jq -r '.tag_name' | tr '_' '.')
+        declare -g ${variable_name}="${version#v}"
+    fi  
+    echo "${variable_name}=${!variable_name}"
+}
+
+get_github_api_repo_url() {
+    local url=$1
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
+}
+
 
 # Figure out correct version of a three part version number is not passed
-find_version_from_git_tags RUBY_VERSION "https://github.com/ruby/ruby" "tags/v" "_"
+RUBY_URL="https://github.com/ruby/ruby"
+ORIGINAL_RUBY_VERSION=$RUBY_VERSION
+find_version_from_git_tags RUBY_VERSION $RUBY_URL "tags/v" "_"
 
-# Just install Ruby if RVM already installed
-if rvm --version > /dev/null; then
-    echo "Ruby Version Manager already exists."
-    if [[ "$(ruby -v)" = *"${RUBY_VERSION}"* ]]; then
-        echo "(!) Ruby is already installed with version ${RUBY_VERSION}. Skipping..."
-    elif [ "${RUBY_VERSION}" != "none" ]; then
-        echo "Installing specified Ruby version."
-        su ${USERNAME} -c "rvm install ruby ${RUBY_VERSION}"
-    fi
-    SKIP_GEM_INSTALL="false"
-    SKIP_RBENV_RBUILD="true"
-else
-    # Install RVM
-    receive_gpg_keys RVM_GPG_KEYS
-    # Determine appropriate settings for rvm installer
+set_rvm_install_args() {
+    RUBY_VERSION=$1
     if [ "${RUBY_VERSION}" = "none" ]; then
         RVM_INSTALL_ARGS=""
     elif [[ "$(ruby -v)" = *"${RUBY_VERSION}"* ]]; then
@@ -210,19 +272,48 @@ else
             DEFAULT_GEMS=""
         fi
     fi
+}
+
+install_previous_version() {
+    if [[ $ORIGINAL_RUBY_VERSION == "latest" ]]; then
+        repo_url=$(get_github_api_repo_url "$RUBY_URL")
+        get_previous_version "${RUBY_URL}" "${repo_url}" RUBY_VERSION
+        set_rvm_install_args $RUBY_VERSION
+        curl -sSL https://get.rvm.io | bash -s stable --ignore-dotfiles ${RVM_INSTALL_ARGS} --with-default-gems="${DEFAULT_GEMS}" 2>&1
+    else 
+        echo "Failed to install Ruby version $ORIGINAL_RUBY_VERSION. Exiting..."
+    fi
+}
+
+# Just install Ruby if RVM already installed
+if rvm --version > /dev/null; then
+    echo "Ruby Version Manager already exists."
+    if [[ "$(ruby -v)" = *"${RUBY_VERSION}"* ]]; then
+        echo "(!) Ruby is already installed with version ${RUBY_VERSION}. Skipping..."
+    elif [ "${RUBY_VERSION}" != "none" ]; then
+        echo "Installing specified Ruby version."
+        su ${USERNAME} -c "rvm install ruby ${RUBY_VERSION}"
+    fi
+    SKIP_GEM_INSTALL="false"
+    SKIP_RBENV_RBUILD="true"
+else
+    # Install RVM
+    receive_gpg_keys RVM_GPG_KEYS
+    # Determine appropriate settings for rvm installer
+    set_rvm_install_args $RUBY_VERSION
     # Create rvm group as a system group to reduce the odds of conflict with local user UIDs
     if ! cat /etc/group | grep -e "^rvm:" > /dev/null 2>&1; then
         groupadd -r rvm
     fi
     # Install rvm
-    curl -sSL https://get.rvm.io | bash -s stable --ignore-dotfiles ${RVM_INSTALL_ARGS} --with-default-gems="${DEFAULT_GEMS}" 2>&1
+    curl -sSL https://get.rvm.io | bash -s stable --ignore-dotfiles ${RVM_INSTALL_ARGS} --with-default-gems="${DEFAULT_GEMS}" 2>&1 || install_previous_version
     usermod -aG rvm ${USERNAME}
     source /usr/local/rvm/scripts/rvm
     rvm fix-permissions system
     rm -rf ${GNUPGHOME}
 fi
 
-if [ "${INSTALL_RUBY_TOOLS}" = "true" ]; then
+if [ "${INSTALL_RUBY_TOOLS}" = "true" ]; then   
     # Non-root user may not have "gem" in path when script is run and no ruby version
     # is installed by rvm, so handle this by using root's default gem in this case
     ROOT_GEM="$(which gem || echo "")"
@@ -239,7 +330,7 @@ if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
         read -a additional_versions <<< "$ADDITIONAL_VERSIONS"
         for version in "${additional_versions[@]}"; do
             # Figure out correct version of a three part version number is not passed
-            find_version_from_git_tags version "https://github.com/ruby/ruby" "tags/v" "_"
+            find_version_from_git_tags version $RUBY_URL "tags/v" "_"
             source /usr/local/rvm/scripts/rvm
             rvm install ruby ${version}
         done
diff --git a/test/ruby/ruby_fallback_test.sh b/test/ruby/ruby_fallback_test.sh
new file mode 100644
index 000000000..fe1a9c77b
--- /dev/null
+++ b/test/ruby/ruby_fallback_test.sh
@@ -0,0 +1,277 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+USERNAME="automatic"
+echo -e "\nRVM version installed previously by ruby feature ..."
+check "rvm" rvm --version
+check "ruby" ruby -v
+
+trap 'echo "Last executed command failed at line ${LINENO}"' ERR
+
+RVM_GPG_KEYS="409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"
+GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
+keyserver hkp://keyserver.ubuntu.com:80
+keyserver hkps://keys.openpgp.org
+keyserver hkp://keyserver.pgp.com"
+
+# Clean up
+rm -rf /var/lib/apt/lists/*
+
+# Determine the appropriate non-root user
+if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
+    USERNAME=""
+    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
+    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
+        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            USERNAME=${CURRENT_USER}
+            break
+        fi
+    done
+    if [ "${USERNAME}" = "" ]; then
+        USERNAME=root
+    fi
+elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
+    USERNAME=root
+fi
+
+# Ensure apt is in non-interactive to avoid prompts
+export DEBIAN_FRONTEND=noninteractive
+
+architecture="$(uname -m)"
+if [ "${architecture}" != "amd64" ] && [ "${architecture}" != "x86_64" ] && [ "${architecture}" != "arm64" ] && [ "${architecture}" != "aarch64" ]; then
+    echo "(!) Architecture $architecture unsupported"
+    exit 1
+fi
+
+apt_get_update()
+{
+    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+        echo "Running apt-get update..."
+        apt-get update -y
+    fi
+}
+
+# Checks if packages are installed and installs them if not
+check_packages() {
+    if ! dpkg -s "$@" > /dev/null 2>&1; then
+        apt_get_update
+        apt-get -y install --no-install-recommends "$@"
+    fi
+}
+
+# Import the specified key in a variable name passed in as 
+receive_gpg_keys() {
+    local keys=${!1}
+    local keyring_args=""
+    if [ ! -z "$2" ]; then
+        keyring_args="--no-default-keyring --keyring \"$2\""
+    fi
+
+    # Use a temporary location for gpg keys to avoid polluting image
+    export GNUPGHOME="/tmp/tmp-gnupg"
+    mkdir -p ${GNUPGHOME}
+    chmod 700 ${GNUPGHOME}
+    echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" | tee ${GNUPGHOME}/dirmngr.conf > /dev/null
+    # GPG key download sometimes fails for some reason and retrying fixes it.
+    local retry_count=0
+    local gpg_ok="false"
+    set +e
+    until [ "${gpg_ok}" = "true" ] || [ "${retry_count}" -eq "5" ]; 
+    do
+        echo "(*) Downloading GPG key..."
+        ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys) 2>&1 && gpg_ok="true"
+        if [ "${gpg_ok}" != "true" ]; then
+            echo "(*) Failed getting key, retring in 10s..."
+            (( retry_count++ ))
+            sleep 10s
+        fi
+    done
+    set -e
+    if [ "${gpg_ok}" = "false" ]; then
+        echo "(!) Failed to get gpg key."
+        exit 1
+    fi
+}
+
+# Figure out correct version of a three part version number is not passed
+find_version_from_git_tags() {
+    local variable_name=$1
+    local requested_version=${!variable_name}
+    if [ "${requested_version}" = "none" ]; then return; fi
+    local repository=$2
+    local prefix=${3:-"tags/v"}
+    local separator=${4:-"."}
+    local last_part_optional=${5:-"false"}    
+    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
+        local escaped_separator=${separator//./\\.}
+        local last_part
+        if [ "${last_part_optional}" = "true" ]; then
+            last_part="(${escaped_separator}[0-9]+)?"
+        else
+            last_part="${escaped_separator}[0-9]+"
+        fi
+        local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
+        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
+            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+        else
+            set +e
+            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            set -e
+        fi
+    fi
+    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
+        echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
+        exit 1
+    fi
+    echo "${variable_name}=${!variable_name}"
+}
+
+# Use semver logic to decrement a version number then look for the closest match
+find_prev_version_from_git_tags() {
+    local variable_name=$1
+    local current_version=${!variable_name}
+    local repository=$2
+    # Normally a "v" is used before the version number, but support alternate cases
+    local prefix=${3:-"tags/v"}
+    # Some repositories use "_" instead of "." for version number part separation, support that
+    local separator=${4:-"."}
+    # Some tools release versions that omit the last digit (e.g. go)
+    local last_part_optional=${5:-"false"}
+    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
+    local version_suffix_regex=$6
+    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
+    set +e
+        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
+        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
+        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
+
+        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
+            ((major=major-1))
+            declare -g ${variable_name}="${major}"
+            # Look for latest version from previous major release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        # Handle situations like Go's odd version pattern where "0" releases omit the last part
+        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
+            ((minor=minor-1))
+            declare -g ${variable_name}="${major}.${minor}"
+            # Look for latest version from previous minor release
+            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
+        else
+            ((breakfix=breakfix-1))
+            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
+                declare -g ${variable_name}="${major}.${minor}"
+            else 
+                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+            fi
+        fi
+    set -e
+}
+
+# Function to fetch the version released prior to the latest version
+get_previous_version() {
+    local url=$1
+    local repo_url=$2
+    local variable_name=$3
+    local mode=$4
+    prev_version=${!variable_name}
+    
+    output=$(curl -s "$repo_url");
+
+    #install jq
+    check_packages jq
+
+    message=$(echo "$output" | jq -r '.message')
+
+    if [[ $mode == "mode1" ]]; then
+        message="API rate limit exceeded"
+    else 
+        message=""
+    fi
+    
+    if [[ $message == "API rate limit exceeded"* ]]; then
+        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
+        echo -e "\nAttempting to find latest version using GitHub tags."
+        find_prev_version_from_git_tags prev_version "$url" "tags/v" "_"
+        declare -g ${variable_name}="${prev_version}"
+    else 
+        echo -e "\nAttempting to find latest version using GitHub Api."
+        version=$(echo "$output" | jq -r '.tag_name' | tr '_' '.')
+        declare -g ${variable_name}="${version#v}"
+    fi  
+    echo "${variable_name}=${!variable_name}"
+}
+
+get_github_api_repo_url() {
+    local url=$1
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
+}
+
+
+# Figure out correct version of a three part version number is not passed
+ruby_url="https://github.com/ruby/ruby"
+
+RUBY_VERSION="3.1.xyz"
+
+set_rvm_install_args() {
+    RUBY_VERSION=$1
+    if [ "${RUBY_VERSION}" = "none" ]; then
+        RVM_INSTALL_ARGS=""
+    elif [[ "$(ruby -v)" = *"${RUBY_VERSION}"* ]]; then
+        echo "(!) Ruby is already installed with version ${RUBY_VERSION}. Skipping..."
+        RVM_INSTALL_ARGS=""
+    else
+        if [ "${RUBY_VERSION}" = "latest" ] || [ "${RUBY_VERSION}" = "current" ] || [ "${RUBY_VERSION}" = "lts" ]; then
+            RVM_INSTALL_ARGS="--ruby"
+            RUBY_VERSION=""
+        else
+            RVM_INSTALL_ARGS="--ruby=${RUBY_VERSION}"
+        fi
+        if [ "${INSTALL_RUBY_TOOLS}" = "true" ]; then
+            SKIP_GEM_INSTALL="true"
+        else 
+            DEFAULT_GEMS=""
+        fi
+    fi
+}
+
+install_previous_version() {
+    mode=$1
+    repo_url=$(get_github_api_repo_url "$ruby_url")
+    get_previous_version "${ruby_url}" "${repo_url}" RUBY_VERSION $mode
+    set_rvm_install_args $RUBY_VERSION
+    curl -sSL https://get.rvm.io | bash -s stable --ignore-dotfiles ${RVM_INSTALL_ARGS} --with-default-gems="${DEFAULT_GEMS}" 2>&1
+}
+
+install_rvm() {
+    mode=$1
+    # Install RVM
+    receive_gpg_keys RVM_GPG_KEYS
+    # Determine appropriate settings for rvm installer
+    set_rvm_install_args $RUBY_VERSION
+    # Create rvm group as a system group to reduce the odds of conflict with local user UIDs
+    if ! cat /etc/group | grep -e "^rvm:" > /dev/null 2>&1; then
+        groupadd -r rvm
+    fi
+    # Install rvm
+    curl -sSL https://get.rvm.io | bash -s stable --ignore-dotfiles ${RVM_INSTALL_ARGS} --with-default-gems="${DEFAULT_GEMS}" 2>&1 || install_previous_version "$mode"
+    sudo usermod -aG rvm ${USERNAME}
+    source /usr/local/rvm/scripts/rvm
+    rvm fix-permissions system
+    rm -rf ${GNUPGHOME}
+}
+
+install_rvm "mode1"
+echo -e "\n👉🏻👉🏻RVM version installed by test file ... (mode: 1 - install using find_prev_version_from_git_tags):"
+check "rvm" rvm --version
+
+install_rvm "mode2"
+echo -e "\n👉🏻👉🏻RVM version installed by test file ... (mode: 1 - install using GitHub Api):"
+check "rvm" rvm --version
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/ruby/scenarios.json b/test/ruby/scenarios.json
index 04cac73f5..cfa2d8554 100644
--- a/test/ruby/scenarios.json
+++ b/test/ruby/scenarios.json
@@ -13,5 +13,13 @@
         "features": {
             "ruby": {}
         }
+    },
+    "ruby_fallback_test": {
+        "image": "mcr.microsoft.com/devcontainers/base:bullseye",
+        "features": {
+            "ruby": {
+                "version": "latest"
+            }
+        }
     }
 }
\ No newline at end of file

From bb7b7ea29f84ea31262c1290a2e14e9984286295 Mon Sep 17 00:00:00 2001
From: Prathamesh Zarkar <159782310+prathameshzarkar9@users.noreply.github.com>
Date: Tue, 23 Apr 2024 03:50:07 +0530
Subject: [PATCH 266/478] upgrade cuda version to 11.7 and cudnn to 8.5.0
 (#942)

upgrade cuda version 11.7 and cudnn 8.5.0
---
 src/nvidia-cuda/devcontainer-feature.json      | 2 +-
 src/nvidia-cuda/install.sh                     | 7 +++++++
 test/nvidia-cuda/install_cudnn_nvxt_version.sh | 8 ++++----
 test/nvidia-cuda/scenarios.json                | 4 ++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/nvidia-cuda/devcontainer-feature.json b/src/nvidia-cuda/devcontainer-feature.json
index bb63ae1c7..4a0fb0834 100644
--- a/src/nvidia-cuda/devcontainer-feature.json
+++ b/src/nvidia-cuda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "nvidia-cuda",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "name": "NVIDIA CUDA",
   "description": "Installs shared libraries for NVIDIA CUDA.",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nvidia-cuda",
diff --git a/src/nvidia-cuda/install.sh b/src/nvidia-cuda/install.sh
index d8658964e..79a7a9a20 100644
--- a/src/nvidia-cuda/install.sh
+++ b/src/nvidia-cuda/install.sh
@@ -12,6 +12,8 @@ INSTALL_TOOLKIT=${INSTALLTOOLKIT}
 CUDA_VERSION=${CUDAVERSION}
 CUDNN_VERSION=${CUDNNVERSION}
 
+. /etc/os-release 
+
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
     exit 1
@@ -33,6 +35,11 @@ check_packages() {
     fi
 }
 
+if [ $VERSION_CODENAME = "bookworm" ] || [ $VERSION_CODENAME = "jammy" ] && [ $CUDA_VERSION \< 11.7 ]; then  
+    echo "(!) Unsupported distribution version '${VERSION_CODENAME}' for CUDA < 11.7"
+    exit 1
+fi  
+
 export DEBIAN_FRONTEND=noninteractive
 
 check_packages wget ca-certificates
diff --git a/test/nvidia-cuda/install_cudnn_nvxt_version.sh b/test/nvidia-cuda/install_cudnn_nvxt_version.sh
index a7f46bdd6..4817ae479 100644
--- a/test/nvidia-cuda/install_cudnn_nvxt_version.sh
+++ b/test/nvidia-cuda/install_cudnn_nvxt_version.sh
@@ -5,11 +5,11 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-# Check installation of libcudnn8 (8.3.2)
-check "libcudnn.so.8.3.2" test 1 -eq "$(find /usr -name 'libcudnn.so.8.3.2' | wc -l)"
+# Check installation of libcudnn8 (8.5.0)
+check "libcudnn.so.8.5.0" test 1 -eq "$(find /usr -name 'libcudnn.so.8.5.0' | wc -l)"
 
-# Check installation of cuda-nvtx-11-5 (11.5)
-check "cuda-11-5+nvtx" test -e '/usr/local/cuda-11.5/targets/x86_64-linux/include/nvtx3'
+# Check installation of cuda-nvtx-11-7 (11.7)
+check "cuda-11-7+nvtx" test -e '/usr/local/cuda-11.7/targets/x86_64-linux/include/nvtx3'
 
 # Report result
 reportResults
diff --git a/test/nvidia-cuda/scenarios.json b/test/nvidia-cuda/scenarios.json
index 3018330e2..bd73263b3 100644
--- a/test/nvidia-cuda/scenarios.json
+++ b/test/nvidia-cuda/scenarios.json
@@ -16,8 +16,8 @@
             "nvidia-cuda": {
                 "installCudnn": true,
                 "installNvtx": true,
-                "cudaVersion": "11.5",
-                "cudnnVersion": "8.3.2.44"
+                "cudaVersion": "11.7",
+                "cudnnVersion": "8.5.0.96"
             }
         }
     }

From d8e9d335952d0b8d488cc3445ad076003bc3c22c Mon Sep 17 00:00:00 2001
From: Barrett Strausser <bearrito@users.noreply.github.com>
Date: Tue, 7 May 2024 11:10:39 -0400
Subject: [PATCH 267/478] Fix rustup-init sha256sum check (#962)

* Fix rustup-init sha256sum check

* Semver update

---------

Co-authored-by: bstrausser <bstrausser@locusrobotics.com>
---
 src/rust/devcontainer-feature.json | 2 +-
 src/rust/install.sh                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index c4a7dd5b9..70013442f 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "rust",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "name": "Rust",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
     "description": "Installs Rust, common Rust utilities, and their required dependencies",
diff --git a/src/rust/install.sh b/src/rust/install.sh
index 00c0a6e72..4db9edc1e 100755
--- a/src/rust/install.sh
+++ b/src/rust/install.sh
@@ -186,6 +186,7 @@ else
     curl -sSL --proto '=https' --tlsv1.2 "https://static.rust-lang.org/rustup/dist/${download_architecture}-unknown-linux-gnu/rustup-init" -o /tmp/rustup/target/${download_architecture}-unknown-linux-gnu/release/rustup-init
     curl -sSL --proto '=https' --tlsv1.2 "https://static.rust-lang.org/rustup/dist/${download_architecture}-unknown-linux-gnu/rustup-init.sha256" -o /tmp/rustup/rustup-init.sha256
     cd /tmp/rustup
+    cp /tmp/rustup/target/${download_architecture}-unknown-linux-gnu/release/rustup-init  /tmp/rustup/rustup-init
     sha256sum -c rustup-init.sha256
     chmod +x target/${download_architecture}-unknown-linux-gnu/release/rustup-init
     target/${download_architecture}-unknown-linux-gnu/release/rustup-init -y --no-modify-path --profile ${RUSTUP_PROFILE} ${default_toolchain_arg}

From 67c10a660868260c284b02f2878dcfdcfd91279f Mon Sep 17 00:00:00 2001
From: Jacob Woffenden <jacob.woffenden@digital.justice.gov.uk>
Date: Mon, 13 May 2024 17:37:11 +0100
Subject: [PATCH 268/478] =?UTF-8?q?=E2=9C=A8=20Add=20Ubuntu=2024=20Noble?=
 =?UTF-8?q?=20to=20`docker-in-docker`=20(#971)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add Ubuntu Noble

Signed-off-by: GitHub <noreply@github.com>

* Changes

Signed-off-by: GitHub <noreply@github.com>

---------

Signed-off-by: GitHub <noreply@github.com>
---
 .github/workflows/test-all.yaml                | 1 +
 .github/workflows/test-pr.yaml                 | 1 +
 src/docker-in-docker/devcontainer-feature.json | 2 +-
 src/docker-in-docker/install.sh                | 4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml
index 40f5efa75..7a9554314 100644
--- a/.github/workflows/test-all.yaml
+++ b/.github/workflows/test-all.yaml
@@ -48,6 +48,7 @@ jobs:
             "debian:12",
             "mcr.microsoft.com/devcontainers/base:ubuntu",
             "mcr.microsoft.com/devcontainers/base:debian",
+            "mcr.microsoft.com/devcontainers/base:noble"
           ]
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index 3aae841e2..776a9731f 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -55,6 +55,7 @@ jobs:
             "debian:12",
             "mcr.microsoft.com/devcontainers/base:ubuntu",
             "mcr.microsoft.com/devcontainers/base:debian",
+            "mcr.microsoft.com/devcontainers/base:noble"
           ]
     steps:
       - uses: actions/checkout@v3
diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 812db444c..4897ebf3e 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.10.2",
+    "version": "2.11.0",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 0dc9e52d1..ee9cb6ee6 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -18,8 +18,8 @@ USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
 INSTALL_DOCKER_COMPOSE_SWITCH="${INSTALLDOCKERCOMPOSESWITCH:-"true"}"
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
-DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal jammy"
-DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal hirsute impish jammy"
+DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal jammy noble"
+DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal hirsute impish jammy noble"
 
 # Default: Exit on any failure.
 set -e

From 4d2dabec57722e23ffe547038923a799e332e291 Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Fri, 17 May 2024 00:12:03 +0530
Subject: [PATCH 269/478] [Desktop-lite]- libasound2 not installing in noble -
 issue (#973)

* [Desktop-lite]- libasound2 not installing in noble - issue

* bump to patch version in Desktop-lite feature

* misc change

* Changes for comments ( review comments )

* changes based on review comments..
---
 src/desktop-lite/devcontainer-feature.json |  2 +-
 src/desktop-lite/install.sh                | 11 +++++++-
 test/desktop-lite/test.sh                  | 30 ++++++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json
index 5387138b5..5386eb31d 100644
--- a/src/desktop-lite/devcontainer-feature.json
+++ b/src/desktop-lite/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "desktop-lite",
-    "version": "1.0.8",
+    "version": "1.1.0",
     "name": "Light-weight Desktop",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
     "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh
index df4390eca..13a524ada 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -41,7 +41,6 @@ package_list="
     libnotify4 \
     libnss3 \
     libxss1 \
-    libasound2 \
     xfonts-base \
     xfonts-terminus \
     fonts-noto \
@@ -198,6 +197,16 @@ fi
 # Install X11, fluxbox and VS Code dependencies
 check_packages ${package_list}
 
+# if Ubuntu-24.04, noble(numbat) found, then will install libasound2-dev instead of libasound2.
+# this change is temporary, https://packages.ubuntu.com/noble/libasound2 will switch to libasound2 once it is available for Ubuntu-24.04, noble(numbat)
+. /etc/os-release
+if [ "${ID}" = "ubuntu" ] && [ "${VERSION_CODENAME}" = "noble" ]; then
+    echo "Ubuntu 24.04, Noble(Numbat) detected. Installing libasound2-dev package..."
+    check_packages "libasound2-dev"
+else 
+    check_packages "libasound2"
+fi
+
 # On newer versions of Ubuntu (22.04), 
 # we need an additional package that isn't provided in earlier versions
 if ! type vncpasswd > /dev/null 2>&1; then
diff --git a/test/desktop-lite/test.sh b/test/desktop-lite/test.sh
index 9009aa9c6..5d11dd424 100755
--- a/test/desktop-lite/test.sh
+++ b/test/desktop-lite/test.sh
@@ -5,9 +5,39 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+echoStderr()
+{
+    echo "$@" 1>&2
+}
+
+checkOSPackage() {
+    LABEL=$1
+    PACKAGE_NAME=$2
+    echo -e "\n🧪 Testing $LABEL"
+    # Check if the package exists and retrieve its exact version
+    if [ "$(dpkg-query -W -f='${Status}' "$PACKAGE_NAME" 2>/dev/null | grep -c "ok installed")" -eq 1 ]; then
+        echo "✅  Package '$PACKAGE_NAME' is installed."
+        exit 0
+    else
+        echo "❌ Package '$PACKAGE_NAME' is not installed."
+        exit 1
+    fi
+}
+
 check "desktop-init-exists" bash -c "ls /usr/local/share/desktop-init.sh"
 check "log-exists" bash -c "ls /tmp/container-init.log"
 check "fluxbox-exists" bash -c "ls -la ~/.fluxbox"
 
+. /etc/os-release
+if [ "${ID}" = "ubuntu" ]; then
+    if [ "${VERSION_CODENAME}" = "noble" ]; then
+        checkOSPackage "if libasound2-dev exists !" "libasound2-dev"
+    else 
+        checkOSPackage "if libasound2 exists !" "libasound2"
+    fi
+else 
+    checkOSPackage "if libasound2 exists !" "libasound2"
+fi
+
 # Report result
 reportResults
\ No newline at end of file

From ecbfd50952e513db872d8d3380e069ccf74a70a8 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Fri, 17 May 2024 09:16:22 -0700
Subject: [PATCH 270/478] [Updates] Automated vendor dotnet-install script
 (#970)

* Automated dotnet-install script update

* Bump version

---------

Co-authored-by: github-actions <github-actions@github.com>
---
 src/dotnet/devcontainer-feature.json        |  2 +-
 src/dotnet/scripts/vendor/dotnet-install.sh | 26 +++++++++++++++++----
 src/oryx/devcontainer-feature.json          |  2 +-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index 78a061d23..8b8ffaf2a 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.0.5",
+    "version": "2.0.6",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
diff --git a/src/dotnet/scripts/vendor/dotnet-install.sh b/src/dotnet/scripts/vendor/dotnet-install.sh
index f6b08d1f8..42c201af4 100755
--- a/src/dotnet/scripts/vendor/dotnet-install.sh
+++ b/src/dotnet/scripts/vendor/dotnet-install.sh
@@ -298,6 +298,10 @@ get_machine_architecture() {
     if command -v uname > /dev/null; then
         CPUName=$(uname -m)
         case $CPUName in
+        armv1*|armv2*|armv3*|armv4*|armv5*|armv6*)
+            echo "armv6-or-below"
+            return 0
+            ;;
         armv*l)
             echo "arm"
             return 0
@@ -339,7 +343,13 @@ get_normalized_architecture_from_architecture() {
     local architecture="$(to_lowercase "$1")"
 
     if [[ $architecture == \<auto\> ]]; then
-        echo "$(get_machine_architecture)"
+        machine_architecture="$(get_machine_architecture)"
+        if [[ "$machine_architecture" == "armv6-or-below" ]]; then
+            say_err "Architecture \`$machine_architecture\` not supported. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues"
+            return 1
+        fi
+
+        echo $machine_architecture
         return 0
     fi
 
@@ -1013,7 +1023,7 @@ extract_dotnet_package() {
     
     rm -rf "$temp_out_path"
     if [ -z ${keep_zip+x} ]; then
-        rm -f "$zip_path" && say_verbose "Temporary zip file $zip_path was removed"
+        rm -f "$zip_path" && say_verbose "Temporary archive file $zip_path was removed"
     fi
 
     if [ "$failed" = true ]; then
@@ -1261,6 +1271,12 @@ get_download_link_from_aka_ms() {
     http_codes=$( echo "$response" | awk '$1 ~ /^HTTP/ {print $2}' )
     # They all need to be 301, otherwise some links are broken (except for the last, which is not a redirect but 200 or 404).
     broken_redirects=$( echo "$http_codes" | sed '$d' | grep -v '301' )
+    # The response may end without final code 2xx/4xx/5xx somehow, e.g. network restrictions on www.bing.com causes redirecting to bing.com fails with connection refused.
+    # In this case it should not exclude the last.
+    last_http_code=$(  echo "$http_codes" | tail -n 1 )
+    if ! [[ $last_http_code =~ ^(2|4|5)[0-9][0-9]$ ]]; then
+        broken_redirects=$( echo "$http_codes" | grep -v '301' )
+    fi
 
     # All HTTP codes are 301 (Moved Permanently), the redirect link exists.
     if [[ -z "$broken_redirects" ]]; then
@@ -1512,7 +1528,7 @@ install_dotnet() {
 
     mkdir -p "$install_root"
     zip_path="${zip_path:-$(mktemp "$temporary_file_template")}"
-    say_verbose "Zip path: $zip_path"
+    say_verbose "Archive path: $zip_path"
 
     for link_index in "${!download_links[@]}"
     do
@@ -1536,7 +1552,7 @@ install_dotnet() {
                 say "Failed to download $link_type link '$download_link': $download_error_msg"
                 ;;
             esac
-            rm -f "$zip_path" 2>&1 && say_verbose "Temporary zip file $zip_path was removed"
+            rm -f "$zip_path" 2>&1 && say_verbose "Temporary archive file $zip_path was removed"
         else
             download_completed=true
             break
@@ -1551,7 +1567,7 @@ install_dotnet() {
 
     remote_file_size="$(get_remote_file_size "$download_link")"
 
-    say "Extracting zip from $download_link"
+    say "Extracting archive from $download_link"
     extract_dotnet_package "$zip_path" "$install_root" "$remote_file_size" || return 1
 
     #  Check if the SDK version is installed; if not, fail the installation.
diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index 41bd1f759..9e6e698a1 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "oryx",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "name": "Oryx",
     "description": "Installs the oryx CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",

From f5787eed01022f177475a99084327e023a84ddaf Mon Sep 17 00:00:00 2001
From: Andy Li <andy@onthewings.net>
Date: Wed, 22 May 2024 00:57:40 +0100
Subject: [PATCH 271/478] Add Ubuntu 24 Noble to `docker-outside-of-docker`
 (#978)

---
 src/docker-outside-of-docker/devcontainer-feature.json | 2 +-
 src/docker-outside-of-docker/install.sh                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 2506031ae..19018ea8e 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.4.5",
+    "version": "1.5.0",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 16ad15f60..de5212fe6 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -19,8 +19,8 @@ USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
-DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal jammy"
-DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal hirsute impish jammy"
+DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal jammy noble"
+DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal hirsute impish jammy noble"
 
 set -e
 

From 02b71cbd6cf972ca29059cd409dc0fe8c3b60e65 Mon Sep 17 00:00:00 2001
From: hellodword <46193371+hellodword@users.noreply.github.com>
Date: Tue, 28 May 2024 23:03:23 +0000
Subject: [PATCH 272/478] [python] add default formatter (#903)

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
---
 src/python/devcontainer-feature.json | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 9f211244f..ef16ee643 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
@@ -73,10 +73,14 @@
     "vscode": {
       "extensions": [
         "ms-python.python",
-        "ms-python.vscode-pylance"
+        "ms-python.vscode-pylance",
+        "ms-python.autopep8"
       ],
       "settings": {
-        "python.defaultInterpreterPath": "/usr/local/python/current/bin/python"
+        "python.defaultInterpreterPath": "/usr/local/python/current/bin/python",
+	      "[python]": {
+	        "editor.defaultFormatter": "ms-python.autopep8"
+	      }
       }
     }
   },
@@ -84,4 +88,4 @@
     "ghcr.io/devcontainers/features/common-utils",
     "ghcr.io/devcontainers/features/oryx"
   ]
-}
\ No newline at end of file
+}

From 10ea0b7dd5a653b08266039527f7e095c02591a8 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Tue, 28 May 2024 16:20:00 -0700
Subject: [PATCH 273/478] Automated documentation update (#984)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/python/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/python/README.md b/src/python/README.md
index db6ad1039..90d79aee8 100644
--- a/src/python/README.md
+++ b/src/python/README.md
@@ -31,6 +31,7 @@ Installs the provided version of Python, as well as PIPX, and other common Pytho
 
 - `ms-python.python`
 - `ms-python.vscode-pylance`
+- `ms-python.autopep8`
 
 
 

From 476a68d0523b004112498dc161c2b6de1bd9fe57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20H=C3=B6chenberger?=
 <richard.hoechenberger@gmail.com>
Date: Wed, 29 May 2024 21:43:03 +0200
Subject: [PATCH 274/478] [desktop-lite] Allow password-less VNC connections
 (#982)

* [desktop-lite] Allow password-less VNC connections

Closes #611

* Restore readme

* Update src/desktop-lite/install.sh

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Fix

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/desktop-lite/devcontainer-feature.json | 13 +++++-----
 src/desktop-lite/install.sh                | 29 +++++++++++++++++++---
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json
index 5386eb31d..417787c51 100644
--- a/src/desktop-lite/devcontainer-feature.json
+++ b/src/desktop-lite/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "desktop-lite",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "name": "Light-weight Desktop",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
     "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
@@ -19,17 +19,18 @@
                 "1.2.0"
             ],
             "default": "1.2.0",
-            "description": "NoVnc Version"
+            "description": "The noVNC version to use"
         },
         "password": {
             "type": "string",
             "proposals": [
                 "vscode",
                 "codespaces",
-                "password"
+                "password",
+                "noPassword"
             ],
             "default": "vscode",
-            "description": "Enter a password for desktop connections"
+            "description": "Enter a password for desktop connections. If \"noPassword\", connections from the local host can be established without entering a password"
         },
         "webPort": {
             "type": "string",
@@ -37,7 +38,7 @@
                 "6080"
             ],
             "default": "6080",
-            "description": "Enter a port for the VNC web client"
+            "description": "Enter a port for the VNC web client (noVNC)"
         },
         "vncPort": {
             "type": "string",
@@ -45,7 +46,7 @@
                 "5901"
             ],
             "default": "5901",
-            "description": "Enter a port for the desktop VNC server"
+            "description": "Enter a port for the desktop VNC server (TigerVNC)"
         }
     },
     "init": true,
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh
index 13a524ada..ef8b603c6 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -9,6 +9,9 @@
 
 NOVNC_VERSION="${NOVNCVERSION:-"1.2.0"}" # TODO: Add in a 'latest' auto-detect and swap name to 'version'
 VNC_PASSWORD=${PASSWORD:-"vscode"}
+if [ "$VNC_PASSWORD" = "noPassword" ]; then
+    unset VNC_PASSWORD
+fi
 NOVNC_PORT="${WEBPORT:-6080}"
 VNC_PORT="${VNCPORT:-5901}"
 
@@ -372,7 +375,15 @@ sudoIf chown root:\${group_name} /tmp/.X11-unix
 if [ "\$(echo "\${VNC_RESOLUTION}" | tr -cd 'x' | wc -c)" = "1" ]; then VNC_RESOLUTION=\${VNC_RESOLUTION}x16; fi
 screen_geometry="\${VNC_RESOLUTION%*x*}"
 screen_depth="\${VNC_RESOLUTION##*x}"
-startInBackgroundIfNotRunning "Xtigervnc" sudoUserIf "tigervncserver \${DISPLAY} -geometry \${screen_geometry} -depth \${screen_depth} -rfbport ${VNC_PORT} -dpi \${VNC_DPI:-96} -localhost -desktop fluxbox -fg -passwd /usr/local/etc/vscode-dev-containers/vnc-passwd"
+
+# Check if VNC_PASSWORD is set and use the appropriate command
+common_options="tigervncserver \${DISPLAY} -geometry \${screen_geometry} -depth \${screen_depth} -rfbport ${VNC_PORT} -dpi \${VNC_DPI:-96} -localhost -desktop fluxbox -fg"
+
+if [ -n "\${VNC_PASSWORD+x}" ]; then
+    startInBackgroundIfNotRunning "Xtigervnc" sudoUserIf "\${common_options} -passwd /usr/local/etc/vscode-dev-containers/vnc-passwd"
+else
+    startInBackgroundIfNotRunning "Xtigervnc" sudoUserIf "\${common_options} -SecurityTypes None"
+fi
 
 # Spin up noVNC if installed and not running.
 if [ -d "/usr/local/novnc" ] && [ "\$(ps -ef | grep /usr/local/novnc/noVNC*/utils/launch.sh | grep -v grep)" = "" ]; then
@@ -388,7 +399,9 @@ exec "\$@"
 log "** SCRIPT EXIT **"
 EOF
 
-echo "${VNC_PASSWORD}" | vncpasswd -f > /usr/local/etc/vscode-dev-containers/vnc-passwd
+if [ -n "${VNC_PASSWORD+x}" ]; then
+    echo "${VNC_PASSWORD}" | vncpasswd -f > /usr/local/etc/vscode-dev-containers/vnc-passwd
+fi
 chmod +x /usr/local/share/desktop-init.sh /usr/local/bin/set-resolution
 
 # Set up fluxbox config
@@ -401,15 +414,23 @@ fi
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
+# Determine the message based on whether VNC_PASSWORD is set
+if [ -n "${VNC_PASSWORD+x}" ]; then
+    PASSWORD_MESSAGE="In both cases, use the password \"${VNC_PASSWORD}\" when connecting"
+else
+    PASSWORD_MESSAGE="In both cases, no password is required."
+fi
+
+# Display the message
 cat << EOF
 
 
 You now have a working desktop! Connect to in one of the following ways:
 
-- Forward port ${NOVNC_PORT} and use a web browser start the noVNC client (recommended)
+- Forward port ${NOVNC_PORT} and use a web browser to start the noVNC client (recommended)
 - Forward port ${VNC_PORT} using VS Code client and connect using a VNC Viewer
 
-In both cases, use the password "${VNC_PASSWORD}" when connecting
+${PASSWORD_MESSAGE}
 
 (*) Done!
 

From 32797f4f693a3bf18a18928ad28bc55589a7ada6 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Wed, 29 May 2024 12:54:52 -0700
Subject: [PATCH 275/478] Automated documentation update (#989)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/desktop-lite/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/desktop-lite/README.md b/src/desktop-lite/README.md
index 7094a2425..6f2d67ce2 100644
--- a/src/desktop-lite/README.md
+++ b/src/desktop-lite/README.md
@@ -16,10 +16,10 @@ Adds a lightweight Fluxbox based desktop to the container that can be accessed u
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
 | version | Currently Unused! | string | latest |
-| noVncVersion | NoVnc Version | string | 1.2.0 |
-| password | Enter a password for desktop connections | string | vscode |
-| webPort | Enter a port for the VNC web client | string | 6080 |
-| vncPort | Enter a port for the desktop VNC server | string | 5901 |
+| noVncVersion | The noVNC version to use | string | 1.2.0 |
+| password | Enter a password for desktop connections. If "noPassword", connections from the local host can be established without entering a password | string | vscode |
+| webPort | Enter a port for the VNC web client (noVNC) | string | 6080 |
+| vncPort | Enter a port for the desktop VNC server (TigerVNC) | string | 5901 |
 
 ## Connecting to the desktop
 

From c1df45b189afae33be72c1ce478452fbfc044abe Mon Sep 17 00:00:00 2001
From: Prabhakar Kumar <64955767+prabhakk-mw@users.noreply.github.com>
Date: Thu, 30 May 2024 03:00:18 +0530
Subject: [PATCH 276/478] Adds /home/USER/.local/bin/ to PATH in
 /etc/sudoers.d/vscode,   (#887)

* Adds /home/USER/.local/bin/ to PATH in /etc/sudoers.d/vscode,  fixes devcontainers/features#870

* Bumping up version to 1.4.2

* Adds to sudoers file if already present

* Tests to ensure Default secure_path is not overwritten

* Bump to version 1.4.4

* Fix version as 1.4.3

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Update src/python/install.sh

Co-authored-by: Prabhakar Kumar <64955767+prabhakk-mw@users.noreply.github.com>

* Update src/python/devcontainer-feature.json

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
---
 src/python/devcontainer-feature.json          |  2 +-
 src/python/install.sh                         | 57 ++++++++++++-------
 test/python/install_jupyterlab.sh             |  3 +
 ...nstall_jupyterlab_existing_sudoers_file.sh | 36 ++++++++++++
 .../Dockerfile                                |  5 ++
 .../sudoers.test                              |  2 +
 test/python/scenarios.json                    | 13 +++++
 7 files changed, 97 insertions(+), 21 deletions(-)
 create mode 100755 test/python/install_jupyterlab_existing_sudoers_file.sh
 create mode 100644 test/python/install_jupyterlab_existing_sudoers_file/Dockerfile
 create mode 100644 test/python/install_jupyterlab_existing_sudoers_file/sudoers.test

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index ef16ee643..7c2c6200a 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/python/install.sh b/src/python/install.sh
index e8a9d24e1..1aad3f631 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -130,7 +130,7 @@ updaterc() {
     fi
 }
 
-# Import the specified key in a variable name passed in as 
+# Import the specified key in a variable name passed in as
 receive_gpg_keys() {
     local keys=${!1}
     local keyring_args=""
@@ -152,7 +152,7 @@ receive_gpg_keys() {
     local retry_count=0
     local gpg_ok="false"
     set +e
-    until [ "${gpg_ok}" = "true" ] || [ "${retry_count}" -eq "5" ]; 
+    until [ "${gpg_ok}" = "true" ] || [ "${retry_count}" -eq "5" ];
     do
         echo "(*) Downloading GPG key..."
         ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys) 2>&1 && gpg_ok="true"
@@ -222,7 +222,7 @@ find_version_from_git_tags() {
     local repository=$2
     local prefix=${3:-"tags/v"}
     local separator=${4:-"."}
-    local last_part_optional=${5:-"false"}    
+    local last_part_optional=${5:-"false"}
     if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
         local escaped_separator=${separator//./\\.}
         local last_part
@@ -282,7 +282,7 @@ find_prev_version_from_git_tags() {
             ((breakfix=breakfix-1))
             if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
                 declare -g ${variable_name}="${major}.${minor}"
-            else 
+            else
                 declare -g ${variable_name}="${major}.${minor}.${breakfix}"
             fi
         fi
@@ -378,13 +378,13 @@ check_packages() {
 
 add_symlink() {
     if [[ ! -d "${CURRENT_PATH}" ]]; then
-        ln -s -r "${INSTALL_PATH}" "${CURRENT_PATH}" 
+        ln -s -r "${INSTALL_PATH}" "${CURRENT_PATH}"
     fi
 
     if [ "${OVERRIDE_DEFAULT_VERSION}" = "true" ]; then
         if [[ $(ls -l ${CURRENT_PATH}) != *"-> ${INSTALL_PATH}"* ]] ; then
             rm "${CURRENT_PATH}"
-            ln -s -r "${INSTALL_PATH}" "${CURRENT_PATH}" 
+            ln -s -r "${INSTALL_PATH}" "${CURRENT_PATH}"
         fi
     fi
 }
@@ -397,7 +397,7 @@ install_openssl3() {
         openssl3_version="3.0"
         # Find version using soft match
         find_version_from_git_tags openssl3_version "https://github.com/openssl/openssl" "openssl-"
-        local tgz_filename="openssl-${openssl3_version}.tar.gz" 
+        local tgz_filename="openssl-${openssl3_version}.tar.gz"
         local tgz_url="https://github.com/openssl/openssl/releases/download/openssl-${openssl3_version}/${tgz_filename}"
         echo "Downloading ${tgz_filename}..."
         curl -sSL -o "/tmp/openssl3/${tgz_filename}" "${tgz_url}"
@@ -434,7 +434,7 @@ install_cpython() {
 }
 
 install_from_source() {
-    VERSION=$1  
+    VERSION=$1
     echo "(*) Building Python ${VERSION} from source..."
     if ! type git > /dev/null 2>&1; then
         check_packages git
@@ -444,7 +444,7 @@ install_from_source() {
     find_version_from_git_tags VERSION "https://github.com/python/cpython"
 
     # Some platforms/os versions need modern versions of openssl installed
-    # via common package repositories, for now rhel-7 family, use case statement to 
+    # via common package repositories, for now rhel-7 family, use case statement to
     # make it easy to expand
     case ${VERSION_CODENAME} in
         centos7|rhel7)
@@ -455,7 +455,7 @@ install_from_source() {
     esac
 
     install_cpython "${VERSION}"
-    if [ -f "/tmp/python-src/${cpython_tgz_filename}" ]; then 
+    if [ -f "/tmp/python-src/${cpython_tgz_filename}" ]; then
         if grep -q "404 Not Found" "/tmp/python-src/${cpython_tgz_filename}"; then
             install_prev_vers_cpython "${VERSION}"
         fi
@@ -512,9 +512,9 @@ install_from_source() {
 }
 
 install_using_oryx() {
-    VERSION=$1 
+    VERSION=$1
     INSTALL_PATH="${PYTHON_INSTALL_PATH}/${VERSION}"
-    
+
     if [ -d "${INSTALL_PATH}" ]; then
         echo "(!) Python version ${VERSION} already exists."
         exit 1
@@ -727,7 +727,7 @@ if [ "${PYTHON_VERSION}" != "none" ]; then
     usermod -a -G python "${USERNAME}"
 
     CURRENT_PATH="${PYTHON_INSTALL_PATH}/current"
-    
+
     install_python ${PYTHON_VERSION}
 
     # Additional python versions to be installed but not be set as default.
@@ -748,7 +748,7 @@ if [ "${PYTHON_VERSION}" != "none" ]; then
         updaterc "if [[ \"\${PATH}\" != *\"${CURRENT_PATH}/bin\"* ]]; then export PATH=${CURRENT_PATH}/bin:\${PATH}; fi"
         PATH="${INSTALL_PATH}/bin:${PATH}"
     fi
-    
+
     # Updates the symlinks for os-provided, or the installed python version in other cases
     chown -R "${USERNAME}:python" "${PYTHON_INSTALL_PATH}"
     chmod -R g+r+w "${PYTHON_INSTALL_PATH}"
@@ -776,7 +776,7 @@ if [[ "${INSTALL_PYTHON_TOOLS}" = "true" ]] && [[ -n "${PYTHON_SRC}" ]]; then
     umask 0002
     mkdir -p ${PIPX_BIN_DIR}
     chown -R "${USERNAME}:pipx" ${PIPX_HOME}
-    chmod -R g+r+w "${PIPX_HOME}" 
+    chmod -R g+r+w "${PIPX_HOME}"
     find "${PIPX_HOME}" -type d -print0 | xargs -0 -n 1 chmod g+s
 
     # Update pip if not using os provided python
@@ -805,21 +805,21 @@ if [[ "${INSTALL_PYTHON_TOOLS}" = "true" ]] && [[ -n "${PYTHON_SRC}" ]]; then
             echo "${util} already installed. Skipping."
         fi
     done
-    
+
     # Temporary: Removes “setup tools” metadata directory due to https://github.com/advisories/GHSA-r9hx-vwmv-q579
-    if [[ $SKIP_VULNERABILITY_PATCHING = "false" ]]; then 
+    if [[ $SKIP_VULNERABILITY_PATCHING = "false" ]]; then
         VULNERABLE_VERSIONS=("3.10" "3.11")
         RUN_TIME_PY_VER_DETECT=$(${PYTHON_SRC} --version 2>&1)
         PY_MAJOR_MINOR_VER=${RUN_TIME_PY_VER_DETECT:7:4};
         if [[ ${VULNERABLE_VERSIONS[*]} =~ $PY_MAJOR_MINOR_VER ]]; then
             rm -rf  ${PIPX_HOME}/shared/lib/"python${PY_MAJOR_MINOR_VER}"/site-packages/setuptools-65.5.0.dist-info
-            if [[ -e "/usr/local/lib/python${PY_MAJOR_MINOR_VER}/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl" ]]; then 
+            if [[ -e "/usr/local/lib/python${PY_MAJOR_MINOR_VER}/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl" ]]; then
                 # remove the vulnerable setuptools-65.5.0-py3-none-any.whl file
                 rm /usr/local/lib/python${PY_MAJOR_MINOR_VER}/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl
                 # create and change to the setuptools_downloaded directory
                 mkdir -p /tmp/setuptools_downloaded
                 cd /tmp/setuptools_downloaded
-                # download the source distribution for setuptools using pip 
+                # download the source distribution for setuptools using pip
                 pip download setuptools==65.5.1 --no-binary :all:
                 # extract the filename of the setuptools-*.tar.gz file
                 filename=$(find . -maxdepth 1 -type f)
@@ -833,7 +833,7 @@ if [[ "${INSTALL_PYTHON_TOOLS}" = "true" ]] && [[ -n "${PYTHON_SRC}" ]]; then
                 python setup.py bdist_wheel
                 # move inside the dist directory in pwd
                 cd dist
-                # copy this file to the ensurepip/_bundled directory 
+                # copy this file to the ensurepip/_bundled directory
                 cp setuptools-65.5.1-py3-none-any.whl /usr/local/lib/python${PY_MAJOR_MINOR_VER}/ensurepip/_bundled/
                 # replace the version in __init__.py file with the installed version
                 sed -i 's/_SETUPTOOLS_VERSION = \"65\.5\.0\"/_SETUPTOOLS_VERSION = "65.5.1"/g' /usr/local/lib/"python${PY_MAJOR_MINOR_VER}"/ensurepip/__init__.py
@@ -865,6 +865,23 @@ if [ "${INSTALL_JUPYTERLAB}" = "true" ]; then
     install_user_package $INSTALL_UNDER_ROOT jupyterlab
     install_user_package $INSTALL_UNDER_ROOT jupyterlab-git
 
+    if [ "$INSTALL_UNDER_ROOT" = false ]; then
+        # JupyterLab would have installed into /home/${USERNAME}/.local/bin
+        # Adding it to default path for Codespaces which use non-login shells
+        SUDOERS_FILE="/etc/sudoers.d/$USERNAME"
+        SEARCH_STR="Defaults secure_path="
+        REPLACE_STR="Defaults secure_path=/home/${USERNAME}/.local/bin"
+
+        if grep -qs ${SEARCH_STR} ${SUDOERS_FILE}; then
+            # string found and file is present
+            sed -i "s|${SEARCH_STR}|${REPLACE_STR}:|g" "${SUDOERS_FILE}"
+        else
+            # either string is not found, or file is not present
+            # In either case take same action, note >> places at end of file
+            echo "${REPLACE_STR}:${PATH}" >> ${SUDOERS_FILE}
+        fi
+    fi
+
     # Configure JupyterLab if needed
     if [ -n "${CONFIGURE_JUPYTERLAB_ALLOW_ORIGIN}" ]; then
         # Resolve config directory
diff --git a/test/python/install_jupyterlab.sh b/test/python/install_jupyterlab.sh
index 58c4f7f54..033b44edd 100755
--- a/test/python/install_jupyterlab.sh
+++ b/test/python/install_jupyterlab.sh
@@ -22,5 +22,8 @@ check "jupyterlab_git" grep jupyterlab_git <<< "$packages"
 # Check for correct JupyterLab configuration
 check "config" grep ".*.allow_origin = '*'" /home/vscode/.jupyter/jupyter_server_config.py
 
+# Check for PATH modification
+check "default path has jupyterlab" sudo grep "/home/${user}/.local/bin" /etc/sudoers.d/$user
+
 # Report result
 reportResults
diff --git a/test/python/install_jupyterlab_existing_sudoers_file.sh b/test/python/install_jupyterlab_existing_sudoers_file.sh
new file mode 100755
index 000000000..22bbc2f92
--- /dev/null
+++ b/test/python/install_jupyterlab_existing_sudoers_file.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Always run these checks as the non-root user
+user="$(whoami)"
+check "user" grep vscode <<< "$user"
+
+# Check for an installation of JupyterLab
+check "version" jupyter lab --version
+
+# Check location of JupyterLab installation
+packages="$(python3 -m pip list)"
+check "location" grep jupyter <<< "$packages"
+
+# Check for git extension
+check "jupyterlab_git" grep jupyterlab_git <<< "$packages"
+
+# Check for correct JupyterLab configuration
+check "config" grep ".*.allow_origin = '*'" /home/vscode/.jupyter/jupyter_server_config.py
+
+# Check for PATH modification
+check "default path has jupyterlab" grep "Defaults secure_path=/home/${user}/.local/bin" /etc/sudoers.d/$user
+
+# Check if previous PATH exists
+check "existing default path is preserved" grep "Defaults secure_path=.*original_content_of_sudoers_file" /etc/sudoers.d/$user
+
+# Check if PATH modification includes original and new paths
+check "existing path included with jupyterlab" grep "Defaults secure_path.*/home/${user}/.local/bin.*original_content_of_sudoers_file" /etc/sudoers.d/$user
+
+
+# Report result
+reportResults
diff --git a/test/python/install_jupyterlab_existing_sudoers_file/Dockerfile b/test/python/install_jupyterlab_existing_sudoers_file/Dockerfile
new file mode 100644
index 000000000..5acb58a37
--- /dev/null
+++ b/test/python/install_jupyterlab_existing_sudoers_file/Dockerfile
@@ -0,0 +1,5 @@
+# Builds an image with a preconfigured SUDOERS file
+# Used to test the install script for JupyterLab which modifies this file
+FROM mcr.microsoft.com/devcontainers/base:focal
+
+COPY --chown=root sudoers.test /etc/sudoers.d/vscode
diff --git a/test/python/install_jupyterlab_existing_sudoers_file/sudoers.test b/test/python/install_jupyterlab_existing_sudoers_file/sudoers.test
new file mode 100644
index 000000000..9a26d777b
--- /dev/null
+++ b/test/python/install_jupyterlab_existing_sudoers_file/sudoers.test
@@ -0,0 +1,2 @@
+# Sudoers File for testing, after install script runs the Defaults secure_path should be appended to
+Defaults secure_path=/original_content_of_sudoers_file
\ No newline at end of file
diff --git a/test/python/scenarios.json b/test/python/scenarios.json
index be37869df..e4fe0f0cd 100644
--- a/test/python/scenarios.json
+++ b/test/python/scenarios.json
@@ -68,6 +68,19 @@
             }
         }
     },
+    "install_jupyterlab_existing_sudoers_file": {
+        "build": {
+            "dockerfile": "Dockerfile"
+        },
+        "remoteUser": "vscode",
+        "features": {
+            "python": {
+                "version": "latest",
+                "installJupyterlab": true,
+                "configureJupyterlabAllowOrigin": "*"
+            }
+        }
+    },
     "install_jupyterlab_rhel_family": {
         "image": "almalinux:8",
         "remoteUser": "vscode",

From b32aa5f0f207e9dc9c5ad36524ed45c6aaec20dd Mon Sep 17 00:00:00 2001
From: Rambaud Pierrick <12rambau@users.noreply.github.com>
Date: Thu, 30 May 2024 19:56:16 +0200
Subject: [PATCH 277/478] fix centos-7 build (#985)

* fix centos-7 build

* Update src/python/install.sh

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Update src/python/install.sh

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Update src/python/install.sh

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* bump(python): 1.5.0 -> 1.5.1

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/python/devcontainer-feature.json | 2 +-
 src/python/install.sh                | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 7c2c6200a..f57568cc6 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/python/install.sh b/src/python/install.sh
index 1aad3f631..94007a9b0 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -390,7 +390,6 @@ add_symlink() {
 }
 
 install_openssl3() {
-    local _prefix=$1
     mkdir /tmp/openssl3
     (
         cd /tmp/openssl3
@@ -403,7 +402,7 @@ install_openssl3() {
         curl -sSL -o "/tmp/openssl3/${tgz_filename}" "${tgz_url}"
         tar xzf ${tgz_filename}
         cd openssl-${openssl3_version}
-        ./config --prefix=${_prefix} --openssldir=${_prefix} --libdir=lib
+        ./config --libdir=lib
         make -j $(nproc)
         make install_dev
     )
@@ -446,11 +445,12 @@ install_from_source() {
     # Some platforms/os versions need modern versions of openssl installed
     # via common package repositories, for now rhel-7 family, use case statement to
     # make it easy to expand
+    SSL_INSTALL_PATH="/usr/local"
     case ${VERSION_CODENAME} in
         centos7|rhel7)
             check_packages perl-IPC-Cmd
-            install_openssl3 ${INSTALL_PATH}
-            ADDL_CONFIG_ARGS="--with-openssl=${INSTALL_PATH} --with-openssl-rpath=${INSTALL_PATH}/lib"
+            install_openssl3
+            ADDL_CONFIG_ARGS="--with-openssl=${SSL_INSTALL_PATH} --with-openssl-rpath=${SSL_INSTALL_PATH}/lib"
             ;;
     esac
 

From dbb135408311512248bfb2b161d52d12936bbaa6 Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Fri, 31 May 2024 05:36:41 +0530
Subject: [PATCH 278/478] [azure-cli] - add support for noble numbat (#986)

* [azure-cli] - add support for noble numbat

* changes requested
---
 src/azure-cli/devcontainer-feature.json | 2 +-
 src/azure-cli/install.sh                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/azure-cli/devcontainer-feature.json b/src/azure-cli/devcontainer-feature.json
index 6b26ef6fc..e73d2295c 100644
--- a/src/azure-cli/devcontainer-feature.json
+++ b/src/azure-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "azure-cli",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "name": "Azure CLI",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/azure-cli",
   "description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/azure-cli/install.sh b/src/azure-cli/install.sh
index a1b254779..2b52ca158 100755
--- a/src/azure-cli/install.sh
+++ b/src/azure-cli/install.sh
@@ -18,7 +18,7 @@ AZ_INSTALLBICEP=${INSTALLBICEP:-false}
 INSTALL_USING_PYTHON=${INSTALLUSINGPYTHON:-false}
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 AZCLI_ARCHIVE_ARCHITECTURES="amd64 arm64"
-AZCLI_ARCHIVE_VERSION_CODENAMES="stretch bookworm buster bullseye bionic focal jammy"
+AZCLI_ARCHIVE_VERSION_CODENAMES="stretch bookworm buster bullseye bionic focal jammy noble"
 
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'

From 1e44a6741d33d65bfaf340b5af6107f0a95441ce Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Mon, 3 Jun 2024 22:15:24 +0530
Subject: [PATCH 279/478] [Java] - Document additionalVersions functionality
 (#987)

* [Java] - Document additionalVersions functionality

* changes requested

* changes as requested in pr review

* bump patch version

* changes requested
---
 src/java/devcontainer-feature.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index 9ed72ad59..c43862610 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "name": "Java (via SDKMAN!)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
@@ -17,6 +17,11 @@
       "default": "latest",
       "description": "Select or enter a Java version to install"
     },
+    "additionalVersions": {
+      "type": "string",
+      "default": "",
+      "description": "Enter additional Java versions, separated by commas."
+    },
     "jdkDistro": {
       "type": "string",
       "proposals": [

From 6a9dd0777c5ac0c9a998728491d0e2e0bca11081 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Mon, 3 Jun 2024 09:52:05 -0700
Subject: [PATCH 280/478] Automated documentation update (#992)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/java/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/java/README.md b/src/java/README.md
index 938cd0f89..1a2d91851 100644
--- a/src/java/README.md
+++ b/src/java/README.md
@@ -16,6 +16,7 @@ Installs Java, SDKMAN! (if not installed), and needed dependencies.
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
 | version | Select or enter a Java version to install | string | latest |
+| additionalVersions | Enter additional Java versions, separated by commas. | string | - |
 | jdkDistro | Select or enter a JDK distribution | string | ms |
 | installGradle | Install Gradle, a build automation tool for multi-language software development | boolean | false |
 | gradleVersion | Select or enter a Gradle version | string | latest |

From 865f69c6a2683603090be0d8c531da1cbf549c9b Mon Sep 17 00:00:00 2001
From: Prathamesh Zarkar <159782310+prathameshzarkar9@users.noreply.github.com>
Date: Wed, 12 Jun 2024 01:06:35 +0530
Subject: [PATCH 281/478] #963 specific powershell module version install
 (#993)

* #963 specific powershell module version install

* review comments addressed

* added test for the version specific module installation and addressed review comments

* Update src/powershell/install.sh

* Update src/powershell/install.sh

* Update src/powershell/install.sh

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/powershell/devcontainer-feature.json   |  4 ++--
 src/powershell/install.sh                  | 16 +++++++++++++---
 test/powershell/install_modules_version.sh | 13 +++++++++++++
 test/powershell/scenarios.json             |  8 ++++++++
 4 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 test/powershell/install_modules_version.sh

diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json
index 82ef39a30..d51b5c03f 100644
--- a/src/powershell/devcontainer-feature.json
+++ b/src/powershell/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "powershell",
-    "version": "1.3.5",
+    "version": "1.4.0",
     "name": "PowerShell",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
     "description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -18,7 +18,7 @@
         "modules": {
             "type": "string",
             "default": "",
-            "description": "Optional comma separated list of PowerShell modules to install."
+            "description": "Optional comma separated list of PowerShell modules to install. If you need to install a specific version of a module, use '==' to specify the version (e.g. 'az.resources==2.5.0')"
         },
         "powershellProfileURL": {
             "type": "string",
diff --git a/src/powershell/install.sh b/src/powershell/install.sh
index 533da6f37..43773b3f6 100755
--- a/src/powershell/install.sh
+++ b/src/powershell/install.sh
@@ -242,14 +242,24 @@ if [ "${use_github}" = "true" ]; then
     install_using_github
 fi
 
-# If PowerShell modules are requested, loop through and install 
+# If PowerShell modules are requested, loop through and install
 if [ ${#POWERSHELL_MODULES[@]} -gt 0 ]; then
     echo "Installing PowerShell Modules: ${POWERSHELL_MODULES}"
     modules=(`echo ${POWERSHELL_MODULES} | tr ',' ' '`)
     for i in "${modules[@]}"
     do
-        echo "Installing ${i}"
-        pwsh -Command "Install-Module -Name ${i} -AllowClobber -Force -Scope AllUsers" || continue
+        module_parts=(`echo ${i} | tr '==' ' '`)
+        module_name="${module_parts[0]}"  
+        args="-Name ${module_name} -AllowClobber -Force -Scope AllUsers"  
+        if [ "${#module_parts[@]}" -eq 2 ]; then
+            module_version="${module_parts[1]}"
+            echo "Installing ${module_name} v${module_version}"
+            args+=" -RequiredVersion ${module_version}"
+        else
+            echo "Installing latest version for ${i} module"
+        fi
+
+        pwsh -Command "Install-Module $args" || continue
     done
 fi
 
diff --git a/test/powershell/install_modules_version.sh b/test/powershell/install_modules_version.sh
new file mode 100644
index 000000000..ea1a3a98c
--- /dev/null
+++ b/test/powershell/install_modules_version.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Extension-specific tests
+check "az.resources" pwsh -Command "(Get-Module -ListAvailable -Name Az.Resources).Version.ToString()" | grep 2.5.0
+check "az.storage" pwsh -Command "(Get-Module -ListAvailable -Name Az.Storage).Version.ToString()" | grep 4.3.0
+
+# Report result
+reportResults
diff --git a/test/powershell/scenarios.json b/test/powershell/scenarios.json
index 6a810b0c9..757a8cc97 100644
--- a/test/powershell/scenarios.json
+++ b/test/powershell/scenarios.json
@@ -16,5 +16,13 @@
         "powershellProfileURL": "https://raw.githubusercontent.com/codspace/powershell-profile/main/Test-Profile.ps1"
       }
     }
+  },
+  "install_modules_version": {
+    "image": "mcr.microsoft.com/devcontainers/base:jammy",
+    "features": {
+      "powershell": {
+        "modules": "az.resources==2.5.0, az.storage==4.3.0"
+      }
+    }
   }
 }

From 22ee16e26000d47f6f2ea03a09d68a7487e4603d Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Tue, 11 Jun 2024 14:09:20 -0700
Subject: [PATCH 282/478] Automated documentation update (#998)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/powershell/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/powershell/README.md b/src/powershell/README.md
index f018778c0..31199a4e1 100644
--- a/src/powershell/README.md
+++ b/src/powershell/README.md
@@ -16,7 +16,7 @@ Installs PowerShell along with needed dependencies. Useful for base Dockerfiles
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
 | version | Select or enter a version of PowerShell. | string | latest |
-| modules | Optional comma separated list of PowerShell modules to install. | string | - |
+| modules | Optional comma separated list of PowerShell modules to install. If you need to install a specific version of a module, use '==' to specify the version (e.g. 'az.resources==2.5.0') | string | - |
 | powershellProfileURL | Optional (publicly accessible) URL to download PowerShell profile. | string | - |
 
 ## Customizations

From 15320f018d0cd72490ba073edb8900968b864ade Mon Sep 17 00:00:00 2001
From: Steven <steven.liekens@gmail.com>
Date: Fri, 14 Jun 2024 02:02:14 +0200
Subject: [PATCH 283/478] dotnet: add ability to install workloads (#997)

* dotnet: add ability to install workloads

* Bump dotnet feature version

* Update NOTES instead of README

* Simplify workloads example

* Fix temp-dir path oopsie

* Improve log message

* Fix typo imstalling->installing

* Install all workloads at once, fix DOTNET vars not taking effect
---
 src/dotnet/NOTES.md                     | 18 +++++++++++-------
 src/dotnet/devcontainer-feature.json    |  7 ++++++-
 src/dotnet/install.sh                   | 17 +++++++++++++++++
 src/dotnet/scripts/dotnet-helpers.sh    | 19 +++++++++++++++----
 test/dotnet/dotnet_helpers.sh           | 14 +++++++++++---
 test/dotnet/install_dotnet_workloads.sh | 24 ++++++++++++++++++++++++
 test/dotnet/scenarios.json              | 12 +++++++++++-
 7 files changed, 95 insertions(+), 16 deletions(-)
 create mode 100644 test/dotnet/install_dotnet_workloads.sh

diff --git a/src/dotnet/NOTES.md b/src/dotnet/NOTES.md
index 578aceaf3..584c90cef 100644
--- a/src/dotnet/NOTES.md
+++ b/src/dotnet/NOTES.md
@@ -2,8 +2,7 @@
 
 Installing only the latest .NET SDK version (the default).
 
-``` json
-{
+``` jsonc
 "features": {
     "ghcr.io/devcontainers/features/dotnet:2": "latest" // or "" or {}
 }
@@ -12,7 +11,6 @@ Installing only the latest .NET SDK version (the default).
 Installing an additional SDK version. Multiple versions can be specified as comma-separated values.
 
 ``` json
-{
 "features": {
     "ghcr.io/devcontainers/features/dotnet:2": {
         "additionalVersions": "lts"
@@ -23,7 +21,6 @@ Installing an additional SDK version. Multiple versions can be specified as comm
 Installing specific SDK versions.
 
 ``` json
-{
 "features": {
     "ghcr.io/devcontainers/features/dotnet:2": {
         "version": "6.0",
@@ -35,7 +32,6 @@ Installing specific SDK versions.
 Installing a specific SDK feature band.
 
 ``` json
-{
 "features": {
     "ghcr.io/devcontainers/features/dotnet:2": {
         "version": "6.0.4xx",
@@ -46,7 +42,6 @@ Installing a specific SDK feature band.
 Installing a specific SDK patch version.
 
 ``` json
-{
 "features": {
     "ghcr.io/devcontainers/features/dotnet:2": {
         "version": "6.0.412",
@@ -57,7 +52,6 @@ Installing a specific SDK patch version.
 Installing only the .NET Runtime or the ASP.NET Core Runtime. (The SDK includes all runtimes so this configuration is only useful if you need to run .NET apps without building them from source.)
 
 ``` json
-{
 "features": {
     "ghcr.io/devcontainers/features/dotnet:2": {
         "version": "none",
@@ -67,6 +61,16 @@ Installing only the .NET Runtime or the ASP.NET Core Runtime. (The SDK includes
 }
 ```
 
+Installing .NET workloads. Multiple workloads can be specified as comma-separated values.
+
+``` json
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+      "workloads": "aspire, wasm-tools"
+    }
+}
+```
+
 ## OS Support
 
 This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index 8b8ffaf2a..fa80799a5 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.0.6",
+    "version": "2.1.0",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
@@ -32,6 +32,11 @@
             "type": "string",
             "default": "",
             "description": "Enter additional ASP.NET Core runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
+        },
+        "workloads": {
+            "type": "string",
+            "default": "",
+            "description": "Enter additional .NET SDK workloads, separated by commas. Use 'dotnet workload search' to learn what workloads are available to install."
         }
     },
     "containerEnv": {
diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh
index 237a8a0be..d289ea2a4 100644
--- a/src/dotnet/install.sh
+++ b/src/dotnet/install.sh
@@ -10,6 +10,14 @@ DOTNET_VERSION="${VERSION:-"latest"}"
 ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 DOTNET_RUNTIME_VERSIONS="${DOTNETRUNTIMEVERSIONS:-""}"
 ASPNETCORE_RUNTIME_VERSIONS="${ASPNETCORERUNTIMEVERSIONS:-""}"
+WORKLOADS="${WORKLOADS:-""}"
+
+# Prevent "Welcome to .NET" message from dotnet
+export DOTNET_NOLOGO=true
+
+# Prevent generating a development certificate while running this script
+# Otherwise it would be stored in the image, which is undesirable
+export DOTNET_GENERATE_ASPNET_CERTIFICATE=false
 
 set -e
 
@@ -111,6 +119,15 @@ for version in "${aspNetCoreRuntimeVersions[@]}"; do
     install_runtime "aspnetcore" "$version"
 done
 
+workloads=()
+for workload in $(split_csv "$WORKLOADS"); do
+    workloads+=("$workload")
+done
+
+if [ ${#workloads[@]} -ne 0 ]; then
+    install_workloads "${workloads[@]}"
+fi
+
 # Clean up
 rm -rf /var/lib/apt/lists/*
 rm -rf scripts
diff --git a/src/dotnet/scripts/dotnet-helpers.sh b/src/dotnet/scripts/dotnet-helpers.sh
index bda0c9c3a..b7024c9d1 100644
--- a/src/dotnet/scripts/dotnet-helpers.sh
+++ b/src/dotnet/scripts/dotnet-helpers.sh
@@ -25,7 +25,6 @@ fetch_latest_version_in_channel() {
     else
         wget -qO- "https://dotnetcli.azureedge.net/dotnet/Sdk/$channel/latest.version"
     fi
-    
 }
 
 # Prints the latest dotnet version
@@ -76,12 +75,11 @@ install_sdk() {
     fi
     
     # Currently this script does not make it possible to qualify the version, 'GA' is always implied
-    echo "Executing $DOTNET_INSTALL_SCRIPT --version $version --channel $channel --install-dir $DOTNET_INSTALL_DIR --no-path"
+    echo "Executing $DOTNET_INSTALL_SCRIPT --version $version --channel $channel --install-dir $DOTNET_INSTALL_DIR"
     "$DOTNET_INSTALL_SCRIPT" \
         --version "$version" \
         --channel "$channel" \
-        --install-dir "$DOTNET_INSTALL_DIR" \
-        --no-path
+        --install-dir "$DOTNET_INSTALL_DIR"
 }
 
 # Installs a version of the .NET Runtime
@@ -117,3 +115,16 @@ install_runtime() {
         --install-dir "$DOTNET_INSTALL_DIR" \
         --no-path
 }
+
+# Installs one or more .NET workloads
+# Usage: install_workload <workload_id> [<workload_id> ...]
+# Reference: https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-workload-install
+install_workloads() {
+    local workloads="$@"
+
+    echo "Installing .NET workload(s) $workloads"
+    dotnet workload install $workloads --temp-dir /tmp/dotnet-workload-temp-dir
+
+    # Clean up
+    rm -r /tmp/dotnet-workload-temp-dir
+}
diff --git a/test/dotnet/dotnet_helpers.sh b/test/dotnet/dotnet_helpers.sh
index 6c833b444..a24bd1ce2 100644
--- a/test/dotnet/dotnet_helpers.sh
+++ b/test/dotnet/dotnet_helpers.sh
@@ -15,7 +15,6 @@ fetch_latest_version_in_channel() {
     else
         wget -qO- "https://dotnetcli.azureedge.net/dotnet/Sdk/$channel/latest.version"
     fi
-    
 }
 
 # Prints the latest dotnet version
@@ -47,7 +46,6 @@ is_dotnet_sdk_version_installed() {
     return $?
 }
 
-
 # Asserts that the specified .NET Runtime version is installed
 # Returns a non-zero exit code if the check fails
 # Usage: is_dotnet_runtime_version_installed <version>
@@ -68,4 +66,14 @@ is_aspnetcore_runtime_version_installed() {
     local expected="$1"
     dotnet --list-runtimes | grep --fixed-strings --silent "Microsoft.AspNetCore.App $expected"
     return $?
-}
\ No newline at end of file
+}
+
+# Asserts that the specified workload is installed
+# Returns a non-zero exit code if the check fails
+# Usage: is_dotnet_workload_installed <workload_id>
+# Example: is_dotnet_workload_installed "aspire"
+is_dotnet_workload_installed() {
+    local expected="$1"
+    dotnet workload list | grep --fixed-strings --silent "$expected"
+    return $?
+}
diff --git a/test/dotnet/install_dotnet_workloads.sh b/test/dotnet/install_dotnet_workloads.sh
new file mode 100644
index 000000000..37c86a2d4
--- /dev/null
+++ b/test/dotnet/install_dotnet_workloads.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
+# Provides the 'check' and 'reportResults' commands.
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
+# check <LABEL> <cmd> [args...]
+source dotnet_env.sh
+source dotnet_helpers.sh
+
+check "Aspire is installed" \
+is_dotnet_workload_installed "aspire"
+
+check "WASM tools are installed" \
+is_dotnet_workload_installed "wasm-tools"
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults
diff --git a/test/dotnet/scenarios.json b/test/dotnet/scenarios.json
index f07aaa508..2fd74f587 100644
--- a/test/dotnet/scenarios.json
+++ b/test/dotnet/scenarios.json
@@ -81,5 +81,15 @@
                 "aspnetcoreRuntimeVersions": "latest"
             }
         }
+    },
+    "install_dotnet_workloads": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "remoteUser": "vscode",
+        "features": {
+            "dotnet": {
+                "version": "latest",
+                "workloads": "aspire, wasm-tools"
+            }
+        }
     }
-}
\ No newline at end of file
+}

From 1045404ea6fe783df230cfc1c022c777a8a67349 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Thu, 13 Jun 2024 17:10:34 -0700
Subject: [PATCH 284/478] Automated documentation update (#1001)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/dotnet/README.md | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/dotnet/README.md b/src/dotnet/README.md
index 972e5d426..fecaeb3f3 100644
--- a/src/dotnet/README.md
+++ b/src/dotnet/README.md
@@ -19,6 +19,7 @@ This Feature installs the latest .NET SDK, which includes the .NET CLI and the s
 | additionalVersions | Enter additional .NET SDK versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version. | string | - |
 | dotnetRuntimeVersions | Enter additional .NET runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version. | string | - |
 | aspNetCoreRuntimeVersions | Enter additional ASP.NET Core runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version. | string | - |
+| workloads | Enter additional .NET SDK workloads, separated by commas. Use 'dotnet workload search' to learn what workloads are available to install. | string | - |
 
 ## Customizations
 
@@ -30,8 +31,7 @@ This Feature installs the latest .NET SDK, which includes the .NET CLI and the s
 
 Installing only the latest .NET SDK version (the default).
 
-``` json
-{
+``` jsonc
 "features": {
     "ghcr.io/devcontainers/features/dotnet:2": "latest" // or "" or {}
 }
@@ -40,7 +40,6 @@ Installing only the latest .NET SDK version (the default).
 Installing an additional SDK version. Multiple versions can be specified as comma-separated values.
 
 ``` json
-{
 "features": {
     "ghcr.io/devcontainers/features/dotnet:2": {
         "additionalVersions": "lts"
@@ -51,7 +50,6 @@ Installing an additional SDK version. Multiple versions can be specified as comm
 Installing specific SDK versions.
 
 ``` json
-{
 "features": {
     "ghcr.io/devcontainers/features/dotnet:2": {
         "version": "6.0",
@@ -63,7 +61,6 @@ Installing specific SDK versions.
 Installing a specific SDK feature band.
 
 ``` json
-{
 "features": {
     "ghcr.io/devcontainers/features/dotnet:2": {
         "version": "6.0.4xx",
@@ -74,7 +71,6 @@ Installing a specific SDK feature band.
 Installing a specific SDK patch version.
 
 ``` json
-{
 "features": {
     "ghcr.io/devcontainers/features/dotnet:2": {
         "version": "6.0.412",
@@ -85,7 +81,6 @@ Installing a specific SDK patch version.
 Installing only the .NET Runtime or the ASP.NET Core Runtime. (The SDK includes all runtimes so this configuration is only useful if you need to run .NET apps without building them from source.)
 
 ``` json
-{
 "features": {
     "ghcr.io/devcontainers/features/dotnet:2": {
         "version": "none",
@@ -95,6 +90,16 @@ Installing only the .NET Runtime or the ASP.NET Core Runtime. (The SDK includes
 }
 ```
 
+Installing .NET workloads. Multiple workloads can be specified as comma-separated values.
+
+``` json
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+      "workloads": "aspire, wasm-tools"
+    }
+}
+```
+
 ## OS Support
 
 This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.

From 05a4cbf9f4f76890fc90045ca7bfb69e682300dc Mon Sep 17 00:00:00 2001
From: Steven <steven.liekens@gmail.com>
Date: Wed, 19 Jun 2024 20:48:11 +0200
Subject: [PATCH 285/478] dotnet: make 'dotnet' available to 'sudo' commands
 (#1007)

* dotnet: use predefined DOTNET_ROOT in install script

* dotnet: create symbolic link in /usr/bin

* dotnet: bump patch version

* dotnet: add test for install dir and symlink

* Remove unneeded --force
---
 src/dotnet/devcontainer-feature.json | 2 +-
 src/dotnet/install.sh                | 6 ++++++
 src/dotnet/scripts/dotnet-helpers.sh | 9 ++++-----
 test/dotnet/test.sh                  | 6 ++++++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index fa80799a5..a9fa62901 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh
index d289ea2a4..4e149e2f0 100644
--- a/src/dotnet/install.sh
+++ b/src/dotnet/install.sh
@@ -128,6 +128,12 @@ if [ ${#workloads[@]} -ne 0 ]; then
     install_workloads "${workloads[@]}"
 fi
 
+# Create a symbolic link '/usr/bin/dotnet', to make dotnet available to 'sudo'
+# This is necessary because 'sudo' resets the PATH variable, so it won't search the DOTNET_ROOT directory
+if [ ! -e /usr/bin/dotnet ]; then
+    ln --symbolic "$DOTNET_ROOT/dotnet" /usr/bin/dotnet
+fi
+
 # Clean up
 rm -rf /var/lib/apt/lists/*
 rm -rf scripts
diff --git a/src/dotnet/scripts/dotnet-helpers.sh b/src/dotnet/scripts/dotnet-helpers.sh
index b7024c9d1..26e29fa36 100644
--- a/src/dotnet/scripts/dotnet-helpers.sh
+++ b/src/dotnet/scripts/dotnet-helpers.sh
@@ -8,7 +8,6 @@
 # Maintainer: The Dev Container spec maintainers
 DOTNET_SCRIPTS=$(dirname "${BASH_SOURCE[0]}")
 DOTNET_INSTALL_SCRIPT="$DOTNET_SCRIPTS/vendor/dotnet-install.sh"
-DOTNET_INSTALL_DIR='/usr/share/dotnet'
 
 # Prints the latest dotnet version in the specified channel
 # Usage: fetch_latest_version_in_channel <channel> [<runtime>]
@@ -75,11 +74,11 @@ install_sdk() {
     fi
     
     # Currently this script does not make it possible to qualify the version, 'GA' is always implied
-    echo "Executing $DOTNET_INSTALL_SCRIPT --version $version --channel $channel --install-dir $DOTNET_INSTALL_DIR"
+    echo "Executing $DOTNET_INSTALL_SCRIPT --version $version --channel $channel --install-dir $DOTNET_ROOT"
     "$DOTNET_INSTALL_SCRIPT" \
         --version "$version" \
         --channel "$channel" \
-        --install-dir "$DOTNET_INSTALL_DIR"
+        --install-dir "$DOTNET_ROOT"
 }
 
 # Installs a version of the .NET Runtime
@@ -107,12 +106,12 @@ install_runtime() {
         version="$inputVersion"
     fi
     
-    echo "Executing $DOTNET_INSTALL_SCRIPT --runtime $runtime --version $version --channel $channel --install-dir $DOTNET_INSTALL_DIR --no-path"
+    echo "Executing $DOTNET_INSTALL_SCRIPT --runtime $runtime --version $version --channel $channel --install-dir $DOTNET_ROOT --no-path"
     "$DOTNET_INSTALL_SCRIPT" \
         --runtime "$runtime" \
         --version "$version" \
         --channel "$channel" \
-        --install-dir "$DOTNET_INSTALL_DIR" \
+        --install-dir "$DOTNET_ROOT" \
         --no-path
 }
 
diff --git a/test/dotnet/test.sh b/test/dotnet/test.sh
index cd23edcf1..50d79941f 100644
--- a/test/dotnet/test.sh
+++ b/test/dotnet/test.sh
@@ -13,6 +13,12 @@ source dev-container-features-test-lib
 source dotnet_env.sh
 source dotnet_helpers.sh
 
+check "dotnet is installed in DOTNET_ROOT and execute permission is granted" \
+test -x "$DOTNET_ROOT/dotnet" 
+
+check "dotnet is symlinked correctly in /usr/bin" \
+test -L /usr/bin/dotnet -a "$(readlink -f /usr/bin/dotnet)" = "$DOTNET_ROOT/dotnet"
+
 expected=$(fetch_latest_version)
 
 check "Latest .NET SDK version installed" \

From 7953318c38a98d6bba8c8e78f7fb5bce095d7619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20H=C3=B6chenberger?=
 <richard.hoechenberger@gmail.com>
Date: Wed, 19 Jun 2024 21:05:01 +0200
Subject: [PATCH 286/478] Fix a typo shared among many installation scripts
 (#1006)

* Fix a typo shared among many installation scripts

`retring` -> `retrying`

* Bump patch versions
---
 src/git-lfs/devcontainer-feature.json                     | 2 +-
 src/git-lfs/install.sh                                    | 2 +-
 src/git/devcontainer-feature.json                         | 2 +-
 src/git/install.sh                                        | 2 +-
 src/github-cli/devcontainer-feature.json                  | 2 +-
 src/github-cli/install.sh                                 | 2 +-
 src/python/devcontainer-feature.json                      | 2 +-
 src/python/install.sh                                     | 4 ++--
 src/ruby/devcontainer-feature.json                        | 2 +-
 src/ruby/install.sh                                       | 2 +-
 src/terraform/devcontainer-feature.json                   | 2 +-
 src/terraform/install.sh                                  | 4 ++--
 test/python/install_cpython_fallback_prev_version_test.sh | 4 ++--
 test/ruby/ruby_fallback_test.sh                           | 2 +-
 14 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/git-lfs/devcontainer-feature.json b/src/git-lfs/devcontainer-feature.json
index ccdd99950..0c6dccad2 100644
--- a/src/git-lfs/devcontainer-feature.json
+++ b/src/git-lfs/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git-lfs",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "name": "Git Large File Support (LFS)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git-lfs",
     "description": "Installs Git Large File Support (Git LFS) along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like git and curl.",
diff --git a/src/git-lfs/install.sh b/src/git-lfs/install.sh
index 2259cef59..4d14c9918 100755
--- a/src/git-lfs/install.sh
+++ b/src/git-lfs/install.sh
@@ -82,7 +82,7 @@ receive_gpg_keys() {
         echo "(*) Downloading GPG key..."
         ( echo "${keys}" | xargs -n 1 gpg --recv-keys) 2>&1 && gpg_ok="true"
         if [ "${gpg_ok}" != "true" ]; then
-            echo "(*) Failed getting key, retring in 10s..."
+            echo "(*) Failed getting key, retrying in 10s..."
             (( retry_count++ ))
             sleep 10s
         fi
diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
index 8d88c4f3b..02c155cef 100644
--- a/src/git/devcontainer-feature.json
+++ b/src/git/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
diff --git a/src/git/install.sh b/src/git/install.sh
index 8a0731933..706beb4f2 100644
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -84,7 +84,7 @@ receive_gpg_keys() {
         echo "(*) Downloading GPG key..."
         ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys) 2>&1 && gpg_ok="true"
         if [ "${gpg_ok}" != "true" ]; then
-            echo "(*) Failed getting key, retring in 10s..."
+            echo "(*) Failed getting key, retrying in 10s..."
             (( retry_count++ ))
             sleep 10s
         fi
diff --git a/src/github-cli/devcontainer-feature.json b/src/github-cli/devcontainer-feature.json
index c47f4ac0d..61b249fde 100644
--- a/src/github-cli/devcontainer-feature.json
+++ b/src/github-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "github-cli",
-    "version": "1.0.11",
+    "version": "1.0.12",
     "name": "GitHub CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/github-cli",
     "description": "Installs the GitHub CLI. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/github-cli/install.sh b/src/github-cli/install.sh
index 2cdc0a684..2f196c981 100755
--- a/src/github-cli/install.sh
+++ b/src/github-cli/install.sh
@@ -49,7 +49,7 @@ receive_gpg_keys() {
         echo "(*) Downloading GPG key..."
         ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys) 2>&1 && gpg_ok="true"
         if [ "${gpg_ok}" != "true" ]; then
-            echo "(*) Failed getting key, retring in 10s..."
+            echo "(*) Failed getting key, retrying in 10s..."
             (( retry_count++ ))
             sleep 10s
         fi
diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index f57568cc6..27417c63e 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/python/install.sh b/src/python/install.sh
index 94007a9b0..7da236e0e 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -157,7 +157,7 @@ receive_gpg_keys() {
         echo "(*) Downloading GPG key..."
         ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys) 2>&1 && gpg_ok="true"
         if [ "${gpg_ok}" != "true" ]; then
-            echo "(*) Failed getting key, retring in 10s..."
+            echo "(*) Failed getting key, retrying in 10s..."
             (( retry_count++ ))
             sleep 10s
         fi
@@ -202,7 +202,7 @@ receive_gpg_keys_centos7() {
                 fi
             done
             if [ "${gpg_ok}" != "true" ]; then
-                echo "(*) Failed getting key, retring in 10s..."
+                echo "(*) Failed getting key, retrying in 10s..."
                 (( retry_count++ ))
                 sleep 10s
             fi
diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json
index 3722cab06..2a95fef8b 100644
--- a/src/ruby/devcontainer-feature.json
+++ b/src/ruby/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "name": "Ruby (via rvm)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
     "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
diff --git a/src/ruby/install.sh b/src/ruby/install.sh
index 8f95829da..a0a97f0b1 100755
--- a/src/ruby/install.sh
+++ b/src/ruby/install.sh
@@ -94,7 +94,7 @@ receive_gpg_keys() {
         echo "(*) Downloading GPG key..."
         ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys) 2>&1 && gpg_ok="true"
         if [ "${gpg_ok}" != "true" ]; then
-            echo "(*) Failed getting key, retring in 10s..."
+            echo "(*) Failed getting key, retrying in 10s..."
             (( retry_count++ ))
             sleep 10s
         fi
diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index 5c9c042cc..c4294efd4 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.3.6",
+    "version": "1.3.7",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index dc7aef8c3..93d27ac7a 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -72,7 +72,7 @@ receive_gpg_keys() {
         echo "(*) Downloading GPG key..."
         ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys) 2>&1 && gpg_ok="true"
         if [ "${gpg_ok}" != "true" ]; then
-            echo "(*) Failed getting key, retring in 10s..."
+            echo "(*) Failed getting key, retrying in 10s..."
             (( retry_count++ ))
             sleep 10s
         fi
@@ -90,7 +90,7 @@ receive_gpg_keys() {
             echo "(*) Downloading GPG key..."
             ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys --keyserver ${keyserver_ip_address}) 2>&1 && gpg_ok="true"
             if [ "${gpg_ok}" != "true" ]; then
-                echo "(*) Failed getting key, retring in 10s..."
+                echo "(*) Failed getting key, retrying in 10s..."
                 (( retry_count++ ))
                 sleep 10s
             fi
diff --git a/test/python/install_cpython_fallback_prev_version_test.sh b/test/python/install_cpython_fallback_prev_version_test.sh
index 7056dba0c..85275c73b 100644
--- a/test/python/install_cpython_fallback_prev_version_test.sh
+++ b/test/python/install_cpython_fallback_prev_version_test.sh
@@ -120,7 +120,7 @@ receive_gpg_keys() {
         echo "(*) Downloading GPG key..."
         ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys) 2>&1 && gpg_ok="true"
         if [ "${gpg_ok}" != "true" ]; then
-            echo "(*) Failed getting key, retring in 10s..."
+            echo "(*) Failed getting key, retrying in 10s..."
             (( retry_count++ ))
             sleep 10s
         fi
@@ -165,7 +165,7 @@ receive_gpg_keys_centos7() {
                 fi
             done
             if [ "${gpg_ok}" != "true" ]; then
-                echo "(*) Failed getting key, retring in 10s..."
+                echo "(*) Failed getting key, retrying in 10s..."
                 (( retry_count++ ))
                 sleep 10s
             fi
diff --git a/test/ruby/ruby_fallback_test.sh b/test/ruby/ruby_fallback_test.sh
index fe1a9c77b..1e65e28e5 100644
--- a/test/ruby/ruby_fallback_test.sh
+++ b/test/ruby/ruby_fallback_test.sh
@@ -85,7 +85,7 @@ receive_gpg_keys() {
         echo "(*) Downloading GPG key..."
         ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys) 2>&1 && gpg_ok="true"
         if [ "${gpg_ok}" != "true" ]; then
-            echo "(*) Failed getting key, retring in 10s..."
+            echo "(*) Failed getting key, retrying in 10s..."
             (( retry_count++ ))
             sleep 10s
         fi

From 62f7f7f448bf08701462ebcd15839888f7828329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20H=C3=B6chenberger?=
 <richard.hoechenberger@gmail.com>
Date: Thu, 20 Jun 2024 23:07:17 +0200
Subject: [PATCH 287/478] Allow installing `yarn` via `corepack` on
 Debian-based systems, too (#1009)

* Allow installing `yarn` via `corepack` on Debian-based systems, too

The default behavior remains unchanged, but users can now opt-out from the APT-based installation to get the latest `yarn` via `corepack`.

Closes #1004

* Update src/node/devcontainer-feature.json

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Update src/node/devcontainer-feature.json

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Rename variable

* Expand comment

* Add test scenario

* Improve tests

* Update test/node/debian_yarn_from_corepack.sh

* Betetr comments

* Update src/node/devcontainer-feature.json

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/node/devcontainer-feature.json     |  7 ++++++-
 src/node/install.sh                    |  8 +++++---
 test/node/debian_yarn_from_corepack.sh | 20 ++++++++++++++++++++
 test/node/scenarios.json               |  8 ++++++++
 4 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100755 test/node/debian_yarn_from_corepack.sh

diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index f15ae4a4d..4e67aa6de 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.4.1",
+    "version": "1.5.0",
     "name": "Node.js (via nvm), yarn and pnpm",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
@@ -36,6 +36,11 @@
             ],
             "default": "latest",
             "description": "Version of NVM to install."
+        },
+        "installYarnUsingApt": {
+            "type": "boolean",
+            "default": true,
+            "description": "On Debian and Ubuntu systems, you have the option to install Yarn globally via APT. If you choose not to use this option, Yarn will be set up using Corepack instead. This choice is specific to Debian and Ubuntu; for other Linux distributions, Yarn is always installed using Corepack, with a fallback to installation via NPM if an error occurs."
         }
     },
     "customizations": {
diff --git a/src/node/install.sh b/src/node/install.sh
index 11a123534..5e833c6fe 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -11,6 +11,7 @@ export NODE_VERSION="${VERSION:-"lts"}"
 export NVM_VERSION="${NVMVERSION:-"latest"}"
 export NVM_DIR="${NVMINSTALLPATH:-"/usr/local/share/nvm"}"
 INSTALL_TOOLS_FOR_NODE_GYP="${NODEGYPDEPENDENCIES:-true}"
+export INSTALL_YARN_USING_APT="${INSTALLYARNUSINGAPT:-true}"  # only concerns Debian-based systems
 
 # Comma-separated list of node versions to be installed (with nvm)
 # alongside NODE_VERSION, but not set as default.
@@ -188,7 +189,7 @@ find_version_from_git_tags() {
 }
 
 install_yarn() {
-    if [ "${ADJUSTED_ID}" = "debian" ]; then
+    if [ "${ADJUSTED_ID}" = "debian" ] && [ "${INSTALL_YARN_USING_APT}" = "true" ]; then
         # for backward compatiblity with existing devcontainer features, install yarn
         # via apt-get on Debian systems
         if ! type yarn >/dev/null 2>&1; then
@@ -202,8 +203,9 @@ install_yarn() {
         fi
     else
         local _ver=${1:-node}
-        # on non-debian systems, prefer corepack, fallback to npm based installation of yarn...
-        # Try to leverage corepack if possible
+        # on non-debian systems or if user opted not to use APT, prefer corepack
+        # Fallback to npm based installation of yarn.
+        # But try to leverage corepack if possible
         # From https://yarnpkg.com:
         # The preferred way to manage Yarn is by-project and through Corepack, a tool
         # shipped by default with Node.js. Modern releases of Yarn aren't meant to be
diff --git a/test/node/debian_yarn_from_corepack.sh b/test/node/debian_yarn_from_corepack.sh
new file mode 100755
index 000000000..97d21ca56
--- /dev/null
+++ b/test/node/debian_yarn_from_corepack.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+YARN_VERSION="4.3.0"
+
+# Corepack provides shims for package managers like yarn. The first time yarn is invoked via the "yarn"
+# command, corepack will interactively request permission to download the yarn binary. To
+# avoid this interactive mode and download the binary automatically, we explicitly call "corepack use yarn"
+# instead (doesn't require user input). Once that command completes, "yarn" can be used in a non-interactive mode.
+check "yarn shim location" bash -c ". /usr/local/share/nvm/nvm.sh && type yarn &> /dev/null"
+check "download yarn" bash -c ". /usr/local/share/nvm/nvm.sh && corepack use yarn@${YARN_VERSION}"
+check "yarn version" bash -c ". /usr/local/share/nvm/nvm.sh && yarn --version | grep ${YARN_VERSION}"
+
+# Report result
+reportResults
diff --git a/test/node/scenarios.json b/test/node/scenarios.json
index 954c2c2e9..4f07e5ac3 100644
--- a/test/node/scenarios.json
+++ b/test/node/scenarios.json
@@ -185,5 +185,13 @@
                 "version": "lts"
             }
         }
+    },
+    "debian_yarn_from_corepack": {
+        "image": "debian:11",
+        "features": {
+            "node": {
+                "installYarnUsingApt": false
+            }
+        }
     }
 }
\ No newline at end of file

From 414d3450434b9072f01afe80cab226c60088224a Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Thu, 20 Jun 2024 14:09:43 -0700
Subject: [PATCH 288/478] Automated documentation update (#1013)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/node/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/node/README.md b/src/node/README.md
index 6ac1b0ff0..dff3f8bfe 100644
--- a/src/node/README.md
+++ b/src/node/README.md
@@ -19,6 +19,7 @@ Installs Node.js, nvm, yarn, pnpm, and needed dependencies.
 | nodeGypDependencies | Install dependencies to compile native node modules (node-gyp)? | boolean | true |
 | nvmInstallPath | The path where NVM will be installed. | string | /usr/local/share/nvm |
 | nvmVersion | Version of NVM to install. | string | latest |
+| installYarnUsingApt | On Debian and Ubuntu systems, you have the option to install Yarn globally via APT. If you choose not to use this option, Yarn will be set up using Corepack instead. This choice is specific to Debian and Ubuntu; for other Linux distributions, Yarn is always installed using Corepack, with a fallback to installation via NPM if an error occurs. | boolean | true |
 
 ## Customizations
 

From 694906e3c18ddf66b8b6c691fe07489476b2ffc6 Mon Sep 17 00:00:00 2001
From: Jonathan Backhaus <jonbackhaus@users.noreply.github.com>
Date: Thu, 27 Jun 2024 14:59:08 -0400
Subject: [PATCH 289/478] Add support for Alpine to `git` feature (#1008)

* feat: add basic scaffolding for alpine, based on debian implementation

* feat: add baseline packages from <https://github.com/alpinelinux/aports/blob/master/main/git/APKBUILD>

* fix: add `curl` package (needed for version lookup)

* feat: use `jq`-based version matching implementation for alpine

the alpine version of `grep` doesn't support PCRE

* fix: forgot to strip the leading "v" from the version number

* fix: need `make` package to build from source

* feat: parameterize make options to easily inject Alpine-specific option

* fix: wip: latest baseline (still breaking due to musl)

* feat: add basic scaffolding for alpine, based on debian implementation

note: this won't install from source (due to build issues with musl) but will install using the `apk` package manager

* chore: chmod +x

* chore: bump semver (proposed)

* docs: add Alpine/apk to notes

* test: add test for `alpine:3` to install system package

note: feature does not currently implement building from source on Alpine

* fix: working build from source!

still need to tweak the package dependencies and make config

* perf: remove OBE `gettext-dev` package from dependencies

no longer required with "NO_GETTEXT=YesPlease" make config

* perf: remove OBE `libintl` package from dependencies

no longer required with "NO_GETTEXT=YesPlease" make config (?)

* feat: add remaining make options from apk package source reference

* docs: add refs. for alpine build from source

* test(git): add test case for building git from src on alpine:3

* fix: lint: SC2068: Double quote array expansions to avoid re-splitting elements

* fix: use Devcontainer Alpine image as base (because it has `bash` installed); refactor test script names to remove major version suffix (since it isn't specified in the associated image tag)

* perf: consolidate to a single, jq-based implementation

using `jq` avoids the need for PCRE `grep` expression (not supported in Alpine)

* fix: set `sysconfdir` option for alpine build as well

see [#395](https://github.com/devcontainers/features/pull/395)

* test: fix: alpine doesn't include perl support; leverage test cases from `install_git_from_src.sh` script

* style: remove unused options

* fix: set `prefix` option for alpine build to be consistent with other builds

see [#395](https://github.com/devcontainers/features/pull/395)

* refactor: move common arguments out of distro-specific logic

* perf: minimum set of make options for building git from source in Alpine

* chore: remove OBE code (unused make options for Git)

* style: whitespace

* test: fix: remove `gettext` check (since this package isn't installed in Alpine)

* feat: update implementation based on local Git feature in `base-alpine` image

* feat: remove `libsecret-dev` package

not present in local Git feature in `base-alpine` image `install.sh` script

* feat: switch `glib-dev` to `g++` and `gcc` packages, based on local Git feature in `base-alpine` image

* chore: remove `alpine-sdk` package, based on local Git feature in `base-alpine` image

no longer needed, based on initial testing

* revert: switch back to `grep`-based PCRE implementation,  based on local Git feature in `base-alpine` image

`jq` package no longer needed

* test: revert: remove test cases (covered by generic `install_git_from_src.sh`)

* test: fix: remove perl check for system package in Alpine (because the system package is not built with PCRE support)

---------

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
---
 src/git/NOTES.md                           |  2 +-
 src/git/devcontainer-feature.json          |  2 +-
 src/git/install.sh                         | 40 +++++++++++++++++++++-
 test/git/install_git_from_src_alpine.sh    | 16 +++++++++
 test/git/install_git_from_system_alpine.sh | 15 ++++++++
 test/git/scenarios.json                    | 18 ++++++++++
 6 files changed, 90 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 src/git/install.sh
 create mode 100644 test/git/install_git_from_src_alpine.sh
 create mode 100644 test/git/install_git_from_system_alpine.sh

diff --git a/src/git/NOTES.md b/src/git/NOTES.md
index e809f2099..507ba8e8b 100644
--- a/src/git/NOTES.md
+++ b/src/git/NOTES.md
@@ -2,6 +2,6 @@
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and RockyLinux distributions with the `apt`, `yum`, `dnf`, or `microdnf` package manager installed.
+This Feature should work on recent versions of Alpine, Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and RockyLinux distributions with the `apk`, `apt`, `yum`, `dnf`, or `microdnf` package manager installed.
 
 `bash` is required to execute the `install.sh` script.
diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
index 02c155cef..4eef35df0 100644
--- a/src/git/devcontainer-feature.json
+++ b/src/git/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.2.1",
+    "version": "1.3.0",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
diff --git a/src/git/install.sh b/src/git/install.sh
old mode 100644
new mode 100755
index 706beb4f2..133bff8b1
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -26,6 +26,8 @@ fi
 # Get an adjusted ID independent of distro variants
 if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
     ADJUSTED_ID="debian"
+elif [ "${ID}" = "alpine" ]; then
+    ADJUSTED_ID="alpine"
 elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
     ADJUSTED_ID="rhel"
     VERSION_CODENAME="${ID}{$VERSION_ID}"
@@ -36,6 +38,8 @@ fi
 
 if type apt-get > /dev/null 2>&1; then
     INSTALL_CMD=apt-get
+elif type apk > /dev/null 2>&1; then
+    INSTALL_CMD=apk
 elif type microdnf > /dev/null 2>&1; then
     INSTALL_CMD=microdnf
 elif type dnf > /dev/null 2>&1; then
@@ -53,6 +57,9 @@ clean_up() {
         debian)
             rm -rf /var/lib/apt/lists/*
             ;;
+        alpine)
+            rm -rf /var/cache/apk/*
+            ;;
         rhel)
             rm -rf /var/cache/dnf/*
             rm -rf /var/cache/yum/*
@@ -102,6 +109,11 @@ pkg_mgr_update() {
             echo "Running apt-get update..."
             ${INSTALL_CMD} update -y
         fi
+    elif [ ${INSTALL_CMD} = "apk" ]; then
+        if [ "$(find /var/cache/apk/* | wc -l)" = "0" ]; then
+            echo "Running apk update..."
+            ${INSTALL_CMD} update
+        fi
     elif [ ${INSTALL_CMD} = "dnf" ] || [ ${INSTALL_CMD} = "yum" ]; then
         if [ "$(find /var/cache/${INSTALL_CMD}/* | wc -l)" = "0" ]; then
             echo "Running ${INSTALL_CMD} check-update ..."
@@ -118,6 +130,10 @@ check_packages() {
             pkg_mgr_update
             ${INSTALL_CMD} -y install --no-install-recommends "$@"
         fi
+    elif [ ${INSTALL_CMD} = "apk" ]; then
+        ${INSTALL_CMD} add \
+            --no-cache \
+            "$@"
     elif [ ${INSTALL_CMD} = "dnf" ] || [ ${INSTALL_CMD} = "yum" ]; then
         _num_pkgs=$(echo "$@" | tr ' ' \\012 | wc -l)
         _num_installed=$(${INSTALL_CMD} -C list installed "$@" | sed '1,/^Installed/d' | wc -l)
@@ -154,6 +170,8 @@ if [ ${GIT_VERSION} = "os-provided" ] || [ ${GIT_VERSION} = "system" ]; then
 
     if [ "$INSTALL_CMD" = "apt-get" ]; then
         echo "Installing git from OS apt repository"
+    elif [ "$INSTALL_CMD" = "apk" ]; then
+        echo "Installing git from OS apk repository"
     else
         echo "Installing git from OS yum/dnf repository"
     fi
@@ -194,6 +212,14 @@ if [ "${ADJUSTED_ID}" = "debian" ]; then
         check_packages libpcre2-posix3
     fi
 
+elif [ "${ADJUSTED_ID}" = "alpine" ]; then
+
+    # update build dependencies
+    ${INSTALL_CMD} add --no-cache --update curl grep make zlib-dev
+
+    # ref. <https://github.com/alpinelinux/aports/blob/32ac93ffb642031b88ba8639fbb3abb324169dea/main/git/APKBUILD#L62>
+    check_packages asciidoc curl-dev expat-dev g++ gcc openssl-dev pcre2-dev perl-dev perl-error python3-dev tcl tk xmlto
+
 elif [ "${ADJUSTED_ID}" = "rhel" ]; then
 
     if [ $VERSION_CODENAME = "centos7" ]; then
@@ -212,6 +238,10 @@ elif [ "${ADJUSTED_ID}" = "rhel" ]; then
     if [ $ID = "mariner" ]; then
         check_packages glibc-devel kernel-headers binutils
     fi
+
+else
+    echo "Linux distro ${ID} not supported."
+    exit 1
 fi
 
 # Partial version matching
@@ -235,7 +265,15 @@ echo "Downloading source for ${GIT_VERSION}..."
 curl -sL https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz | tar -xzC /tmp 2>&1
 echo "Building..."
 cd /tmp/git-${GIT_VERSION}
-make -s USE_LIBPCRE=YesPlease prefix=/usr/local sysconfdir=/etc all && make -s USE_LIBPCRE=YesPlease prefix=/usr/local sysconfdir=/etc install 2>&1
+git_options=("prefix=/usr/local")
+git_options+=("sysconfdir=/etc")
+git_options+=("USE_LIBPCRE=YesPlease")
+if [ "${ADJUSTED_ID}" = "alpine" ]; then
+    # ref. <https://github.com/alpinelinux/aports/blob/32ac93ffb642031b88ba8639fbb3abb324169dea/main/git/APKBUILD#L126>
+    git_options+=("NO_REGEX=YesPlease")
+    git_options+=("NO_GETTEXT=YesPlease")
+fi
+make -s "${git_options[@]}" all && make -s "${git_options[@]}" install 2>&1
 rm -rf /tmp/git-${GIT_VERSION}
 clean_up
 echo "Done!"
diff --git a/test/git/install_git_from_src_alpine.sh b/test/git/install_git_from_src_alpine.sh
new file mode 100644
index 000000000..2a26beec5
--- /dev/null
+++ b/test/git/install_git_from_src_alpine.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git --version
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/install_git_from_system_alpine.sh b/test/git/install_git_from_system_alpine.sh
new file mode 100644
index 000000000..972976a4c
--- /dev/null
+++ b/test/git/install_git_from_system_alpine.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+
+# Report result
+reportResults
diff --git a/test/git/scenarios.json b/test/git/scenarios.json
index 583c1adbe..4d606c365 100644
--- a/test/git/scenarios.json
+++ b/test/git/scenarios.json
@@ -8,6 +8,15 @@
             }
         }
     },
+    "install_git_from_src_alpine": {
+        "image": "mcr.microsoft.com/devcontainers/base:alpine",
+        "features": {
+            "git": {
+                "version": "latest",
+                "ppa": "false"
+            }
+        }
+    },
     "install_git_from_src_jammy": {
         "image": "ubuntu:jammy",
         "features": {
@@ -107,6 +116,15 @@
             }
         }
     },
+    "install_git_from_system_alpine": {
+        "image": "mcr.microsoft.com/devcontainers/base:alpine",
+        "features": {
+            "git": {
+                "version": "system",
+                "ppa": "false"
+            }
+        }
+    },
     "install_git_from_system_centos-7": {
         "image": "centos:centos7",
         "features": {

From 0356cbb046e3bac9ecff76ac3624178681592cff Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Thu, 27 Jun 2024 12:02:04 -0700
Subject: [PATCH 290/478] Automated documentation update (#1019)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/git/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/git/README.md b/src/git/README.md
index adcb04e36..e750bbed2 100644
--- a/src/git/README.md
+++ b/src/git/README.md
@@ -22,7 +22,7 @@ Install an up-to-date version of Git, built from source as needed. Useful for wh
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and RockyLinux distributions with the `apt`, `yum`, `dnf`, or `microdnf` package manager installed.
+This Feature should work on recent versions of Alpine, Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and RockyLinux distributions with the `apk`, `apt`, `yum`, `dnf`, or `microdnf` package manager installed.
 
 `bash` is required to execute the `install.sh` script.
 

From 9387225ac7ada315d94511848fd490a8519ed591 Mon Sep 17 00:00:00 2001
From: Paul Taylor <178183+trxcllnt@users.noreply.github.com>
Date: Fri, 28 Jun 2024 14:28:44 -0700
Subject: [PATCH 291/478] Guard against undefined variables when PS1 is
 evaluated (#1020)

* Guard against undefined variables when PS1 is evaluated

* Update version in devcontainer-feature.json
---
 src/common-utils/devcontainer-feature.json     | 4 ++--
 src/common-utils/scripts/bash_theme_snippet.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 308e256ef..dc62272ad 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.4.3",
+    "version": "2.4.4",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
@@ -66,4 +66,4 @@
             "description": "Add packages from non-free Debian repository? (Debian only)"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/common-utils/scripts/bash_theme_snippet.sh b/src/common-utils/scripts/bash_theme_snippet.sh
index a028e4b63..491e4c047 100644
--- a/src/common-utils/scripts/bash_theme_snippet.sh
+++ b/src/common-utils/scripts/bash_theme_snippet.sh
@@ -2,13 +2,13 @@
 # bash theme - partly inspired by https://github.com/ohmyzsh/ohmyzsh/blob/master/themes/robbyrussell.zsh-theme
 __bash_prompt() {
     local userpart='`export XIT=$? \
-        && [ ! -z "${GITHUB_USER}" ] && echo -n "\[\033[0;32m\]@${GITHUB_USER} " || echo -n "\[\033[0;32m\]\u " \
+        && [ ! -z "${GITHUB_USER:-}" ] && echo -n "\[\033[0;32m\]@${GITHUB_USER:-} " || echo -n "\[\033[0;32m\]\u " \
         && [ "$XIT" -ne "0" ] && echo -n "\[\033[1;31m\]➜" || echo -n "\[\033[0m\]➜"`'
     local gitbranch='`\
         if [ "$(git config --get devcontainers-theme.hide-status 2>/dev/null)" != 1 ] && [ "$(git config --get codespaces-theme.hide-status 2>/dev/null)" != 1 ]; then \
-            export BRANCH=$(git --no-optional-locks symbolic-ref --short HEAD 2>/dev/null || git --no-optional-locks rev-parse --short HEAD 2>/dev/null); \
-            if [ "${BRANCH}" != "" ]; then \
-                echo -n "\[\033[0;36m\](\[\033[1;31m\]${BRANCH}" \
+            export BRANCH="$(git --no-optional-locks symbolic-ref --short HEAD 2>/dev/null || git --no-optional-locks rev-parse --short HEAD 2>/dev/null)"; \
+            if [ "${BRANCH:-}" != "" ]; then \
+                echo -n "\[\033[0;36m\](\[\033[1;31m\]${BRANCH:-}" \
                 && if [ "$(git config --get devcontainers-theme.show-dirty 2>/dev/null)" = 1 ] && \
                     git --no-optional-locks ls-files --error-unmatch -m --directory --no-empty-directory -o --exclude-standard ":/*" > /dev/null 2>&1; then \
                         echo -n " \[\033[1;33m\]✗"; \

From 09d5632279a541ba9db0834fbe451776d64ccfdd Mon Sep 17 00:00:00 2001
From: James Hodgkinson <james@terminaloutcomes.com>
Date: Wed, 10 Jul 2024 11:56:22 -0700
Subject: [PATCH 292/478] Rust: add the option to install additional targets
 (#1033)

* Rust: add the option to install additional targets
Fixes #1032

* Apply suggestions from code review

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Changed description

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/rust/devcontainer-feature.json | 14 +++++++++--
 src/rust/install.sh                | 37 +++++++++++++++++++-----------
 test/rust/rust_with_target.sh      | 15 ++++++++++++
 test/rust/scenarios.json           |  9 ++++++++
 4 files changed, 60 insertions(+), 15 deletions(-)
 create mode 100644 test/rust/rust_with_target.sh

diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index 70013442f..909f315c4 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "rust",
-    "version": "1.1.3",
+    "version": "1.2.0",
     "name": "Rust",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
     "description": "Installs Rust, common Rust utilities, and their required dependencies",
@@ -39,6 +39,16 @@
             ],
             "default": "minimal",
             "description": "Select a rustup install profile."
+        },
+        "targets": {
+            "type": "string",
+            "default": "",
+            "description": "Optional comma separated list of additional Rust targets to install.",
+            "proposals": [
+                "aarch64-unknown-linux-gnu",
+                "armv7-unknown-linux-gnueabihf",
+                "x86_64-unknown-redox,x86_64-unknown-uefi"
+            ]
         }
     },
     "customizations": {
@@ -70,4 +80,4 @@
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
-}
+}
\ No newline at end of file
diff --git a/src/rust/install.sh b/src/rust/install.sh
index 4db9edc1e..1025e46bb 100755
--- a/src/rust/install.sh
+++ b/src/rust/install.sh
@@ -9,6 +9,7 @@
 
 RUST_VERSION="${VERSION:-"latest"}"
 RUSTUP_PROFILE="${PROFILE:-"minimal"}"
+RUSTUP_TARGETS="${TARGETS:-""}"
 
 export CARGO_HOME="${CARGO_HOME:-"/usr/local/cargo"}"
 export RUSTUP_HOME="${RUSTUP_HOME:-"/usr/local/rustup"}"
@@ -19,7 +20,9 @@ UPDATE_RUST="${UPDATE_RUST:-"false"}"
 set -e
 
 # Clean up
-rm -rf /var/lib/apt/lists/*
+if [ "$(ls -1 /var/lib/apt/lists/ | wc -l)" -gt -1 ]; then
+    rm -rf /var/lib/apt/lists/*
+fi
 
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
@@ -36,7 +39,7 @@ if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
     USERNAME=""
     POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
     for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+        if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
             USERNAME=${CURRENT_USER}
             break
         fi
@@ -44,7 +47,7 @@ if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
     if [ "${USERNAME}" = "" ]; then
         USERNAME=root
     fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
+elif [ "${USERNAME}" = "none" ] || ! id -u "${USERNAME}" > /dev/null 2>&1; then
     USERNAME=root
 fi
 
@@ -56,7 +59,7 @@ find_version_from_git_tags() {
     local repository=$2
     local prefix=${3:-"tags/v"}
     local separator=${4:-"."}
-    local last_part_optional=${5:-"false"}    
+    local last_part_optional=${5:-"false"}
     if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
         local escaped_separator=${separator//./\\.}
         local last_part
@@ -66,7 +69,7 @@ find_version_from_git_tags() {
             last_part="${escaped_separator}[0-9]+"
         fi
         local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        local version_list="$(git ls-remote --tags "${repository}" | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
             declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
         else
@@ -89,13 +92,13 @@ check_nightly_version_formatting() {
 
     local version_date=$(echo ${requested_version} | sed -e "s/^nightly-//")
 
-    date -d ${version_date} &>/dev/null
-    if [ $? != 0 ]; then
+
+    if ! date -d "${version_date}" &>/dev/null; then
         echo -e "Invalid ${variable_name} value: ${requested_version}\nNightly version should be in the format nightly-YYYY-MM-DD" >&2
         exit 1
     fi
 
-    if [ $(date -d ${version_date} +%s) -ge $(date +%s) ]; then
+    if [ "$(date -d "${version_date}" +%s)" -ge "$(date +%s)" ]; then
         echo -e "Invalid ${variable_name} value: ${requested_version}\nNightly version should not exceed current date" >&2
         exit 1
     fi
@@ -141,10 +144,10 @@ fi
 architecture="$(dpkg --print-architecture)"
 download_architecture="${architecture}"
 case ${download_architecture} in
- amd64) 
+ amd64)
     download_architecture="x86_64"
     ;;
- arm64) 
+ arm64)
     download_architecture="aarch64"
     ;;
  *) echo "(!) Architecture ${architecture} not supported."
@@ -154,7 +157,7 @@ esac
 
 # Install Rust
 umask 0002
-if ! cat /etc/group | grep -e "^rustlang:" > /dev/null 2>&1; then
+if ! grep -e "^rustlang:" /etc/group > /dev/null 2>&1; then
     groupadd -r rustlang
 fi
 usermod -a -G rustlang "${USERNAME}"
@@ -172,7 +175,7 @@ else
         fi
 
         is_nightly=0
-        echo ${RUST_VERSION} | grep -q "nightly" || is_nightly=$?
+        echo "${RUST_VERSION}" | grep -q "nightly" || is_nightly=$?
         if [ $is_nightly = 0 ]; then
             check_nightly_version_formatting RUST_VERSION
         else
@@ -189,7 +192,7 @@ else
     cp /tmp/rustup/target/${download_architecture}-unknown-linux-gnu/release/rustup-init  /tmp/rustup/rustup-init
     sha256sum -c rustup-init.sha256
     chmod +x target/${download_architecture}-unknown-linux-gnu/release/rustup-init
-    target/${download_architecture}-unknown-linux-gnu/release/rustup-init -y --no-modify-path --profile ${RUSTUP_PROFILE} ${default_toolchain_arg}
+    target/${download_architecture}-unknown-linux-gnu/release/rustup-init -y --no-modify-path --profile "${RUSTUP_PROFILE}" ${default_toolchain_arg}
     cd ~
     rm -rf /tmp/rustup
 fi
@@ -202,6 +205,14 @@ fi
 echo "Installing common Rust dependencies..."
 rustup component add rls rust-analysis rust-src rustfmt clippy 2>&1
 
+if [ -n "${RUSTUP_TARGETS}" ]; then
+    IFS=',' read -ra targets <<< "${RUSTUP_TARGETS}"
+    for target in "${targets[@]}"; do
+        echo "Installing additional Rust target $target"
+        rustup target add "$target" 2>&1
+    done
+fi
+
 # Add CARGO_HOME, RUSTUP_HOME and bin directory into bashrc/zshrc files (unless disabled)
 updaterc "$(cat << EOF
 export RUSTUP_HOME="${RUSTUP_HOME}"
diff --git a/test/rust/rust_with_target.sh b/test/rust/rust_with_target.sh
new file mode 100644
index 000000000..c00a21dd2
--- /dev/null
+++ b/test/rust/rust_with_target.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "cargo version" cargo  --version
+check "rustc version" rustc  --version
+check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
+
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/rust/scenarios.json b/test/rust/scenarios.json
index 4a2d540ef..de037cd29 100644
--- a/test/rust/scenarios.json
+++ b/test/rust/scenarios.json
@@ -6,5 +6,14 @@
                 "version": "1.62.0"
             }
         }
+    },
+    "rust_with_target": {
+        "image": "ubuntu:focal",
+        "features": {
+            "rust": {
+                "version": "latest",
+                "targets": "aarch64-unknown-linux-gnu"
+            }
+        }
     }
 }
\ No newline at end of file

From f45518999e598127c46ece79a607a241eb5e38d6 Mon Sep 17 00:00:00 2001
From: H3xCat <2304691+h3xcat@users.noreply.github.com>
Date: Wed, 17 Jul 2024 09:36:01 -0700
Subject: [PATCH 293/478] Resolve slow key retrieval when some GPG key servers
 are not reachable (#1016)

* Reduce timeout to GPG key servers for Python feature

* Dynamically find out reachable GPG servers

* Apply fix to other features

* Fix build issues

* Fix shellcheck SC2068 by quoting array expansion

* Bump up patch version for affected features

* improve readability for keyservers_curl_map
---
 src/git-lfs/devcontainer-feature.json         |  2 +-
 src/git-lfs/install.sh                        | 43 ++++++++++++++--
 src/git/devcontainer-feature.json             |  2 +-
 src/git/install.sh                            | 43 ++++++++++++++--
 src/github-cli/devcontainer-feature.json      |  2 +-
 src/github-cli/install.sh                     | 42 +++++++++++++--
 .../devcontainer-feature.json                 |  2 +-
 src/kubectl-helm-minikube/install.sh          | 38 ++++++++++++--
 src/python/devcontainer-feature.json          |  2 +-
 src/python/install.sh                         | 51 ++++++++++++++++---
 src/ruby/devcontainer-feature.json            |  2 +-
 src/ruby/install.sh                           | 43 ++++++++++++++--
 src/terraform/devcontainer-feature.json       |  2 +-
 src/terraform/install.sh                      | 41 +++++++++++++--
 ...tall_cpython_fallback_prev_version_test.sh | 46 ++++++++++++++++-
 test/ruby/ruby_fallback_test.sh               | 43 ++++++++++++++--
 16 files changed, 354 insertions(+), 50 deletions(-)

diff --git a/src/git-lfs/devcontainer-feature.json b/src/git-lfs/devcontainer-feature.json
index 0c6dccad2..c9e0d9b82 100644
--- a/src/git-lfs/devcontainer-feature.json
+++ b/src/git-lfs/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git-lfs",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "name": "Git Large File Support (LFS)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git-lfs",
     "description": "Installs Git Large File Support (Git LFS) along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like git and curl.",
diff --git a/src/git-lfs/install.sh b/src/git-lfs/install.sh
index 4d14c9918..f5c473816 100755
--- a/src/git-lfs/install.sh
+++ b/src/git-lfs/install.sh
@@ -15,10 +15,6 @@ GIT_LFS_ARCHIVE_GPG_KEY_URI="https://packagecloud.io/github/git-lfs/gpgkey"
 GIT_LFS_ARCHIVE_ARCHITECTURES="amd64 arm64"
 GIT_LFS_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal jammy"
 GIT_LFS_CHECKSUM_GPG_KEYS="0x88ace9b29196305ba9947552f1ba225c0223b187 0x86cd3297749375bcf8206715f54fe648088335a9 0xaa3b3450295830d2de6db90caba67be5a5795889"
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
-keyserver hkp://keyserver.ubuntu.com:80
-keyserver hkps://keys.openpgp.org
-keyserver hkp://keyserver.pgp.com"
 
 set -e
 
@@ -64,15 +60,52 @@ find_version_from_git_tags() {
     echo "${variable_name}=${!variable_name}"
 }
 
+# Get the list of GPG key servers that are reachable
+get_gpg_key_servers() {
+    declare -A keyservers_curl_map=(
+        ["hkp://keyserver.ubuntu.com"]="http://keyserver.ubuntu.com:11371"
+        ["hkp://keyserver.ubuntu.com:80"]="http://keyserver.ubuntu.com"
+        ["hkps://keys.openpgp.org"]="https://keys.openpgp.org"
+        ["hkp://keyserver.pgp.com"]="http://keyserver.pgp.com:11371"
+    )
+
+    local curl_args=""
+    local keyserver_reachable=false  # Flag to indicate if any keyserver is reachable
+
+    if [ ! -z "${KEYSERVER_PROXY}" ]; then
+        curl_args="--proxy ${KEYSERVER_PROXY}"
+    fi
+
+    for keyserver in "${!keyservers_curl_map[@]}"; do
+        local keyserver_curl_url="${keyservers_curl_map[${keyserver}]}"
+        if curl -s ${curl_args} --max-time 5 ${keyserver_curl_url} > /dev/null; then
+            echo "keyserver ${keyserver}"
+            keyserver_reachable=true
+        else
+            echo "(*) Keyserver ${keyserver} is not reachable." >&2
+        fi
+    done
+
+    if ! $keyserver_reachable; then
+        echo "(!) No keyserver is reachable." >&2
+        exit 1
+    fi
+}
+
 # Import the specified key in a variable name passed in as 
 receive_gpg_keys() {
     local keys=${!1}
 
+    # Install curl
+    if ! type curl > /dev/null 2>&1; then
+        check_packages curl
+    fi
+
     # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
     chmod 700 ${GNUPGHOME}
-    echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" > ${GNUPGHOME}/dirmngr.conf
+    echo -e "disable-ipv6\n$(get_gpg_key_servers)" > ${GNUPGHOME}/dirmngr.conf
     # GPG key download sometimes fails for some reason and retrying fixes it.
     local retry_count=0
     local gpg_ok="false"
diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
index 4eef35df0..2d18b8d34 100644
--- a/src/git/devcontainer-feature.json
+++ b/src/git/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
diff --git a/src/git/install.sh b/src/git/install.sh
index 133bff8b1..974dc66c0 100755
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -11,10 +11,6 @@ GIT_VERSION=${VERSION} # 'system' checks the base image first, else installs 'la
 USE_PPA_IF_AVAILABLE=${PPA}
 
 GIT_CORE_PPA_ARCHIVE_GPG_KEY=E1DD270288B4E6030699E45FA1715D88E1DF1F24
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
-keyserver hkp://keyserver.ubuntu.com:80
-keyserver hkps://keys.openpgp.org
-keyserver hkp://keyserver.pgp.com"
 
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
@@ -68,6 +64,38 @@ clean_up() {
 }
 clean_up
 
+# Get the list of GPG key servers that are reachable
+get_gpg_key_servers() {
+    declare -A keyservers_curl_map=(
+        ["hkp://keyserver.ubuntu.com"]="http://keyserver.ubuntu.com:11371"
+        ["hkp://keyserver.ubuntu.com:80"]="http://keyserver.ubuntu.com"
+        ["hkps://keys.openpgp.org"]="https://keys.openpgp.org"
+        ["hkp://keyserver.pgp.com"]="http://keyserver.pgp.com:11371"
+    )
+
+    local curl_args=""
+    local keyserver_reachable=false  # Flag to indicate if any keyserver is reachable
+
+    if [ ! -z "${KEYSERVER_PROXY}" ]; then
+        curl_args="--proxy ${KEYSERVER_PROXY}"
+    fi
+
+    for keyserver in "${!keyservers_curl_map[@]}"; do
+        local keyserver_curl_url="${keyservers_curl_map[${keyserver}]}"
+        if curl -s ${curl_args} --max-time 5 ${keyserver_curl_url} > /dev/null; then
+            echo "keyserver ${keyserver}"
+            keyserver_reachable=true
+        else
+            echo "(*) Keyserver ${keyserver} is not reachable." >&2
+        fi
+    done
+
+    if ! $keyserver_reachable; then
+        echo "(!) No keyserver is reachable." >&2
+        exit 1
+    fi
+}
+
 # Import the specified key in a variable name passed in as 
 receive_gpg_keys() {
     local keys=${!1}
@@ -77,11 +105,16 @@ receive_gpg_keys() {
         keyring_args="--no-default-keyring --keyring $2"
     fi
 
+    # Install curl
+    if ! type curl > /dev/null 2>&1; then
+        check_packages curl
+    fi
+    
     # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
     chmod 700 ${GNUPGHOME}
-    echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" > ${GNUPGHOME}/dirmngr.conf
+    echo -e "disable-ipv6\n$(get_gpg_key_servers)" > ${GNUPGHOME}/dirmngr.conf
     # GPG key download sometimes fails for some reason and retrying fixes it.
     local retry_count=0
     local gpg_ok="false"
diff --git a/src/github-cli/devcontainer-feature.json b/src/github-cli/devcontainer-feature.json
index 61b249fde..9b1558ec0 100644
--- a/src/github-cli/devcontainer-feature.json
+++ b/src/github-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "github-cli",
-    "version": "1.0.12",
+    "version": "1.0.13",
     "name": "GitHub CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/github-cli",
     "description": "Installs the GitHub CLI. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/github-cli/install.sh b/src/github-cli/install.sh
index 2f196c981..18dae33ce 100755
--- a/src/github-cli/install.sh
+++ b/src/github-cli/install.sh
@@ -11,10 +11,6 @@ CLI_VERSION=${VERSION:-"latest"}
 INSTALL_DIRECTLY_FROM_GITHUB_RELEASE=${INSTALLDIRECTLYFROMGITHUBRELEASE:-"true"}
 
 GITHUB_CLI_ARCHIVE_GPG_KEY=23F3D4EA75716059
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
-keyserver hkp://keyserver.ubuntu.com:80
-keyserver hkps://keys.openpgp.org
-keyserver hkp://keyserver.pgp.com"
 
 set -e
 
@@ -26,6 +22,37 @@ if [ "$(id -u)" -ne 0 ]; then
     exit 1
 fi
 
+# Get the list of GPG key servers that are reachable
+get_gpg_key_servers() {
+    declare -A keyservers_curl_map=(
+        ["hkp://keyserver.ubuntu.com"]="http://keyserver.ubuntu.com:11371"
+        ["hkp://keyserver.ubuntu.com:80"]="http://keyserver.ubuntu.com"
+        ["hkps://keys.openpgp.org"]="https://keys.openpgp.org"
+        ["hkp://keyserver.pgp.com"]="http://keyserver.pgp.com:11371"
+    )
+
+    local curl_args=""
+    local keyserver_reachable=false  # Flag to indicate if any keyserver is reachable
+
+    if [ ! -z "${KEYSERVER_PROXY}" ]; then
+        curl_args="--proxy ${KEYSERVER_PROXY}"
+    fi
+
+    for keyserver in "${!keyservers_curl_map[@]}"; do
+        local keyserver_curl_url="${keyservers_curl_map[${keyserver}]}"
+        if curl -s ${curl_args} --max-time 5 ${keyserver_curl_url} > /dev/null; then
+            echo "keyserver ${keyserver}"
+            keyserver_reachable=true
+        else
+            echo "(*) Keyserver ${keyserver} is not reachable." >&2
+        fi
+    done
+
+    if ! $keyserver_reachable; then
+        echo "(!) No keyserver is reachable." >&2
+        exit 1
+    fi
+}
 
 # Import the specified key in a variable name passed in as 
 receive_gpg_keys() {
@@ -35,11 +62,16 @@ receive_gpg_keys() {
         keyring_args="--no-default-keyring --keyring $2"
     fi
 
+    # Install curl
+    if ! type curl > /dev/null 2>&1; then
+        check_packages curl
+    fi
+
     # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
     chmod 700 ${GNUPGHOME}
-    echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" > ${GNUPGHOME}/dirmngr.conf
+    echo -e "disable-ipv6\n$(get_gpg_key_servers)" > ${GNUPGHOME}/dirmngr.conf
     # GPG key download sometimes fails for some reason and retrying fixes it.
     local retry_count=0
     local gpg_ok="false"
diff --git a/src/kubectl-helm-minikube/devcontainer-feature.json b/src/kubectl-helm-minikube/devcontainer-feature.json
index 8c5dfddc0..dabee64a5 100644
--- a/src/kubectl-helm-minikube/devcontainer-feature.json
+++ b/src/kubectl-helm-minikube/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "kubectl-helm-minikube",
-    "version": "1.1.9",
+    "version": "1.1.10",
     "name": "Kubectl, Helm, and Minikube",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
     "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
diff --git a/src/kubectl-helm-minikube/install.sh b/src/kubectl-helm-minikube/install.sh
index 871a77ca1..c2f9ba0c9 100755
--- a/src/kubectl-helm-minikube/install.sh
+++ b/src/kubectl-helm-minikube/install.sh
@@ -22,10 +22,6 @@ MINIKUBE_SHA256="${MINIKUBE_SHA256:-"automatic"}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 
 HELM_GPG_KEYS_URI="https://raw.githubusercontent.com/helm/helm/main/KEYS"
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
-keyserver hkp://keyserver.ubuntu.com:80
-keyserver hkps://keys.openpgp.org
-keyserver hkp://keyserver.pgp.com"
 
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
@@ -234,6 +230,38 @@ get_helm() {
     curl -sSL "https://github.com/helm/helm/releases/download/${HELM_VERSION}/${helm_filename}.asc" -o "${tmp_helm_filename}.asc"
 }
 
+# Get the list of GPG key servers that are reachable
+get_gpg_key_servers() {
+    declare -A keyservers_curl_map=(
+        ["hkp://keyserver.ubuntu.com"]="http://keyserver.ubuntu.com:11371"
+        ["hkp://keyserver.ubuntu.com:80"]="http://keyserver.ubuntu.com"
+        ["hkps://keys.openpgp.org"]="https://keys.openpgp.org"
+        ["hkp://keyserver.pgp.com"]="http://keyserver.pgp.com:11371"
+    )
+
+    local curl_args=""
+    local keyserver_reachable=false  # Flag to indicate if any keyserver is reachable
+
+    if [ ! -z "${KEYSERVER_PROXY}" ]; then
+        curl_args="--proxy ${KEYSERVER_PROXY}"
+    fi
+
+    for keyserver in "${!keyservers_curl_map[@]}"; do
+        local keyserver_curl_url="${keyservers_curl_map[${keyserver}]}"
+        if curl -s ${curl_args} --max-time 5 ${keyserver_curl_url} > /dev/null; then
+            echo "keyserver ${keyserver}"
+            keyserver_reachable=true
+        else
+            echo "(*) Keyserver ${keyserver} is not reachable." >&2
+        fi
+    done
+
+    if ! $keyserver_reachable; then
+        echo "(!) No keyserver is reachable." >&2
+        exit 1
+    fi
+}
+
 if [ ${HELM_VERSION} != "none" ]; then
     # Install Helm, verify signature and checksum
     echo "Downloading Helm..."
@@ -255,7 +283,7 @@ if [ ${HELM_VERSION} != "none" ]; then
     mkdir -p "${GNUPGHOME}"
     chmod 700 ${GNUPGHOME}
     curl -sSL "${HELM_GPG_KEYS_URI}" -o /tmp/helm/KEYS
-    echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" > ${GNUPGHOME}/dirmngr.conf
+    echo -e "disable-ipv6\n$(get_gpg_key_servers)" > ${GNUPGHOME}/dirmngr.conf
     gpg -q --import "/tmp/helm/KEYS"
     if ! gpg --verify "${tmp_helm_filename}.asc" > ${GNUPGHOME}/verify.log 2>&1; then
         echo "Verification failed!"
diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 27417c63e..2cb4cc87b 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/python/install.sh b/src/python/install.sh
index 7da236e0e..e6702add9 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -31,12 +31,7 @@ ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 # Comma-separated list of additional tools to be installed via pipx.
 IFS="," read -r -a DEFAULT_UTILS <<< "${TOOLSTOINSTALL:-flake8,autopep8,black,yapf,mypy,pydocstyle,pycodestyle,bandit,pipenv,virtualenv,pytest}"
 
-
 PYTHON_SOURCE_GPG_KEYS="64E628F8D684696D B26995E310250568 2D347EA6AA65421D FB9921286F5E1540 3A5CA953F73C700D 04C367C218ADD4FF 0EDDC5F26A45C816 6AF053F07D9DC8D2 C9BE28DEE6DF025C 126EB563A74B06BF D9866941EA5BBD71 ED9D77D5 A821E680E5FA6305"
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
-keyserver hkp://keyserver.ubuntu.com:80
-keyserver hkps://keys.openpgp.org
-keyserver hkp://keyserver.pgp.com"
 
 KEYSERVER_PROXY="${HTTPPROXY:-"${HTTP_PROXY:-""}"}"
 
@@ -130,6 +125,38 @@ updaterc() {
     fi
 }
 
+# Get the list of GPG key servers that are reachable
+get_gpg_key_servers() {
+    declare -A keyservers_curl_map=(
+        ["hkp://keyserver.ubuntu.com"]="http://keyserver.ubuntu.com:11371"
+        ["hkp://keyserver.ubuntu.com:80"]="http://keyserver.ubuntu.com"
+        ["hkps://keys.openpgp.org"]="https://keys.openpgp.org"
+        ["hkp://keyserver.pgp.com"]="http://keyserver.pgp.com:11371"
+    )
+
+    local curl_args=""
+    local keyserver_reachable=false  # Flag to indicate if any keyserver is reachable
+
+    if [ ! -z "${KEYSERVER_PROXY}" ]; then
+        curl_args="--proxy ${KEYSERVER_PROXY}"
+    fi
+
+    for keyserver in "${!keyservers_curl_map[@]}"; do
+        local keyserver_curl_url="${keyservers_curl_map[${keyserver}]}"
+        if curl -s ${curl_args} --max-time 5 ${keyserver_curl_url} > /dev/null; then
+            echo "keyserver ${keyserver}"
+            keyserver_reachable=true
+        else
+            echo "(*) Keyserver ${keyserver} is not reachable." >&2
+        fi
+    done
+
+    if ! $keyserver_reachable; then
+        echo "(!) No keyserver is reachable." >&2
+        exit 1
+    fi
+}
+
 # Import the specified key in a variable name passed in as
 receive_gpg_keys() {
     local keys=${!1}
@@ -143,11 +170,16 @@ receive_gpg_keys() {
         keyring_args="${keyring_args} --keyserver-options http-proxy=${KEYSERVER_PROXY}"
     fi
 
+    # Install curl
+    if ! type curl > /dev/null 2>&1; then
+        check_packages curl
+    fi
+
     # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
     chmod 700 ${GNUPGHOME}
-    echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" > ${GNUPGHOME}/dirmngr.conf
+    echo -e "disable-ipv6\n$(get_gpg_key_servers)" > ${GNUPGHOME}/dirmngr.conf
     # GPG key download sometimes fails for some reason and retrying fixes it.
     local retry_count=0
     local gpg_ok="false"
@@ -182,6 +214,11 @@ receive_gpg_keys_centos7() {
         keyring_args="${keyring_args} --keyserver-options http-proxy=${KEYSERVER_PROXY}"
     fi
 
+    # Install curl
+    if ! type curl > /dev/null 2>&1; then
+        check_packages curl
+    fi
+
     # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
@@ -193,7 +230,7 @@ receive_gpg_keys_centos7() {
     set +e
         echo "(*) Downloading GPG keys..."
         until [ "${gpg_ok}" = "true" ] || [ "${retry_count}" -eq "5" ]; do
-            for keyserver in $(echo "${GPG_KEY_SERVERS}" | sed 's/keyserver //'); do
+            for keyserver in $(echo "$(get_gpg_key_servers)" | sed 's/keyserver //'); do
                 ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys --keyserver=${keyserver} ) 2>&1
                 downloaded_keys=$(gpg --list-keys | grep ^pub | wc -l)
                 if [[ ${num_keys} = ${downloaded_keys} ]]; then
diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json
index 2a95fef8b..0618d4296 100644
--- a/src/ruby/devcontainer-feature.json
+++ b/src/ruby/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "name": "Ruby (via rvm)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
     "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
diff --git a/src/ruby/install.sh b/src/ruby/install.sh
index a0a97f0b1..befeee4af 100755
--- a/src/ruby/install.sh
+++ b/src/ruby/install.sh
@@ -23,10 +23,6 @@ ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 DEFAULT_GEMS="rake"
 
 RVM_GPG_KEYS="409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
-keyserver hkp://keyserver.ubuntu.com:80
-keyserver hkps://keys.openpgp.org
-keyserver hkp://keyserver.pgp.com"
 
 set -e
 
@@ -72,6 +68,38 @@ updaterc() {
     fi
 }
 
+# Get the list of GPG key servers that are reachable
+get_gpg_key_servers() {
+    declare -A keyservers_curl_map=(
+        ["hkp://keyserver.ubuntu.com"]="http://keyserver.ubuntu.com:11371"
+        ["hkp://keyserver.ubuntu.com:80"]="http://keyserver.ubuntu.com"
+        ["hkps://keys.openpgp.org"]="https://keys.openpgp.org"
+        ["hkp://keyserver.pgp.com"]="http://keyserver.pgp.com:11371"
+    )
+
+    local curl_args=""
+    local keyserver_reachable=false  # Flag to indicate if any keyserver is reachable
+
+    if [ ! -z "${KEYSERVER_PROXY}" ]; then
+        curl_args="--proxy ${KEYSERVER_PROXY}"
+    fi
+
+    for keyserver in "${!keyservers_curl_map[@]}"; do
+        local keyserver_curl_url="${keyservers_curl_map[${keyserver}]}"
+        if curl -s ${curl_args} --max-time 5 ${keyserver_curl_url} > /dev/null; then
+            echo "keyserver ${keyserver}"
+            keyserver_reachable=true
+        else
+            echo "(*) Keyserver ${keyserver} is not reachable." >&2
+        fi
+    done
+
+    if ! $keyserver_reachable; then
+        echo "(!) No keyserver is reachable." >&2
+        exit 1
+    fi
+}
+
 # Import the specified key in a variable name passed in as 
 receive_gpg_keys() {
     local keys=${!1}
@@ -80,11 +108,16 @@ receive_gpg_keys() {
         keyring_args="--no-default-keyring --keyring \"$2\""
     fi
 
+    # Install curl
+    if ! type curl > /dev/null 2>&1; then
+        check_packages curl
+    fi
+
     # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
     chmod 700 ${GNUPGHOME}
-    echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" > ${GNUPGHOME}/dirmngr.conf
+    echo -e "disable-ipv6\n$(get_gpg_key_servers)" > ${GNUPGHOME}/dirmngr.conf
     # GPG key download sometimes fails for some reason and retrying fixes it.
     local retry_count=0
     local gpg_ok="false"
diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index c4294efd4..3193f25af 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.3.7",
+    "version": "1.3.8",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index 93d27ac7a..a2aace9b4 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -28,9 +28,6 @@ TERRAFORM_DOCS_SHA256="${TERRAFORM_DOCS_SHA256:-"automatic"}"
 
 TERRAFORM_GPG_KEY="72D7468F"
 TFLINT_GPG_KEY_URI="https://raw.githubusercontent.com/terraform-linters/tflint/v0.46.1/8CE69160EB3F2FE9.key"
-GPG_KEY_SERVERS="keyserver hkps://keyserver.ubuntu.com
-keyserver hkps://keys.openpgp.org
-keyserver hkps://keyserver.pgp.com"
 KEYSERVER_PROXY="${HTTPPROXY:-"${HTTP_PROXY:-""}"}"
 
 architecture="$(uname -m)"
@@ -47,6 +44,37 @@ if [ "$(id -u)" -ne 0 ]; then
     exit 1
 fi
 
+# Get the list of GPG key servers that are reachable
+get_gpg_key_servers() {
+    declare -A keyservers_curl_map=(
+        ["hkps://keyserver.ubuntu.com"]="https://keyserver.ubuntu.com"
+        ["hkps://keys.openpgp.org"]="https://keys.openpgp.org"
+        ["hkps://keyserver.pgp.com"]="https://keyserver.pgp.com"
+    )
+
+    local curl_args=""
+    local keyserver_reachable=false  # Flag to indicate if any keyserver is reachable
+
+    if [ ! -z "${KEYSERVER_PROXY}" ]; then
+        curl_args="--proxy ${KEYSERVER_PROXY}"
+    fi
+
+    for keyserver in "${!keyservers_curl_map[@]}"; do
+        local keyserver_curl_url="${keyservers_curl_map[${keyserver}]}"
+        if curl -s ${curl_args} --max-time 5 ${keyserver_curl_url} > /dev/null; then
+            echo "keyserver ${keyserver}"
+            keyserver_reachable=true
+        else
+            echo "(*) Keyserver ${keyserver} is not reachable." >&2
+        fi
+    done
+
+    if ! $keyserver_reachable; then
+        echo "(!) No keyserver is reachable." >&2
+        exit 1
+    fi
+}
+
 # Import the specified key in a variable name passed in as 
 receive_gpg_keys() {
     local keys=${!1}
@@ -58,11 +86,16 @@ receive_gpg_keys() {
 	keyring_args="${keyring_args} --keyserver-options http-proxy=${KEYSERVER_PROXY}"
     fi
 
+    # Install curl
+    if ! type curl > /dev/null 2>&1; then
+        check_packages curl
+    fi
+
     # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
     chmod 700 ${GNUPGHOME}
-    echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" > ${GNUPGHOME}/dirmngr.conf
+    echo -e "disable-ipv6\n$(get_gpg_key_servers)" > ${GNUPGHOME}/dirmngr.conf
     # GPG key download sometimes fails for some reason and retrying fixes it.
     local retry_count=0
     local gpg_ok="false"
diff --git a/test/python/install_cpython_fallback_prev_version_test.sh b/test/python/install_cpython_fallback_prev_version_test.sh
index 85275c73b..c1beba455 100644
--- a/test/python/install_cpython_fallback_prev_version_test.sh
+++ b/test/python/install_cpython_fallback_prev_version_test.sh
@@ -93,6 +93,38 @@ check_packages() {
     esac
 }
 
+# Get the list of GPG key servers that are reachable
+get_gpg_key_servers() {
+    declare -A keyservers_curl_map=(
+        ["hkp://keyserver.ubuntu.com"]="http://keyserver.ubuntu.com:11371"
+        ["hkp://keyserver.ubuntu.com:80"]="http://keyserver.ubuntu.com"
+        ["hkps://keys.openpgp.org"]="https://keys.openpgp.org"
+        ["hkp://keyserver.pgp.com"]="http://keyserver.pgp.com:11371"
+    )
+
+    local curl_args=""
+    local keyserver_reachable=false  # Flag to indicate if any keyserver is reachable
+
+    if [ ! -z "${KEYSERVER_PROXY}" ]; then
+        curl_args="--proxy ${KEYSERVER_PROXY}"
+    fi
+
+    for keyserver in "${!keyservers_curl_map[@]}"; do
+        local keyserver_curl_url="${keyservers_curl_map[${keyserver}]}"
+        if curl -s ${curl_args} --max-time 5 ${keyserver_curl_url} > /dev/null; then
+            echo "keyserver ${keyserver}"
+            keyserver_reachable=true
+        else
+            echo "(*) Keyserver ${keyserver} is not reachable." >&2
+        fi
+    done
+
+    if ! $keyserver_reachable; then
+        echo "(!) No keyserver is reachable." >&2
+        exit 1
+    fi
+}
+
 # Import the specified key in a variable name passed in as 
 receive_gpg_keys() {
     local keys=${!1}
@@ -106,11 +138,16 @@ receive_gpg_keys() {
         keyring_args="${keyring_args} --keyserver-options http-proxy=${KEYSERVER_PROXY}"
     fi
 
+    # Install curl
+    if ! type curl > /dev/null 2>&1; then
+        check_packages curl
+    fi
+
     # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
     chmod 700 ${GNUPGHOME}
-    echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" > ${GNUPGHOME}/dirmngr.conf
+    echo -e "disable-ipv6\n$(get_gpg_key_servers)" > ${GNUPGHOME}/dirmngr.conf
     # GPG key download sometimes fails for some reason and retrying fixes it.
     local retry_count=0
     local gpg_ok="false"
@@ -145,6 +182,11 @@ receive_gpg_keys_centos7() {
         keyring_args="${keyring_args} --keyserver-options http-proxy=${KEYSERVER_PROXY}"
     fi
 
+    # Install curl
+    if ! type curl > /dev/null 2>&1; then
+        check_packages curl
+    fi
+
     # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
@@ -156,7 +198,7 @@ receive_gpg_keys_centos7() {
     set +e
         echo "(*) Downloading GPG keys..."
         until [ "${gpg_ok}" = "true" ] || [ "${retry_count}" -eq "5" ]; do
-            for keyserver in $(echo "${GPG_KEY_SERVERS}" | sed 's/keyserver //'); do
+            for keyserver in $(echo "$(get_gpg_key_servers)" | sed 's/keyserver //'); do
                 ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys --keyserver=${keyserver} ) 2>&1
                 downloaded_keys=$(gpg --list-keys | grep ^pub | wc -l)
                 if [[ ${num_keys} = ${downloaded_keys} ]]; then
diff --git a/test/ruby/ruby_fallback_test.sh b/test/ruby/ruby_fallback_test.sh
index 1e65e28e5..1c2179fc3 100644
--- a/test/ruby/ruby_fallback_test.sh
+++ b/test/ruby/ruby_fallback_test.sh
@@ -13,10 +13,6 @@ check "ruby" ruby -v
 trap 'echo "Last executed command failed at line ${LINENO}"' ERR
 
 RVM_GPG_KEYS="409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"
-GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
-keyserver hkp://keyserver.ubuntu.com:80
-keyserver hkps://keys.openpgp.org
-keyserver hkp://keyserver.pgp.com"
 
 # Clean up
 rm -rf /var/lib/apt/lists/*
@@ -63,6 +59,38 @@ check_packages() {
     fi
 }
 
+# Get the list of GPG key servers that are reachable
+get_gpg_key_servers() {
+    declare -A keyservers_curl_map=(
+        ["hkp://keyserver.ubuntu.com"]="http://keyserver.ubuntu.com:11371"
+        ["hkp://keyserver.ubuntu.com:80"]="http://keyserver.ubuntu.com"
+        ["hkps://keys.openpgp.org"]="https://keys.openpgp.org"
+        ["hkp://keyserver.pgp.com"]="http://keyserver.pgp.com:11371"
+    )
+
+    local curl_args=""
+    local keyserver_reachable=false  # Flag to indicate if any keyserver is reachable
+
+    if [ ! -z "${KEYSERVER_PROXY}" ]; then
+        curl_args="--proxy ${KEYSERVER_PROXY}"
+    fi
+
+    for keyserver in "${!keyservers_curl_map[@]}"; do
+        local keyserver_curl_url="${keyservers_curl_map[${keyserver}]}"
+        if curl -s ${curl_args} --max-time 5 ${keyserver_curl_url} > /dev/null; then
+            echo "keyserver ${keyserver}"
+            keyserver_reachable=true
+        else
+            echo "(*) Keyserver ${keyserver} is not reachable." >&2
+        fi
+    done
+
+    if ! $keyserver_reachable; then
+        echo "(!) No keyserver is reachable." >&2
+        exit 1
+    fi
+}
+
 # Import the specified key in a variable name passed in as 
 receive_gpg_keys() {
     local keys=${!1}
@@ -71,11 +99,16 @@ receive_gpg_keys() {
         keyring_args="--no-default-keyring --keyring \"$2\""
     fi
 
+    # Install curl
+    if ! type curl > /dev/null 2>&1; then
+        check_packages curl
+    fi
+
     # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
     chmod 700 ${GNUPGHOME}
-    echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" | tee ${GNUPGHOME}/dirmngr.conf > /dev/null
+    echo -e "disable-ipv6\n$(get_gpg_key_servers)" | tee ${GNUPGHOME}/dirmngr.conf > /dev/null
     # GPG key download sometimes fails for some reason and retrying fixes it.
     local retry_count=0
     local gpg_ok="false"

From 47e1764cfe6255ba3682c39b7675c59360a5a056 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Wed, 17 Jul 2024 09:47:59 -0700
Subject: [PATCH 294/478] Automated documentation update (#1042)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/rust/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/rust/README.md b/src/rust/README.md
index 974d78516..e72b932f0 100644
--- a/src/rust/README.md
+++ b/src/rust/README.md
@@ -17,6 +17,7 @@ Installs Rust, common Rust utilities, and their required dependencies
 |-----|-----|-----|-----|
 | version | Select or enter a version of Rust to install. | string | latest |
 | profile | Select a rustup install profile. | string | minimal |
+| targets | Optional comma separated list of additional Rust targets to install. | string | - |
 
 ## Customizations
 

From 4bb0335b0e6b31a7d9b4f5bbf58061396951fa55 Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Fri, 19 Jul 2024 09:52:50 +0530
Subject: [PATCH 295/478] [rust] - remove crates deprecated ext. - install
 dependi ext. instead (#1045)

* [rust] - remove crates deprecated ext. - install dependi ext. instead

* Update devcontainer-feature.json

* [rust] - bump minor version as removed extension

* Update src/rust/devcontainer-feature.json

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/rust/devcontainer-feature.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index 909f315c4..929b27eef 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "rust",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "name": "Rust",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
     "description": "Installs Rust, common Rust utilities, and their required dependencies",
@@ -56,8 +56,7 @@
             "extensions": [
                 "vadimcn.vscode-lldb",
                 "rust-lang.rust-analyzer",
-                "tamasfe.even-better-toml",
-                "serayuzgur.crates"
+                "tamasfe.even-better-toml"
             ],
             "settings": {
                 "files.watcherExclude": {
@@ -80,4 +79,4 @@
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
-}
\ No newline at end of file
+}

From d2bee515543a424b58c6951b1ec8a458227aa5b2 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Thu, 18 Jul 2024 21:24:19 -0700
Subject: [PATCH 296/478] Automated documentation update (#1047)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/rust/README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/rust/README.md b/src/rust/README.md
index e72b932f0..c19855aac 100644
--- a/src/rust/README.md
+++ b/src/rust/README.md
@@ -26,7 +26,6 @@ Installs Rust, common Rust utilities, and their required dependencies
 - `vadimcn.vscode-lldb`
 - `rust-lang.rust-analyzer`
 - `tamasfe.even-better-toml`
-- `serayuzgur.crates`
 
 
 

From 779283ad4e27b08051952de0c81566e0c41204e3 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Mon, 22 Jul 2024 09:53:32 -0700
Subject: [PATCH 297/478] [Updates] Automated vendor dotnet-install script
 (#1051)

* Automated dotnet-install script update

* Bump version

---------

Co-authored-by: github-actions <github-actions@github.com>
---
 src/dotnet/devcontainer-feature.json        | 2 +-
 src/dotnet/scripts/vendor/dotnet-install.sh | 4 ++++
 src/oryx/devcontainer-feature.json          | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index a9fa62901..eb09f1d54 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
diff --git a/src/dotnet/scripts/vendor/dotnet-install.sh b/src/dotnet/scripts/vendor/dotnet-install.sh
index 42c201af4..caa3ea450 100755
--- a/src/dotnet/scripts/vendor/dotnet-install.sh
+++ b/src/dotnet/scripts/vendor/dotnet-install.sh
@@ -327,6 +327,10 @@ get_machine_architecture() {
             echo "loongarch64"
             return 0
             ;;
+        riscv64)
+            echo "riscv64"
+            return 0
+            ;;
         esac
     fi
 
diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index 9e6e698a1..e0813fbb9 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "oryx",
-    "version": "1.3.3",
+    "version": "1.3.4",
     "name": "Oryx",
     "description": "Installs the oryx CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",

From 648c8d56b9ec4f90cb9d754cd532a9d2e08c0674 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 23 Jul 2024 12:05:01 -0700
Subject: [PATCH 298/478] Update update-dotnet-install-script.yml which updates
 vendor dotnet script for oryx (#938)

Update update-dotnet-install-script.yml
---
 .github/workflows/update-dotnet-install-script.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-dotnet-install-script.yml b/.github/workflows/update-dotnet-install-script.yml
index 85a9ea4d8..3394e8798 100644
--- a/.github/workflows/update-dotnet-install-script.yml
+++ b/.github/workflows/update-dotnet-install-script.yml
@@ -39,7 +39,7 @@ jobs:
 
           # Add / update and commit
           git add src/dotnet/scripts/vendor/dotnet-install.sh
-          git add src/dotnet/scripts/vendor/dotnet-install.sh
+          git add src/oryx/scripts/vendor/dotnet-install.sh
 
           git commit -m 'Automated dotnet-install script update' || export NO_UPDATES=true
 

From 788017f6860f75080b6917bdc225f2f815c6be74 Mon Sep 17 00:00:00 2001
From: Paul Taylor <178183+trxcllnt@users.noreply.github.com>
Date: Fri, 26 Jul 2024 10:26:19 -0700
Subject: [PATCH 299/478] Fix installing latest git from PPA in bionic (#1056)

* add failing bionic test

* Enforce keyserver test order (fixes #1055)

* bump feature version

* remove check for gettext

* update centos7 .repo files to reference vault.centos.org instead of mirrorlist.centos.org

* fix centos7 build from source
---
 src/git/devcontainer-feature.json       |  5 ++-
 src/git/install.sh                      | 56 +++++++++++++------------
 test/git/install_git_from_ppa_bionic.sh | 16 +++++++
 test/git/scenarios.json                 | 11 ++++-
 4 files changed, 58 insertions(+), 30 deletions(-)
 create mode 100644 test/git/install_git_from_ppa_bionic.sh

diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
index 2d18b8d34..87fb2ab3f 100644
--- a/src/git/devcontainer-feature.json
+++ b/src/git/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
@@ -9,6 +9,7 @@
             "type": "string",
             "proposals": [
                 "latest",
+                "system",
                 "os-provided"
             ],
             "default": "os-provided",
@@ -23,4 +24,4 @@
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
-}
\ No newline at end of file
+}
diff --git a/src/git/install.sh b/src/git/install.sh
index 974dc66c0..976eb348d 100755
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -26,12 +26,20 @@ elif [ "${ID}" = "alpine" ]; then
     ADJUSTED_ID="alpine"
 elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
     ADJUSTED_ID="rhel"
-    VERSION_CODENAME="${ID}{$VERSION_ID}"
+    VERSION_CODENAME="${ID}${VERSION_ID}"
 else
     echo "Linux distro ${ID} not supported."
     exit 1
 fi
 
+if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${VERSION_CODENAME-}" = "centos7" ]; then
+    # As of 1 July 2024, mirrorlist.centos.org no longer exists.
+    # Update the repo files to reference vault.centos.org.
+    sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
+    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
+    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
+fi
+
 if type apt-get > /dev/null 2>&1; then
     INSTALL_CMD=apt-get
 elif type apk > /dev/null 2>&1; then
@@ -66,13 +74,6 @@ clean_up
 
 # Get the list of GPG key servers that are reachable
 get_gpg_key_servers() {
-    declare -A keyservers_curl_map=(
-        ["hkp://keyserver.ubuntu.com"]="http://keyserver.ubuntu.com:11371"
-        ["hkp://keyserver.ubuntu.com:80"]="http://keyserver.ubuntu.com"
-        ["hkps://keys.openpgp.org"]="https://keys.openpgp.org"
-        ["hkp://keyserver.pgp.com"]="http://keyserver.pgp.com:11371"
-    )
-
     local curl_args=""
     local keyserver_reachable=false  # Flag to indicate if any keyserver is reachable
 
@@ -80,15 +81,26 @@ get_gpg_key_servers() {
         curl_args="--proxy ${KEYSERVER_PROXY}"
     fi
 
-    for keyserver in "${!keyservers_curl_map[@]}"; do
-        local keyserver_curl_url="${keyservers_curl_map[${keyserver}]}"
-        if curl -s ${curl_args} --max-time 5 ${keyserver_curl_url} > /dev/null; then
+    test_keyserver() {
+        local keyserver="$1"
+        local keyserver_curl_url="$2"
+        if curl -s ${curl_args} --max-time 5 "${keyserver_curl_url}" > /dev/null; then
             echo "keyserver ${keyserver}"
             keyserver_reachable=true
         else
             echo "(*) Keyserver ${keyserver} is not reachable." >&2
         fi
-    done
+    }
+
+    # Explicitly test these in order because Bash v4.4.20 (Ubuntu Bionic)
+    # enumerates associative array keys in a different order than Bash v5
+    test_keyserver "hkp://keyserver.ubuntu.com"    "http://keyserver.ubuntu.com:11371"
+    test_keyserver "hkp://keyserver.ubuntu.com:80" "http://keyserver.ubuntu.com"
+    test_keyserver "hkp://keyserver.pgp.com"       "http://keyserver.pgp.com:11371"
+    # Test this server last because keys.openpgp.org strips user IDs from keys unless
+    # the owner gives permission, which causes gpg in Ubuntu Bionic to reject the key
+    # (https://github.com/devcontainers/features/issues/1055)
+    test_keyserver "hkps://keys.openpgp.org"       "https://keys.openpgp.org"
 
     if ! $keyserver_reachable; then
         echo "(!) No keyserver is reachable." >&2
@@ -96,7 +108,7 @@ get_gpg_key_servers() {
     fi
 }
 
-# Import the specified key in a variable name passed in as 
+# Import the specified key in a variable name passed in as
 receive_gpg_keys() {
     local keys=${!1}
     local keyring_args=""
@@ -109,7 +121,7 @@ receive_gpg_keys() {
     if ! type curl > /dev/null 2>&1; then
         check_packages curl
     fi
-    
+
     # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
@@ -119,7 +131,7 @@ receive_gpg_keys() {
     local retry_count=0
     local gpg_ok="false"
     set +e
-    until [ "${gpg_ok}" = "true" ] || [ "${retry_count}" -eq "5" ]; 
+    until [ "${gpg_ok}" = "true" ] || [ "${retry_count}" -eq "5" ];
     do
         echo "(*) Downloading GPG key..."
         ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys) 2>&1 && gpg_ok="true"
@@ -224,7 +236,7 @@ if ([ "${GIT_VERSION}" = "latest" ] || [ "${GIT_VERSION}" = "lts" ] || [ "${GIT_
     receive_gpg_keys GIT_CORE_PPA_ARCHIVE_GPG_KEY /usr/share/keyrings/gitcoreppa-archive-keyring.gpg
     echo -e "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/gitcoreppa-archive-keyring.gpg] http://ppa.launchpad.net/git-core/ppa/ubuntu ${VERSION_CODENAME} main\ndeb-src [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/gitcoreppa-archive-keyring.gpg] http://ppa.launchpad.net/git-core/ppa/ubuntu ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/git-core-ppa.list
     ${INSTALL_CMD} update
-    ${INSTALL_CMD} -y install --no-install-recommends git 
+    ${INSTALL_CMD} -y install --no-install-recommends git
     rm -rf "/tmp/tmp-gnupg"
     rm -rf /var/lib/apt/lists/*
     exit 0
@@ -254,17 +266,7 @@ elif [ "${ADJUSTED_ID}" = "alpine" ]; then
     check_packages asciidoc curl-dev expat-dev g++ gcc openssl-dev pcre2-dev perl-dev perl-error python3-dev tcl tk xmlto
 
 elif [ "${ADJUSTED_ID}" = "rhel" ]; then
-
-    if [ $VERSION_CODENAME = "centos7" ]; then
-        check_packages centos-release-scl 
-        check_packages devtoolset-11
-        source /opt/rh/devtoolset-11/enable
-    else
-        check_packages gcc
-    fi
-
-
-    check_packages libcurl-devel expat-devel gettext-devel openssl-devel perl-devel zlib-devel cmake pcre2-devel tar gzip ca-certificates
+    check_packages gcc libcurl-devel expat-devel gettext-devel openssl-devel perl-devel zlib-devel cmake pcre2-devel tar gzip ca-certificates
     if ! type curl > /dev/null 2>&1; then
         check_packages curl
     fi
diff --git a/test/git/install_git_from_ppa_bionic.sh b/test/git/install_git_from_ppa_bionic.sh
new file mode 100644
index 000000000..84800b543
--- /dev/null
+++ b/test/git/install_git_from_ppa_bionic.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
diff --git a/test/git/scenarios.json b/test/git/scenarios.json
index 4d606c365..0f5d522b3 100644
--- a/test/git/scenarios.json
+++ b/test/git/scenarios.json
@@ -26,6 +26,15 @@
             }
         }
     },
+    "install_git_from_ppa_bionic": {
+        "image": "ubuntu:bionic",
+        "features": {
+            "git": {
+                "version": "latest",
+                "ppa": "true"
+            }
+        }
+    },
     "install_git_from_src_bionic": {
         "image": "ubuntu:bionic",
         "features": {
@@ -188,4 +197,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

From 51940aa423dfa5928c40f897a78e88b88b24197f Mon Sep 17 00:00:00 2001
From: Anoop Nayak <665703+anoopknayak@users.noreply.github.com>
Date: Fri, 26 Jul 2024 16:02:46 -0700
Subject: [PATCH 300/478] [Rust] Update devcontainer-feature.json to include
 rust versions until 1.79 (#1040)

* Update devcontainer-feature.json to include rust versions until 1.79

Update devcontainer.json to enable pinning rustc version upto 1.79

* Bump patch version for devcontainer.json
---
 src/rust/devcontainer-feature.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index 929b27eef..9fc540c7d 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "rust",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "name": "Rust",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
     "description": "Installs Rust, common Rust utilities, and their required dependencies",
@@ -10,6 +10,9 @@
             "proposals": [
                 "latest",
                 "none",
+                "1.79",
+                "1.78",
+                "1.77",
                 "1.76",
                 "1.75",
                 "1.74",

From 5f4d20101820e52c0a6c877637088c8981af3dc0 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Mon, 29 Jul 2024 10:05:53 -0700
Subject: [PATCH 301/478] [Updates] Automated vendor dotnet-install script
 (#1064)

* Automated dotnet-install script update

* Bump version

* Update src/dotnet/devcontainer-feature.json

---------

Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
---
 src/oryx/devcontainer-feature.json        |  2 +-
 src/oryx/scripts/vendor/dotnet-install.sh | 30 +++++++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index e0813fbb9..68391cde9 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "oryx",
-    "version": "1.3.4",
+    "version": "1.3.5",
     "name": "Oryx",
     "description": "Installs the oryx CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
diff --git a/src/oryx/scripts/vendor/dotnet-install.sh b/src/oryx/scripts/vendor/dotnet-install.sh
index f6b08d1f8..caa3ea450 100755
--- a/src/oryx/scripts/vendor/dotnet-install.sh
+++ b/src/oryx/scripts/vendor/dotnet-install.sh
@@ -298,6 +298,10 @@ get_machine_architecture() {
     if command -v uname > /dev/null; then
         CPUName=$(uname -m)
         case $CPUName in
+        armv1*|armv2*|armv3*|armv4*|armv5*|armv6*)
+            echo "armv6-or-below"
+            return 0
+            ;;
         armv*l)
             echo "arm"
             return 0
@@ -323,6 +327,10 @@ get_machine_architecture() {
             echo "loongarch64"
             return 0
             ;;
+        riscv64)
+            echo "riscv64"
+            return 0
+            ;;
         esac
     fi
 
@@ -339,7 +347,13 @@ get_normalized_architecture_from_architecture() {
     local architecture="$(to_lowercase "$1")"
 
     if [[ $architecture == \<auto\> ]]; then
-        echo "$(get_machine_architecture)"
+        machine_architecture="$(get_machine_architecture)"
+        if [[ "$machine_architecture" == "armv6-or-below" ]]; then
+            say_err "Architecture \`$machine_architecture\` not supported. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues"
+            return 1
+        fi
+
+        echo $machine_architecture
         return 0
     fi
 
@@ -1013,7 +1027,7 @@ extract_dotnet_package() {
     
     rm -rf "$temp_out_path"
     if [ -z ${keep_zip+x} ]; then
-        rm -f "$zip_path" && say_verbose "Temporary zip file $zip_path was removed"
+        rm -f "$zip_path" && say_verbose "Temporary archive file $zip_path was removed"
     fi
 
     if [ "$failed" = true ]; then
@@ -1261,6 +1275,12 @@ get_download_link_from_aka_ms() {
     http_codes=$( echo "$response" | awk '$1 ~ /^HTTP/ {print $2}' )
     # They all need to be 301, otherwise some links are broken (except for the last, which is not a redirect but 200 or 404).
     broken_redirects=$( echo "$http_codes" | sed '$d' | grep -v '301' )
+    # The response may end without final code 2xx/4xx/5xx somehow, e.g. network restrictions on www.bing.com causes redirecting to bing.com fails with connection refused.
+    # In this case it should not exclude the last.
+    last_http_code=$(  echo "$http_codes" | tail -n 1 )
+    if ! [[ $last_http_code =~ ^(2|4|5)[0-9][0-9]$ ]]; then
+        broken_redirects=$( echo "$http_codes" | grep -v '301' )
+    fi
 
     # All HTTP codes are 301 (Moved Permanently), the redirect link exists.
     if [[ -z "$broken_redirects" ]]; then
@@ -1512,7 +1532,7 @@ install_dotnet() {
 
     mkdir -p "$install_root"
     zip_path="${zip_path:-$(mktemp "$temporary_file_template")}"
-    say_verbose "Zip path: $zip_path"
+    say_verbose "Archive path: $zip_path"
 
     for link_index in "${!download_links[@]}"
     do
@@ -1536,7 +1556,7 @@ install_dotnet() {
                 say "Failed to download $link_type link '$download_link': $download_error_msg"
                 ;;
             esac
-            rm -f "$zip_path" 2>&1 && say_verbose "Temporary zip file $zip_path was removed"
+            rm -f "$zip_path" 2>&1 && say_verbose "Temporary archive file $zip_path was removed"
         else
             download_completed=true
             break
@@ -1551,7 +1571,7 @@ install_dotnet() {
 
     remote_file_size="$(get_remote_file_size "$download_link")"
 
-    say "Extracting zip from $download_link"
+    say "Extracting archive from $download_link"
     extract_dotnet_package "$zip_path" "$install_root" "$remote_file_size" || return 1
 
     #  Check if the SDK version is installed; if not, fail the installation.

From 175185811e716c1f3b92caea7ae2b3389aba9134 Mon Sep 17 00:00:00 2001
From: Dmytro Kyrychuk <dmytro@kyrych.uk>
Date: Mon, 29 Jul 2024 20:54:13 +0300
Subject: [PATCH 302/478] common-utils: add bash-completion (#1048)

* common-utils: add bash-completion

Resolve #1043

* update centos7 .repo files to reference vault.centos.org instead of mirrorlist.centos.org

Copied from src/git/install.sh

---------

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
---
 src/common-utils/devcontainer-feature.json |  2 +-
 src/common-utils/main.sh                   | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index dc62272ad..a253bfb05 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.4.4",
+    "version": "2.4.5",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 5d7592cfc..8f82dcdf9 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -32,6 +32,7 @@ install_debian_packages() {
     if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
         package_list="${package_list} \
         apt-utils \
+        bash-completion \
         openssh-client \
         gnupg2 \
         dirmngr \
@@ -170,6 +171,7 @@ install_redhat_packages() {
     if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
         package_list="${package_list} \
             gawk \
+            bash-completion \
             openssh-clients \
             gnupg2 \
             iproute \
@@ -254,6 +256,7 @@ install_alpine_packages() {
     if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
         apk add --no-cache \
             openssh-client \
+            bash-completion \
             gnupg \
             procps \
             lsof \
@@ -343,6 +346,7 @@ if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
     ADJUSTED_ID="debian"
 elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
     ADJUSTED_ID="rhel"
+    VERSION_CODENAME="${ID}${VERSION_ID}"
 elif [ "${ID}" = "alpine" ]; then
     ADJUSTED_ID="alpine"
 else
@@ -350,6 +354,14 @@ else
     exit 1
 fi
 
+if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${VERSION_CODENAME-}" = "centos7" ]; then
+    # As of 1 July 2024, mirrorlist.centos.org no longer exists.
+    # Update the repo files to reference vault.centos.org.
+    sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
+    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
+    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
+fi
+
 # Install packages for appropriate OS
 case "${ADJUSTED_ID}" in
     "debian")

From f5f489f66e6f6ae777dcff4a555a15945a4ce2ae Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Wed, 7 Aug 2024 00:03:59 +0530
Subject: [PATCH 303/478] [Desktop-lite] - VNC_RESOLUTION unreadable fix -
 issue #945 fix (#1024)

* [Desktop-lite] - VNC_RESOLUTION unreadable fix - issue #945

* bump to patch version done

* changes as suggested

* changes - removing escaped variables for init to go smoothly

* misc change

* few more escaped vars - making them unescaped

* misc changes

* changes for sudo - command not found error in few test cases
---
 src/desktop-lite/devcontainer-feature.json |  2 +-
 src/desktop-lite/install.sh                | 73 +++++++++++++---------
 2 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json
index 417787c51..2dee08bde 100644
--- a/src/desktop-lite/devcontainer-feature.json
+++ b/src/desktop-lite/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "desktop-lite",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "name": "Light-weight Desktop",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
     "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh
index ef8b603c6..777be8f1a 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -293,7 +293,7 @@ echo -e "\nSuccess!\n"
 EOF
 
 # Container ENTRYPOINT script
-cat << EOF > /usr/local/share/desktop-init.sh
+cat << 'EOF' > /usr/local/share/desktop-init.sh
 #!/bin/bash
 
 user_name="${USERNAME}"
@@ -309,50 +309,67 @@ export LANGUAGE="${LANGUAGE:-"en_US.UTF-8"}"
 # Execute the command it not already running
 startInBackgroundIfNotRunning()
 {
-    log "Starting \$1."
-    echo -e "\n** \$(date) **" | sudoIf tee -a /tmp/\$1.log > /dev/null
-    if ! pgrep -x \$1 > /dev/null; then
-        keepRunningInBackground "\$@"
-        while ! pgrep -x \$1 > /dev/null; do
+    log "Starting $1."
+    echo -e "\n** $(date) **" | sudoIf tee -a /tmp/\$1.log > /dev/null
+    if ! pgrep -x $1 > /dev/null; then
+        keepRunningInBackground "$@"
+        while ! pgrep -x $1 > /dev/null; do
             sleep 1
         done
-        log "\$1 started."
+        log "$1 started."
     else
-        echo "\$1 is already running." | sudoIf tee -a /tmp/\$1.log > /dev/null
-        log "\$1 is already running."
+        echo "$1 is already running." | sudoIf tee -a /tmp/\$1.log > /dev/null
+        log "$1 is already running."
     fi
 }
 
 # Keep command running in background
 keepRunningInBackground()
 {
-    (\$2 bash -c "while :; do echo [\\\$(date)] Process started.; \$3; echo [\\\$(date)] Process exited!; sleep 5; done 2>&1" | sudoIf tee -a /tmp/\$1.log > /dev/null & echo "\$!" | sudoIf tee /tmp/\$1.pid > /dev/null)
+    ($2 bash -c "while :; do echo [\\$(date)] Process started.; $3; echo [\\$(date)] Process exited!; sleep 5; done 2>&1" | sudoIf tee -a /tmp/\$1.log > /dev/null & echo "\$!" | sudoIf tee /tmp/\$1.pid > /dev/null)
+}
+
+apt_get_update()
+{
+    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+        echo "Running apt-get update..."
+        apt-get update -y
+    fi
+}
+
+check_packages() {
+    if ! dpkg -s "$@" > /dev/null 2>&1; then
+        apt_get_update
+        apt-get -y install --no-install-recommends "$@"
+    fi
 }
 
 # Use sudo to run as root when required
 sudoIf()
 {
-    if [ "\$(id -u)" -ne 0 ]; then
-        sudo "\$@"
+    if [ "$(id -u)" -ne 0 ]; then
+        check_packages sudo
+        sudo "$@"
     else
-        "\$@"
+        "$@"
     fi
 }
 
 # Use sudo to run as non-root user if not already running
 sudoUserIf()
 {
-    if [ "\$(id -u)" -eq 0 ] && [ "\${user_name}" != "root" ]; then
-        sudo -u \${user_name} "\$@"
+    if [ "$(id -u)" -eq 0 ] && [ "${user_name}" != "root" ]; then
+        check_packages sudo
+        sudo -u "${user_name}" "$@"
     else
-        "\$@"
+        "$@"
     fi
 }
 
 # Log messages
 log()
 {
-    echo -e "[\$(date)] \$@" | sudoIf tee -a \$LOG > /dev/null
+    echo -e "[$(date)] $@" | sudoIf tee -a $LOG > /dev/null
 }
 
 log "** SCRIPT START **"
@@ -371,22 +388,22 @@ done
 sudoIf rm -rf /tmp/.X11-unix /tmp/.X*-lock
 mkdir -p /tmp/.X11-unix
 sudoIf chmod 1777 /tmp/.X11-unix
-sudoIf chown root:\${group_name} /tmp/.X11-unix
-if [ "\$(echo "\${VNC_RESOLUTION}" | tr -cd 'x' | wc -c)" = "1" ]; then VNC_RESOLUTION=\${VNC_RESOLUTION}x16; fi
-screen_geometry="\${VNC_RESOLUTION%*x*}"
-screen_depth="\${VNC_RESOLUTION##*x}"
+sudoIf chown root:${group_name} /tmp/.X11-unix
+if [ "$(echo "${VNC_RESOLUTION}" | tr -cd 'x' | wc -c)" = "1" ]; then VNC_RESOLUTION=${VNC_RESOLUTION}x16; fi
+screen_geometry="${VNC_RESOLUTION%*x*}"
+screen_depth="${VNC_RESOLUTION##*x}"
 
 # Check if VNC_PASSWORD is set and use the appropriate command
-common_options="tigervncserver \${DISPLAY} -geometry \${screen_geometry} -depth \${screen_depth} -rfbport ${VNC_PORT} -dpi \${VNC_DPI:-96} -localhost -desktop fluxbox -fg"
+common_options="tigervncserver ${DISPLAY} -geometry ${screen_geometry} -depth ${screen_depth} -rfbport ${VNC_PORT} -dpi ${VNC_DPI:-96} -localhost -desktop fluxbox -fg"
 
-if [ -n "\${VNC_PASSWORD+x}" ]; then
-    startInBackgroundIfNotRunning "Xtigervnc" sudoUserIf "\${common_options} -passwd /usr/local/etc/vscode-dev-containers/vnc-passwd"
+if [ -n "${VNC_PASSWORD+x}" ]; then
+    startInBackgroundIfNotRunning "Xtigervnc" sudoUserIf "${common_options} -passwd /usr/local/etc/vscode-dev-containers/vnc-passwd"
 else
-    startInBackgroundIfNotRunning "Xtigervnc" sudoUserIf "\${common_options} -SecurityTypes None"
+    startInBackgroundIfNotRunning "Xtigervnc" sudoUserIf "${common_options} -SecurityTypes None"
 fi
 
 # Spin up noVNC if installed and not running.
-if [ -d "/usr/local/novnc" ] && [ "\$(ps -ef | grep /usr/local/novnc/noVNC*/utils/launch.sh | grep -v grep)" = "" ]; then
+if [ -d "/usr/local/novnc" ] && [ "$(ps -ef | grep /usr/local/novnc/noVNC*/utils/launch.sh | grep -v grep)" = "" ]; then
     keepRunningInBackground "noVNC" sudoIf "/usr/local/novnc/noVNC*/utils/launch.sh --listen ${NOVNC_PORT} --vnc localhost:${VNC_PORT}"
     log "noVNC started."
 else
@@ -394,8 +411,8 @@ else
 fi
 
 # Run whatever was passed in
-log "Executing \"\$@\"."
-exec "\$@"
+log "Executing "\$@\"."
+exec "$@"
 log "** SCRIPT EXIT **"
 EOF
 

From dd0266fe7161dfb097c3d92315822bb248fc9047 Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Wed, 7 Aug 2024 22:57:55 +0530
Subject: [PATCH 304/478] [Java] - features issue #1101 - installs -tem instead
 -ms for lts installation (#1021)

* [Java] - features issue #1101 - installs -tem instead -ms for lts installation

* misc change

* misc change, by mistake needs correction

* leave a line change

* remove spaces

* bump patch version..

* changes for pr reviewed

* changes

* Update src/java/devcontainer-feature.json

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* [java] - corrected lts version finding logic in install.sh

* small change

* changes as requested..

* changes as requested

* changes as suggested - centos-7, mirrorlist no longer exists - changed to vault

* corrected condition for specific version installations..

* misc change

* corrected condition

* small change

* corrections

* change

* changes in test cases - removing /tmp before test specific test runs..

* few changes to test cases again..

* small change

* addition of --overwrite option to gradle init command

* changes as suggested on pr comments

* misc. change for correcting logic

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/java/devcontainer-feature.json            |  2 +-
 src/java/install.sh                           | 44 ++++++++++++++++---
 ...all_ant_and_gradle_and_maven_and_groovy.sh |  2 +-
 ...nd_gradle_and_maven_and_groovy_for_user.sh |  3 +-
 ...d_maven_and_groovy_for_user_rhel_family.sh |  2 +-
 ...gradle_and_maven_and_groovy_rhel_family.sh |  2 +-
 test/java/install_lts_version.sh              | 11 +++++
 test/java/scenarios.json                      |  8 ++++
 8 files changed, 62 insertions(+), 12 deletions(-)
 create mode 100644 test/java/install_lts_version.sh

diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index c43862610..51e214a25 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "name": "Java (via SDKMAN!)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
diff --git a/src/java/install.sh b/src/java/install.sh
index 30b6cb10c..277681fec 100644
--- a/src/java/install.sh
+++ b/src/java/install.sh
@@ -9,7 +9,7 @@
 #
 # Syntax: ./java-debian.sh [JDK version] [SDKMAN_DIR] [non-root user] [Add to rc files flag]
 
-JAVA_VERSION="${VERSION:-"lts"}"
+JAVA_VERSION="${VERSION:-"latest"}"
 INSTALL_GRADLE="${INSTALLGRADLE:-"false"}"
 GRADLE_VERSION="${GRADLEVERSION:-"latest"}"
 INSTALL_MAVEN="${INSTALLMAVEN:-"false"}"
@@ -53,6 +53,14 @@ else
     exit 1
 fi
 
+if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${VERSION_CODENAME-}" = "centos7" ]; then
+    # As of 1 July 2024, mirrorlist.centos.org no longer exists.
+    # Update the repo files to reference vault.centos.org.
+    sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
+    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
+    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
+fi
+
 # Setup INSTALL_CMD & PKG_MGR_CMD
 if type apt-get > /dev/null 2>&1; then
     PKG_MGR_CMD=apt-get
@@ -197,6 +205,22 @@ get_jdk_distro() {
     fi
 }
 
+find_version_list() {
+    prefix="$1"
+    suffix="$2"
+    install_type=$3
+    ifLts="$4"
+    version_list=$5
+    if [ "${ifLts}" = "true" ]; then 
+        all_lts_versions=$(curl -s https://api.adoptium.net/v3/info/available_releases)
+        major_version=$(echo "$all_lts_versions" | jq -r '.most_recent_lts')
+        regex="${prefix}\\K${major_version}\\.?[0-9]*\\.?[0-9]*${suffix}"
+    else 
+        regex="${prefix}\\K[0-9]+\\.?[0-9]*\\.?[0-9]*${suffix}"
+    fi
+    declare -g ${version_list}="$(su ${USERNAME} -c ". \${SDKMAN_DIR}/bin/sdkman-init.sh && sdk list ${install_type} 2>&1 | grep -oP \"${regex}\" | tr -d ' ' | sort -rV")"
+}
+
 # Use SDKMAN to install something using a partial version match
 sdk_install() {
     local install_type=$1
@@ -205,15 +229,21 @@ sdk_install() {
     local suffix="${4:-"\\s*"}"
     local full_version_check=${5:-".*-[a-z]+"}
     local set_as_default=${6:-"true"}
+    pkgs=("maven" "gradle" "ant" "groovy")
+    pkg_vals="${pkgs[@]}"
     if [ "${requested_version}" = "none" ]; then return; fi
-    # Blank will install latest stable version SDKMAN has
-    if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "lts" ] || [ "${requested_version}" = "default" ]; then
-         requested_version=""
+    if [ "${requested_version}" = "default" ]; then
+        requested_version=""
+    elif [[ "${pkg_vals}" =~ "${install_type}" ]] && [ "${requested_version}" = "latest" ]; then
+        requested_version=""
+    elif [ "${requested_version}" = "lts" ]; then
+            check_packages jq
+            find_version_list "$prefix" "$suffix" "$install_type" "true" version_list
+            requested_version="$(echo "${version_list}" | head -n 1)"
     elif echo "${requested_version}" | grep -oE "${full_version_check}" > /dev/null 2>&1; then
         echo "${requested_version}"
-    else
-        local regex="${prefix}\\K[0-9]+\\.?[0-9]*\\.?[0-9]*${suffix}"
-        local version_list=$(su ${USERNAME} -c ". \${SDKMAN_DIR}/bin/sdkman-init.sh && sdk list ${install_type} 2>&1 | grep -oP \"${regex}\" | tr -d ' ' | sort -rV")
+    else 
+        find_version_list "$prefix" "$suffix" "$install_type" "false" version_list
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ]; then
             requested_version="$(echo "${version_list}" | head -n 1)"
         else
diff --git a/test/java/install_ant_and_gradle_and_maven_and_groovy.sh b/test/java/install_ant_and_gradle_and_maven_and_groovy.sh
index e171f5be5..a9ab99dfd 100644
--- a/test/java/install_ant_and_gradle_and_maven_and_groovy.sh
+++ b/test/java/install_ant_and_gradle_and_maven_and_groovy.sh
@@ -17,7 +17,7 @@ cd /tmp && ant init
 check "ant-src exists" grep "ant-src" <(ls -la /tmp)
 
 check "gradle" gradle --version
-cd /tmp && gradle init --type basic --dsl groovy --incubating --project-name test
+cd /tmp && gradle init --type basic --dsl groovy --overwrite --incubating --project-name test
 check "GRADLE_USER_HOME exists" grep ".gradle" <(ls -la /root)
 
 check "maven" mvn --version
diff --git a/test/java/install_ant_and_gradle_and_maven_and_groovy_for_user.sh b/test/java/install_ant_and_gradle_and_maven_and_groovy_for_user.sh
index 8d9f293e9..54f7ee9ea 100644
--- a/test/java/install_ant_and_gradle_and_maven_and_groovy_for_user.sh
+++ b/test/java/install_ant_and_gradle_and_maven_and_groovy_for_user.sh
@@ -10,6 +10,7 @@ check "user is vscode" grep vscode <(whoami)
 check "java" java --version
 
 check "ant" ant -version
+
 cat << EOF > /tmp/build.xml
 <project><target name="init"><mkdir dir="ant-src"/></target></project>
 EOF
@@ -17,7 +18,7 @@ cd /tmp && ant init
 check "ant-src exists" grep "ant-src" <(ls -la /tmp)
 
 check "gradle" gradle --version
-cd /tmp && gradle init --type basic --dsl groovy --incubating --project-name test
+cd /tmp && gradle init --type basic --dsl groovy --overwrite --incubating --project-name test
 check "GRADLE_USER_HOME exists" grep ".gradle" <(ls -la /home/vscode)
 
 check "maven" mvn --version
diff --git a/test/java/install_ant_and_gradle_and_maven_and_groovy_for_user_rhel_family.sh b/test/java/install_ant_and_gradle_and_maven_and_groovy_for_user_rhel_family.sh
index 8d9f293e9..6ff97f5b1 100644
--- a/test/java/install_ant_and_gradle_and_maven_and_groovy_for_user_rhel_family.sh
+++ b/test/java/install_ant_and_gradle_and_maven_and_groovy_for_user_rhel_family.sh
@@ -17,7 +17,7 @@ cd /tmp && ant init
 check "ant-src exists" grep "ant-src" <(ls -la /tmp)
 
 check "gradle" gradle --version
-cd /tmp && gradle init --type basic --dsl groovy --incubating --project-name test
+cd /tmp && gradle init --type basic --dsl groovy --overwrite --incubating --project-name test
 check "GRADLE_USER_HOME exists" grep ".gradle" <(ls -la /home/vscode)
 
 check "maven" mvn --version
diff --git a/test/java/install_ant_and_gradle_and_maven_and_groovy_rhel_family.sh b/test/java/install_ant_and_gradle_and_maven_and_groovy_rhel_family.sh
index e171f5be5..a9ab99dfd 100644
--- a/test/java/install_ant_and_gradle_and_maven_and_groovy_rhel_family.sh
+++ b/test/java/install_ant_and_gradle_and_maven_and_groovy_rhel_family.sh
@@ -17,7 +17,7 @@ cd /tmp && ant init
 check "ant-src exists" grep "ant-src" <(ls -la /tmp)
 
 check "gradle" gradle --version
-cd /tmp && gradle init --type basic --dsl groovy --incubating --project-name test
+cd /tmp && gradle init --type basic --dsl groovy --overwrite --incubating --project-name test
 check "GRADLE_USER_HOME exists" grep ".gradle" <(ls -la /root)
 
 check "maven" mvn --version
diff --git a/test/java/install_lts_version.sh b/test/java/install_lts_version.sh
new file mode 100644
index 000000000..c3518897f
--- /dev/null
+++ b/test/java/install_lts_version.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "java version LTS installed as default" grep "LTS" <(java --version)
+
+# Report result
+reportResults
diff --git a/test/java/scenarios.json b/test/java/scenarios.json
index 6e6426969..538d77972 100644
--- a/test/java/scenarios.json
+++ b/test/java/scenarios.json
@@ -8,6 +8,14 @@
             }
         }
     },
+    "install_lts_version": {
+        "image": "ubuntu:focal",
+        "features": {
+            "java": {
+                "version": "lts"
+            }
+        }
+    },
     "install_additional_java": {
         "image": "ubuntu:focal",
         "features": {

From 6d2b646ad118454674d7c72df4f2e0f85d8cf18c Mon Sep 17 00:00:00 2001
From: Daniel Meilak <32960789+daniel-meilak@users.noreply.github.com>
Date: Mon, 12 Aug 2024 19:27:26 +0200
Subject: [PATCH 305/478] [desktop-lite] Suggested usage of appPort instead of
 forwardPorts for devconatiner-cli (#1086)

[desktop-lite] Suggested usage of appPort instead of forwardPorts for devcontainer-cli
---
 src/desktop-lite/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/desktop-lite/README.md b/src/desktop-lite/README.md
index 6f2d67ce2..f8b692471 100644
--- a/src/desktop-lite/README.md
+++ b/src/desktop-lite/README.md
@@ -25,7 +25,7 @@ Adds a lightweight Fluxbox based desktop to the container that can be accessed u
 
 This feature provides two ways of connecting to the desktop environment it adds. The first is to connect using a web browser. To do so:
 
-1. Forward the noVNC port (`6080` by default) to your local machine using either the `forwardPorts` property in `devcontainer.json` or the user interface in your tool (e.g., you can press <kbd>F1</kbd> or <kbd>Ctrl/Cmd</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd> and select **Ports: Focus on Ports View** in VS Code to bring it into focus).
+1. Forward the noVNC port (`6080` by default) to your local machine using either the `forwardPorts` property in `devcontainer.json` or the user interface in your tool (e.g., you can press <kbd>F1</kbd> or <kbd>Ctrl/Cmd</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd> and select **Ports: Focus on Ports View** in VS Code to bring it into focus). If using the [Dev Conatiner Cli](https://github.com/devcontainers/cli), you should use the `appPort` property in `devcontainer.json` instead.
 1. Open the ports view in your tool, select the noVNC port, and click the Globe icon.
 1. In the browser that appears, click the **Connect** button and enter the desktop password (`vscode` by default).
 

From 46f7cea75d820562617297ea0421dc7bf103e6ae Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Mon, 12 Aug 2024 10:37:46 -0700
Subject: [PATCH 306/478] Automated documentation update (#1087)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/desktop-lite/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/desktop-lite/README.md b/src/desktop-lite/README.md
index f8b692471..6f2d67ce2 100644
--- a/src/desktop-lite/README.md
+++ b/src/desktop-lite/README.md
@@ -25,7 +25,7 @@ Adds a lightweight Fluxbox based desktop to the container that can be accessed u
 
 This feature provides two ways of connecting to the desktop environment it adds. The first is to connect using a web browser. To do so:
 
-1. Forward the noVNC port (`6080` by default) to your local machine using either the `forwardPorts` property in `devcontainer.json` or the user interface in your tool (e.g., you can press <kbd>F1</kbd> or <kbd>Ctrl/Cmd</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd> and select **Ports: Focus on Ports View** in VS Code to bring it into focus). If using the [Dev Conatiner Cli](https://github.com/devcontainers/cli), you should use the `appPort` property in `devcontainer.json` instead.
+1. Forward the noVNC port (`6080` by default) to your local machine using either the `forwardPorts` property in `devcontainer.json` or the user interface in your tool (e.g., you can press <kbd>F1</kbd> or <kbd>Ctrl/Cmd</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd> and select **Ports: Focus on Ports View** in VS Code to bring it into focus).
 1. Open the ports view in your tool, select the noVNC port, and click the Globe icon.
 1. In the browser that appears, click the **Connect** button and enter the desktop password (`vscode` by default).
 

From 8f3115afe337554b1077ab51659b2f7334ca67d2 Mon Sep 17 00:00:00 2001
From: Mostafa Dahshan <12108158+mdahshan@users.noreply.github.com>
Date: Tue, 13 Aug 2024 09:49:50 +1000
Subject: [PATCH 307/478] Desktop lite: Fix quote error (#1082)

* Update install.sh

Corrected a syntax error in line 414

log "Executing "\$@\"."

was corrected to

log "Executing \"$@\"."

* Update devcontainer-feature.json

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/desktop-lite/devcontainer-feature.json | 2 +-
 src/desktop-lite/install.sh                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json
index 2dee08bde..86eabbdad 100644
--- a/src/desktop-lite/devcontainer-feature.json
+++ b/src/desktop-lite/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "desktop-lite",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "name": "Light-weight Desktop",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
     "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh
index 777be8f1a..83f9635b4 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -411,7 +411,7 @@ else
 fi
 
 # Run whatever was passed in
-log "Executing "\$@\"."
+log "Executing \"$@\"."
 exec "$@"
 log "** SCRIPT EXIT **"
 EOF

From 9b189037cd883cd817321720d5916e086ad982be Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 13 Aug 2024 08:58:28 -0700
Subject: [PATCH 308/478] Revert "[Desktop-lite] - VNC_RESOLUTION unreadable
 fix - issue #945 fix (#1024) (#1088)

Revert "[Desktop-lite] - VNC_RESOLUTION unreadable fix - issue #945 fix (#1024)"

This reverts commit f5f489f66e6f6ae777dcff4a555a15945a4ce2ae.
---
 src/desktop-lite/devcontainer-feature.json |  2 +-
 src/desktop-lite/install.sh                | 71 ++++++++--------------
 2 files changed, 28 insertions(+), 45 deletions(-)

diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json
index 86eabbdad..ebc04ebad 100644
--- a/src/desktop-lite/devcontainer-feature.json
+++ b/src/desktop-lite/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "desktop-lite",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "name": "Light-weight Desktop",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
     "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh
index 83f9635b4..5230425f0 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -293,7 +293,7 @@ echo -e "\nSuccess!\n"
 EOF
 
 # Container ENTRYPOINT script
-cat << 'EOF' > /usr/local/share/desktop-init.sh
+cat << EOF > /usr/local/share/desktop-init.sh
 #!/bin/bash
 
 user_name="${USERNAME}"
@@ -309,67 +309,50 @@ export LANGUAGE="${LANGUAGE:-"en_US.UTF-8"}"
 # Execute the command it not already running
 startInBackgroundIfNotRunning()
 {
-    log "Starting $1."
-    echo -e "\n** $(date) **" | sudoIf tee -a /tmp/\$1.log > /dev/null
-    if ! pgrep -x $1 > /dev/null; then
-        keepRunningInBackground "$@"
-        while ! pgrep -x $1 > /dev/null; do
+    log "Starting \$1."
+    echo -e "\n** \$(date) **" | sudoIf tee -a /tmp/\$1.log > /dev/null
+    if ! pgrep -x \$1 > /dev/null; then
+        keepRunningInBackground "\$@"
+        while ! pgrep -x \$1 > /dev/null; do
             sleep 1
         done
-        log "$1 started."
+        log "\$1 started."
     else
-        echo "$1 is already running." | sudoIf tee -a /tmp/\$1.log > /dev/null
-        log "$1 is already running."
+        echo "\$1 is already running." | sudoIf tee -a /tmp/\$1.log > /dev/null
+        log "\$1 is already running."
     fi
 }
 
 # Keep command running in background
 keepRunningInBackground()
 {
-    ($2 bash -c "while :; do echo [\\$(date)] Process started.; $3; echo [\\$(date)] Process exited!; sleep 5; done 2>&1" | sudoIf tee -a /tmp/\$1.log > /dev/null & echo "\$!" | sudoIf tee /tmp/\$1.pid > /dev/null)
-}
-
-apt_get_update()
-{
-    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
-        echo "Running apt-get update..."
-        apt-get update -y
-    fi
-}
-
-check_packages() {
-    if ! dpkg -s "$@" > /dev/null 2>&1; then
-        apt_get_update
-        apt-get -y install --no-install-recommends "$@"
-    fi
+    (\$2 bash -c "while :; do echo [\\\$(date)] Process started.; \$3; echo [\\\$(date)] Process exited!; sleep 5; done 2>&1" | sudoIf tee -a /tmp/\$1.log > /dev/null & echo "\$!" | sudoIf tee /tmp/\$1.pid > /dev/null)
 }
 
 # Use sudo to run as root when required
 sudoIf()
 {
-    if [ "$(id -u)" -ne 0 ]; then
-        check_packages sudo
-        sudo "$@"
+    if [ "\$(id -u)" -ne 0 ]; then
+        sudo "\$@"
     else
-        "$@"
+        "\$@"
     fi
 }
 
 # Use sudo to run as non-root user if not already running
 sudoUserIf()
 {
-    if [ "$(id -u)" -eq 0 ] && [ "${user_name}" != "root" ]; then
-        check_packages sudo
-        sudo -u "${user_name}" "$@"
+    if [ "\$(id -u)" -eq 0 ] && [ "\${user_name}" != "root" ]; then
+        sudo -u \${user_name} "\$@"
     else
-        "$@"
+        "\$@"
     fi
 }
 
 # Log messages
 log()
 {
-    echo -e "[$(date)] $@" | sudoIf tee -a $LOG > /dev/null
+    echo -e "[\$(date)] \$@" | sudoIf tee -a \$LOG > /dev/null
 }
 
 log "** SCRIPT START **"
@@ -388,22 +371,22 @@ done
 sudoIf rm -rf /tmp/.X11-unix /tmp/.X*-lock
 mkdir -p /tmp/.X11-unix
 sudoIf chmod 1777 /tmp/.X11-unix
-sudoIf chown root:${group_name} /tmp/.X11-unix
-if [ "$(echo "${VNC_RESOLUTION}" | tr -cd 'x' | wc -c)" = "1" ]; then VNC_RESOLUTION=${VNC_RESOLUTION}x16; fi
-screen_geometry="${VNC_RESOLUTION%*x*}"
-screen_depth="${VNC_RESOLUTION##*x}"
+sudoIf chown root:\${group_name} /tmp/.X11-unix
+if [ "\$(echo "\${VNC_RESOLUTION}" | tr -cd 'x' | wc -c)" = "1" ]; then VNC_RESOLUTION=\${VNC_RESOLUTION}x16; fi
+screen_geometry="\${VNC_RESOLUTION%*x*}"
+screen_depth="\${VNC_RESOLUTION##*x}"
 
 # Check if VNC_PASSWORD is set and use the appropriate command
-common_options="tigervncserver ${DISPLAY} -geometry ${screen_geometry} -depth ${screen_depth} -rfbport ${VNC_PORT} -dpi ${VNC_DPI:-96} -localhost -desktop fluxbox -fg"
+common_options="tigervncserver \${DISPLAY} -geometry \${screen_geometry} -depth \${screen_depth} -rfbport ${VNC_PORT} -dpi \${VNC_DPI:-96} -localhost -desktop fluxbox -fg"
 
-if [ -n "${VNC_PASSWORD+x}" ]; then
-    startInBackgroundIfNotRunning "Xtigervnc" sudoUserIf "${common_options} -passwd /usr/local/etc/vscode-dev-containers/vnc-passwd"
+if [ -n "\${VNC_PASSWORD+x}" ]; then
+    startInBackgroundIfNotRunning "Xtigervnc" sudoUserIf "\${common_options} -passwd /usr/local/etc/vscode-dev-containers/vnc-passwd"
 else
-    startInBackgroundIfNotRunning "Xtigervnc" sudoUserIf "${common_options} -SecurityTypes None"
+    startInBackgroundIfNotRunning "Xtigervnc" sudoUserIf "\${common_options} -SecurityTypes None"
 fi
 
 # Spin up noVNC if installed and not running.
-if [ -d "/usr/local/novnc" ] && [ "$(ps -ef | grep /usr/local/novnc/noVNC*/utils/launch.sh | grep -v grep)" = "" ]; then
+if [ -d "/usr/local/novnc" ] && [ "\$(ps -ef | grep /usr/local/novnc/noVNC*/utils/launch.sh | grep -v grep)" = "" ]; then
     keepRunningInBackground "noVNC" sudoIf "/usr/local/novnc/noVNC*/utils/launch.sh --listen ${NOVNC_PORT} --vnc localhost:${VNC_PORT}"
     log "noVNC started."
 else
@@ -411,7 +394,7 @@ else
 fi
 
 # Run whatever was passed in
-log "Executing \"$@\"."
+log "Executing \"\$@\"."
 exec "$@"
 log "** SCRIPT EXIT **"
 EOF

From 56233fda3b8dfad16dfc1bf1bcc11350eaf772d0 Mon Sep 17 00:00:00 2001
From: Prathamesh Zarkar <159782310+prathameshzarkar9@users.noreply.github.com>
Date: Wed, 14 Aug 2024 01:52:24 +0530
Subject: [PATCH 309/478] common-utils overwrites .zshrc coming from image
 built (#1069)

* common-utils overwrites .zshrc coming from image built with common-utils already

* version bumped and added scenario to test the user issue

* cp command failing fix test

* bump version reverted

* fixed the pipeline failures

* discarded diff logic and introduced new one

* Update src/common-utils/main.sh

* instead of overwritting, template file will be appended to existing .zshrc file if INSTALL_OH_MY_ZSH_CONFIG is true

* removed if statement to check .zshrc file exists

* if condition added to check user_rc_file exist

* linter error fixed

* optimize duplication for template_path and user_rc_file logic

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/common-utils/devcontainer-feature.json     |  2 +-
 src/common-utils/main.sh                       |  4 ++--
 test/common-utils/devcontainer-ruby-zshrc.sh   | 12 ++++++++++++
 .../devcontainer-ruby-zshrc/Dockerfile         |  4 ++++
 .../devcontainer-ruby-zshrc/meta.env           |  8 ++++++++
 test/common-utils/scenarios.json               | 18 ++++++++++++++++++
 6 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100755 test/common-utils/devcontainer-ruby-zshrc.sh
 create mode 100644 test/common-utils/devcontainer-ruby-zshrc/Dockerfile
 create mode 100644 test/common-utils/devcontainer-ruby-zshrc/meta.env

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index a253bfb05..3ae86cd3e 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.4.5",
+    "version": "2.4.6",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 8f82dcdf9..91cfc4d3b 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -491,7 +491,6 @@ if [ "${INSTALL_ZSH}" = "true" ]; then
         echo 'source $HOME/.profile' >> "${user_home}/.zprofile" # TODO: Reconsider adding '.profile' to '.zprofile'
         chown ${USERNAME}:${group_name} "${user_home}/.zprofile"
     fi
-
     if [ "${ZSH_ALREADY_INSTALLED}" != "true" ]; then
         if [ "${ADJUSTED_ID}" = "rhel" ]; then
              global_rc_path="/etc/zshrc"
@@ -543,7 +542,8 @@ if [ "${INSTALL_ZSH}" = "true" ]; then
 
         # Add devcontainer .zshrc template
         if [ "$INSTALL_OH_MY_ZSH_CONFIG" = "true" ]; then
-            echo -e "$(cat "${template_path}")\nDISABLE_AUTO_UPDATE=true\nDISABLE_UPDATE_PROMPT=true" > ${user_rc_file}
+            template_code="$(cat "${template_path}")\nDISABLE_AUTO_UPDATE=true\nDISABLE_UPDATE_PROMPT=true"
+            echo -e "$([ -f "${user_rc_file}" ] && cat "${user_rc_file}")\n${template_code}" > "${user_rc_file}"
             sed -i -e 's/ZSH_THEME=.*/ZSH_THEME="devcontainers"/g' ${user_rc_file}
         fi
 
diff --git a/test/common-utils/devcontainer-ruby-zshrc.sh b/test/common-utils/devcontainer-ruby-zshrc.sh
new file mode 100755
index 000000000..9e7b26e4c
--- /dev/null
+++ b/test/common-utils/devcontainer-ruby-zshrc.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "configure-zshrc-without-overwrite" bash -c "grep 'rbenv init -' ~/.zshrc"
+
+# Report result
+reportResults
diff --git a/test/common-utils/devcontainer-ruby-zshrc/Dockerfile b/test/common-utils/devcontainer-ruby-zshrc/Dockerfile
new file mode 100644
index 000000000..67cabf907
--- /dev/null
+++ b/test/common-utils/devcontainer-ruby-zshrc/Dockerfile
@@ -0,0 +1,4 @@
+FROM mcr.microsoft.com/devcontainers/ruby:3.2
+
+RUN echo 'eval "$(rbenv init -)"' >> /home/vscode/.zshrc
+
diff --git a/test/common-utils/devcontainer-ruby-zshrc/meta.env b/test/common-utils/devcontainer-ruby-zshrc/meta.env
new file mode 100644
index 000000000..dfc61d31c
--- /dev/null
+++ b/test/common-utils/devcontainer-ruby-zshrc/meta.env
@@ -0,0 +1,8 @@
+VERSION='test-version'
+DEFINITION_ID='test-id'
+VARIANT='test-variant'
+GIT_REPOSITORY='test-repository'
+GIT_REPOSITORY_RELEASE='test-release'
+GIT_REPOSITORY_REVISION='test-revision'
+BUILD_TIMESTAMP='test-time'
+CONTENTS_URL='test-url'
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index 744f16dc1..0151d9d1f 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -235,6 +235,24 @@
             }
         }
     },
+    "devcontainer-ruby-zshrc": {
+        "build": {
+            "dockerfile": "Dockerfile"
+        },
+        "remoteUser": "vscode",
+        "features": {
+            "common-utils": {
+                "installZsh": true,
+                "username": "vscode",
+                "userUid": "1000",
+                "userGid": "1000",
+                "upgradePackages": true,
+                "installOhMyZsh": true,
+                "installOhMyZshConfig": true,
+                "configureZshAsDefaultShell": true
+            }
+        }
+    },
     "alpine-base-zsh-default": {
         "image": "mcr.microsoft.com/devcontainers/base:alpine",
         "remoteUser": "vscode",

From b2c7d17f0a8320895c3b52df8485c645398854e1 Mon Sep 17 00:00:00 2001
From: Ruben Suarez Alvarez <rubensa@gmail.com>
Date: Tue, 13 Aug 2024 22:30:03 +0200
Subject: [PATCH 310/478] =?UTF-8?q?feat(kubectl-helm-minikube):=20?=
 =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20add=20helm=20completion=20(?=
 =?UTF-8?q?#1080)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(kubectl-helm-minikube): 🧑‍💻 add helm completion

Like **kubectl**, **helm** supports **bash** and **zsh** command completion.

* test(kubectl-helm-minikube): ✅ test helm bash completion

* chore(kubectl-helm-minikube): 🔧 update feature version
---
 .../devcontainer-feature.json                 |  2 +-
 src/kubectl-helm-minikube/install.sh          | 10 +++++++
 .../checkBashCompletion.sh                    | 27 +++++++++++++++++++
 test/kubectl-helm-minikube/test.sh            | 10 +++++++
 4 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100755 test/kubectl-helm-minikube/checkBashCompletion.sh

diff --git a/src/kubectl-helm-minikube/devcontainer-feature.json b/src/kubectl-helm-minikube/devcontainer-feature.json
index dabee64a5..23596516c 100644
--- a/src/kubectl-helm-minikube/devcontainer-feature.json
+++ b/src/kubectl-helm-minikube/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "kubectl-helm-minikube",
-    "version": "1.1.10",
+    "version": "1.2.0",
     "name": "Kubectl, Helm, and Minikube",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
     "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
diff --git a/src/kubectl-helm-minikube/install.sh b/src/kubectl-helm-minikube/install.sh
index c2f9ba0c9..bf6c8f535 100755
--- a/src/kubectl-helm-minikube/install.sh
+++ b/src/kubectl-helm-minikube/install.sh
@@ -311,6 +311,16 @@ if [ ${HELM_VERSION} != "none" ]; then
         echo '(!) Helm installation failed!'
         exit 1
     fi
+
+    # helm bash completion
+    helm completion bash > /etc/bash_completion.d/helm
+
+    # helm zsh completion
+    if [ -e "${USERHOME}/.oh-my-zsh" ]; then
+        mkdir -p "${USERHOME}/.oh-my-zsh/completions"
+        helm completion zsh > "${USERHOME}/.oh-my-zsh/completions/_helm"
+        chown -R "${USERNAME}" "${USERHOME}/.oh-my-zsh"
+    fi
 fi
 
 # Install Minikube, verify checksum
diff --git a/test/kubectl-helm-minikube/checkBashCompletion.sh b/test/kubectl-helm-minikube/checkBashCompletion.sh
new file mode 100755
index 000000000..376461b52
--- /dev/null
+++ b/test/kubectl-helm-minikube/checkBashCompletion.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+command=$1
+expected=$2
+
+echo -e "Checking completion for command '$command'..."
+
+# Send command as a character stream, followed by two tab characters, into an interactive bash shell.
+# Also note the 'y' which responds to the possible Bash question "Display all xxx possibilities? (y or n)".
+# Bash produces the autocompletion output on stderr, so redirect that to stdout.
+# The sed bit captures the lines between Header and Footer (used as output delimiters).
+# The first grep removes the "Display all" message (that is atomatically answered to "y" by the script).
+# The last grep filters the output to lines containing the expected result.
+COMPLETE_OUTPUT=$(echo if false\; then "Header"\; $command$'\t'$'\t'y\; "Footer" fi | bash -i 2>&1 | sed -n '/Header/{:a;n;/Footer/q;p;ba}' | grep -v ^'Display all ')
+echo -e "\nCompletion output:\n"
+echo -e "$COMPLETE_OUTPUT"
+echo -e "\n"
+
+FILTERED_COMPLETE_OUTPUT=$(echo "$COMPLETE_OUTPUT" | grep "$expected")
+
+if [ -z "$FILTERED_COMPLETE_OUTPUT" ]; then
+  echo -e "Completion output does not contains '$expected'."
+  exit 1
+else
+  echo -e "Completion output contains '$expected'."
+  exit 0
+fi
diff --git a/test/kubectl-helm-minikube/test.sh b/test/kubectl-helm-minikube/test.sh
index 9dc41417a..703ba58d7 100755
--- a/test/kubectl-helm-minikube/test.sh
+++ b/test/kubectl-helm-minikube/test.sh
@@ -10,5 +10,15 @@ check "kube" kubectl
 check "helm" helm version
 check "minikune" minikube version
 
+# By default bash complete is disabled for the root user
+# Enable it by replacing current ~/.bashrc with the /etc/skel/.bashrc file
+mv ~/.bashrc ~/.bashrc.bak
+cp /etc/skel/.bashrc ~/
+
+check "helm-bash-completion-contains-version-command" ./checkBashCompletion.sh "helm " "version"
+
+# Restore original ~/.bashrc
+mv ~/.bashrc.bak ~/.bashrc
+
 # Report result
 reportResults
\ No newline at end of file

From 28ca71a147402fb0189c688bf0abb9843da4b435 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Thu, 15 Aug 2024 09:29:12 -0700
Subject: [PATCH 311/478] Revert "common-utils overwrites .zshrc coming from
 image built" (#1094)

* Revert "common-utils overwrites .zshrc coming from image built (#1069)"

This reverts commit 56233fda3b8dfad16dfc1bf1bcc11350eaf772d0.

* Update devcontainer-feature.json
---
 src/common-utils/devcontainer-feature.json     |  2 +-
 src/common-utils/main.sh                       |  4 ++--
 test/common-utils/devcontainer-ruby-zshrc.sh   | 12 ------------
 .../devcontainer-ruby-zshrc/Dockerfile         |  4 ----
 .../devcontainer-ruby-zshrc/meta.env           |  8 --------
 test/common-utils/scenarios.json               | 18 ------------------
 6 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100755 test/common-utils/devcontainer-ruby-zshrc.sh
 delete mode 100644 test/common-utils/devcontainer-ruby-zshrc/Dockerfile
 delete mode 100644 test/common-utils/devcontainer-ruby-zshrc/meta.env

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 3ae86cd3e..c403c2644 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.4.6",
+    "version": "2.4.7",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 91cfc4d3b..8f82dcdf9 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -491,6 +491,7 @@ if [ "${INSTALL_ZSH}" = "true" ]; then
         echo 'source $HOME/.profile' >> "${user_home}/.zprofile" # TODO: Reconsider adding '.profile' to '.zprofile'
         chown ${USERNAME}:${group_name} "${user_home}/.zprofile"
     fi
+
     if [ "${ZSH_ALREADY_INSTALLED}" != "true" ]; then
         if [ "${ADJUSTED_ID}" = "rhel" ]; then
              global_rc_path="/etc/zshrc"
@@ -542,8 +543,7 @@ if [ "${INSTALL_ZSH}" = "true" ]; then
 
         # Add devcontainer .zshrc template
         if [ "$INSTALL_OH_MY_ZSH_CONFIG" = "true" ]; then
-            template_code="$(cat "${template_path}")\nDISABLE_AUTO_UPDATE=true\nDISABLE_UPDATE_PROMPT=true"
-            echo -e "$([ -f "${user_rc_file}" ] && cat "${user_rc_file}")\n${template_code}" > "${user_rc_file}"
+            echo -e "$(cat "${template_path}")\nDISABLE_AUTO_UPDATE=true\nDISABLE_UPDATE_PROMPT=true" > ${user_rc_file}
             sed -i -e 's/ZSH_THEME=.*/ZSH_THEME="devcontainers"/g' ${user_rc_file}
         fi
 
diff --git a/test/common-utils/devcontainer-ruby-zshrc.sh b/test/common-utils/devcontainer-ruby-zshrc.sh
deleted file mode 100755
index 9e7b26e4c..000000000
--- a/test/common-utils/devcontainer-ruby-zshrc.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-# Definition specific tests
-check "configure-zshrc-without-overwrite" bash -c "grep 'rbenv init -' ~/.zshrc"
-
-# Report result
-reportResults
diff --git a/test/common-utils/devcontainer-ruby-zshrc/Dockerfile b/test/common-utils/devcontainer-ruby-zshrc/Dockerfile
deleted file mode 100644
index 67cabf907..000000000
--- a/test/common-utils/devcontainer-ruby-zshrc/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM mcr.microsoft.com/devcontainers/ruby:3.2
-
-RUN echo 'eval "$(rbenv init -)"' >> /home/vscode/.zshrc
-
diff --git a/test/common-utils/devcontainer-ruby-zshrc/meta.env b/test/common-utils/devcontainer-ruby-zshrc/meta.env
deleted file mode 100644
index dfc61d31c..000000000
--- a/test/common-utils/devcontainer-ruby-zshrc/meta.env
+++ /dev/null
@@ -1,8 +0,0 @@
-VERSION='test-version'
-DEFINITION_ID='test-id'
-VARIANT='test-variant'
-GIT_REPOSITORY='test-repository'
-GIT_REPOSITORY_RELEASE='test-release'
-GIT_REPOSITORY_REVISION='test-revision'
-BUILD_TIMESTAMP='test-time'
-CONTENTS_URL='test-url'
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index 0151d9d1f..744f16dc1 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -235,24 +235,6 @@
             }
         }
     },
-    "devcontainer-ruby-zshrc": {
-        "build": {
-            "dockerfile": "Dockerfile"
-        },
-        "remoteUser": "vscode",
-        "features": {
-            "common-utils": {
-                "installZsh": true,
-                "username": "vscode",
-                "userUid": "1000",
-                "userGid": "1000",
-                "upgradePackages": true,
-                "installOhMyZsh": true,
-                "installOhMyZshConfig": true,
-                "configureZshAsDefaultShell": true
-            }
-        }
-    },
     "alpine-base-zsh-default": {
         "image": "mcr.microsoft.com/devcontainers/base:alpine",
         "remoteUser": "vscode",

From 5cb0d2da02402aa0d3cbb93c1fc58c33f53022e7 Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Fri, 16 Aug 2024 04:59:51 +0530
Subject: [PATCH 312/478] [desktop-lite] - add tests for running xtigervnc and
 novnc (#1090)

* [desktop-lite] - add tests for running xtigervnc and novnc

* change for error while running test scenario

* changed test

* Update devcontainer-feature.json

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/desktop-lite/devcontainer-feature.json    |  2 +-
 src/desktop-lite/install.sh                   |  8 +++--
 test/desktop-lite/scenarios.json              |  8 +++++
 .../test_xtigervnc_novnc_started.sh           | 31 +++++++++++++++++++
 4 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 test/desktop-lite/scenarios.json
 create mode 100644 test/desktop-lite/test_xtigervnc_novnc_started.sh

diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json
index ebc04ebad..7c2549a0d 100644
--- a/src/desktop-lite/devcontainer-feature.json
+++ b/src/desktop-lite/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "desktop-lite",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "name": "Light-weight Desktop",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
     "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh
index 5230425f0..5060f9210 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -394,8 +394,12 @@ else
 fi
 
 # Run whatever was passed in
-log "Executing \"\$@\"."
-exec "$@"
+if [ -n "$1" ]; then
+    log "Executing \"\$@\"."
+    exec "$@"
+else
+    log "No command provided to execute."
+fi
 log "** SCRIPT EXIT **"
 EOF
 
diff --git a/test/desktop-lite/scenarios.json b/test/desktop-lite/scenarios.json
new file mode 100644
index 000000000..d86b321fd
--- /dev/null
+++ b/test/desktop-lite/scenarios.json
@@ -0,0 +1,8 @@
+{
+    "test_xtigervnc_novnc_started": {
+        "image": "ubuntu:noble",
+        "features": {
+            "desktop-lite": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/desktop-lite/test_xtigervnc_novnc_started.sh b/test/desktop-lite/test_xtigervnc_novnc_started.sh
new file mode 100644
index 000000000..671032229
--- /dev/null
+++ b/test/desktop-lite/test_xtigervnc_novnc_started.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Check if xtigervnc & noVnc processes are running after successful installation and initialization
+check_process_running() {
+    port=$1
+    # Get process id of process running on specific port
+    PID=$(lsof -i :$port | awk 'NR==2 {print $2}')
+    if [ -n "$PID" ]; then
+        CMD=$(ps -p $PID -o cmd --no-headers)
+        GREEN='\033[0;32m'; NC='\033[0m'; RED='\033[0;31m'; YELLOW='\033[0;33m';
+        echo -e "${GREEN}Command running on port $port: ${YELLOW}$CMD${NC}"
+    else
+        echo -e "${RED}No process found listening on port $port.${NC}"
+    fi
+}
+
+check "Whether xtigervnc is Running" check_process_running 5901
+sleep 1
+check "Whether no_vnc is Running" check_process_running 6080
+
+check "desktop-init-exists" bash -c "ls /usr/local/share/desktop-init.sh"
+check "log-exists" bash -c "ls /tmp/container-init.log"
+check "log file contents" bash -c "cat /tmp/container-init.log"
+
+# Report result
+reportResults
\ No newline at end of file

From 808ee3846c7ccec8d3e550e50d6479a4cb9c3c17 Mon Sep 17 00:00:00 2001
From: Daniel Meilak <32960789+daniel-meilak@users.noreply.github.com>
Date: Fri, 16 Aug 2024 22:56:46 +0200
Subject: [PATCH 313/478] [desktop-lite] Suggested usage of appPort instead of
 forwardPorts for devcontainer-cli (#1096)

* [desktop-lite] Suggested usage of appPort instead of forwardPorts for devcontainer-cli

* Update src/desktop-lite/NOTES.md

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/desktop-lite/NOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/desktop-lite/NOTES.md b/src/desktop-lite/NOTES.md
index 924ce9b6e..ec9ec71d4 100644
--- a/src/desktop-lite/NOTES.md
+++ b/src/desktop-lite/NOTES.md
@@ -19,7 +19,7 @@ To set up the `6080` port from your `devcontainer.json` file, include the follow
 You can also connect to the desktop using a [VNC viewer](https://www.realvnc.com/en/connect/download/viewer/). To do so:
 
 1. Connect to the environment from a desktop tool that supports the dev container spec (e.g., VS Code client).
-1. Forward the VNC server port (`5901` by default) to your local machine using either the `forwardPorts` property in `devcontainer.json` or the user interface in your tool (e.g., you can press <kbd>F1</kbd> or <kbd>Ctrl/Cmd</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd> and select **Ports: Focus on Ports View** in VS Code to bring it into focus).
+1. Forward the VNC server port (`5901` by default) to your local machine using either the `forwardPorts` property in `devcontainer.json` or the user interface in your tool (e.g., you can press <kbd>F1</kbd> or <kbd>Ctrl/Cmd</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd> and select **Ports: Focus on Ports View** in VS Code to bring it into focus). If you are using the [Dev Container CLI](https://github.com/devcontainers/cli), you should instead use the `appPort` property in `devcontainer.json`.
 1. Start your VNC Viewer and connect to localhost:5901. Note that you may need to bump up the color depth to 24 bits to see full color.
 1. Enter the desktop password (`vscode` by default).
 

From 5150fb9a06aae0d9aff30e03789c2a31b7df38fb Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Fri, 16 Aug 2024 14:33:48 -0700
Subject: [PATCH 314/478] Automated documentation update (#1097)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/desktop-lite/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/desktop-lite/README.md b/src/desktop-lite/README.md
index 6f2d67ce2..a70997405 100644
--- a/src/desktop-lite/README.md
+++ b/src/desktop-lite/README.md
@@ -42,7 +42,7 @@ To set up the `6080` port from your `devcontainer.json` file, include the follow
 You can also connect to the desktop using a [VNC viewer](https://www.realvnc.com/en/connect/download/viewer/). To do so:
 
 1. Connect to the environment from a desktop tool that supports the dev container spec (e.g., VS Code client).
-1. Forward the VNC server port (`5901` by default) to your local machine using either the `forwardPorts` property in `devcontainer.json` or the user interface in your tool (e.g., you can press <kbd>F1</kbd> or <kbd>Ctrl/Cmd</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd> and select **Ports: Focus on Ports View** in VS Code to bring it into focus).
+1. Forward the VNC server port (`5901` by default) to your local machine using either the `forwardPorts` property in `devcontainer.json` or the user interface in your tool (e.g., you can press <kbd>F1</kbd> or <kbd>Ctrl/Cmd</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd> and select **Ports: Focus on Ports View** in VS Code to bring it into focus). If you are using the [Dev Container CLI](https://github.com/devcontainers/cli), you should instead use the `appPort` property in `devcontainer.json`.
 1. Start your VNC Viewer and connect to localhost:5901. Note that you may need to bump up the color depth to 24 bits to see full color.
 1. Enter the desktop password (`vscode` by default).
 

From b45b19975b636d082daa45c6832f9f915e020071 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Mon, 19 Aug 2024 09:51:08 -0700
Subject: [PATCH 315/478] [Updates] Automated vendor dotnet-install script
 (#1098)

* Automated dotnet-install script update

* Bump version

---------

Co-authored-by: github-actions <github-actions@github.com>
---
 src/dotnet/devcontainer-feature.json        | 2 +-
 src/dotnet/scripts/vendor/dotnet-install.sh | 4 ++++
 src/oryx/devcontainer-feature.json          | 2 +-
 src/oryx/scripts/vendor/dotnet-install.sh   | 4 ++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index eb09f1d54..f6e0c39ab 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.1.2",
+    "version": "2.1.3",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
diff --git a/src/dotnet/scripts/vendor/dotnet-install.sh b/src/dotnet/scripts/vendor/dotnet-install.sh
index caa3ea450..38a160cf1 100755
--- a/src/dotnet/scripts/vendor/dotnet-install.sh
+++ b/src/dotnet/scripts/vendor/dotnet-install.sh
@@ -331,6 +331,10 @@ get_machine_architecture() {
             echo "riscv64"
             return 0
             ;;
+        powerpc|ppc)
+            echo "ppc"
+            return 0
+            ;;
         esac
     fi
 
diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index 68391cde9..39b9a7103 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "oryx",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "name": "Oryx",
     "description": "Installs the oryx CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
diff --git a/src/oryx/scripts/vendor/dotnet-install.sh b/src/oryx/scripts/vendor/dotnet-install.sh
index caa3ea450..38a160cf1 100755
--- a/src/oryx/scripts/vendor/dotnet-install.sh
+++ b/src/oryx/scripts/vendor/dotnet-install.sh
@@ -331,6 +331,10 @@ get_machine_architecture() {
             echo "riscv64"
             return 0
             ;;
+        powerpc|ppc)
+            echo "ppc"
+            return 0
+            ;;
         esac
     fi
 

From 34c3a51114451043f3608d803c99bbbcc9aaa60b Mon Sep 17 00:00:00 2001
From: Osvaldo Ortega <48293249+osortega@users.noreply.github.com>
Date: Mon, 19 Aug 2024 12:05:32 -0700
Subject: [PATCH 316/478] Modify scripts to stream terminal title changes
 (#1095)

* Modify scripts to stream terminal title changes

Adding the capabilities to signal terminal title changes based on the command that is being executed

* Fixes

* Review comments

* Update src/common-utils/devcontainer-feature.json

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Update src/common-utils/scripts/bash_theme_snippet.sh

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Update src/common-utils/scripts/rc_snippet.sh

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Remove RC

* Adding tests

* Update test/common-utils/scenarios.json

* Update src/common-utils/scripts/bash_theme_snippet.sh

* Test fixes

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
---
 src/common-utils/devcontainer-feature.json    |  2 +-
 .../scripts/bash_theme_snippet.sh             | 21 ++++++++++++++++++-
 .../scripts/devcontainers.zsh-theme           | 19 +++++++++++++++++
 src/common-utils/scripts/rc_snippet.sh        |  1 -
 .../no-terminal-title-by-default.sh           | 18 ++++++++++++++++
 test/common-utils/scenarios.json              | 15 +++++++++++++
 test/common-utils/terminal-title-on-xterm.sh  | 18 ++++++++++++++++
 7 files changed, 91 insertions(+), 3 deletions(-)
 create mode 100755 test/common-utils/no-terminal-title-by-default.sh
 create mode 100755 test/common-utils/terminal-title-on-xterm.sh

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index c403c2644..153e2503d 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.4.7",
+    "version": "2.5.0",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/scripts/bash_theme_snippet.sh b/src/common-utils/scripts/bash_theme_snippet.sh
index 491e4c047..6e80952a4 100644
--- a/src/common-utils/scripts/bash_theme_snippet.sh
+++ b/src/common-utils/scripts/bash_theme_snippet.sh
@@ -1,4 +1,3 @@
-
 # bash theme - partly inspired by https://github.com/ohmyzsh/ohmyzsh/blob/master/themes/robbyrussell.zsh-theme
 __bash_prompt() {
     local userpart='`export XIT=$? \
@@ -23,3 +22,23 @@ __bash_prompt() {
 }
 __bash_prompt
 export PROMPT_DIRTRIM=4
+
+# Check if the terminal is xterm
+if [[ "$TERM" == "xterm" ]]; then
+    # Function to set the terminal title to the current command
+    preexec() {
+        local cmd="${BASH_COMMAND}"
+        echo -ne "\033]0;${USER}@${HOSTNAME}: ${cmd}\007"
+    }
+
+    # Function to reset the terminal title to the shell type after the command is executed
+    precmd() {
+        echo -ne "\033]0;${USER}@${HOSTNAME}: ${SHELL}\007"
+    }
+
+    # Trap DEBUG signal to call preexec before each command
+    trap 'preexec' DEBUG
+
+    # Append to PROMPT_COMMAND to call precmd before displaying the prompt
+    PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND; }precmd"
+fi
\ No newline at end of file
diff --git a/src/common-utils/scripts/devcontainers.zsh-theme b/src/common-utils/scripts/devcontainers.zsh-theme
index ff11c917e..d12993a67 100644
--- a/src/common-utils/scripts/devcontainers.zsh-theme
+++ b/src/common-utils/scripts/devcontainers.zsh-theme
@@ -24,3 +24,22 @@ __zsh_prompt() {
     unset -f __zsh_prompt
 }
 __zsh_prompt
+
+# Check if the terminal is xterm
+if [[ "$TERM" == "xterm" ]]; then
+    # Function to set the terminal title to the current command
+    preexec() {
+        local cmd=${1}
+        echo -ne "\033]0;${USER}@${HOSTNAME}: ${cmd}\007"
+    }
+
+    # Function to reset the terminal title to the shell type after the command is executed
+    precmd() {
+        echo -ne "\033]0;${USER}@${HOSTNAME}: ${SHELL}\007"
+    }
+
+    # Add the preexec and precmd functions to the corresponding hooks
+    autoload -Uz add-zsh-hook
+    add-zsh-hook preexec preexec
+    add-zsh-hook precmd precmd
+fi
\ No newline at end of file
diff --git a/src/common-utils/scripts/rc_snippet.sh b/src/common-utils/scripts/rc_snippet.sh
index 4810cd993..42249ecbd 100644
--- a/src/common-utils/scripts/rc_snippet.sh
+++ b/src/common-utils/scripts/rc_snippet.sh
@@ -1,4 +1,3 @@
-
 if [ -z "${USER}" ]; then export USER=$(whoami); fi
 if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi
 
diff --git a/test/common-utils/no-terminal-title-by-default.sh b/test/common-utils/no-terminal-title-by-default.sh
new file mode 100755
index 000000000..83fe7d221
--- /dev/null
+++ b/test/common-utils/no-terminal-title-by-default.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+
+# Make sure bashrc is applied
+source /root/.bashrc
+
+check "check_term_is_not_set" test !"$TERM"
+check "check_prompt_command_not_set" test !"$PROMPT_COMMAND"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index 744f16dc1..e5529ea04 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -259,5 +259,20 @@
         "features": {
             "common-utils": {}
         }
+    },
+    "terminal-title-on-xterm": {
+        "image": "node",
+        "features": {
+            "common-utils": {}
+        },
+        "containerEnv": {
+            "TERM": "xterm"
+        }
+    },
+    "no-terminal-title-by-default": {
+        "image": "node",
+        "features": {
+            "common-utils": {}
+        }
     }
 }
\ No newline at end of file
diff --git a/test/common-utils/terminal-title-on-xterm.sh b/test/common-utils/terminal-title-on-xterm.sh
new file mode 100755
index 000000000..9b483651f
--- /dev/null
+++ b/test/common-utils/terminal-title-on-xterm.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+
+# Make sure bashrc is applied
+source /root/.bashrc
+
+check "check_term_is_set" test "$TERM" = "xterm"
+check "check_term_is_set" test "$PROMPT_COMMAND" = "precmd"
+
+# Report result
+reportResults
\ No newline at end of file

From f0e6ba6b8c4c719c57c93b6bf845c344e14d9f58 Mon Sep 17 00:00:00 2001
From: Paul Taylor <178183+trxcllnt@users.noreply.github.com>
Date: Tue, 20 Aug 2024 09:58:50 -0700
Subject: [PATCH 317/478] Ensure `common-utils` rc snippets end with newlines
 (#1100)

ensure common-utils rc snippets have line endings
---
 src/common-utils/devcontainer-feature.json       | 2 +-
 src/common-utils/scripts/bash_theme_snippet.sh   | 2 +-
 src/common-utils/scripts/devcontainers.zsh-theme | 4 ++--
 src/common-utils/scripts/rc_snippet.sh           | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 153e2503d..968cbfb77 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.5.0",
+    "version": "2.5.1",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/scripts/bash_theme_snippet.sh b/src/common-utils/scripts/bash_theme_snippet.sh
index 6e80952a4..ab76ada33 100644
--- a/src/common-utils/scripts/bash_theme_snippet.sh
+++ b/src/common-utils/scripts/bash_theme_snippet.sh
@@ -41,4 +41,4 @@ if [[ "$TERM" == "xterm" ]]; then
 
     # Append to PROMPT_COMMAND to call precmd before displaying the prompt
     PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND; }precmd"
-fi
\ No newline at end of file
+fi
diff --git a/src/common-utils/scripts/devcontainers.zsh-theme b/src/common-utils/scripts/devcontainers.zsh-theme
index d12993a67..0cfd70e65 100644
--- a/src/common-utils/scripts/devcontainers.zsh-theme
+++ b/src/common-utils/scripts/devcontainers.zsh-theme
@@ -1,7 +1,7 @@
 # Oh My Zsh! theme - partly inspired by https://github.com/ohmyzsh/ohmyzsh/blob/master/themes/robbyrussell.zsh-theme
 __zsh_prompt() {
     local prompt_username
-    if [ ! -z "${GITHUB_USER}" ]; then 
+    if [ ! -z "${GITHUB_USER}" ]; then
         prompt_username="@${GITHUB_USER}"
     else
         prompt_username="%n"
@@ -42,4 +42,4 @@ if [[ "$TERM" == "xterm" ]]; then
     autoload -Uz add-zsh-hook
     add-zsh-hook preexec preexec
     add-zsh-hook precmd precmd
-fi
\ No newline at end of file
+fi
diff --git a/src/common-utils/scripts/rc_snippet.sh b/src/common-utils/scripts/rc_snippet.sh
index 42249ecbd..f3f36a4b8 100644
--- a/src/common-utils/scripts/rc_snippet.sh
+++ b/src/common-utils/scripts/rc_snippet.sh
@@ -16,9 +16,9 @@ fi
 # Set the default git editor if not already set
 if [ -z "$(git config --get core.editor)" ] && [ -z "${GIT_EDITOR}" ]; then
     if  [ "${TERM_PROGRAM}" = "vscode" ]; then
-        if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then
             export GIT_EDITOR="code-insiders --wait"
-        else 
+        else
             export GIT_EDITOR="code --wait"
         fi
     fi

From 07dc0288d4b98f0ef76ea307d262ddc3d08b81c2 Mon Sep 17 00:00:00 2001
From: Shoki Hata <syouki100241@gmail.com>
Date: Thu, 22 Aug 2024 02:23:24 +0900
Subject: [PATCH 318/478] [Go] Update proposals for the "version" option
 (#1104)

Update Go version to 1.3.1 and proposals to 1.23 and 1.22
---
 src/go/devcontainer-feature.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/go/devcontainer-feature.json b/src/go/devcontainer-feature.json
index 58415ce6b..afb1f9128 100644
--- a/src/go/devcontainer-feature.json
+++ b/src/go/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "go",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "name": "Go",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/go",
     "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.",
@@ -10,8 +10,8 @@
             "proposals": [
                 "latest",
                 "none",
-                "1.21",
-                "1.20"
+                "1.23",
+                "1.22"
             ],
             "default": "latest",
             "description": "Select or enter a Go version to install"
@@ -44,4 +44,4 @@
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
-}
\ No newline at end of file
+}

From 52c79b4963879dd941c67b583199ec7966e41ab4 Mon Sep 17 00:00:00 2001
From: Prathamesh Zarkar <159782310+prathameshzarkar9@users.noreply.github.com>
Date: Wed, 28 Aug 2024 04:54:29 +0530
Subject: [PATCH 319/478] Features update logic for PPA in bionic (#1079)

* Features update logic for PPA in bionic

* node failing fixed after pnpm install from npm package manager

* for node version 16 pnpm version 7 is installed

* uninstalled pnpm package first and then reinstalled as per node version

* force installing pnpm package

* optimized logic to install compatible pnpm for node 16

* pnpm install specific version compatible for node

* new variable added pnpmVersion in node feature

* test case failure fixed

* fixed test cases

* fixing test cases

* pnpm version fixed for test cases

* default version for pnpm updated

* review comments addressed

* Update src/node/devcontainer-feature.json

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/common-utils/main.sh                       |  8 ++++++++
 src/go/install.sh                              |  8 ++++++++
 src/node/devcontainer-feature.json             | 16 +++++++++++++++-
 src/node/install.sh                            | 15 ++++++++++++---
 src/python/devcontainer-feature.json           |  2 +-
 src/python/install.sh                          |  8 ++++++++
 test/node/centos-7.sh                          |  2 +-
 test/node/install_additional_node.sh           |  2 +-
 .../install_additional_node_on_rhel_family.sh  |  2 +-
 test/node/install_node_16_on_bionic.sh         |  2 +-
 test/node/install_nvm_0.39.sh                  |  2 +-
 test/node/non_root_user.sh                     |  2 +-
 test/node/scenarios.json                       | 18 ++++++++++++------
 13 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 8f82dcdf9..7658c4850 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -362,6 +362,14 @@ if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${VERSION_CODENAME-}" = "centos7" ]; then
     sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
 fi
 
+if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${VERSION_CODENAME-}" = "centos7" ]; then
+    # As of 1 July 2024, mirrorlist.centos.org no longer exists.
+    # Update the repo files to reference vault.centos.org.
+    sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
+    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
+    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
+fi
+
 # Install packages for appropriate OS
 case "${ADJUSTED_ID}" in
     "debian")
diff --git a/src/go/install.sh b/src/go/install.sh
index ca01d34f5..85fea5dc4 100755
--- a/src/go/install.sh
+++ b/src/go/install.sh
@@ -43,6 +43,14 @@ else
     exit 1
 fi
 
+if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${VERSION_CODENAME-}" = "centos7" ]; then
+    # As of 1 July 2024, mirrorlist.centos.org no longer exists.
+    # Update the repo files to reference vault.centos.org.
+    sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
+    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
+    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
+fi
+
 # Setup INSTALL_CMD & PKG_MGR_CMD
 if type apt-get > /dev/null 2>&1; then
     PKG_MGR_CMD=apt-get
diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index 4e67aa6de..a9b0d46b8 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.5.0",
+    "version": "1.6.0",
     "name": "Node.js (via nvm), yarn and pnpm",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
@@ -28,6 +28,20 @@
             "default": "/usr/local/share/nvm",
             "description": "The path where NVM will be installed."
         },
+        "pnpmVersion": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "8.8.0",
+                "8.0.0",
+                "7.30.0",
+                "6.14.8",
+                "5.18.10",
+                "none"
+            ],
+            "default": "latest",
+            "description": "Select or enter the PNPM version to install"
+        },
         "nvmVersion": {
             "type": "string",
             "proposals": [
diff --git a/src/node/install.sh b/src/node/install.sh
index 5e833c6fe..3b74f885b 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -8,6 +8,7 @@
 # Maintainer: The Dev Container spec maintainers
 
 export NODE_VERSION="${VERSION:-"lts"}"
+export PNPM_VERSION="${PNPMVERSION:-"latest"}"
 export NVM_VERSION="${NVMVERSION:-"latest"}"
 export NVM_DIR="${NVMINSTALLPATH:-"/usr/local/share/nvm"}"
 INSTALL_TOOLS_FOR_NODE_GYP="${NODEGYPDEPENDENCIES:-true}"
@@ -45,6 +46,14 @@ else
     exit 1
 fi
 
+if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${VERSION_CODENAME-}" = "centos7" ]; then
+    # As of 1 July 2024, mirrorlist.centos.org no longer exists.
+    # Update the repo files to reference vault.centos.org.
+    sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
+    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
+    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
+fi
+
 # Setup INSTALL_CMD & PKG_MGR_CMD
 if type apt-get > /dev/null 2>&1; then
     PKG_MGR_CMD=apt-get
@@ -370,8 +379,8 @@ if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
 fi
 
 # Install pnpm
-if bash -c ". '${NVM_DIR}/nvm.sh' && type pnpm >/dev/null 2>&1"; then
-    echo "pnpm already installed."
+if [ ! -z "${PNPM_VERSION}" ] && [ "${PNPM_VERSION}" = "none" ]; then
+    echo "Ignoring installation of PNPM"
 else
     if bash -c ". '${NVM_DIR}/nvm.sh' && type npm >/dev/null 2>&1"; then
         (
@@ -379,7 +388,7 @@ else
             [ ! -z "$http_proxy" ] && npm set proxy="$http_proxy"
             [ ! -z "$https_proxy" ] && npm set https-proxy="$https_proxy"
             [ ! -z "$no_proxy" ] && npm set noproxy="$no_proxy"
-            npm install -g pnpm
+            npm install -g pnpm@$PNPM_VERSION --force
         )
     else
         echo "Skip installing pnpm because npm is missing"
diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 2cb4cc87b..768cb4388 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/python/install.sh b/src/python/install.sh
index e6702add9..7e30ea041 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -60,6 +60,14 @@ else
     exit 1
 fi
 
+if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${VERSION_CODENAME-}" = "centos7" ]; then
+    # As of 1 July 2024, mirrorlist.centos.org no longer exists.
+    # Update the repo files to reference vault.centos.org.
+    sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
+    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
+    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
+fi
+
 # To find some devel packages, some rhel need to enable specific extra repos, but not on RedHat ubi images...
 INSTALL_CMD_ADDL_REPO=""
 if [ ${ADJUSTED_ID} = "rhel" ] && [ ${ID} != "rhel" ]; then
diff --git a/test/node/centos-7.sh b/test/node/centos-7.sh
index c5980129b..7c064131f 100755
--- a/test/node/centos-7.sh
+++ b/test/node/centos-7.sh
@@ -7,7 +7,7 @@ source dev-container-features-test-lib
 
 # Definition specific tests
 check "version" node  --version
-check "pnpm" pnpm -v
+check "pnpm" bash -c "pnpm -v | grep 8.8.0"
 check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
 check "yarn" yarn --version
 
diff --git a/test/node/install_additional_node.sh b/test/node/install_additional_node.sh
index d8f27317f..57d615a0a 100644
--- a/test/node/install_additional_node.sh
+++ b/test/node/install_additional_node.sh
@@ -7,7 +7,7 @@ source dev-container-features-test-lib
 
 # 'lts' is now some version of node 20...
 check "version_on_path"  node -v | grep 20
-check "pnpm" pnpm -v
+check "pnpm" bash -c "pnpm -v | grep 8.8.0"
 
 check "v20_installed" ls -1 /usr/local/share/nvm/versions/node | grep 20
 check "v14_installed" ls -1 /usr/local/share/nvm/versions/node | grep 14.19.3
diff --git a/test/node/install_additional_node_on_rhel_family.sh b/test/node/install_additional_node_on_rhel_family.sh
index d8f27317f..3300f7f1a 100644
--- a/test/node/install_additional_node_on_rhel_family.sh
+++ b/test/node/install_additional_node_on_rhel_family.sh
@@ -7,7 +7,7 @@ source dev-container-features-test-lib
 
 # 'lts' is now some version of node 20...
 check "version_on_path"  node -v | grep 20
-check "pnpm" pnpm -v
+check "pnpm" bash -c "pnpm -v | grep 6.16.0"
 
 check "v20_installed" ls -1 /usr/local/share/nvm/versions/node | grep 20
 check "v14_installed" ls -1 /usr/local/share/nvm/versions/node | grep 14.19.3
diff --git a/test/node/install_node_16_on_bionic.sh b/test/node/install_node_16_on_bionic.sh
index 500e0070e..aefa0b490 100755
--- a/test/node/install_node_16_on_bionic.sh
+++ b/test/node/install_node_16_on_bionic.sh
@@ -7,7 +7,7 @@ source dev-container-features-test-lib
 
 # Definition specific tests
 check "version" bash -c "node --version | grep 16"
-check "pnpm" pnpm -v
+check "pnpm" bash -c "pnpm -v | grep 8.8.0"
 check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
 
 # Report result
diff --git a/test/node/install_nvm_0.39.sh b/test/node/install_nvm_0.39.sh
index 6b96381b5..1f34f7ce4 100755
--- a/test/node/install_nvm_0.39.sh
+++ b/test/node/install_nvm_0.39.sh
@@ -7,7 +7,7 @@ source dev-container-features-test-lib
 
 # Definition specific tests
 check "version" bash -c "node --version"
-check "pnpm" pnpm -v
+check "pnpm" bash -c "pnpm -v | grep 6.16.0"
 check "nvm version" bash -c ". /usr/local/share/nvm/nvm.sh && nvm --version | grep 0.39"
 
 # Report result
diff --git a/test/node/non_root_user.sh b/test/node/non_root_user.sh
index 499dbe68a..2826adcbf 100755
--- a/test/node/non_root_user.sh
+++ b/test/node/non_root_user.sh
@@ -7,7 +7,7 @@ source dev-container-features-test-lib
 
 # Definition specific tests
 check "version" node  --version
-check "pnpm" pnpm -v
+check "pnpm" bash -c "pnpm -v | grep 8.8.0"
 check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
 
 # Report result
diff --git a/test/node/scenarios.json b/test/node/scenarios.json
index 4f07e5ac3..df03128d6 100644
--- a/test/node/scenarios.json
+++ b/test/node/scenarios.json
@@ -12,7 +12,8 @@
         "features": {
             "node": {
                 "version": "lts",
-                "additionalVersions": "v17.9.1,v14.19.3"
+                "additionalVersions": "v17.9.1,v14.19.3",
+                "pnpmVersion": "8.8.0"
             }
         }
     },
@@ -21,7 +22,8 @@
         "features": {
             "node": {
                 "version": "lts",
-                "additionalVersions": "v17.9.1,v14.19.3"
+                "additionalVersions": "v17.9.1,v14.19.3",
+                "pnpmVersion": "6.16.0"
             }
         }
     },
@@ -30,7 +32,8 @@
         "remoteUser": "vscode",
         "features": {
             "node": {
-                "version": "latest"
+                "version": "latest",
+                "pnpmVersion": "8.8.0"
             }
         }
     },
@@ -78,7 +81,8 @@
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu-18.04",
         "features": {
             "node": {
-                "version": "16"
+                "version": "16",
+                "pnpmVersion":"8.8.0"
             }
         }
     },
@@ -86,7 +90,8 @@
         "image": "mcr.microsoft.com/devcontainers/base",
         "features": {
             "node": {
-                "nvmVersion": "0.39"
+                "nvmVersion": "0.39",
+                "pnpmVersion": "6.16.0"
             }
         }
     },
@@ -102,7 +107,8 @@
         "image": "centos:centos7",
         "features": {
             "node": {
-                "version": "16"
+                "version": "16",
+                "pnpmVersion": "8.8.0"
             }
         }
     },

From 3bf4e20e5fb560b7df0fc821ceca64569a61d1da Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Tue, 27 Aug 2024 16:28:38 -0700
Subject: [PATCH 320/478] Automated documentation update (#1109)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/node/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/node/README.md b/src/node/README.md
index dff3f8bfe..328af529f 100644
--- a/src/node/README.md
+++ b/src/node/README.md
@@ -18,6 +18,7 @@ Installs Node.js, nvm, yarn, pnpm, and needed dependencies.
 | version | Select or enter a Node.js version to install | string | lts |
 | nodeGypDependencies | Install dependencies to compile native node modules (node-gyp)? | boolean | true |
 | nvmInstallPath | The path where NVM will be installed. | string | /usr/local/share/nvm |
+| pnpmVersion | Select or enter the PNPM version to install | string | latest |
 | nvmVersion | Version of NVM to install. | string | latest |
 | installYarnUsingApt | On Debian and Ubuntu systems, you have the option to install Yarn globally via APT. If you choose not to use this option, Yarn will be set up using Corepack instead. This choice is specific to Debian and Ubuntu; for other Linux distributions, Yarn is always installed using Corepack, with a fallback to installation via NPM if an error occurs. | boolean | true |
 

From 878a900d55e60add9c7a76b433c7d4a4adf299bc Mon Sep 17 00:00:00 2001
From: Julian Pawlowski <75446+jpawlowski@users.noreply.github.com>
Date: Wed, 28 Aug 2024 01:56:57 +0200
Subject: [PATCH 321/478] `[powershell]`: Fix manual PowerShell installation
 binary execution permissions (#1050)

* Align manual pwsh install with DEB package

- ensure execution permissions for pwsh
- correct path from /usr/local/bin/pwsh to /usr/bin/pwsh
- register as shell in /etc/shells

* Update versions

* Update repositories

* Check for existing pwsh installation

This will avoid build failures when multiple features depend on this PowerShell package

* test: Fix PS profile test

* Test: Fix install_using_github

* Test: Fix getcwd warning

* fix: Move out of directory before deleting it

* test: Add validate_powershell_installation

* test: Change Ubuntu test base image to upcoming new LTS version
---
 src/powershell/devcontainer-feature.json      |  6 ++-
 src/powershell/install.sh                     | 37 +++++++++++--------
 .../install_powershell_fallback_test.sh       | 10 +++--
 test/powershell/scenarios.json                | 12 ++++--
 .../validate_powershell_installation.sh       | 19 ++++++++++
 5 files changed, 60 insertions(+), 24 deletions(-)
 create mode 100644 test/powershell/validate_powershell_installation.sh

diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json
index d51b5c03f..585e34630 100644
--- a/src/powershell/devcontainer-feature.json
+++ b/src/powershell/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "powershell",
-    "version": "1.4.0",
+    "version": "1.5.0",
     "name": "PowerShell",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
     "description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -10,7 +10,9 @@
             "proposals": [
                 "latest",
                 "none",
-                "7.1"
+                "7.4",
+                "7.3",
+                "7.2"
             ],
             "default": "latest",
             "description": "Select or enter a version of PowerShell."
diff --git a/src/powershell/install.sh b/src/powershell/install.sh
index 43773b3f6..4953a49d8 100755
--- a/src/powershell/install.sh
+++ b/src/powershell/install.sh
@@ -18,7 +18,7 @@ POWERSHELL_PROFILE_URL="${POWERSHELLPROFILEURL}"
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 POWERSHELL_ARCHIVE_ARCHITECTURES="amd64"
-POWERSHELL_ARCHIVE_VERSION_CODENAMES="stretch buster bionic focal bullseye jammy"
+POWERSHELL_ARCHIVE_VERSION_CODENAMES="stretch buster bionic focal bullseye jammy bookworm noble"
 GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
 keyserver hkp://keyserver.ubuntu.com:80
 keyserver hkps://keys.openpgp.org
@@ -221,25 +221,32 @@ install_using_github() {
         echo "${powershell_archive_sha256} *${powershell_filename}" | sha256sum -c -
     fi
     tar xf "${powershell_filename}" -C "${powershell_target_path}"
-    ln -s "${powershell_target_path}/pwsh" /usr/local/bin/pwsh
+    chmod 755 "${powershell_target_path}/pwsh"
+    ln -sf "${powershell_target_path}/pwsh" /usr/bin/pwsh
+    add-shell "/usr/bin/pwsh"
+    cd /tmp
     rm -rf /tmp/pwsh
 }
 
-export DEBIAN_FRONTEND=noninteractive
-
-# Source /etc/os-release to get OS info
-. /etc/os-release
-architecture="$(dpkg --print-architecture)"
+if ! type pwsh >/dev/null 2>&1; then
+    export DEBIAN_FRONTEND=noninteractive
+    
+    # Source /etc/os-release to get OS info
+    . /etc/os-release
+    architecture="$(dpkg --print-architecture)"
 
-if [[ "${POWERSHELL_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[  "${POWERSHELL_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
-    install_using_apt || use_github="true"
+    if [[ "${POWERSHELL_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[  "${POWERSHELL_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
+        install_using_apt || use_github="true"
+    else
+        use_github="true"
+    fi
+    
+    if [ "${use_github}" = "true" ]; then
+        echo "Attempting install from GitHub release..."
+        install_using_github
+    fi
 else
-    use_github="true"
-fi
-
-if [ "${use_github}" = "true" ]; then
-    echo "Attempting install from GitHub release..."
-    install_using_github
+    echo "PowerShell is already installed."
 fi
 
 # If PowerShell modules are requested, loop through and install
diff --git a/test/powershell/install_powershell_fallback_test.sh b/test/powershell/install_powershell_fallback_test.sh
index 39c8bc49e..169863c7b 100644
--- a/test/powershell/install_powershell_fallback_test.sh
+++ b/test/powershell/install_powershell_fallback_test.sh
@@ -8,7 +8,7 @@ source dev-container-features-test-lib
 # Extension-specific tests
 check "az.resources" pwsh -Command "(Get-Module -ListAvailable -Name Az.Resources).Version.ToString()"
 check "az.storage" pwsh -Command "(Get-Module -ListAvailable -Name Az.Storage).Version.ToString()"
-check "profile" pwsh -Command "(Get-Variable $env:ProfileLoaded).Value"
+check "profile" pwsh -Command "if (\$null -eq \$env:ProfileLoaded) { echo 'Not set!'; exit 1 } else { if ( [bool]\$env:ProfileLoaded ) { echo 'Profile loaded.'; exit 0 } else { echo 'False value!'; exit 1 } }"
 
 check "Powershell version as installed by feature" bash -c "pwsh --version"
 
@@ -168,9 +168,11 @@ install_using_github() {
         echo "${powershell_archive_sha256} *${powershell_filename}" | sha256sum -c -
     fi
     sudo tar xf "${powershell_filename}" -C "${powershell_target_path}"
-    sudo ln -s "${powershell_target_path}/pwsh" /usr/local/bin/pwsh
-    sudo rm -rf /tmp/pwsh /usr/local/bin/pwsh
-
+    sudo chmod 755 "${powershell_target_path}/pwsh"
+    sudo ln -sf "${powershell_target_path}/pwsh" /usr/bin/pwsh
+    sudo add-shell "/usr/bin/pwsh"
+    cd /tmp
+    sudo rm -rf /tmp/pwsh
 }
 
 echo -e "\nInstalling Powershell with find_prev_version_from_git_tags() fn 👈🏻"
diff --git a/test/powershell/scenarios.json b/test/powershell/scenarios.json
index 757a8cc97..87a5b9d16 100644
--- a/test/powershell/scenarios.json
+++ b/test/powershell/scenarios.json
@@ -1,6 +1,6 @@
 {
   "install_modules": {
-    "image": "mcr.microsoft.com/devcontainers/base:jammy",
+    "image": "mcr.microsoft.com/devcontainers/base:noble",
     "features": {
       "powershell": {
         "modules": "az.resources, az.storage",
@@ -9,7 +9,7 @@
     }
   },
   "install_powershell_fallback_test": {
-    "image": "mcr.microsoft.com/devcontainers/base:jammy",
+    "image": "mcr.microsoft.com/devcontainers/base:noble",
     "features": {
       "powershell": {
         "modules": "az.resources, az.storage",
@@ -18,11 +18,17 @@
     }
   },
   "install_modules_version": {
-    "image": "mcr.microsoft.com/devcontainers/base:jammy",
+    "image": "mcr.microsoft.com/devcontainers/base:noble",
     "features": {
       "powershell": {
         "modules": "az.resources==2.5.0, az.storage==4.3.0"
       }
     }
+  },
+  "validate_powershell_installation": {
+    "image": "mcr.microsoft.com/devcontainers/base:noble",
+    "features": {
+      "powershell": {}
+    }
   }
 }
diff --git a/test/powershell/validate_powershell_installation.sh b/test/powershell/validate_powershell_installation.sh
new file mode 100644
index 000000000..88544f28b
--- /dev/null
+++ b/test/powershell/validate_powershell_installation.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Extension-specific tests
+check "pwsh file is symlink" bash -c "[ -L /usr/bin/pwsh ]"
+check "pwsh symlink is registered as shell" bash -c "[ $(grep -c '/usr/bin/pwsh' /etc/shells) -eq 1 ]"
+check "pwsh target is correct" bash -c "[ $(readlink /usr/bin/pwsh) = /opt/microsoft/powershell/7/pwsh ]"
+check "pwsh target is registered as shell" bash -c "[ $(grep -c '/opt/microsoft/powershell/7/pwsh' /etc/shells) -eq 1 ]"
+check "pwsh owner is root" bash -c "[ $(stat -c %U /opt/microsoft/powershell/7/pwsh) = root ]"
+check "pwsh group is root" bash -c "[ $(stat -c %G /opt/microsoft/powershell/7/pwsh) = root ]"
+check "pwsh file mode is -rwxr-xr-x" bash -c "[ $(stat -c '%A' /opt/microsoft/powershell/7/pwsh) = '-rwxr-xr-x' ]"
+check "pwsh is in PATH" bash -c "command -v pwsh"
+
+# Report result
+reportResults

From 6123e41230425fc830c5e190005f91e88309efc2 Mon Sep 17 00:00:00 2001
From: Ruben Suarez Alvarez <rubensa@gmail.com>
Date: Wed, 28 Aug 2024 02:00:05 +0200
Subject: [PATCH 322/478] =?UTF-8?q?feat(aws-cli):=20=F0=9F=A7=91=E2=80=8D?=
 =?UTF-8?q?=F0=9F=92=BB=20add=20aws-cli=20completion=20(#1083)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(aws-cli): 🧑‍💻 add aws completion

aws supports bash and zsh command completion.

* test(aws-cli): ✅ test aws bash completion

* chore(aws-cli): 🔧 update feature version

* fix(aws-cli): cp command fix

* refactor(aws-cli): move vendor scripts to specific folder

* docs(aws-cli): add README to vendor scripts

* build(aws-cli): automate aws-cli vendor completer scripts updates

* chore(aws-cli): update vendor completer scripts

* build(aws-cli): update message

* chore(aws-cli): remove some code remainders
---
 .../update-aws-cli-completer-scripts.yml      | 58 ++++++++++++++++++
 src/aws-cli/devcontainer-feature.json         |  2 +-
 src/aws-cli/install.sh                        | 24 +++++---
 .../scripts/fetch-latest-completer-scripts.sh | 20 +++++++
 src/aws-cli/scripts/vendor/README.md          | 12 ++++
 src/aws-cli/scripts/vendor/aws_bash_completer |  6 ++
 .../scripts/vendor/aws_zsh_completer.sh       | 60 +++++++++++++++++++
 test/aws-cli/checkBashCompletion.sh           | 27 +++++++++
 test/aws-cli/test.sh                          | 10 ++++
 9 files changed, 211 insertions(+), 8 deletions(-)
 create mode 100644 .github/workflows/update-aws-cli-completer-scripts.yml
 create mode 100755 src/aws-cli/scripts/fetch-latest-completer-scripts.sh
 create mode 100644 src/aws-cli/scripts/vendor/README.md
 create mode 100755 src/aws-cli/scripts/vendor/aws_bash_completer
 create mode 100755 src/aws-cli/scripts/vendor/aws_zsh_completer.sh
 create mode 100755 test/aws-cli/checkBashCompletion.sh

diff --git a/.github/workflows/update-aws-cli-completer-scripts.yml b/.github/workflows/update-aws-cli-completer-scripts.yml
new file mode 100644
index 000000000..b46d43f39
--- /dev/null
+++ b/.github/workflows/update-aws-cli-completer-scripts.yml
@@ -0,0 +1,58 @@
+name: "Updates vendor 'aws_bash_completer' and 'aws_zsh_completer.sh' scripts"
+on:
+  workflow_dispatch:
+  schedule:
+  - cron: '0 0 * * 0'  # Runs every Sunday at midnight UTC (adjust as needed)
+
+jobs:
+  fetch-latest-aws-completer-scripts:
+    runs-on: ubuntu-latest
+    environment: documentation # grants access to secrets.PAT, for creating pull requests
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Run fetch-latest-completer-scripts.sh
+        run: src/aws-cli/scripts/fetch-latest-completer-scripts.sh
+
+      - name: Create a PR for completer scripts
+        id: push_image_info
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+        run: |
+          set -e
+          echo "Start."
+
+          # Configure git and Push updates
+          git config --global user.email github-actions@github.com
+          git config --global user.name github-actions
+          git config pull.rebase false
+
+          branch=automated-script-update-$GITHUB_RUN_ID
+          git checkout -b $branch
+          message='[Updates] Automated vendor 'aws-cli' completer scripts'
+
+          # Add / update and commit
+          git add src/aws-cli/scripts/vendor/aws_bash_completer
+          git add src/aws-cli/scripts/vendor/aws_zsh_completer.sh
+
+          git commit -m 'Automated completer scripts update' || export NO_UPDATES=true
+
+          # Bump version and push
+          if [ "$NO_UPDATES" != "true" ] ; then
+              echo "$(jq --indent 4 '.version = (.version | split(".") | map(tonumber) | .[2] += 1 | join("."))' src/aws-cli/devcontainer-feature.json)"  > src/aws-cli/devcontainer-feature.json 
+              git add src/aws-cli/devcontainer-feature.json
+
+              git commit -m 'Bump version'
+              git push origin "$branch"
+              gh api \
+                --method POST \
+                -H "Accept: application/vnd.github+json" \
+                /repos/${GITHUB_REPOSITORY}/pulls \
+                -f title="$message" \
+              -f body="$message" \
+              -f head="$branch" \
+              -f base="$GITHUB_REF_NAME"
+          fi
diff --git a/src/aws-cli/devcontainer-feature.json b/src/aws-cli/devcontainer-feature.json
index 35a035917..3c3128ac3 100644
--- a/src/aws-cli/devcontainer-feature.json
+++ b/src/aws-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "aws-cli",
-    "version": "1.0.7",
+    "version": "1.1.0",
     "name": "AWS CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/aws-cli",
     "description": "Installs the AWS CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/aws-cli/install.sh b/src/aws-cli/install.sh
index d802400ef..e7c03f728 100755
--- a/src/aws-cli/install.sh
+++ b/src/aws-cli/install.sh
@@ -52,24 +52,23 @@ fi
 
 apt_get_update()
 {
-    echo "Running apt-get update..."
-    apt-get update -y
+    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+        echo "Running apt-get update..."
+        apt-get update -y
+    fi
 }
 
 # Checks if packages are installed and installs them if not
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
-        if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
-            echo "Running apt-get update..."
-            apt-get update -y
-        fi
+        apt_get_update
         apt-get -y install --no-install-recommends "$@"
     fi
 }
 
 export DEBIAN_FRONTEND=noninteractive
 
-check_packages curl ca-certificates gnupg2 dirmngr unzip
+check_packages curl ca-certificates gnupg2 dirmngr unzip bash-completion
 
 verify_aws_cli_gpg_signature() {
     local filePath=$1
@@ -114,6 +113,17 @@ install() {
     unzip "${scriptZipFile}"
     ./aws/install
 
+    # kubectl bash completion
+    mkdir -p /etc/bash_completion.d
+    cp ./scripts/vendor/aws_bash_completer /etc/bash_completion.d/aws
+
+    # kubectl zsh completion
+    if [ -e "${USERHOME}/.oh-my-zsh" ]; then
+        mkdir -p "${USERHOME}/.oh-my-zsh/completions"
+        cp ./scripts/vendor/aws_zsh_completer.sh "${USERHOME}/.oh-my-zsh/completions/_aws"
+        chown -R "${USERNAME}" "${USERHOME}/.oh-my-zsh"
+    fi
+
     rm -rf ./aws
 }
 
diff --git a/src/aws-cli/scripts/fetch-latest-completer-scripts.sh b/src/aws-cli/scripts/fetch-latest-completer-scripts.sh
new file mode 100755
index 000000000..47dc6ee1d
--- /dev/null
+++ b/src/aws-cli/scripts/fetch-latest-completer-scripts.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+#
+# Docs: https://github.com/devcontainers/features/tree/main/src/aws-cli
+# Maintainer: The Dev Container spec maintainers
+#
+# Run this script to replace aws_bash_completer and aws_zsh_completer.sh with the latest and greatest available version
+# 
+COMPLETER_SCRIPTS=$(dirname "${BASH_SOURCE[0]}")
+BASH_COMPLETER_SCRIPT="$COMPLETER_SCRIPTS/vendor/aws_bash_completer"
+ZSH_COMPLETER_SCRIPT="$COMPLETER_SCRIPTS/vendor/aws_zsh_completer.sh"
+
+wget https://raw.githubusercontent.com/aws/aws-cli/v2/bin/aws_bash_completer -O "$BASH_COMPLETER_SCRIPT"
+chmod +x "$BASH_COMPLETER_SCRIPT"
+
+wget https://raw.githubusercontent.com/aws/aws-cli/v2/bin/aws_zsh_completer.sh -O "$ZSH_COMPLETER_SCRIPT"
+chmod +x "$ZSH_COMPLETER_SCRIPT"
diff --git a/src/aws-cli/scripts/vendor/README.md b/src/aws-cli/scripts/vendor/README.md
new file mode 100644
index 000000000..1f3838d46
--- /dev/null
+++ b/src/aws-cli/scripts/vendor/README.md
@@ -0,0 +1,12 @@
+### **IMPORTANT NOTE**
+
+Scripts in this directory are sourced externally and not maintained by the Dev Container spec maintainers. Do not make changes directly as they might be overwritten at any moment.
+
+## aws_bash_completer
+
+`aws_bash_completer` is a copy of <https://raw.githubusercontent.com/aws/aws-cli/v2/bin/aws_bash_completer>.
+
+## aws_zsh_completer.sh
+
+`aws_zsh_completer.sh` is a copy of <https://raw.githubusercontent.com/aws/aws-cli/v2/bin/aws_zsh_completer.sh>.
+
diff --git a/src/aws-cli/scripts/vendor/aws_bash_completer b/src/aws-cli/scripts/vendor/aws_bash_completer
new file mode 100755
index 000000000..32cd1dd8f
--- /dev/null
+++ b/src/aws-cli/scripts/vendor/aws_bash_completer
@@ -0,0 +1,6 @@
+# Typically that would be added under one of the following paths:
+# - /etc/bash_completion.d
+# - /usr/local/etc/bash_completion.d
+# - /usr/share/bash-completion/completions
+
+complete -C aws_completer aws
diff --git a/src/aws-cli/scripts/vendor/aws_zsh_completer.sh b/src/aws-cli/scripts/vendor/aws_zsh_completer.sh
new file mode 100755
index 000000000..c1b2c1244
--- /dev/null
+++ b/src/aws-cli/scripts/vendor/aws_zsh_completer.sh
@@ -0,0 +1,60 @@
+# Source this file to activate auto completion for zsh using the bash
+# compatibility helper.  Make sure to run `compinit` before, which should be
+# given usually.
+#
+# % source /path/to/zsh_complete.sh
+#
+# Typically that would be called somewhere in your .zshrc.
+#
+# Note, the overwrite of _bash_complete() is to export COMP_LINE and COMP_POINT
+# That is only required for zsh <= edab1d3dbe61da7efe5f1ac0e40444b2ec9b9570
+#
+# https://github.com/zsh-users/zsh/commit/edab1d3dbe61da7efe5f1ac0e40444b2ec9b9570
+#
+# zsh releases prior to that version do not export the required env variables!
+
+autoload -Uz bashcompinit
+bashcompinit -i
+
+_bash_complete() {
+  local ret=1
+  local -a suf matches
+  local -x COMP_POINT COMP_CWORD
+  local -a COMP_WORDS COMPREPLY BASH_VERSINFO
+  local -x COMP_LINE="$words"
+  local -A savejobstates savejobtexts
+
+  (( COMP_POINT = 1 + ${#${(j. .)words[1,CURRENT]}} + $#QIPREFIX + $#IPREFIX + $#PREFIX ))
+  (( COMP_CWORD = CURRENT - 1))
+  COMP_WORDS=( $words )
+  BASH_VERSINFO=( 2 05b 0 1 release )
+
+  savejobstates=( ${(kv)jobstates} )
+  savejobtexts=( ${(kv)jobtexts} )
+
+  [[ ${argv[${argv[(I)nospace]:-0}-1]} = -o ]] && suf=( -S '' )
+
+  matches=( ${(f)"$(compgen $@ -- ${words[CURRENT]})"} )
+
+  if [[ -n $matches ]]; then
+    if [[ ${argv[${argv[(I)filenames]:-0}-1]} = -o ]]; then
+      compset -P '*/' && matches=( ${matches##*/} )
+      compset -S '/*' && matches=( ${matches%%/*} )
+      compadd -Q -f "${suf[@]}" -a matches && ret=0
+    else
+      compadd -Q "${suf[@]}" -a matches && ret=0
+    fi
+  fi
+
+  if (( ret )); then
+    if [[ ${argv[${argv[(I)default]:-0}-1]} = -o ]]; then
+      _default "${suf[@]}" && ret=0
+    elif [[ ${argv[${argv[(I)dirnames]:-0}-1]} = -o ]]; then
+      _directories "${suf[@]}" && ret=0
+    fi
+  fi
+
+  return ret
+}
+
+complete -C aws_completer aws
diff --git a/test/aws-cli/checkBashCompletion.sh b/test/aws-cli/checkBashCompletion.sh
new file mode 100755
index 000000000..376461b52
--- /dev/null
+++ b/test/aws-cli/checkBashCompletion.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+command=$1
+expected=$2
+
+echo -e "Checking completion for command '$command'..."
+
+# Send command as a character stream, followed by two tab characters, into an interactive bash shell.
+# Also note the 'y' which responds to the possible Bash question "Display all xxx possibilities? (y or n)".
+# Bash produces the autocompletion output on stderr, so redirect that to stdout.
+# The sed bit captures the lines between Header and Footer (used as output delimiters).
+# The first grep removes the "Display all" message (that is atomatically answered to "y" by the script).
+# The last grep filters the output to lines containing the expected result.
+COMPLETE_OUTPUT=$(echo if false\; then "Header"\; $command$'\t'$'\t'y\; "Footer" fi | bash -i 2>&1 | sed -n '/Header/{:a;n;/Footer/q;p;ba}' | grep -v ^'Display all ')
+echo -e "\nCompletion output:\n"
+echo -e "$COMPLETE_OUTPUT"
+echo -e "\n"
+
+FILTERED_COMPLETE_OUTPUT=$(echo "$COMPLETE_OUTPUT" | grep "$expected")
+
+if [ -z "$FILTERED_COMPLETE_OUTPUT" ]; then
+  echo -e "Completion output does not contains '$expected'."
+  exit 1
+else
+  echo -e "Completion output contains '$expected'."
+  exit 0
+fi
diff --git a/test/aws-cli/test.sh b/test/aws-cli/test.sh
index d213eac38..45ef63db1 100755
--- a/test/aws-cli/test.sh
+++ b/test/aws-cli/test.sh
@@ -8,5 +8,15 @@ source dev-container-features-test-lib
 # Definition specific tests
 check "version" aws --version
 
+# By default bash complete is disabled for the root user
+# Enable it by replacing current ~/.bashrc with the /etc/skel/.bashrc file
+mv ~/.bashrc ~/.bashrc.bak
+cp /etc/skel/.bashrc ~/
+
+check "aws-bash-completion-contains-version-option" ./checkBashCompletion.sh "aws --" "version"
+
+# Restore original ~/.bashrc
+mv ~/.bashrc.bak ~/.bashrc
+
 # Report result
 reportResults
\ No newline at end of file

From 28846e52809dfd65c0569fb58eae55afcb5f366a Mon Sep 17 00:00:00 2001
From: Vatsal Gupta <40350810+gvatsal60@users.noreply.github.com>
Date: Wed, 4 Sep 2024 00:40:16 +0530
Subject: [PATCH 323/478] Updated actions version i.e checkout@4 and
 paths-filter@v3 (#1110)

* Updated from checkout@3 to checkout@4

* Updated action paths-filter from @v2 to @v3
---
 .github/workflows/docker-in-docker-stress-test.yaml    | 4 ++--
 .github/workflows/linter-automated.yaml                | 4 ++--
 .github/workflows/linter-manual.yaml                   | 2 +-
 .github/workflows/release.yaml                         | 4 ++--
 .github/workflows/test-all.yaml                        | 6 +++---
 .github/workflows/test-manual.yaml                     | 2 +-
 .github/workflows/test-pr.yaml                         | 8 ++++----
 .github/workflows/update-aws-cli-completer-scripts.yml | 4 ++--
 .github/workflows/update-documentation.yml             | 2 +-
 .github/workflows/update-dotnet-install-script.yml     | 4 ++--
 .github/workflows/validate-metadata-files.yml          | 4 ++--
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/docker-in-docker-stress-test.yaml b/.github/workflows/docker-in-docker-stress-test.yaml
index 569f94699..1c9410a88 100644
--- a/.github/workflows/docker-in-docker-stress-test.yaml
+++ b/.github/workflows/docker-in-docker-stress-test.yaml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
diff --git a/.github/workflows/linter-automated.yaml b/.github/workflows/linter-automated.yaml
index 98921bf68..46cbd085a 100644
--- a/.github/workflows/linter-automated.yaml
+++ b/.github/workflows/linter-automated.yaml
@@ -1,5 +1,5 @@
 name: "CI - Shell Script Linter"
-on: 
+on:
   push:
     branches:
       - main
@@ -9,7 +9,7 @@ jobs:
   shellchecker:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Shell Linter
       uses: azohra/shell-linter@v0.6.0
diff --git a/.github/workflows/linter-manual.yaml b/.github/workflows/linter-manual.yaml
index ec2e5f0a7..019724d35 100644
--- a/.github/workflows/linter-manual.yaml
+++ b/.github/workflows/linter-manual.yaml
@@ -15,7 +15,7 @@ jobs:
   shellchecker:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Shell Linter
       uses: azohra/shell-linter@v0.6.0
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a1ec773b9..22297641a 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -12,8 +12,8 @@ jobs:
     permissions:
       packages: write
     steps:
-      - uses: actions/checkout@v3
-      
+      - uses: actions/checkout@v4
+
       - name: "Publish"
         uses: devcontainers/action@v1
         with:
diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml
index 7a9554314..7e4c343bd 100644
--- a/.github/workflows/test-all.yaml
+++ b/.github/workflows/test-all.yaml
@@ -51,7 +51,7 @@ jobs:
             "mcr.microsoft.com/devcontainers/base:noble"
           ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
@@ -94,7 +94,7 @@ jobs:
             "nix",
         ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
@@ -106,7 +106,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
diff --git a/.github/workflows/test-manual.yaml b/.github/workflows/test-manual.yaml
index f163eb8ea..10d099b25 100644
--- a/.github/workflows/test-manual.yaml
+++ b/.github/workflows/test-manual.yaml
@@ -19,7 +19,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index 776a9731f..79a34fb66 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -8,7 +8,7 @@ jobs:
     outputs:
       features: ${{ steps.filter.outputs.changes }}
     steps:
-      - uses: dorny/paths-filter@v2
+      - uses: dorny/paths-filter@v3
         id: filter
         with:
           filters: |
@@ -17,7 +17,7 @@ jobs:
             azure-cli: ./**/azure-cli/**
             common-utils: ./**/common-utils/**
             conda: ./**/conda/**
-            desktop-lite: ./**/desktop-lite/** 
+            desktop-lite: ./**/desktop-lite/**
             docker-outside-of-docker: ./**/docker-outside-of-docker/**
             docker-in-docker: ./**/docker-in-docker/**
             dotnet: ./**/dotnet/**
@@ -58,7 +58,7 @@ jobs:
             "mcr.microsoft.com/devcontainers/base:noble"
           ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
@@ -74,7 +74,7 @@ jobs:
       matrix:
         features: ${{ fromJSON(needs.detect-changes.outputs.features) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
diff --git a/.github/workflows/update-aws-cli-completer-scripts.yml b/.github/workflows/update-aws-cli-completer-scripts.yml
index b46d43f39..41d67189f 100644
--- a/.github/workflows/update-aws-cli-completer-scripts.yml
+++ b/.github/workflows/update-aws-cli-completer-scripts.yml
@@ -12,7 +12,7 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Run fetch-latest-completer-scripts.sh
         run: src/aws-cli/scripts/fetch-latest-completer-scripts.sh
@@ -42,7 +42,7 @@ jobs:
 
           # Bump version and push
           if [ "$NO_UPDATES" != "true" ] ; then
-              echo "$(jq --indent 4 '.version = (.version | split(".") | map(tonumber) | .[2] += 1 | join("."))' src/aws-cli/devcontainer-feature.json)"  > src/aws-cli/devcontainer-feature.json 
+              echo "$(jq --indent 4 '.version = (.version | split(".") | map(tonumber) | .[2] += 1 | join("."))' src/aws-cli/devcontainer-feature.json)"  > src/aws-cli/devcontainer-feature.json
               git add src/aws-cli/devcontainer-feature.json
 
               git commit -m 'Bump version'
diff --git a/.github/workflows/update-documentation.yml b/.github/workflows/update-documentation.yml
index 2452e0d71..d74d970d5 100644
--- 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@v4
 
       - name: Generate Documentation
         uses: devcontainers/action@v1
diff --git a/.github/workflows/update-dotnet-install-script.yml b/.github/workflows/update-dotnet-install-script.yml
index 3394e8798..604f6880b 100644
--- a/.github/workflows/update-dotnet-install-script.yml
+++ b/.github/workflows/update-dotnet-install-script.yml
@@ -12,7 +12,7 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Run fetch-latest-dotnet-install.sh
         run: src/dotnet/scripts/fetch-latest-dotnet-install.sh
@@ -45,7 +45,7 @@ jobs:
 
           # Bump version and push
           if [ "$NO_UPDATES" != "true" ] ; then
-              echo "$(jq --indent 4 '.version = (.version | split(".") | map(tonumber) | .[2] += 1 | join("."))' src/dotnet/devcontainer-feature.json)"  > src/dotnet/devcontainer-feature.json 
+              echo "$(jq --indent 4 '.version = (.version | split(".") | map(tonumber) | .[2] += 1 | join("."))' src/dotnet/devcontainer-feature.json)"  > src/dotnet/devcontainer-feature.json
               git add src/dotnet/devcontainer-feature.json
 
               echo "$(jq --indent 4 '.version = (.version | split(".") | map(tonumber) | .[2] += 1 | join("."))' src/oryx/devcontainer-feature.json)"  > src/oryx/devcontainer-feature.json
diff --git a/.github/workflows/validate-metadata-files.yml b/.github/workflows/validate-metadata-files.yml
index dbba8e2b4..863418e93 100644
--- a/.github/workflows/validate-metadata-files.yml
+++ b/.github/workflows/validate-metadata-files.yml
@@ -7,8 +7,8 @@ jobs:
   validate:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      
+      - uses: actions/checkout@v4
+
       - name: "Validate devcontainer-feature.json files"
         uses: devcontainers/action@v1
         with:

From b0667c5589bfe1b382c49392c58fe4c9433f1fde Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Tue, 10 Sep 2024 05:27:54 +0530
Subject: [PATCH 324/478] [desktop-lite] - vnc_resolution - set thru env var
 (#1112)

* [desktop-lite] - vnc_resolution - set thru env var

* mistake in scenarios.json corrected

* small change of function addition in desktop-init.sh file

* changes as requested (review pr)

* changes as suggested
---
 src/desktop-lite/devcontainer-feature.json    |  2 +-
 src/desktop-lite/install.sh                   | 10 ++--
 test/desktop-lite/scenarios.json              | 27 +++++++++++
 ...est_vnc_resolution_as_container_env_var.sh | 47 +++++++++++++++++++
 .../test_vnc_resolution_as_remote_env_var.sh  | 33 +++++++++++++
 5 files changed, 113 insertions(+), 6 deletions(-)
 create mode 100644 test/desktop-lite/test_vnc_resolution_as_container_env_var.sh
 create mode 100644 test/desktop-lite/test_vnc_resolution_as_remote_env_var.sh

diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json
index 7c2549a0d..135c812b7 100644
--- a/src/desktop-lite/devcontainer-feature.json
+++ b/src/desktop-lite/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "desktop-lite",
-    "version": "1.2.4",
+    "version": "1.2.5",
     "name": "Light-weight Desktop",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
     "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh
index 5060f9210..6e6fff265 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -300,11 +300,11 @@ user_name="${USERNAME}"
 group_name="$(id -gn ${USERNAME})"
 LOG=/tmp/container-init.log
 
-export DBUS_SESSION_BUS_ADDRESS="${DBUS_SESSION_BUS_ADDRESS:-"autolaunch:"}"
-export DISPLAY="${DISPLAY:-:1}"
-export VNC_RESOLUTION="${VNC_RESOLUTION:-1440x768x16}" 
-export LANG="${LANG:-"en_US.UTF-8"}"
-export LANGUAGE="${LANGUAGE:-"en_US.UTF-8"}"
+export DBUS_SESSION_BUS_ADDRESS="\${DBUS_SESSION_BUS_ADDRESS:-"autolaunch:"}"
+export DISPLAY="\${DISPLAY:-:1}"
+export VNC_RESOLUTION="\${VNC_RESOLUTION:-1440x768x16}" 
+export LANG="\${LANG:-"en_US.UTF-8"}"
+export LANGUAGE="\${LANGUAGE:-"en_US.UTF-8"}"
 
 # Execute the command it not already running
 startInBackgroundIfNotRunning()
diff --git a/test/desktop-lite/scenarios.json b/test/desktop-lite/scenarios.json
index d86b321fd..ab920ddb9 100644
--- a/test/desktop-lite/scenarios.json
+++ b/test/desktop-lite/scenarios.json
@@ -4,5 +4,32 @@
         "features": {
             "desktop-lite": {}
         }
+    },
+    "test_vnc_resolution_as_container_env_var": {
+        "image": "ubuntu:noble",
+        "features": {
+            "desktop-lite": {}
+        }
+        ,
+        "containerEnv": {
+            "VNC_RESOLUTION": "1920x1080x32"
+        },
+        "forwardPorts": [
+            5901,
+            6080
+        ]
+    },
+    "test_vnc_resolution_as_remote_env_var": {
+        "image": "ubuntu:noble",
+        "features": {
+            "desktop-lite": {}
+        },
+        "remoteEnv": {
+            "VNC_RESOLUTION": "1920x1080x32"
+        },
+        "forwardPorts": [
+            5901,
+            6080
+        ]
     }
 }
\ No newline at end of file
diff --git a/test/desktop-lite/test_vnc_resolution_as_container_env_var.sh b/test/desktop-lite/test_vnc_resolution_as_container_env_var.sh
new file mode 100644
index 000000000..cc3dd3261
--- /dev/null
+++ b/test/desktop-lite/test_vnc_resolution_as_container_env_var.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+GREEN='\033[0;32m'; NC='\033[0m'; RED='\033[0;31m'; YELLOW='\033[0;33m';
+
+# Check if xtigervnc & noVnc processes are running after successful installation and initialization
+check_process_running() {
+    port=$1
+    # Get process id of process running on specific port
+    PID=$(lsof -i :$port | awk 'NR==2 {print $2}')
+    if [ -n "$PID" ]; then
+        CMD=$(ps -p $PID -o cmd --no-headers)
+        echo -e "${GREEN}Command running on port $port: ${YELLOW}$CMD${NC}"
+    else
+        echo -e "${RED}No process found listening on port $port.${NC}"
+        exit 1
+    fi
+}
+
+check_w_config_resolution() {
+    configResolution=$1
+    actualResolution=$2
+
+    if echo "$1" | grep -q "$2"; then 
+        echo -e "\n👍👍 ${GREEN}Configured resolution i.e. ${YELLOW}$configResolution${GREEN} has been set as vnc resolution i.e. ${YELLOW}$actualResolution${GREEN} in container.${NC}"
+    else 
+        echo -e "\n❌❌ ${GREEN}Configured resolution i.e. ${YELLOW}$configResolution${GREEN} couldn't be set as vnc resolution i.e. ${YELLOW}$actualResolution${GREEN} in container.${NC}"
+    fi
+}
+
+check "Whether xtigervnc is Running" check_process_running 5901
+resolution=$(ps -x -ww | grep Xtigervnc | awk "{for(i=1;i<=NF;i++) if (\$i ~ /-geometry/) {print \$(i+1); exit}}")
+check "xtigervnc resolution" bash -c '$resolution'
+check_w_config_resolution $VNC_RESOLUTION $resolution 
+sleep 2
+check "Whether no_vnc is Running" check_process_running 6080
+
+check "desktop-init-exists" bash -c "ls /usr/local/share/desktop-init.sh"
+check "log-exists" bash -c "ls /tmp/container-init.log"
+check "log file contents" bash -c "cat /tmp/container-init.log"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/desktop-lite/test_vnc_resolution_as_remote_env_var.sh b/test/desktop-lite/test_vnc_resolution_as_remote_env_var.sh
new file mode 100644
index 000000000..18409505c
--- /dev/null
+++ b/test/desktop-lite/test_vnc_resolution_as_remote_env_var.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Check if xtigervnc & noVnc processes are running after successful installation and initialization
+check_process_running() {
+    port=$1
+    # Get process id of process running on specific port
+    PID=$(lsof -i :$port | awk 'NR==2 {print $2}')
+    GREEN='\033[0;32m'; NC='\033[0m'; RED='\033[0;31m'; YELLOW='\033[0;33m';
+    if [ -n "$PID" ]; then
+        CMD=$(ps -p $PID -o cmd --no-headers)
+        echo -e "${GREEN}Command running on port $port: ${YELLOW}$CMD${NC}"
+    else
+        echo -e "${RED}No process found listening on port $port.${NC}"
+        exit 1
+    fi
+}
+
+check "Whether xtigervnc is Running" check_process_running 5901
+check "xtigervnc resolution" bash -c 'ps -x -ww | grep Xtigervnc | awk "{for(i=1;i<=NF;i++) if (\$i ~ /-geometry/) {print \$(i+1); exit}}"' 
+sleep 2
+check "Whether no_vnc is Running" check_process_running 6080
+
+check "desktop-init-exists" bash -c "ls /usr/local/share/desktop-init.sh"
+check "log-exists" bash -c "ls /tmp/container-init.log"
+check "log file contents" bash -c "cat /tmp/container-init.log"
+
+# Report result
+reportResults
\ No newline at end of file

From d926879cf044a7d2149eee0df4667e264a15454b Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Tue, 17 Sep 2024 02:03:34 +0530
Subject: [PATCH 325/478] [docker-in-docker] - toggle ip6tables settings value
 as option (#1068)

* [docker-in-docker] - toggle ip6tables settings value as option

* Update src/docker-in-docker/devcontainer-feature.json

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* Update src/docker-in-docker/devcontainer-feature.json

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* ip6tables - can be toggled

* changes as requested

* change to add test file..

* changes for docker_build_older test passing

* misc change

* CHANGE

* chg

* minor change to make tests pass

* for sh compatibility

* change for version

* small change

* few imp. changes

* few changes

* for test passing

* minor commit

* version added to a test scenario

* changes

* LOGIC was moved outside the init file for faster initialization times

* changes

* logic updated !

* chg

* default value to be null

* changes as suggested in review comments..

* by mistake

* another small change

* requested changes in comments (review pr)

* change as requested

* changes as suggested in review comments

* Update src/docker-in-docker/install.sh

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 .../devcontainer-feature.json                 |  7 +++++-
 src/docker-in-docker/install.sh               | 23 ++++++++++++++++--
 .../dockerIp6tablesDisabledTest.sh            | 24 +++++++++++++++++++
 test/docker-in-docker/scenarios.json          |  9 +++++++
 4 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 test/docker-in-docker/dockerIp6tablesDisabledTest.sh

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 4897ebf3e..f13b62d2d 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.11.0",
+    "version": "2.12.0",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
@@ -55,6 +55,11 @@
             "type": "boolean",
             "default": true,
             "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
+        },
+        "disableIp6tables": {
+            "type": "boolean",
+            "default": false,
+            "description": "Disable ip6tables (this option is only applicable for Docker versions 27 and greater)"
         }
     },
     "entrypoint": "/usr/local/share/docker-init.sh",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index ee9cb6ee6..c4c098ba8 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -20,6 +20,7 @@ INSTALL_DOCKER_COMPOSE_SWITCH="${INSTALLDOCKERCOMPOSESWITCH:-"true"}"
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal jammy noble"
 DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal hirsute impish jammy noble"
+DISABLE_IP6_TABLES="${DISABLEIP6TABLES:-false}"
 
 # Default: Exit on any failure.
 set -e
@@ -468,6 +469,23 @@ if [ "${INSTALL_DOCKER_BUILDX}" = "true" ]; then
     find "${docker_home}" -type d -print0 | xargs -n 1 -0 chmod g+s
 fi
 
+DOCKER_DEFAULT_IP6_TABLES=""
+if [ "$DISABLE_IP6_TABLES" == true ]; then
+    requested_version=""
+    # checking whether the version requested either is in semver format or just a number denoting the major version
+    # and, extracting the major version number out of the two scenarios
+    semver_regex="^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?(\+([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?$"
+    if echo "$DOCKER_VERSION" | grep -Eq $semver_regex; then
+        requested_version=$(echo $DOCKER_VERSION | cut -d. -f1)
+    elif echo "$DOCKER_VERSION" | grep -Eq "^[1-9][0-9]*$"; then
+        requested_version=$DOCKER_VERSION
+    fi
+    if [ "$DOCKER_VERSION" = "latest" ] || [[ -n "$requested_version" && "$requested_version" -ge 27 ]] ; then
+        DOCKER_DEFAULT_IP6_TABLES="--ip6tables=false"
+        echo "(!) As requested, passing '${DOCKER_DEFAULT_IP6_TABLES}'"
+    fi
+fi
+
 tee /usr/local/share/docker-init.sh > /dev/null \
 << EOF
 #!/bin/sh
@@ -480,11 +498,12 @@ set -e
 
 AZURE_DNS_AUTO_DETECTION=${AZURE_DNS_AUTO_DETECTION}
 DOCKER_DEFAULT_ADDRESS_POOL=${DOCKER_DEFAULT_ADDRESS_POOL}
+DOCKER_DEFAULT_IP6_TABLES=${DOCKER_DEFAULT_IP6_TABLES}
 EOF
 
 tee -a /usr/local/share/docker-init.sh > /dev/null \
 << 'EOF'
-dockerd_start="AZURE_DNS_AUTO_DETECTION=${AZURE_DNS_AUTO_DETECTION} DOCKER_DEFAULT_ADDRESS_POOL=${DOCKER_DEFAULT_ADDRESS_POOL} $(cat << 'INNEREOF'
+dockerd_start="AZURE_DNS_AUTO_DETECTION=${AZURE_DNS_AUTO_DETECTION} DOCKER_DEFAULT_ADDRESS_POOL=${DOCKER_DEFAULT_ADDRESS_POOL} DOCKER_DEFAULT_IP6_TABLES=${DOCKER_DEFAULT_IP6_TABLES} $(cat << 'INNEREOF'
     # explicitly remove dockerd and containerd PID file to ensure that it can start properly if it was stopped uncleanly
     find /run /var/run -iname 'docker*.pid' -delete || :
     find /run /var/run -iname 'container*.pid' -delete || :
@@ -562,7 +581,7 @@ dockerd_start="AZURE_DNS_AUTO_DETECTION=${AZURE_DNS_AUTO_DETECTION} DOCKER_DEFAU
     fi
 
     # Start docker/moby engine
-    ( dockerd $CUSTOMDNS $DEFAULT_ADDRESS_POOL > /tmp/dockerd.log 2>&1 ) &
+    ( dockerd $CUSTOMDNS $DEFAULT_ADDRESS_POOL $DOCKER_DEFAULT_IP6_TABLES > /tmp/dockerd.log 2>&1 ) &
 INNEREOF
 )"
 
diff --git a/test/docker-in-docker/dockerIp6tablesDisabledTest.sh b/test/docker-in-docker/dockerIp6tablesDisabledTest.sh
new file mode 100644
index 000000000..977054ffc
--- /dev/null
+++ b/test/docker-in-docker/dockerIp6tablesDisabledTest.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+ip6tablesCheck() {
+    if command -v ip6tables > /dev/null 2>&1; then
+        if ip6tables -L > /dev/null 2>&1; then
+            echo "✔️ ip6tables is enabled."
+        else
+            echo "❌ ip6tables is disabled."
+        fi
+    else
+        echo "❕ip6tables command not found. ❕"
+    fi
+}
+
+check "ip6tables" ip6tablesCheck
+check "ip6tables check" bash -c "docker network inspect bridge"
+check "docker-build" docker build ./
+
+reportResults
\ No newline at end of file
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index 33333583d..699a1dd79 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -8,6 +8,15 @@
             }
         }
     },
+    "dockerIp6tablesDisabledTest": {
+        "image": "ubuntu:focal",
+        "features": {
+            "docker-in-docker": {
+                "version": "27.0.3",
+                "disableIp6tables": true
+            }
+        }
+    },
     "dockerDefaultAddressPool": {
         "image": "mcr.microsoft.com/vscode/devcontainers/javascript-node:0-18",
         "remoteUser": "node",

From d1c0cc2476690cb9479cf1b6a3e27211b14cbe88 Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Mon, 16 Sep 2024 21:36:25 +0100
Subject: [PATCH 326/478] Automated documentation update (#1123)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/docker-in-docker/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index b913fa45f..336e458e4 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -23,6 +23,7 @@ Create child containers *inside* a container, independent from the host's docker
 | dockerDefaultAddressPool | Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24 | string | - |
 | installDockerBuildx | Install Docker Buildx | boolean | true |
 | installDockerComposeSwitch | Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter. | boolean | true |
+| disableIp6tables | Disable ip6tables (this option is only applicable for Docker versions 27 and greater) | boolean | false |
 
 ## Customizations
 

From d849e12748a2e7e44b17ecad9fb386f1e9aa30d3 Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Tue, 24 Sep 2024 05:00:18 +0530
Subject: [PATCH 327/478] [Git-Lfs] - Solution to #1072 issue - Can't download
 public key (#1124)

* [Git-Lfs] - Solution to #1072 issue

* bumped patch version for ths feature
---
 src/git-lfs/devcontainer-feature.json |  2 +-
 src/git-lfs/install.sh                | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/git-lfs/devcontainer-feature.json b/src/git-lfs/devcontainer-feature.json
index c9e0d9b82..69f83dd86 100644
--- a/src/git-lfs/devcontainer-feature.json
+++ b/src/git-lfs/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git-lfs",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "name": "Git Large File Support (LFS)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git-lfs",
     "description": "Installs Git Large File Support (Git LFS) along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like git and curl.",
diff --git a/src/git-lfs/install.sh b/src/git-lfs/install.sh
index f5c473816..554f42bbe 100755
--- a/src/git-lfs/install.sh
+++ b/src/git-lfs/install.sh
@@ -62,13 +62,6 @@ find_version_from_git_tags() {
 
 # Get the list of GPG key servers that are reachable
 get_gpg_key_servers() {
-    declare -A keyservers_curl_map=(
-        ["hkp://keyserver.ubuntu.com"]="http://keyserver.ubuntu.com:11371"
-        ["hkp://keyserver.ubuntu.com:80"]="http://keyserver.ubuntu.com"
-        ["hkps://keys.openpgp.org"]="https://keys.openpgp.org"
-        ["hkp://keyserver.pgp.com"]="http://keyserver.pgp.com:11371"
-    )
-
     local curl_args=""
     local keyserver_reachable=false  # Flag to indicate if any keyserver is reachable
 
@@ -76,15 +69,26 @@ get_gpg_key_servers() {
         curl_args="--proxy ${KEYSERVER_PROXY}"
     fi
 
-    for keyserver in "${!keyservers_curl_map[@]}"; do
-        local keyserver_curl_url="${keyservers_curl_map[${keyserver}]}"
-        if curl -s ${curl_args} --max-time 5 ${keyserver_curl_url} > /dev/null; then
+    test_keyserver() {
+        local keyserver="$1"
+        local keyserver_curl_url="$2"
+        if curl -s ${curl_args} --max-time 5 "${keyserver_curl_url}" > /dev/null; then
             echo "keyserver ${keyserver}"
             keyserver_reachable=true
         else
             echo "(*) Keyserver ${keyserver} is not reachable." >&2
         fi
-    done
+    }
+
+    # Explicitly test these in order because Bash v4.4.20 (Ubuntu Bionic)
+    # enumerates associative array keys in a different order than Bash v5
+    test_keyserver "hkp://keyserver.ubuntu.com"    "http://keyserver.ubuntu.com:11371"
+    test_keyserver "hkp://keyserver.ubuntu.com:80" "http://keyserver.ubuntu.com"
+    test_keyserver "hkp://keyserver.pgp.com"       "http://keyserver.pgp.com:11371"
+    # Test this server last because keys.openpgp.org strips user IDs from keys unless
+    # the owner gives permission, which causes gpg in Ubuntu Bionic to reject the key
+    # (https://github.com/devcontainers/features/issues/1055)
+    test_keyserver "hkps://keys.openpgp.org"       "https://keys.openpgp.org"
 
     if ! $keyserver_reachable; then
         echo "(!) No keyserver is reachable." >&2

From 1a6b7152026edf77a5ef39b975fcf2072e3f040a Mon Sep 17 00:00:00 2001
From: Prathamesh Zarkar <159782310+prathameshzarkar9@users.noreply.github.com>
Date: Tue, 24 Sep 2024 05:17:20 +0530
Subject: [PATCH 328/478] cuda support for 12.3 .. 12.5 (#1119)

* cuda support for 12.3 .. 12.5

* cuda 12.3 to 12.5 support

* patch version update

* review comments addressed
---
 src/nvidia-cuda/devcontainer-feature.json     | 32 +++++++++------
 src/nvidia-cuda/install.sh                    | 20 +++++++++-
 test/nvidia-cuda/install_cudnn_123_version.sh | 16 ++++++++
 test/nvidia-cuda/install_cudnn_124_version.sh | 16 ++++++++
 .../install_cudnn_latest_version.sh           | 16 ++++++++
 test/nvidia-cuda/scenarios.json               | 39 +++++++++++++++++++
 6 files changed, 126 insertions(+), 13 deletions(-)
 create mode 100644 test/nvidia-cuda/install_cudnn_123_version.sh
 create mode 100644 test/nvidia-cuda/install_cudnn_124_version.sh
 create mode 100644 test/nvidia-cuda/install_cudnn_latest_version.sh

diff --git a/src/nvidia-cuda/devcontainer-feature.json b/src/nvidia-cuda/devcontainer-feature.json
index 4a0fb0834..b46d7c433 100644
--- a/src/nvidia-cuda/devcontainer-feature.json
+++ b/src/nvidia-cuda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "nvidia-cuda",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "name": "NVIDIA CUDA",
   "description": "Installs shared libraries for NVIDIA CUDA.",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nvidia-cuda",
@@ -28,6 +28,9 @@
     "cudaVersion": {
       "type": "string",
       "proposals": [
+        "12.5",
+        "12.4",
+        "12.3",
         "12.2",
         "12.1",
         "12.0",
@@ -45,15 +48,15 @@
     "cudnnVersion": {
       "type": "string",
       "proposals": [
-	"8.9.5.29",
-	"8.9.4.25",
-	"8.9.3.28",
-	"8.9.2.26",
-	"8.9.1.23",
-	"8.9.0.131",
-	"8.8.1.3",
-	"8.8.0.121",
-	"8.7.0.84",
+        "8.9.5.29",
+        "8.9.4.25",
+        "8.9.3.28",
+        "8.9.2.26",
+        "8.9.1.23",
+        "8.9.0.131",
+        "8.8.1.3",
+        "8.8.0.121",
+        "8.7.0.84",
         "8.6.0.163",
         "8.5.0.96",
         "8.4.1.50",
@@ -67,7 +70,14 @@
         "8.2.1.32",
         "8.2.0.53",
         "8.1.1.33",
-        "8.1.0.77"
+        "8.1.0.77",
+        "9.0.0.312",
+        "9.1.0.70",
+        "9.1.1.17",
+        "9.2.0.82",
+        "9.2.1.18",
+        "9.3.0.75",
+        "9.4.0.58"
       ],
       "default": "8.6.0.163",
       "description": "Version of cuDNN to install"
diff --git a/src/nvidia-cuda/install.sh b/src/nvidia-cuda/install.sh
index 79a7a9a20..37ba7f0f4 100644
--- a/src/nvidia-cuda/install.sh
+++ b/src/nvidia-cuda/install.sh
@@ -59,6 +59,8 @@ apt-get update -yq
 cuda_pkg="cuda-libraries-${CUDA_VERSION/./-}"
 nvtx_pkg="cuda-nvtx-${CUDA_VERSION/./-}"
 toolkit_pkg="cuda-toolkit-${CUDA_VERSION/./-}"
+major_cudnn_version=$(echo "${CUDNN_VERSION}" | cut -d '.' -f 1)
+major_cuda_version=$(echo "${CUDA_VERSION}" | cut -d '.' -f 1)
 if ! apt-cache show "$cuda_pkg"; then
     echo "The requested version of CUDA is not available: CUDA $CUDA_VERSION"
     exit 1
@@ -69,7 +71,15 @@ apt-get install -yq "$cuda_pkg"
 
 if [ "$INSTALL_CUDNN" = "true" ]; then
     # Ensure that the requested version of cuDNN is available AND compatible
-    cudnn_pkg_version="libcudnn8=${CUDNN_VERSION}-1+cuda${CUDA_VERSION}"
+    #if major cudnn version is 9, then we need to install libcudnn9-cuda-<major_version> package
+    #else we need to install libcudnn8-cuda-<major_version> package
+    if [[ $major_cudnn_version -ge "9" ]]
+    then
+        cudnn_pkg_version="libcudnn9-cuda-${major_cuda_version}=${CUDNN_VERSION}-1"
+    else
+        cudnn_pkg_version="libcudnn8=${CUDNN_VERSION}-1+cuda${CUDA_VERSION}"
+    fi
+
     if ! apt-cache show "$cudnn_pkg_version"; then
         echo "The requested version of cuDNN is not available: cuDNN $CUDNN_VERSION for CUDA $CUDA_VERSION"
         exit 1
@@ -81,7 +91,13 @@ fi
 
 if [ "$INSTALL_CUDNNDEV" = "true" ]; then
     # Ensure that the requested version of cuDNN development package is available AND compatible
-    cudnn_dev_pkg_version="libcudnn8-dev=${CUDNN_VERSION}-1+cuda${CUDA_VERSION}"
+    if [[ $major_cudnn_version -ge "9" ]]
+    then
+        cudnn_dev_pkg_version="libcudnn9-dev-cuda-${major_cuda_version}=${CUDNN_VERSION}-1"
+    else
+        cudnn_dev_pkg_version="libcudnn8-dev=${CUDNN_VERSION}-1+cuda${CUDA_VERSION}"
+    fi
+    
     if ! apt-cache show "$cudnn_dev_pkg_version"; then
         echo "The requested version of cuDNN development package is not available: cuDNN $CUDNN_VERSION for CUDA $CUDA_VERSION"
         exit 1
diff --git a/test/nvidia-cuda/install_cudnn_123_version.sh b/test/nvidia-cuda/install_cudnn_123_version.sh
new file mode 100644
index 000000000..f331a591f
--- /dev/null
+++ b/test/nvidia-cuda/install_cudnn_123_version.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Check installation of libcudnn9-cuda-12 (9.4.0)
+check "libcudnn.so.9.4.0" test 1 -eq "$(find /usr -name 'libcudnn.so.9.4.0' | wc -l)"
+
+# Check installation of cuda-nvtx-11-7 (11.7)
+# check "cuda-12-4+nvtx" test -e '/usr/local/cuda-12.4/targets/x86_64-linux/include/nvtx3'
+
+# Report result
+reportResults
+    
\ No newline at end of file
diff --git a/test/nvidia-cuda/install_cudnn_124_version.sh b/test/nvidia-cuda/install_cudnn_124_version.sh
new file mode 100644
index 000000000..f331a591f
--- /dev/null
+++ b/test/nvidia-cuda/install_cudnn_124_version.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Check installation of libcudnn9-cuda-12 (9.4.0)
+check "libcudnn.so.9.4.0" test 1 -eq "$(find /usr -name 'libcudnn.so.9.4.0' | wc -l)"
+
+# Check installation of cuda-nvtx-11-7 (11.7)
+# check "cuda-12-4+nvtx" test -e '/usr/local/cuda-12.4/targets/x86_64-linux/include/nvtx3'
+
+# Report result
+reportResults
+    
\ No newline at end of file
diff --git a/test/nvidia-cuda/install_cudnn_latest_version.sh b/test/nvidia-cuda/install_cudnn_latest_version.sh
new file mode 100644
index 000000000..f331a591f
--- /dev/null
+++ b/test/nvidia-cuda/install_cudnn_latest_version.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Check installation of libcudnn9-cuda-12 (9.4.0)
+check "libcudnn.so.9.4.0" test 1 -eq "$(find /usr -name 'libcudnn.so.9.4.0' | wc -l)"
+
+# Check installation of cuda-nvtx-11-7 (11.7)
+# check "cuda-12-4+nvtx" test -e '/usr/local/cuda-12.4/targets/x86_64-linux/include/nvtx3'
+
+# Report result
+reportResults
+    
\ No newline at end of file
diff --git a/test/nvidia-cuda/scenarios.json b/test/nvidia-cuda/scenarios.json
index bd73263b3..d2400503b 100644
--- a/test/nvidia-cuda/scenarios.json
+++ b/test/nvidia-cuda/scenarios.json
@@ -20,5 +20,44 @@
                 "cudnnVersion": "8.5.0.96"
             }
         }
+    },
+    "install_cudnn_123_version": {
+        "image": "debian",
+        "features": {
+            "nvidia-cuda": {
+                "installCudnn": true,
+                "installNvtx": true,
+                "installCudnnDev": true,
+                "installToolkit": true,
+                "cudaVersion": "12.3",
+                "cudnnVersion": "9.4.0.58"
+            }
+        }
+    },
+    "install_cudnn_124_version": {
+        "image": "debian",
+        "features": {
+            "nvidia-cuda": {
+                "installCudnn": true,
+                "installNvtx": true,
+                "installCudnnDev": true,
+                "installToolkit": true,
+                "cudaVersion": "12.4",
+                "cudnnVersion": "9.4.0.58"
+            }
+        }
+    },
+    "install_cudnn_latest_version": {
+        "image": "debian",
+        "features": {
+            "nvidia-cuda": {
+                "installCudnn": true,
+                "installNvtx": true,
+                "installCudnnDev": true,
+                "installToolkit": true,
+                "cudaVersion": "12.5",
+                "cudnnVersion": "9.4.0.58"
+            }
+        }
     }
 }

From f02df17a38df650a130405bf06a35db49e8a9eff Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Wed, 25 Sep 2024 00:53:44 +0530
Subject: [PATCH 329/478] [docker-outside-of-docker] - Fix
 externally-managed-environment python error for "bookworm" - solution to
 issue #1120 (#1121)

* [docker-outside-of-docker] - solution to issue #1120

* minor changes

* err fn addition

* changes as required

* Update src/docker-outside-of-docker/devcontainer-feature.json

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* remove debugging code

* missed this change

* reverting changes

* keeping docker_compose_install to be false for v1 installs

* changes as requested

* changes as required

---------

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 .../devcontainer-feature.json                 |   7 +-
 src/docker-outside-of-docker/install.sh       | 111 +++++++++++++-----
 .../docker_build_compose_fallback.sh          |  10 +-
 .../docker_install_compose_switch.sh          |  29 +++++
 .../docker_not_install_compose_switch.sh      |  29 +++++
 .../docker_python_bookworm.sh                 |  22 ++++
 test/docker-outside-of-docker/scenarios.json  |  30 +++++
 7 files changed, 202 insertions(+), 36 deletions(-)
 create mode 100644 test/docker-outside-of-docker/docker_install_compose_switch.sh
 create mode 100644 test/docker-outside-of-docker/docker_not_install_compose_switch.sh
 create mode 100644 test/docker-outside-of-docker/docker_python_bookworm.sh

diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 19018ea8e..24b5658dc 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.5.0",
+    "version": "1.6.0",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
@@ -39,6 +39,11 @@
             "type": "boolean",
             "default": true,
             "description": "Install Docker Buildx"
+        },
+        "installDockerComposeSwitch": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
         }
     },
     "entrypoint": "/usr/local/share/docker-init.sh",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index de5212fe6..5854fc340 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -17,6 +17,7 @@ SOURCE_SOCKET="${SOURCE_SOCKET:-"/var/run/docker-host.sock"}"
 TARGET_SOCKET="${TARGET_SOCKET:-"/var/run/docker.sock"}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
+INSTALL_DOCKER_COMPOSE_SWITCH="${INSTALLDOCKERCOMPOSESWITCH:-"true"}"
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal jammy noble"
@@ -27,6 +28,11 @@ set -e
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
+# Setup STDERR.
+err() {
+    echo "(!) $*" >&2
+}
+
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
     exit 1
@@ -177,7 +183,7 @@ install_compose_switch_fallback() {
     echo -e "\n(!) Failed to fetch the latest artifacts for compose-switch v${compose_switch_version}..."
     get_previous_version "${compose_switch_url}" "${repo_url}" compose_switch_version
     echo -e "\nAttempting to install v${compose_switch_version}"
-    curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/docker-compose
+    curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/compose-switch
 }
 
 # Ensure apt is in non-interactive to avoid prompts
@@ -273,6 +279,19 @@ if [ "${USE_MOBY}" = "true" ]; then
     fi
 fi
 
+
+docker_home="/usr/libexec/docker"
+cli_plugins_dir="${docker_home}/cli-plugins"
+
+install_compose_fallback(){
+    local url=$1
+    local repo_url=$(get_github_api_repo_url "$url")
+    echo -e "\n(!) Failed to fetch the latest artifacts for docker-compose v${compose_version}..."
+    get_previous_version "${url}" "${repo_url}" compose_version
+    echo -e "\nAttempting to install v${compose_version}"
+    curl -fsSL "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path}
+}
+
 # Install Docker / Moby CLI if not already installed
 if type docker > /dev/null 2>&1; then
     echo "Docker / Moby CLI already installed."
@@ -302,44 +321,82 @@ fi
 
 # If 'docker-compose' command is to be included
 if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
+    case "${architecture}" in
+        amd64) target_compose_arch=x86_64 ;;
+        arm64) target_compose_arch=aarch64 ;;
+        *)
+            echo "(!) Docker outside of docker does not support machine architecture '$architecture'. Please use an x86-64 or ARM64 machine."
+            exit 1
+    esac
+    docker_compose_path="/usr/local/bin/docker-compose" 
     # Install Docker Compose if not already installed  and is on a supported architecture
     if type docker-compose > /dev/null 2>&1; then
         echo "Docker Compose already installed."
     elif [ "${DOCKER_DASH_COMPOSE_VERSION}" = "v1" ]; then
-        TARGET_COMPOSE_ARCH="$(uname -m)"
-        if [ "${TARGET_COMPOSE_ARCH}" = "amd64" ]; then
-            TARGET_COMPOSE_ARCH="x86_64"
-        fi
-        if [ "${TARGET_COMPOSE_ARCH}" != "x86_64" ]; then
+        err "The final Compose V1 release, version 1.29.2, was May 10, 2021. These packages haven't received any security updates since then. Use at your own risk."
+        INSTALL_DOCKER_COMPOSE_SWITCH="false"
+        
+        if [ "${target_compose_arch}" = "x86_64" ]; then
+            echo "(*) Installing docker compose v1..."
+            curl -fsSL "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64" -o ${docker_compose_path}
+            chmod +x ${docker_compose_path}
+
+            # Download the SHA256 checksum
+            DOCKER_COMPOSE_SHA256="$(curl -sSL "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64.sha256" | awk '{print $1}')"
+            echo "${DOCKER_COMPOSE_SHA256}  ${docker_compose_path}" > docker-compose.sha256sum
+            sha256sum -c docker-compose.sha256sum --ignore-missing
+        elif [ "${VERSION_CODENAME}" = "bookworm" ]; then
+            err "Docker compose v1 is unavailable for 'bookworm' on Arm64. Kindly switch to use v2"
+            exit 1
+        else
             # Use pip to get a version that runs on this architecture
             check_packages python3-minimal python3-pip libffi-dev python3-venv
-            export PIPX_HOME=/usr/local/pipx
-            mkdir -p ${PIPX_HOME}
-            export PIPX_BIN_DIR=/usr/local/bin
-            export PYTHONUSERBASE=/tmp/pip-tmp
-            export PIP_CACHE_DIR=/tmp/pip-tmp/cache
-            pipx_bin=pipx
-            if ! type pipx > /dev/null 2>&1; then
-                pip3 install --disable-pip-version-check --no-cache-dir --user pipx
-                pipx_bin=/tmp/pip-tmp/bin/pipx
-            fi
-            ${pipx_bin} install --pip-args '--no-cache-dir --force-reinstall' docker-compose
-            rm -rf /tmp/pip-tmp
-        else
-            compose_v1_version="1"
-            find_version_from_git_tags compose_v1_version "https://github.com/docker/compose" "tags/"
-            echo "(*) Installing docker-compose ${compose_v1_version}..."
-            curl -fsSL "https://github.com/docker/compose/releases/download/${compose_v1_version}/docker-compose-Linux-x86_64" -o /usr/local/bin/docker-compose
-            chmod +x /usr/local/bin/docker-compose
+            echo "(*) Installing docker compose v1 via pip..."
+            export PYTHONUSERBASE=/usr/local
+            pip3 install --disable-pip-version-check --no-cache-dir --user "Cython<3.0" pyyaml wheel docker-compose --no-build-isolation
         fi
     else
-        echo "(*) Installing compose-switch as docker-compose..."
+        compose_version=${DOCKER_DASH_COMPOSE_VERSION#v}
+        docker_compose_url="https://github.com/docker/compose"
+        find_version_from_git_tags compose_version "$docker_compose_url" "tags/v"
+        echo "(*) Installing docker-compose ${compose_version}..."
+        curl -fsSL "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path} || {
+            if [[ $DOCKER_DASH_COMPOSE_VERSION == "latest" ]]; then 
+                install_compose_fallback "$docker_compose_url" "$compose_version" "$target_compose_arch" "$docker_compose_path"
+            else
+                echo -e "Error: Failed to install docker-compose v${compose_version}" 
+            fi
+        }
+        chmod +x ${docker_compose_path}
+
+        # Download the SHA256 checksum
+        DOCKER_COMPOSE_SHA256="$(curl -sSL "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}.sha256" | awk '{print $1}')"
+        echo "${DOCKER_COMPOSE_SHA256}  ${docker_compose_path}" > docker-compose.sha256sum
+        sha256sum -c docker-compose.sha256sum --ignore-missing
+
+        mkdir -p ${cli_plugins_dir}
+        cp ${docker_compose_path} ${cli_plugins_dir}
+    fi
+fi
+
+# Install docker-compose switch if not already installed - https://github.com/docker/compose-switch#manual-installation
+if [ "${INSTALL_DOCKER_COMPOSE_SWITCH}" = "true" ] && ! type compose-switch > /dev/null 2>&1; then
+    if type docker-compose > /dev/null 2>&1; then
+        echo "(*) Installing compose-switch..."
+        current_compose_path="$(which docker-compose)"
+        target_compose_path="$(dirname "${current_compose_path}")/docker-compose-v1"
         compose_switch_version="latest"
         compose_switch_url="https://github.com/docker/compose-switch"
         find_version_from_git_tags compose_switch_version "${compose_switch_url}"
-        curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/docker-compose || install_compose_switch_fallback "${compose_switch_url}"
-        chmod +x /usr/local/bin/docker-compose
+        curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/compose-switch || install_compose_switch_fallback "${compose_switch_url}"
+        chmod +x /usr/local/bin/compose-switch
         # TODO: Verify checksum once available: https://github.com/docker/compose-switch/issues/11
+        # Setup v1 CLI as alternative in addition to compose-switch (which maps to v2)
+        mv "${current_compose_path}" "${target_compose_path}"
+        update-alternatives --install ${docker_compose_path} docker-compose /usr/local/bin/compose-switch 99
+        update-alternatives --install ${docker_compose_path} docker-compose "${target_compose_path}" 1
+    else
+        err "Skipping installation of compose-switch as docker compose is unavailable..."
     fi
 fi
 
diff --git a/test/docker-outside-of-docker/docker_build_compose_fallback.sh b/test/docker-outside-of-docker/docker_build_compose_fallback.sh
index 193d79d28..7f3a6f1dd 100644
--- a/test/docker-outside-of-docker/docker_build_compose_fallback.sh
+++ b/test/docker-outside-of-docker/docker_build_compose_fallback.sh
@@ -112,20 +112,14 @@ get_previous_version() {
     local variable_name=$3
     local mode=$4
     prev_version=${!variable_name}
-    
+
     output=$(curl -s "$repo_url");
 
     check_packages jq
 
     message=$(echo "$output" | jq -r '.message')
-
-    if [[ $mode == 'mode1' ]]; then
-        message="API rate limit exceeded"
-    else 
-        message=""
-    fi
     
-    if [[ $message == "API rate limit exceeded"* ]]; then
+    if [[ $message == "API rate limit exceeded"* ]] || [[ $mode == 'mode1' ]]; then
         echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
         echo -e "\nAttempting to find latest version using GitHub tags."
         find_prev_version_from_git_tags prev_version "$url" "tags/v"
diff --git a/test/docker-outside-of-docker/docker_install_compose_switch.sh b/test/docker-outside-of-docker/docker_install_compose_switch.sh
new file mode 100644
index 000000000..77f7bbef6
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_install_compose_switch.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Check if compose-switch is installed
+check_compose_switch_installation() {
+    COMPOSE_SWITCH_BINARY="/usr/local/bin/compose-switch"
+    # Check if the binary exists
+    if [ ! -x "$COMPOSE_SWITCH_BINARY" ]; then
+        echo "compose-switch binary not found at $COMPOSE_SWITCH_BINARY"
+        exit 1
+    else 
+        compose_switch_version=$("$COMPOSE_SWITCH_BINARY" --version | awk '{print $4}')
+        if [ -z "$compose_switch_version" ]; then
+            echo "Unable to determine compose-switch version"
+        else
+            echo "compose-switch version: $compose_switch_version"
+            echo -e "\n✅ compose-switch is installed"
+        fi
+    fi
+}
+
+check "Check whether compose-switch is installed" check_compose_switch_installation
+
+reportResults
+ 
\ No newline at end of file
diff --git a/test/docker-outside-of-docker/docker_not_install_compose_switch.sh b/test/docker-outside-of-docker/docker_not_install_compose_switch.sh
new file mode 100644
index 000000000..7160ef7ce
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_not_install_compose_switch.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Check if compose-switch is installed
+check_compose_switch_installation() {
+    COMPOSE_SWITCH_BINARY="/usr/local/bin/compose-switch"
+    # Check if the binary exists
+    if [ ! -x "$COMPOSE_SWITCH_BINARY" ]; then
+        echo "compose-switch binary not found at $COMPOSE_SWITCH_BINARY"
+        echo -e "\n❎ compose-switch is not installed"
+    else 
+        compose_switch_version=$("$COMPOSE_SWITCH_BINARY" --version | awk '{print $4}')
+        if [ -z "$compose_switch_version" ]; then
+            echo "Unable to determine compose-switch version"
+        else
+            echo "compose-switch version: $compose_switch_version"
+        fi
+        exit 1
+    fi
+}
+
+check "Check whether compose-switch is installed" check_compose_switch_installation
+
+reportResults
+ 
\ No newline at end of file
diff --git a/test/docker-outside-of-docker/docker_python_bookworm.sh b/test/docker-outside-of-docker/docker_python_bookworm.sh
new file mode 100644
index 000000000..21ad3b7a4
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_python_bookworm.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker-buildx" bash -c "docker buildx version"
+check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
+
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+
+check "installs docker-compose v2 install" bash -c "type docker-compose"
+check "docker compose" bash -c "docker compose version | grep -E '2.[0-9]+.[0-9]+'"
+check "docker-compose" bash -c "docker-compose --version | grep -E '2.[0-9]+.[0-9]+'"
+
+check "installs compose-switch as docker-compose" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/docker-outside-of-docker/scenarios.json b/test/docker-outside-of-docker/scenarios.json
index 6239a1ada..7d3301f12 100644
--- a/test/docker-outside-of-docker/scenarios.json
+++ b/test/docker-outside-of-docker/scenarios.json
@@ -142,5 +142,35 @@
                 "mobyBuildxVersion": "0.12.0"
             }
         }
+    },
+    "docker_python_bookworm": {
+        "image": "mcr.microsoft.com/devcontainers/base:bookworm",
+        "features": {
+            "docker-outside-of-docker": {
+                "moby": true,
+                "installDockerBuildx": true,
+                "dockerDashComposeVersion": "v2"
+            }
+        }
+    },
+    "docker_not_install_compose_switch": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "features": {
+            "docker-outside-of-docker": {
+                "dockerDashComposeVersion": "latest",
+                "installDockerComposeSwitch": false
+            }
+        },
+        "containerUser": "vscode"
+    },
+    "docker_install_compose_switch": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "features": {
+            "docker-outside-of-docker": {
+                "dockerDashComposeVersion": "latest",
+                "installDockerComposeSwitch": true
+            }
+        },
+        "containerUser": "vscode"
     }
 }

From 0be79410981d50c2b5fa35e97f4af8a1a4f4727d Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Tue, 24 Sep 2024 21:36:19 +0100
Subject: [PATCH 330/478] Automated documentation update (#1129)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/docker-outside-of-docker/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/docker-outside-of-docker/README.md b/src/docker-outside-of-docker/README.md
index 18fe79573..04e7260f6 100644
--- a/src/docker-outside-of-docker/README.md
+++ b/src/docker-outside-of-docker/README.md
@@ -22,6 +22,7 @@ Re-use the host docker socket, adding the Docker CLI to a container. Feature inv
 | mobyBuildxVersion | Install a specific version of moby-buildx when using Moby | string | latest |
 | dockerDashComposeVersion | Compose version to use for docker-compose (v1 or v2 or none) | string | v2 |
 | installDockerBuildx | Install Docker Buildx | boolean | true |
+| installDockerComposeSwitch | Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter. | boolean | true |
 
 ## Customizations
 

From 5077a2cb2c9ab9e2eb82b569c3ec27a9eedc4e5e Mon Sep 17 00:00:00 2001
From: Prathamesh Zarkar <159782310+prathameshzarkar9@users.noreply.github.com>
Date: Thu, 26 Sep 2024 03:38:25 +0530
Subject: [PATCH 331/478] [Java] Add JDK 22 support (#1102)

* Add JDK 22 support

* bump patch version

* removed exit added for debugging

* added one condition before changing the JDK_DISTRO

* version set to 21 and jdk_distro open fixed

* failed test cases fixed

* fixing install_type issue if not java

* yum update with epel-release install

* explicit test case writen to validate jdk 22 works fine

* moved check_packages to the start

* INSTALL_CMD moved to start

* variable changed
---
 src/java/devcontainer-feature.json  |   2 +-
 src/java/install.sh                 | 166 ++++++++++++++--------------
 test/java/install_latest_version.sh |  15 +++
 test/java/scenarios.json            |   8 ++
 4 files changed, 108 insertions(+), 83 deletions(-)
 create mode 100644 test/java/install_latest_version.sh

diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index 51e214a25..7a9caa924 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "name": "Java (via SDKMAN!)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
diff --git a/src/java/install.sh b/src/java/install.sh
index 277681fec..47f0e8559 100644
--- a/src/java/install.sh
+++ b/src/java/install.sh
@@ -53,14 +53,6 @@ else
     exit 1
 fi
 
-if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${VERSION_CODENAME-}" = "centos7" ]; then
-    # As of 1 July 2024, mirrorlist.centos.org no longer exists.
-    # Update the repo files to reference vault.centos.org.
-    sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
-    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
-    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
-fi
-
 # Setup INSTALL_CMD & PKG_MGR_CMD
 if type apt-get > /dev/null 2>&1; then
     PKG_MGR_CMD=apt-get
@@ -79,6 +71,67 @@ else
     exit 1
 fi
 
+pkg_manager_update() {
+    case $ADJUSTED_ID in
+        debian)
+            if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+                echo "Running apt-get update..."
+                ${PKG_MGR_CMD} update -y
+            fi
+            ;;
+        rhel)
+            if [ ${PKG_MGR_CMD} = "microdnf" ]; then
+                if [ "$(ls /var/cache/yum/* 2>/dev/null | wc -l)" = 0 ]; then
+                    echo "Running ${PKG_MGR_CMD} makecache ..."
+                    ${PKG_MGR_CMD} makecache
+                fi
+            else
+                if [ "$(ls /var/cache/${PKG_MGR_CMD}/* 2>/dev/null | wc -l)" = 0 ]; then
+                    echo "Running ${PKG_MGR_CMD} check-update ..."
+                    set +e
+                        stderr_messages=$(${PKG_MGR_CMD} -q check-update 2>&1)
+                        rc=$?
+                        # centos 7 sometimes returns a status of 100 when it apears to work.
+                        if [ $rc != 0 ] && [ $rc != 100 ]; then
+                            echo "(Error) ${PKG_MGR_CMD} check-update produced the following error message(s):"
+                            echo "${stderr_messages}"
+                            exit 1
+                        fi
+                    set -e
+                fi
+            fi
+            ;;
+    esac
+}
+
+# Checks if packages are installed and installs them if not
+check_packages() {
+    case ${ADJUSTED_ID} in
+        debian)
+            if ! dpkg -s "$@" > /dev/null 2>&1; then
+                pkg_manager_update
+                ${INSTALL_CMD} "$@"
+            fi
+            ;;
+        rhel)
+            if ! rpm -q "$@" > /dev/null 2>&1; then
+                pkg_manager_update
+                ${INSTALL_CMD} "$@"
+            fi
+            ;;
+    esac
+}
+
+if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${VERSION_CODENAME-}" = "centos7" ]; then
+    # As of 1 July 2024, mirrorlist.centos.org no longer exists.
+    # Update the repo files to reference vault.centos.org.
+    sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
+    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
+    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
+    yum update -y
+    check_packages epel-release
+fi
+
 # Clean up
 clean_up() {
     local pkg
@@ -95,7 +148,6 @@ clean_up() {
             ;;
     esac
 }
-clean_up
 
 # Ensure that login shells get the correct path if the user updated the PATH using ENV.
 rm -f /etc/profile.d/00-restore-env.sh
@@ -143,80 +195,33 @@ updaterc() {
     fi
 }
 
-
-pkg_manager_update() {
-    case $ADJUSTED_ID in
-        debian)
-            if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
-                echo "Running apt-get update..."
-                ${PKG_MGR_CMD} update -y
-            fi
-            ;;
-        rhel)
-            if [ ${PKG_MGR_CMD} = "microdnf" ]; then
-                if [ "$(ls /var/cache/yum/* 2>/dev/null | wc -l)" = 0 ]; then
-                    echo "Running ${PKG_MGR_CMD} makecache ..."
-                    ${PKG_MGR_CMD} makecache
-                fi
-            else
-                if [ "$(ls /var/cache/${PKG_MGR_CMD}/* 2>/dev/null | wc -l)" = 0 ]; then
-                    echo "Running ${PKG_MGR_CMD} check-update ..."
-                    set +e
-                        stderr_messages=$(${PKG_MGR_CMD} -q check-update 2>&1)
-                        rc=$?
-                        # centos 7 sometimes returns a status of 100 when it apears to work.
-                        if [ $rc != 0 ] && [ $rc != 100 ]; then
-                            echo "(Error) ${PKG_MGR_CMD} check-update produced the following error message(s):"
-                            echo "${stderr_messages}"
-                            exit 1
-                        fi
-                    set -e
-                fi
-            fi
-            ;;
-    esac
-}
-
-# Checks if packages are installed and installs them if not
-check_packages() {
-    case ${ADJUSTED_ID} in
-        debian)
-            if ! dpkg -s "$@" > /dev/null 2>&1; then
-                pkg_manager_update
-                ${INSTALL_CMD} "$@"
-            fi
-            ;;
-        rhel)
-            if ! rpm -q "$@" > /dev/null 2>&1; then
-                pkg_manager_update
-                ${INSTALL_CMD} "$@"
-            fi
-            ;;
-    esac
-}
-
-# Use Microsoft JDK for everything but JDK 8 and 18 (unless specified differently with jdkDistro option)
-get_jdk_distro() {
-    VERSION="$1"
-    if [ "${JDK_DISTRO}" = "ms" ]; then
-        if echo "${VERSION}" | grep -E '^8([\s\.]|$)' > /dev/null 2>&1 || echo "${VERSION}" | grep -E '^18([\s\.]|$)' > /dev/null 2>&1; then
-            JDK_DISTRO="tem"
-        fi
-    fi
-}
-
 find_version_list() {
     prefix="$1"
     suffix="$2"
     install_type=$3
     ifLts="$4"
     version_list=$5
+    java_ver=$6
+    
+    check_packages jq
+    all_versions=$(curl -s https://api.adoptium.net/v3/info/available_releases)
     if [ "${ifLts}" = "true" ]; then 
-        all_lts_versions=$(curl -s https://api.adoptium.net/v3/info/available_releases)
-        major_version=$(echo "$all_lts_versions" | jq -r '.most_recent_lts')
-        regex="${prefix}\\K${major_version}\\.?[0-9]*\\.?[0-9]*${suffix}"
-    else 
+        major_version=$(echo "$all_versions" | jq -r '.most_recent_lts')
+    elif [ "${java_ver}" = "latest" ]; then
+        major_version=$(echo "$all_versions" | jq -r '.most_recent_feature_release') 
+    else
+        major_version=$(echo "$java_ver" | cut -d '.' -f 1)
+    fi
+    
+    if [ "${JDK_DISTRO}" = "ms" ]; then
+        if [ "${major_version}" = "8" ] || [ "${major_version}" = "18" ] || [ "${major_version}" = "22" ]; then
+            JDK_DISTRO="tem"
+        fi
+    fi
+    if [ "${install_type}" != "java" ]; then
         regex="${prefix}\\K[0-9]+\\.?[0-9]*\\.?[0-9]*${suffix}"
+    else
+        regex="${prefix}\\K${major_version}\\.?[0-9]*\\.?[0-9]*${suffix}${JDK_DISTRO}\\s*"
     fi
     declare -g ${version_list}="$(su ${USERNAME} -c ". \${SDKMAN_DIR}/bin/sdkman-init.sh && sdk list ${install_type} 2>&1 | grep -oP \"${regex}\" | tr -d ' ' | sort -rV")"
 }
@@ -237,13 +242,12 @@ sdk_install() {
     elif [[ "${pkg_vals}" =~ "${install_type}" ]] && [ "${requested_version}" = "latest" ]; then
         requested_version=""
     elif [ "${requested_version}" = "lts" ]; then
-            check_packages jq
-            find_version_list "$prefix" "$suffix" "$install_type" "true" version_list
+            find_version_list "$prefix" "$suffix" "$install_type" "true" version_list "${requested_version}"
             requested_version="$(echo "${version_list}" | head -n 1)"
     elif echo "${requested_version}" | grep -oE "${full_version_check}" > /dev/null 2>&1; then
         echo "${requested_version}"
     else 
-        find_version_list "$prefix" "$suffix" "$install_type" "false" version_list
+        find_version_list "$prefix" "$suffix" "$install_type" "false" version_list "${requested_version}"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ]; then
             requested_version="$(echo "${version_list}" | head -n 1)"
         else
@@ -301,8 +305,7 @@ if [ ! -d "${SDKMAN_DIR}" ]; then
     updaterc "export SDKMAN_DIR=${SDKMAN_DIR}\n. \${SDKMAN_DIR}/bin/sdkman-init.sh"
 fi
 
-get_jdk_distro ${JAVA_VERSION}
-sdk_install java ${JAVA_VERSION} "\\s*" "(\\.[a-z0-9]+)*-${JDK_DISTRO}\\s*" ".*-[a-z]+$" "true"
+sdk_install java ${JAVA_VERSION} "\\s*" "(\\.[a-z0-9]+)*-" ".*-[a-z]+$" "true"
 
 # Additional java versions to be installed but not be set as default.
 if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
@@ -310,8 +313,7 @@ if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
     IFS=","
         read -a additional_versions <<< "$ADDITIONAL_VERSIONS"
         for version in "${additional_versions[@]}"; do
-            get_jdk_distro ${version}
-            sdk_install java ${version} "\\s*" "(\\.[a-z0-9]+)*-${JDK_DISTRO}\\s*" ".*-[a-z]+$" "false"
+            sdk_install java ${version} "\\s*" "(\\.[a-z0-9]+)*-" ".*-[a-z]+$" "false"
         done
     IFS=$OLDIFS
     su ${USERNAME} -c ". ${SDKMAN_DIR}/bin/sdkman-init.sh && sdk default java ${JAVA_VERSION}"
diff --git a/test/java/install_latest_version.sh b/test/java/install_latest_version.sh
new file mode 100644
index 000000000..a45d5e0b0
--- /dev/null
+++ b/test/java/install_latest_version.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+echo 'public class HelloWorld { public static void main(String[] args) { System.out.println("Hello, World!"); } }' > HelloWorld.java
+javac HelloWorld.java
+
+check "hello world" /bin/bash -c "java HelloWorld | grep "Hello, World!""
+check "java version latest installed" grep "22.0.2" <(java --version)
+
+# Report result
+reportResults
diff --git a/test/java/scenarios.json b/test/java/scenarios.json
index 538d77972..f28fceb41 100644
--- a/test/java/scenarios.json
+++ b/test/java/scenarios.json
@@ -8,6 +8,14 @@
             }
         }
     },
+    "install_latest_version": {
+        "image": "ubuntu:focal",
+        "features": {
+            "java": {
+                "version": "latest"
+            }
+        }
+    },
     "install_lts_version": {
         "image": "ubuntu:focal",
         "features": {

From 302fecab063c63a4f3b6de1bbba408f4b896f7cd Mon Sep 17 00:00:00 2001
From: Flo <max06.net@outlook.com>
Date: Thu, 26 Sep 2024 01:35:41 +0200
Subject: [PATCH 332/478] feat(nix): Enable persistent volume for shared
 nix-store (#1127)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(nix): Enable persistent volume for shared nix-store

* fix: Wrong mount

* fix: Switch to persistent volumes per devcontainer, fixes renamed nix package used in test

* Update src/nix/devcontainer-feature.json

Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>

* fix: Bump version

---------

Co-authored-by: Flo Müller <flo.mueller@gec.io>
Co-authored-by: Samruddhi Khandale <samruddhikhandale@github.com>
---
 src/nix/devcontainer-feature.json |  14 +++-
 src/nix/install.sh                | 104 ++++++++++++++----------------
 test/nix/scenarios.json           |   1 -
 3 files changed, 62 insertions(+), 57 deletions(-)

diff --git a/src/nix/devcontainer-feature.json b/src/nix/devcontainer-feature.json
index 0e37efed2..7fadd63fa 100644
--- a/src/nix/devcontainer-feature.json
+++ b/src/nix/devcontainer-feature.json
@@ -1,13 +1,16 @@
 {
     "id": "nix",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "name": "Nix Package Manager",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nix",
     "description": "Installs the Nix package manager and optionally a set of packages.",
     "options": {
         "version": {
             "type": "string",
-            "proposals": ["latest", "2.11"],
+            "proposals": [
+                "latest",
+                "2.11"
+            ],
             "default": "latest",
             "description": "Version of Nix to install."
         },
@@ -43,5 +46,12 @@
     "containerEnv": {
         "PATH": "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:${PATH}"
     },
+    "mounts": [
+        {
+            "source": "nix-store-${devcontainerId}",
+            "target": "/nix",
+            "type": "volume"
+        }
+    ],
     "entrypoint": "/usr/local/share/nix-entrypoint.sh"
 }
diff --git a/src/nix/install.sh b/src/nix/install.sh
index 5b8fe8f28..0030c2b18 100755
--- a/src/nix/install.sh
+++ b/src/nix/install.sh
@@ -23,67 +23,63 @@ fi
 
 detect_user USERNAME
 
-if [ -e "/nix" ]; then
-    echo "(!) Nix is already installed! Skipping installation."
-else
-    if [ "${USERNAME}" = "root" ] && [ "${MULTIUSER}" != "true" ]; then
-        echo "(!) A single user install is not allowed for root. Add a non-root user to your image or set multiUser to true in your feature configuration."
-        exit 1
-    fi
+if [ "${USERNAME}" = "root" ] && [ "${MULTIUSER}" != "true" ]; then
+    echo "(!) A single user install is not allowed for root. Add a non-root user to your image or set multiUser to true in your feature configuration."
+    exit 1
+fi
 
-    # Verify dependencies
-    apt_get_update_if_exists
-    check_command curl "curl ca-certificates" "curl ca-certificates" "curl ca-certificates"
-    check_command gpg2 gnupg2 gnupg gnupg2
-    check_command dirmngr dirmngr dirmngr dirmngr
-    check_command xz xz-utils xz xz
-    check_command git git git git
-    check_command xargs findutils findutils findutils
+# Verify dependencies
+apt_get_update_if_exists
+check_command curl "curl ca-certificates" "curl ca-certificates" "curl ca-certificates"
+check_command gpg2 gnupg2 gnupg gnupg2
+check_command dirmngr dirmngr dirmngr dirmngr
+check_command xz xz-utils xz xz
+check_command git git git git
+check_command xargs findutils findutils findutils
 
-    # Determine version
-    find_version_from_git_tags VERSION https://github.com/NixOS/nix "tags/"
+# Determine version
+find_version_from_git_tags VERSION https://github.com/NixOS/nix "tags/"
 
-    # Download and verify install per https://nixos.org/download.html#nix-verify-installation
-    tmpdir="$(mktemp -d)"
-    echo "(*) Downloading Nix installer..."
-    set +e
+# Download and verify install per https://nixos.org/download.html#nix-verify-installation
+tmpdir="$(mktemp -d)"
+echo "(*) Downloading Nix installer..."
+set +e
+curl -sSLf -o "${tmpdir}/install-nix" https://releases.nixos.org/nix/nix-${VERSION}/install
+exit_code=$?
+set -e
+if [ "$exit_code" != "0" ]; then
+    # Handle situation where git tags are ahead of what was is available to actually download
+    echo "(!) Nix version ${VERSION} failed to download. Attempting to fall back one version to retry..."
+    find_prev_version_from_git_tags VERSION https://github.com/NixOS/nix "tags/"
     curl -sSLf -o "${tmpdir}/install-nix" https://releases.nixos.org/nix/nix-${VERSION}/install
-    exit_code=$?
-    set -e
-    if [ "$exit_code" != "0" ]; then
-        # Handle situation where git tags are ahead of what was is available to actually download
-        echo "(!) Nix version ${VERSION} failed to download. Attempting to fall back one version to retry..."
-        find_prev_version_from_git_tags VERSION https://github.com/NixOS/nix "tags/"
-        curl -sSLf -o "${tmpdir}/install-nix" https://releases.nixos.org/nix/nix-${VERSION}/install
-    fi
-    cd "${FEATURE_DIR}"
+fi
+cd "${FEATURE_DIR}"
 
-    # Do a multi or single-user setup based on feature config
-    if [ "${MULTIUSER}" = "true" ]; then
-        echo "(*) Performing multi-user install..."
-        sh "${tmpdir}/install-nix" --daemon
-    else
-        home_dir="$(eval echo ~${USERNAME})"
-        if [ ! -e "${home_dir}" ]; then
-            echo "(!) Home directory ${home_dir} does not exist for ${USERNAME}. Nix install will fail."
-            exit 1
-        fi
-        echo "(*) Performing single-user install..."
-        echo -e "\n**NOTE: Nix will only work for user ${USERNAME} on Linux if the host machine user's UID is $(id -u ${USERNAME}). You will need to chown /nix otherwise.**\n"
-        # Install per https://nixos.org/manual/nix/stable/installation/installing-binary.html#single-user-installation
-        mkdir -p /nix
-        chown ${USERNAME} /nix ${tmpdir}
-        su ${USERNAME} -c "sh \"${tmpdir}/install-nix\" --no-daemon --no-modify-profile"
-        # nix installer does not update ~/.bashrc, and USER may or may not be defined, so update rc/profile files directly to handle that
-        snippet='
-        if [ "${PATH#*$HOME/.nix-profile/bin}" = "${PATH}" ]; then if [ -z "$USER" ]; then USER=$(whoami); fi; . $HOME/.nix-profile/etc/profile.d/nix.sh; fi
-        '
-        update_rc_file "$home_dir/.bashrc" "${snippet}"
-        update_rc_file "$home_dir/.zshenv" "${snippet}"
-        update_rc_file "$home_dir/.profile" "${snippet}"
+# Do a multi or single-user setup based on feature config
+if [ "${MULTIUSER}" = "true" ]; then
+    echo "(*) Performing multi-user install..."
+    sh "${tmpdir}/install-nix" --daemon
+else
+    home_dir="$(eval echo ~${USERNAME})"
+    if [ ! -e "${home_dir}" ]; then
+        echo "(!) Home directory ${home_dir} does not exist for ${USERNAME}. Nix install will fail."
+        exit 1
     fi
-    rm -rf "${tmpdir}" "/tmp/tmp-gnupg"
+    echo "(*) Performing single-user install..."
+    echo -e "\n**NOTE: Nix will only work for user ${USERNAME} on Linux if the host machine user's UID is $(id -u ${USERNAME}). You will need to chown /nix otherwise.**\n"
+    # Install per https://nixos.org/manual/nix/stable/installation/installing-binary.html#single-user-installation
+    mkdir -p /nix
+    chown ${USERNAME} /nix ${tmpdir}
+    su ${USERNAME} -c "sh \"${tmpdir}/install-nix\" --no-daemon --no-modify-profile"
+    # nix installer does not update ~/.bashrc, and USER may or may not be defined, so update rc/profile files directly to handle that
+    snippet='
+    if [ "${PATH#*$HOME/.nix-profile/bin}" = "${PATH}" ]; then if [ -z "$USER" ]; then USER=$(whoami); fi; . $HOME/.nix-profile/etc/profile.d/nix.sh; fi
+    '
+    update_rc_file "$home_dir/.bashrc" "${snippet}"
+    update_rc_file "$home_dir/.zshenv" "${snippet}"
+    update_rc_file "$home_dir/.profile" "${snippet}"
 fi
+rm -rf "${tmpdir}" "/tmp/tmp-gnupg"
 
 # Set nix config
 mkdir -p /etc/nix
diff --git a/test/nix/scenarios.json b/test/nix/scenarios.json
index 80ead7ff6..dac5624f1 100644
--- a/test/nix/scenarios.json
+++ b/test/nix/scenarios.json
@@ -91,7 +91,6 @@
             }
         }
     },
-
     "flake": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
         "remoteUser": "vscode",

From 68871f5cd6a1f22fd66caca00f82e5c7eb0ea9c3 Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Mon, 7 Oct 2024 08:54:19 -0700
Subject: [PATCH 333/478] Add 'contents: write' permission to release workflow
 (#1142)

I suspect this will fix the git tagging issue reported in https://github.com/devcontainers/features/issues/1122
---
 .github/workflows/release.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 22297641a..6890f5ae5 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -11,6 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       packages: write
+      contents: write
     steps:
       - uses: actions/checkout@v4
 
@@ -20,4 +21,4 @@ jobs:
           publish-features: "true"
           base-path-to-features: "./src"
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From d23166286d8123410be6c41144669dcd8e4c8eea Mon Sep 17 00:00:00 2001
From: Vatsal Gupta <40350810+gvatsal60@users.noreply.github.com>
Date: Wed, 9 Oct 2024 00:32:21 +0530
Subject: [PATCH 334/478] Fix: Handle case where Python version is already
 installed (#222) (#1115)

* Fix: Handle case where Python version is already installed in dev container (#617)

* Incorporated Review Comment: Version exist handling
---
 src/python/install.sh | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/python/install.sh b/src/python/install.sh
index 7e30ea041..ead55cc8a 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -465,16 +465,18 @@ install_prev_vers_cpython() {
 install_cpython() {
     VERSION=$1
     INSTALL_PATH="${PYTHON_INSTALL_PATH}/${VERSION}"
+
+    # Check if the specified Python version is already installed
     if [ -d "${INSTALL_PATH}" ]; then
         echo "(!) Python version ${VERSION} already exists."
-        exit 1
+    else
+        mkdir -p /tmp/python-src ${INSTALL_PATH}
+        cd /tmp/python-src
+        cpython_tgz_filename="Python-${VERSION}.tgz"
+        cpython_tgz_url="https://www.python.org/ftp/python/${VERSION}/${cpython_tgz_filename}"
+        echo "Downloading ${cpython_tgz_filename}..."
+        curl -sSL -o "/tmp/python-src/${cpython_tgz_filename}" "${cpython_tgz_url}"
     fi
-    mkdir -p /tmp/python-src ${INSTALL_PATH}
-    cd /tmp/python-src
-    cpython_tgz_filename="Python-${VERSION}.tgz"
-    cpython_tgz_url="https://www.python.org/ftp/python/${VERSION}/${cpython_tgz_filename}"
-    echo "Downloading ${cpython_tgz_filename}..."
-    curl -sSL -o "/tmp/python-src/${cpython_tgz_filename}" "${cpython_tgz_url}"
 }
 
 install_from_source() {
@@ -560,20 +562,20 @@ install_using_oryx() {
     VERSION=$1
     INSTALL_PATH="${PYTHON_INSTALL_PATH}/${VERSION}"
 
+    # Check if the specified Python version is already installed
     if [ -d "${INSTALL_PATH}" ]; then
         echo "(!) Python version ${VERSION} already exists."
-        exit 1
-    fi
-
-    # The python install root path may not exist, so create it
-    mkdir -p "${PYTHON_INSTALL_PATH}"
-    oryx_install "python" "${VERSION}" "${INSTALL_PATH}" "lib" || return 1
+    else
+        # The python install root path may not exist, so create it
+        mkdir -p "${PYTHON_INSTALL_PATH}"
+        oryx_install "python" "${VERSION}" "${INSTALL_PATH}" "lib" || return 1
 
-    ln -s "${INSTALL_PATH}/bin/idle3" "${INSTALL_PATH}/bin/idle"
-    ln -s "${INSTALL_PATH}/bin/pydoc3" "${INSTALL_PATH}/bin/pydoc"
-    ln -s "${INSTALL_PATH}/bin/python3-config" "${INSTALL_PATH}/bin/python-config"
+        ln -s "${INSTALL_PATH}/bin/idle3" "${INSTALL_PATH}/bin/idle"
+        ln -s "${INSTALL_PATH}/bin/pydoc3" "${INSTALL_PATH}/bin/pydoc"
+        ln -s "${INSTALL_PATH}/bin/python3-config" "${INSTALL_PATH}/bin/python-config"
 
-    add_symlink
+        add_symlink
+    fi
 }
 
 sudo_if() {

From 88253ef4ce3827c381ff1a1e6c37d47396bc3232 Mon Sep 17 00:00:00 2001
From: Prathamesh Zarkar <159782310+prathameshzarkar9@users.noreply.github.com>
Date: Fri, 18 Oct 2024 03:32:07 +0530
Subject: [PATCH 335/478] common-utils zshrc issue fix (#1111)

* common-utils zshrc issue fix

* bump feature patch version

* test added to validate the changes of zshrc fix

* user vscode added

* User env added
---
 src/common-utils/devcontainer-feature.json     |  2 +-
 src/common-utils/main.sh                       |  4 +++-
 test/common-utils/devcontainer-ruby-zshrc.sh   | 12 ++++++++++++
 .../devcontainer-ruby-zshrc/Dockerfile         |  6 ++++++
 test/common-utils/scenarios.json               | 18 ++++++++++++++++++
 5 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 test/common-utils/devcontainer-ruby-zshrc.sh
 create mode 100644 test/common-utils/devcontainer-ruby-zshrc/Dockerfile

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 968cbfb77..3fa6487df 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.5.1",
+    "version": "2.5.2",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 7658c4850..b5fe11f57 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -551,7 +551,9 @@ if [ "${INSTALL_ZSH}" = "true" ]; then
 
         # Add devcontainer .zshrc template
         if [ "$INSTALL_OH_MY_ZSH_CONFIG" = "true" ]; then
-            echo -e "$(cat "${template_path}")\nDISABLE_AUTO_UPDATE=true\nDISABLE_UPDATE_PROMPT=true" > ${user_rc_file}
+            if ! [ -f "${template_path}" ] || ! grep -qF "$(head -n 1 "${template_path}")" "${user_rc_file}"; then
+                echo -e "$(cat "${template_path}")\nDISABLE_AUTO_UPDATE=true\nDISABLE_UPDATE_PROMPT=true" > ${user_rc_file}
+            fi
             sed -i -e 's/ZSH_THEME=.*/ZSH_THEME="devcontainers"/g' ${user_rc_file}
         fi
 
diff --git a/test/common-utils/devcontainer-ruby-zshrc.sh b/test/common-utils/devcontainer-ruby-zshrc.sh
new file mode 100644
index 000000000..9e7b26e4c
--- /dev/null
+++ b/test/common-utils/devcontainer-ruby-zshrc.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "configure-zshrc-without-overwrite" bash -c "grep 'rbenv init -' ~/.zshrc"
+
+# Report result
+reportResults
diff --git a/test/common-utils/devcontainer-ruby-zshrc/Dockerfile b/test/common-utils/devcontainer-ruby-zshrc/Dockerfile
new file mode 100644
index 000000000..c5e7c69c4
--- /dev/null
+++ b/test/common-utils/devcontainer-ruby-zshrc/Dockerfile
@@ -0,0 +1,6 @@
+FROM mcr.microsoft.com/devcontainers/ruby:3.2
+
+USER vscode
+ENV USER=vscode
+RUN echo 'eval "$(rbenv init -)"' >> /home/$USER/.zshrc
+
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index e5529ea04..a929f534a 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -235,6 +235,24 @@
             }
         }
     },
+    "devcontainer-ruby-zshrc": {
+        "build": {
+            "dockerfile": "Dockerfile"
+        },
+        "remoteUser": "vscode",
+        "features": {
+            "common-utils": {
+                "installZsh": true,
+                "username": "vscode",
+                "userUid": "1000",
+                "userGid": "1000",
+                "upgradePackages": true,
+                "installOhMyZsh": true,
+                "installOhMyZshConfig": true,
+                "configureZshAsDefaultShell": true
+            }
+        }
+    },
     "alpine-base-zsh-default": {
         "image": "mcr.microsoft.com/devcontainers/base:alpine",
         "remoteUser": "vscode",

From 125f6b0071597a59f3ccbefaf9145b5867528ae3 Mon Sep 17 00:00:00 2001
From: Prathamesh Zarkar <159782310+prathameshzarkar9@users.noreply.github.com>
Date: Fri, 18 Oct 2024 03:34:12 +0530
Subject: [PATCH 336/478] latest jdk 23 is introduced accordingly changed the
 source code (#1152)

* latest jdk 23 is introduced accordingly changed the source code

* java version bumped
---
 src/java/devcontainer-feature.json  | 2 +-
 src/java/install.sh                 | 2 +-
 test/java/install_latest_version.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index 7a9caa924..4e4b6c5d3 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "name": "Java (via SDKMAN!)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
diff --git a/src/java/install.sh b/src/java/install.sh
index 47f0e8559..ef3d1913a 100644
--- a/src/java/install.sh
+++ b/src/java/install.sh
@@ -214,7 +214,7 @@ find_version_list() {
     fi
     
     if [ "${JDK_DISTRO}" = "ms" ]; then
-        if [ "${major_version}" = "8" ] || [ "${major_version}" = "18" ] || [ "${major_version}" = "22" ]; then
+        if [ "${major_version}" = "8" ] || [ "${major_version}" = "18" ] || [ "${major_version}" = "22" ] || [ "${major_version}" = "23" ]; then
             JDK_DISTRO="tem"
         fi
     fi
diff --git a/test/java/install_latest_version.sh b/test/java/install_latest_version.sh
index a45d5e0b0..af8a621ce 100644
--- a/test/java/install_latest_version.sh
+++ b/test/java/install_latest_version.sh
@@ -9,7 +9,7 @@ echo 'public class HelloWorld { public static void main(String[] args) { System.
 javac HelloWorld.java
 
 check "hello world" /bin/bash -c "java HelloWorld | grep "Hello, World!""
-check "java version latest installed" grep "22.0.2" <(java --version)
+check "java version latest installed" grep "23" <(java --version)
 
 # Report result
 reportResults

From 90824ffb3694aa328deaa2c4b96486a953d738b4 Mon Sep 17 00:00:00 2001
From: Vatsal Gupta <40350810+gvatsal60@users.noreply.github.com>
Date: Tue, 22 Oct 2024 22:23:56 +0530
Subject: [PATCH 337/478] Python Feature Version Update (#222) (#1148)

* Fix: Handle case where Python version is already installed in dev container (#617)

* Incorporated Review Comment: Version exist handling

* Update: Python Feature Version
---
 src/python/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 768cb4388..64b02fd34 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",

From 2951f0481a488ea43a6f2ea6f18a47f0a0bf744d Mon Sep 17 00:00:00 2001
From: Vatsal Gupta <40350810+gvatsal60@users.noreply.github.com>
Date: Tue, 22 Oct 2024 23:51:35 +0530
Subject: [PATCH 338/478] Fixed Nvm Source Issue(#1078) (#1114)

* Fixed Nvm Source Issue

* Fix: Test Scenario Failure

* Updated node feature version

* Incorporated Review Comment
---
 src/node/devcontainer-feature.json | 2 +-
 src/node/install.sh                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index a9b0d46b8..d8d49e538 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.6.0",
+    "version": "1.6.1",
     "name": "Node.js (via nvm), yarn and pnpm",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
diff --git a/src/node/install.sh b/src/node/install.sh
index 3b74f885b..46d448440 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -227,7 +227,7 @@ install_yarn() {
                 # Yum/DNF want to install nodejs dependencies, we'll use NPM to install yarn
                 su ${USERNAME} -c "umask 0002 && . '${NVM_DIR}/nvm.sh' && nvm use ${_ver} && npm install --global yarn"
             fi
-        else 
+        else
             echo "Yarn already installed."
         fi
     fi
@@ -309,7 +309,7 @@ curl -so- "https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.
     curl -so- "https://raw.githubusercontent.com/nvm-sh/nvm/\${PREV_NVM_VERSION}/install.sh" | bash
     NVM_VERSION="\${PREV_NVM_VERSION}"
 }
-source "${NVM_DIR}/nvm.sh"
+[ -s "${NVM_DIR}/nvm.sh" ] && source "${NVM_DIR}/nvm.sh"
 if [ "${NODE_VERSION}" != "" ]; then
     nvm alias default "${NODE_VERSION}"
 fi

From 9a4639409a19ec122904cd67fb04a6c2e66e5b80 Mon Sep 17 00:00:00 2001
From: Mathiyarasy <157102811+Mathiyarasy@users.noreply.github.com>
Date: Mon, 2 Dec 2024 22:44:22 +0530
Subject: [PATCH 339/478] Exclude unsupported image scenarios for Oryx (#1209)

* Update test-pr.yaml

* Update test-pr.yaml for Oryx feature
---
 .github/workflows/test-pr.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index 79a34fb66..758ab2b74 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -57,6 +57,11 @@ jobs:
             "mcr.microsoft.com/devcontainers/base:debian",
             "mcr.microsoft.com/devcontainers/base:noble"
           ]
+        exclude:
+          - features: oryx
+            baseImage: ubuntu:jammy
+          - features: oryx
+            baseImage: mcr.microsoft.com/devcontainers/base:ubuntu
     steps:
       - uses: actions/checkout@v4
 

From f8e7e275b7ba2808e14a035afd753b83be68e2d9 Mon Sep 17 00:00:00 2001
From: Mathiyarasy <157102811+Mathiyarasy@users.noreply.github.com>
Date: Tue, 3 Dec 2024 22:28:40 +0530
Subject: [PATCH 340/478] Oryx Issue (#1181)

Universal Image Latest Version: Caused issue in a Pipeline
Azure DevOps Pipeline generate-kitchensink-automated Failed

This PR aims to do things:

The pinned dotnet version now is 8.0.202 : Oryx: Unpin .NET version 8.0.101
Publish oryx app with --self-contained true tag . Without this tag oryx fails to launch stating compatible .net runtime version not found
---
 src/oryx/devcontainer-feature.json |  2 +-
 src/oryx/install.sh                | 29 +++++++++++++++--------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index 39b9a7103..1a3ee1b2f 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "oryx",
-    "version": "1.3.6",
+    "version": "1.3.7",
     "name": "Oryx",
     "description": "Installs the oryx CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
diff --git a/src/oryx/install.sh b/src/oryx/install.sh
index 6c193f863..cf67db6b1 100755
--- a/src/oryx/install.sh
+++ b/src/oryx/install.sh
@@ -149,6 +149,7 @@ DOTNET_BINARY=""
 
 if dotnet --version > /dev/null ; then
     DOTNET_BINARY=$(which dotnet)
+    RUNTIME_VERSIONS=$(dotnet --list-runtimes | awk '{print $2}' | sort | uniq)
 fi
 
 MAJOR_VERSION_ID=$(echo $(dotnet --version) | cut -d . -f 1)
@@ -156,20 +157,17 @@ PATCH_VERSION_ID=$(echo $(dotnet --version) | cut -d . -f 3)
 
 PINNED_SDK_VERSION=""
 # Oryx needs to be built with .NET 8
-if [[ "${DOTNET_BINARY}" = "" ]] || [[ $MAJOR_VERSION_ID != "8" ]] || [[ $MAJOR_VERSION_ID = "8" && ${PATCH_VERSION_ID} -ge "101" ]] ; then
+if [[ "${DOTNET_BINARY}" = "" ]] || [[ $MAJOR_VERSION_ID != "8" ]] || [[ $MAJOR_VERSION_ID = "8" && ${PATCH_VERSION_ID} -ne "202" ]] ; then
     echo "'dotnet 8' was not detected. Attempting to install .NET 8 to build oryx."
-
     # The oryx build fails with .Net 8.0.201, see https://github.com/devcontainers/images/issues/974
     # Pinning it to a working version until the upstream Oryx repo updates the dependency
     # install_dotnet_using_apt
-    PINNED_SDK_VERSION="8.0.101"
+    PINNED_SDK_VERSION="8.0.202"
     install_dotnet_with_script ${PINNED_SDK_VERSION}
-
     if ! dotnet --version > /dev/null ; then
         echo "(!) Please install Dotnet before installing Oryx"
         exit 1
     fi
-
 fi
 
 BUILD_SCRIPT_GENERATOR=/usr/local/buildscriptgen
@@ -192,8 +190,8 @@ echo "Building solution '$SOLUTION_FILE_NAME'..."
 cd $GIT_ORYX
 ${DOTNET_BINARY} build "$SOLUTION_FILE_NAME" -c Debug
 
-${DOTNET_BINARY} publish -property:ValidateExecutableReferencesMatchSelfContained=false -r linux-x64 -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildScriptGeneratorCli/BuildScriptGeneratorCli.csproj
-${DOTNET_BINARY} publish -r linux-x64 -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildServer/BuildServer.csproj
+${DOTNET_BINARY} publish -property:ValidateExecutableReferencesMatchSelfContained=false -r linux-x64 -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildScriptGeneratorCli/BuildScriptGeneratorCli.csproj --self-contained true
+${DOTNET_BINARY} publish -r linux-x64 -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildServer/BuildServer.csproj --self-contained true
 
 chmod a+x ${BUILD_SCRIPT_GENERATOR}/GenerateBuildScript
 
@@ -236,16 +234,19 @@ fi
 if [[ "${PINNED_SDK_VERSION}" != "" ]]; then
     rm -f ${GIT_ORYX}/global.json
     rm -rf /usr/share/dotnet/sdk/$PINNED_SDK_VERSION
-
-    # Extract the major, minor version and the first digit of the patch version
-    MAJOR_MINOR_PATCH1_VERSION=${PINNED_SDK_VERSION%??}
-    rm -rf /usr/share/dotnet/shared/Microsoft.NETCore.App/$MAJOR_MINOR_PATCH1_VERSION
-    rm -rf /usr/share/dotnet/shared/Microsoft.AspNetCore.App/$MAJOR_MINOR_PATCH1_VERSION
-    rm -rf /usr/share/dotnet/templates/$MAJOR_MINOR_PATCH1_VERSION
+    NEW_RUNTIME_VERSIONS=$(dotnet --list-runtimes | awk '{print $2}' | sort | uniq)
+    if [ -n "${RUNTIME_VERSIONS:-}" ]; then
+        SDK_INSTALLED_RUNTIME=$(echo "$NEW_RUNTIME_VERSIONS" | grep -vxFf <(echo "$RUNTIME_VERSIONS"))
+    else
+        SDK_INSTALLED_RUNTIME="$NEW_RUNTIME_VERSIONS"
+    fi
+    rm -rf /usr/share/dotnet/shared/Microsoft.NETCore.App/$SDK_INSTALLED_RUNTIME
+    rm -rf /usr/share/dotnet/shared/Microsoft.AspNetCore.App/$SDK_INSTALLED_RUNTIME
+    rm -rf /usr/share/dotnet/templates/$SDK_INSTALLED_RUNTIME
 fi
 
 
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
-echo "Done!"
+echo "Done!"
\ No newline at end of file

From 8e8e14f6fbb1f1c30e7794aff293960caba2945a Mon Sep 17 00:00:00 2001
From: Mathiyarasy <157102811+Mathiyarasy@users.noreply.github.com>
Date: Wed, 18 Dec 2024 22:31:43 +0530
Subject: [PATCH 341/478] Codespace unable to start in Jupyter using python
 feature with option "installJupyterLab": true  (#1199)

* Add path for JupyterLab

* Remove unwanted code
---
 src/python/devcontainer-feature.json          | 12 +++++------
 src/python/install.sh                         | 20 +++++++------------
 test/python/install_jupyterlab.sh             |  4 ++--
 .../Dockerfile                                |  5 -----
 .../sudoers.test                              |  2 --
 test/python/scenarios.json                    | 13 ------------
 6 files changed, 15 insertions(+), 41 deletions(-)
 delete mode 100644 test/python/install_jupyterlab_existing_sudoers_file/Dockerfile
 delete mode 100644 test/python/install_jupyterlab_existing_sudoers_file/sudoers.test

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 64b02fd34..64976fc63 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.6.5",
+  "version": "1.7.0",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
@@ -67,7 +67,7 @@
     "PYTHON_PATH": "/usr/local/python/current",
     "PIPX_HOME": "/usr/local/py-utils",
     "PIPX_BIN_DIR": "/usr/local/py-utils/bin",
-    "PATH": "/usr/local/python/current/bin:/usr/local/py-utils/bin:${PATH}"
+    "PATH": "/usr/local/python/current/bin:/usr/local/py-utils/bin:/usr/local/jupyter:${PATH}"
   },
   "customizations": {
     "vscode": {
@@ -78,9 +78,9 @@
       ],
       "settings": {
         "python.defaultInterpreterPath": "/usr/local/python/current/bin/python",
-	      "[python]": {
-	        "editor.defaultFormatter": "ms-python.autopep8"
-	      }
+        "[python]": {
+          "editor.defaultFormatter": "ms-python.autopep8"
+        }
       }
     }
   },
@@ -88,4 +88,4 @@
     "ghcr.io/devcontainers/features/common-utils",
     "ghcr.io/devcontainers/features/oryx"
   ]
-}
+}
\ No newline at end of file
diff --git a/src/python/install.sh b/src/python/install.sh
index ead55cc8a..b3311c7c6 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -912,21 +912,15 @@ if [ "${INSTALL_JUPYTERLAB}" = "true" ]; then
     install_user_package $INSTALL_UNDER_ROOT jupyterlab
     install_user_package $INSTALL_UNDER_ROOT jupyterlab-git
 
+    # Create a symlink to the JupyterLab binary for non root users
     if [ "$INSTALL_UNDER_ROOT" = false ]; then
-        # JupyterLab would have installed into /home/${USERNAME}/.local/bin
-        # Adding it to default path for Codespaces which use non-login shells
-        SUDOERS_FILE="/etc/sudoers.d/$USERNAME"
-        SEARCH_STR="Defaults secure_path="
-        REPLACE_STR="Defaults secure_path=/home/${USERNAME}/.local/bin"
-
-        if grep -qs ${SEARCH_STR} ${SUDOERS_FILE}; then
-            # string found and file is present
-            sed -i "s|${SEARCH_STR}|${REPLACE_STR}:|g" "${SUDOERS_FILE}"
-        else
-            # either string is not found, or file is not present
-            # In either case take same action, note >> places at end of file
-            echo "${REPLACE_STR}:${PATH}" >> ${SUDOERS_FILE}
+        JUPYTER_INPATH=/home/${USERNAME}/.local/bin
+        if [ ! -d "$JUPYTER_INPATH" ]; then
+            echo "Error: $JUPYTER_INPATH does not exist."
+            exit 1
         fi
+        JUPYTER_PATH=/usr/local/jupyter
+        ln -s "$JUPYTER_INPATH" "$JUPYTER_PATH"
     fi
 
     # Configure JupyterLab if needed
diff --git a/test/python/install_jupyterlab.sh b/test/python/install_jupyterlab.sh
index 033b44edd..255b4e896 100755
--- a/test/python/install_jupyterlab.sh
+++ b/test/python/install_jupyterlab.sh
@@ -22,8 +22,8 @@ check "jupyterlab_git" grep jupyterlab_git <<< "$packages"
 # Check for correct JupyterLab configuration
 check "config" grep ".*.allow_origin = '*'" /home/vscode/.jupyter/jupyter_server_config.py
 
-# Check for PATH modification
-check "default path has jupyterlab" sudo grep "/home/${user}/.local/bin" /etc/sudoers.d/$user
+#check "default path has jupyterlab symlink"
+check "default path has jupyterlab" test -L "/usr/local/jupyter"
 
 # Report result
 reportResults
diff --git a/test/python/install_jupyterlab_existing_sudoers_file/Dockerfile b/test/python/install_jupyterlab_existing_sudoers_file/Dockerfile
deleted file mode 100644
index 5acb58a37..000000000
--- a/test/python/install_jupyterlab_existing_sudoers_file/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-# Builds an image with a preconfigured SUDOERS file
-# Used to test the install script for JupyterLab which modifies this file
-FROM mcr.microsoft.com/devcontainers/base:focal
-
-COPY --chown=root sudoers.test /etc/sudoers.d/vscode
diff --git a/test/python/install_jupyterlab_existing_sudoers_file/sudoers.test b/test/python/install_jupyterlab_existing_sudoers_file/sudoers.test
deleted file mode 100644
index 9a26d777b..000000000
--- a/test/python/install_jupyterlab_existing_sudoers_file/sudoers.test
+++ /dev/null
@@ -1,2 +0,0 @@
-# Sudoers File for testing, after install script runs the Defaults secure_path should be appended to
-Defaults secure_path=/original_content_of_sudoers_file
\ No newline at end of file
diff --git a/test/python/scenarios.json b/test/python/scenarios.json
index e4fe0f0cd..be37869df 100644
--- a/test/python/scenarios.json
+++ b/test/python/scenarios.json
@@ -68,19 +68,6 @@
             }
         }
     },
-    "install_jupyterlab_existing_sudoers_file": {
-        "build": {
-            "dockerfile": "Dockerfile"
-        },
-        "remoteUser": "vscode",
-        "features": {
-            "python": {
-                "version": "latest",
-                "installJupyterlab": true,
-                "configureJupyterlabAllowOrigin": "*"
-            }
-        }
-    },
     "install_jupyterlab_rhel_family": {
         "image": "almalinux:8",
         "remoteUser": "vscode",

From 978aa3f8b8a49d4e8a8bc0f7e5fdb55eb94a09fa Mon Sep 17 00:00:00 2001
From: Steven <steven.liekens@gmail.com>
Date: Thu, 9 Jan 2025 19:09:12 +0100
Subject: [PATCH 342/478] Use new CDN for dotnet builds (#1230)

The azureedge.net domain might stop working as detailed in dotnet/core#9671

Changes in this PR:

dotnet: update the logic to determine the latest version
dotnet and oryx: copy latest dotnet-install script from
https://github.com/dotnet/install-scripts/blob/main/src/dotnet-install.sh
(Normally this happens automatically by a GitHub Action, but there is a sense of urgency here, so I did it manually)
Additional context

https://devblogs.microsoft.com/dotnet/critical-dotnet-install-links-are-changing/
https://build5nines.com/retirement-of-azureedge-net-dns-edg-io-business-closure-and-what-you-need-to-know/
---
 src/dotnet/devcontainer-feature.json          |   2 +-
 src/dotnet/scripts/dotnet-helpers.sh          |   6 +-
 src/dotnet/scripts/vendor/dotnet-install.sh   | 123 +++++++++++++++---
 src/oryx/devcontainer-feature.json            |   2 +-
 src/oryx/scripts/vendor/dotnet-install.sh     | 123 +++++++++++++++---
 test/dotnet/dotnet_helpers.sh                 |   6 +-
 ...all_dotnet_latest_when_version_is_empty.sh |   3 -
 test/dotnet/install_dotnet_lts.sh             |   3 -
 .../install_dotnet_multiple_versions.sh       |  27 ++++
 .../multitargeting/example_classlib.csproj    |   2 +-
 .../projects/net5.0/example_project.csproj    |   2 +-
 .../projects/net6.0/example_project.csproj    |   2 +-
 .../projects/net7.0/example_project.csproj    |   2 +-
 .../projects/net8.0/example_project.csproj    |   2 +-
 test/dotnet/projects/net9.0/Program.cs        |  32 +++++
 .../projects/net9.0/example_project.csproj    |  14 ++
 .../netcoreapp3.1/example_project.csproj      |   3 +-
 test/dotnet/scenarios.json                    |   9 +-
 test/dotnet/test.sh                           |   3 -
 19 files changed, 307 insertions(+), 59 deletions(-)
 create mode 100644 test/dotnet/projects/net9.0/Program.cs
 create mode 100644 test/dotnet/projects/net9.0/example_project.csproj

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index f6e0c39ab..600997dde 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.1.3",
+    "version": "2.2.0",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
diff --git a/src/dotnet/scripts/dotnet-helpers.sh b/src/dotnet/scripts/dotnet-helpers.sh
index 26e29fa36..84a674917 100644
--- a/src/dotnet/scripts/dotnet-helpers.sh
+++ b/src/dotnet/scripts/dotnet-helpers.sh
@@ -18,11 +18,11 @@ fetch_latest_version_in_channel() {
     local channel="$1"
     local runtime="$2"
     if [ "$runtime" = "dotnet" ]; then
-        wget -qO- "https://dotnetcli.azureedge.net/dotnet/Runtime/$channel/latest.version"
+        wget -qO- "https://builds.dotnet.microsoft.com/dotnet/Runtime/$channel/latest.version"
     elif [ "$runtime" = "aspnetcore" ]; then
-        wget -qO- "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$channel/latest.version"
+        wget -qO- "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$channel/latest.version"
     else
-        wget -qO- "https://dotnetcli.azureedge.net/dotnet/Sdk/$channel/latest.version"
+        wget -qO- "https://builds.dotnet.microsoft.com/dotnet/Sdk/$channel/latest.version"
     fi
 }
 
diff --git a/src/dotnet/scripts/vendor/dotnet-install.sh b/src/dotnet/scripts/vendor/dotnet-install.sh
index 38a160cf1..122ee68ed 100755
--- a/src/dotnet/scripts/vendor/dotnet-install.sh
+++ b/src/dotnet/scripts/vendor/dotnet-install.sh
@@ -423,11 +423,17 @@ get_normalized_architecture_for_specific_sdk_version() {
 # args:
 # version or channel - $1
 is_arm64_supported() {
-    #any channel or version that starts with the specified versions
-    case "$1" in
-        ( "1"* | "2"* | "3"*  | "4"* | "5"*) 
-            echo false
-            return 0
+    # Extract the major version by splitting on the dot
+    major_version="${1%%.*}"
+
+    # Check if the major version is a valid number and less than 6
+    case "$major_version" in
+        [0-9]*)  
+            if [ "$major_version" -lt 6 ]; then
+                echo false
+                return 0
+            fi
+            ;;
     esac
 
     echo true
@@ -950,6 +956,37 @@ get_absolute_path() {
     return 0
 }
 
+# args:
+# override - $1 (boolean, true or false)
+get_cp_options() {
+    eval $invocation
+
+    local override="$1"
+    local override_switch=""
+
+    if [ "$override" = false ]; then
+        override_switch="-n"
+
+        # create temporary files to check if 'cp -u' is supported
+        tmp_dir="$(mktemp -d)"
+        tmp_file="$tmp_dir/testfile"
+        tmp_file2="$tmp_dir/testfile2"
+
+        touch "$tmp_file"
+
+        # use -u instead of -n if it's available
+        if cp -u "$tmp_file" "$tmp_file2" 2>/dev/null; then
+            override_switch="-u"
+        fi
+
+        # clean up
+        rm -f "$tmp_file" "$tmp_file2"
+        rm -rf "$tmp_dir"
+    fi
+
+    echo "$override_switch"
+}
+
 # args:
 # input_files - stdin
 # root_path - $1
@@ -961,15 +998,7 @@ copy_files_or_dirs_from_list() {
     local root_path="$(remove_trailing_slash "$1")"
     local out_path="$(remove_trailing_slash "$2")"
     local override="$3"
-    local osname="$(get_current_os_name)"
-    local override_switch=$(
-        if [ "$override" = false ]; then
-            if [ "$osname" = "linux-musl" ]; then
-                printf -- "-u";
-            else
-                printf -- "-n";
-            fi
-        fi)
+    local override_switch="$(get_cp_options "$override")"
 
     cat | uniq | while read -r file_path; do
         local path="$(remove_beginning_slash "${file_path#$root_path}")"
@@ -1243,6 +1272,61 @@ downloadwget() {
     return 0
 }
 
+extract_stem() {
+    local url="$1"
+    # extract the protocol
+    proto="$(echo $1 | grep :// | sed -e's,^\(.*://\).*,\1,g')"
+    # remove the protocol
+    url="${1/$proto/}"
+    # extract the path (if any) - since we know all of our feeds have a first path segment, we can skip the first one. otherwise we'd use -f2- to get the full path
+    full_path="$(echo $url | grep / | cut -d/ -f2-)"
+    path="$(echo $full_path | cut -d/ -f2-)"
+    echo $path
+}
+
+check_url_exists() {
+    eval $invocation
+    local url="$1"
+
+    local code=""
+    if machine_has "curl"
+    then
+        code=$(curl --head -o /dev/null -w "%{http_code}" -s --fail "$url");
+    elif machine_has "wget"
+    then
+        # get the http response, grab the status code
+        server_response=$(wget -qO- --method=HEAD --server-response "$url" 2>&1)
+        code=$(echo "$server_response" | grep "HTTP/" | awk '{print $2}')
+    fi
+    if [ $code = "200" ]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+sanitize_redirect_url() {
+    eval $invocation
+
+    local url_stem
+    url_stem=$(extract_stem "$1")
+    say_verbose "Checking configured feeds for the asset at ${yellow:-}$url_stem${normal:-}"
+
+    for feed in "${feeds[@]}"
+    do
+        local trial_url="$feed/$url_stem"
+        say_verbose "Checking ${yellow:-}$trial_url${normal:-}"
+        if check_url_exists "$trial_url"; then
+            say_verbose "Found a match at ${yellow:-}$trial_url${normal:-}"
+            echo "$trial_url"
+            return 0
+        else
+            say_verbose "No match at ${yellow:-}$trial_url${normal:-}"
+        fi
+    done
+    return 1
+}
+
 get_download_link_from_aka_ms() {
     eval $invocation
 
@@ -1295,6 +1379,11 @@ get_download_link_from_aka_ms() {
             return 1
         fi
 
+        sanitized_redirect_url=$(sanitize_redirect_url "$aka_ms_download_link")
+        if [[ -n "$sanitized_redirect_url" ]]; then
+            aka_ms_download_link="$sanitized_redirect_url"
+        fi
+
         say_verbose "The redirect location retrieved: '$aka_ms_download_link'."
         return 0
     else
@@ -1306,7 +1395,9 @@ get_download_link_from_aka_ms() {
 get_feeds_to_use()
 {
     feeds=(
+    "https://builds.dotnet.microsoft.com/dotnet"
     "https://dotnetcli.azureedge.net/dotnet"
+    "https://ci.dot.net/public"
     "https://dotnetbuilds.azureedge.net/public"
     )
 
@@ -1735,7 +1826,7 @@ do
             zip_path="$1"
             ;;
         -?|--?|-h|--help|-[Hh]elp)
-            script_name="$(basename "$0")"
+            script_name="dotnet-install.sh"
             echo ".NET Tools Installer"
             echo "Usage:"
             echo "       # Install a .NET SDK of a given Quality from a given Channel"
@@ -1865,4 +1956,4 @@ fi
 
 say "Note that the script does not resolve dependencies during installation."
 say "To check the list of dependencies, go to https://learn.microsoft.com/dotnet/core/install, select your operating system and check the \"Dependencies\" section."
-say "Installation finished successfully."
+say "Installation finished successfully."
\ No newline at end of file
diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index 1a3ee1b2f..ab9a8e782 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "oryx",
-    "version": "1.3.7",
+    "version": "1.4.0",
     "name": "Oryx",
     "description": "Installs the oryx CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
diff --git a/src/oryx/scripts/vendor/dotnet-install.sh b/src/oryx/scripts/vendor/dotnet-install.sh
index 38a160cf1..122ee68ed 100755
--- a/src/oryx/scripts/vendor/dotnet-install.sh
+++ b/src/oryx/scripts/vendor/dotnet-install.sh
@@ -423,11 +423,17 @@ get_normalized_architecture_for_specific_sdk_version() {
 # args:
 # version or channel - $1
 is_arm64_supported() {
-    #any channel or version that starts with the specified versions
-    case "$1" in
-        ( "1"* | "2"* | "3"*  | "4"* | "5"*) 
-            echo false
-            return 0
+    # Extract the major version by splitting on the dot
+    major_version="${1%%.*}"
+
+    # Check if the major version is a valid number and less than 6
+    case "$major_version" in
+        [0-9]*)  
+            if [ "$major_version" -lt 6 ]; then
+                echo false
+                return 0
+            fi
+            ;;
     esac
 
     echo true
@@ -950,6 +956,37 @@ get_absolute_path() {
     return 0
 }
 
+# args:
+# override - $1 (boolean, true or false)
+get_cp_options() {
+    eval $invocation
+
+    local override="$1"
+    local override_switch=""
+
+    if [ "$override" = false ]; then
+        override_switch="-n"
+
+        # create temporary files to check if 'cp -u' is supported
+        tmp_dir="$(mktemp -d)"
+        tmp_file="$tmp_dir/testfile"
+        tmp_file2="$tmp_dir/testfile2"
+
+        touch "$tmp_file"
+
+        # use -u instead of -n if it's available
+        if cp -u "$tmp_file" "$tmp_file2" 2>/dev/null; then
+            override_switch="-u"
+        fi
+
+        # clean up
+        rm -f "$tmp_file" "$tmp_file2"
+        rm -rf "$tmp_dir"
+    fi
+
+    echo "$override_switch"
+}
+
 # args:
 # input_files - stdin
 # root_path - $1
@@ -961,15 +998,7 @@ copy_files_or_dirs_from_list() {
     local root_path="$(remove_trailing_slash "$1")"
     local out_path="$(remove_trailing_slash "$2")"
     local override="$3"
-    local osname="$(get_current_os_name)"
-    local override_switch=$(
-        if [ "$override" = false ]; then
-            if [ "$osname" = "linux-musl" ]; then
-                printf -- "-u";
-            else
-                printf -- "-n";
-            fi
-        fi)
+    local override_switch="$(get_cp_options "$override")"
 
     cat | uniq | while read -r file_path; do
         local path="$(remove_beginning_slash "${file_path#$root_path}")"
@@ -1243,6 +1272,61 @@ downloadwget() {
     return 0
 }
 
+extract_stem() {
+    local url="$1"
+    # extract the protocol
+    proto="$(echo $1 | grep :// | sed -e's,^\(.*://\).*,\1,g')"
+    # remove the protocol
+    url="${1/$proto/}"
+    # extract the path (if any) - since we know all of our feeds have a first path segment, we can skip the first one. otherwise we'd use -f2- to get the full path
+    full_path="$(echo $url | grep / | cut -d/ -f2-)"
+    path="$(echo $full_path | cut -d/ -f2-)"
+    echo $path
+}
+
+check_url_exists() {
+    eval $invocation
+    local url="$1"
+
+    local code=""
+    if machine_has "curl"
+    then
+        code=$(curl --head -o /dev/null -w "%{http_code}" -s --fail "$url");
+    elif machine_has "wget"
+    then
+        # get the http response, grab the status code
+        server_response=$(wget -qO- --method=HEAD --server-response "$url" 2>&1)
+        code=$(echo "$server_response" | grep "HTTP/" | awk '{print $2}')
+    fi
+    if [ $code = "200" ]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+sanitize_redirect_url() {
+    eval $invocation
+
+    local url_stem
+    url_stem=$(extract_stem "$1")
+    say_verbose "Checking configured feeds for the asset at ${yellow:-}$url_stem${normal:-}"
+
+    for feed in "${feeds[@]}"
+    do
+        local trial_url="$feed/$url_stem"
+        say_verbose "Checking ${yellow:-}$trial_url${normal:-}"
+        if check_url_exists "$trial_url"; then
+            say_verbose "Found a match at ${yellow:-}$trial_url${normal:-}"
+            echo "$trial_url"
+            return 0
+        else
+            say_verbose "No match at ${yellow:-}$trial_url${normal:-}"
+        fi
+    done
+    return 1
+}
+
 get_download_link_from_aka_ms() {
     eval $invocation
 
@@ -1295,6 +1379,11 @@ get_download_link_from_aka_ms() {
             return 1
         fi
 
+        sanitized_redirect_url=$(sanitize_redirect_url "$aka_ms_download_link")
+        if [[ -n "$sanitized_redirect_url" ]]; then
+            aka_ms_download_link="$sanitized_redirect_url"
+        fi
+
         say_verbose "The redirect location retrieved: '$aka_ms_download_link'."
         return 0
     else
@@ -1306,7 +1395,9 @@ get_download_link_from_aka_ms() {
 get_feeds_to_use()
 {
     feeds=(
+    "https://builds.dotnet.microsoft.com/dotnet"
     "https://dotnetcli.azureedge.net/dotnet"
+    "https://ci.dot.net/public"
     "https://dotnetbuilds.azureedge.net/public"
     )
 
@@ -1735,7 +1826,7 @@ do
             zip_path="$1"
             ;;
         -?|--?|-h|--help|-[Hh]elp)
-            script_name="$(basename "$0")"
+            script_name="dotnet-install.sh"
             echo ".NET Tools Installer"
             echo "Usage:"
             echo "       # Install a .NET SDK of a given Quality from a given Channel"
@@ -1865,4 +1956,4 @@ fi
 
 say "Note that the script does not resolve dependencies during installation."
 say "To check the list of dependencies, go to https://learn.microsoft.com/dotnet/core/install, select your operating system and check the \"Dependencies\" section."
-say "Installation finished successfully."
+say "Installation finished successfully."
\ No newline at end of file
diff --git a/test/dotnet/dotnet_helpers.sh b/test/dotnet/dotnet_helpers.sh
index a24bd1ce2..01e554f66 100644
--- a/test/dotnet/dotnet_helpers.sh
+++ b/test/dotnet/dotnet_helpers.sh
@@ -9,11 +9,11 @@ fetch_latest_version_in_channel() {
     local channel="$1"
     local runtime="$2"
     if [ "$runtime" = "dotnet" ]; then
-        wget -qO- "https://dotnetcli.azureedge.net/dotnet/Runtime/$channel/latest.version"
+        wget -qO- "https://builds.dotnet.microsoft.com/dotnet/Runtime/$channel/latest.version"
     elif [ "$runtime" = "aspnetcore" ]; then
-        wget -qO- "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$channel/latest.version"
+        wget -qO- "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$channel/latest.version"
     else
-        wget -qO- "https://dotnetcli.azureedge.net/dotnet/Sdk/$channel/latest.version"
+        wget -qO- "https://builds.dotnet.microsoft.com/dotnet/Sdk/$channel/latest.version"
     fi
 }
 
diff --git a/test/dotnet/install_dotnet_latest_when_version_is_empty.sh b/test/dotnet/install_dotnet_latest_when_version_is_empty.sh
index cd23edcf1..b28c45a2f 100644
--- a/test/dotnet/install_dotnet_latest_when_version_is_empty.sh
+++ b/test/dotnet/install_dotnet_latest_when_version_is_empty.sh
@@ -18,9 +18,6 @@ expected=$(fetch_latest_version)
 check "Latest .NET SDK version installed" \
 is_dotnet_sdk_version_installed "$expected"
 
-check "Build and run example project" \
-dotnet run --project projects/net8.0
-
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
 reportResults
\ No newline at end of file
diff --git a/test/dotnet/install_dotnet_lts.sh b/test/dotnet/install_dotnet_lts.sh
index bc2d40782..da9175c15 100644
--- a/test/dotnet/install_dotnet_lts.sh
+++ b/test/dotnet/install_dotnet_lts.sh
@@ -18,9 +18,6 @@ expected=$(fetch_latest_version_in_channel "LTS")
 check "Latest LTS version installed" \
 is_dotnet_sdk_version_installed "$expected"
 
-check "Build and run example project" \
-dotnet run --project projects/net8.0
-
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
 reportResults
\ No newline at end of file
diff --git a/test/dotnet/install_dotnet_multiple_versions.sh b/test/dotnet/install_dotnet_multiple_versions.sh
index 5f0f12533..87bf8caf4 100644
--- a/test/dotnet/install_dotnet_multiple_versions.sh
+++ b/test/dotnet/install_dotnet_multiple_versions.sh
@@ -13,6 +13,9 @@ source dev-container-features-test-lib
 source dotnet_env.sh
 source dotnet_helpers.sh
 
+check ".NET SDK 9.0 installed" \
+is_dotnet_sdk_version_installed "9.0"
+
 check ".NET SDK 8.0 installed" \
 is_dotnet_sdk_version_installed "8.0"
 
@@ -22,9 +25,33 @@ is_dotnet_sdk_version_installed "7.0"
 check ".NET SDK 6.0 installed" \
 is_dotnet_sdk_version_installed "6.0"
 
+check ".NET SDK 5.0 installed" \
+is_dotnet_sdk_version_installed "5.0"
+
+check ".NET Core SDK 3.1 installed" \
+is_dotnet_sdk_version_installed "3.1"
+
 check "Build example class library" \
 dotnet build projects/multitargeting
 
+check "Build and run .NET 9.0 project" \
+dotnet run --project projects/net9.0
+
+check "Build and run .NET 8.0 project" \
+dotnet run --project projects/net8.0
+
+check "Build and run .NET 7.0 project" \
+dotnet run --project projects/net7.0
+
+check "Build and run .NET 6.0 project" \
+dotnet run --project projects/net6.0
+
+check "Build and run .NET 5.0 project" \
+dotnet run --project projects/net5.0
+
+check "Build and run .NET Core 3.1 project" \
+dotnet run --project projects/netcoreapp3.1
+
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
 reportResults
\ No newline at end of file
diff --git a/test/dotnet/projects/multitargeting/example_classlib.csproj b/test/dotnet/projects/multitargeting/example_classlib.csproj
index ba47b0f46..8a8ca0c32 100644
--- a/test/dotnet/projects/multitargeting/example_classlib.csproj
+++ b/test/dotnet/projects/multitargeting/example_classlib.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/test/dotnet/projects/net5.0/example_project.csproj b/test/dotnet/projects/net5.0/example_project.csproj
index 63450c349..9fa0cf3f7 100644
--- a/test/dotnet/projects/net5.0/example_project.csproj
+++ b/test/dotnet/projects/net5.0/example_project.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/test/dotnet/projects/net6.0/example_project.csproj b/test/dotnet/projects/net6.0/example_project.csproj
index aa2434cb7..48c9b4e8a 100644
--- a/test/dotnet/projects/net6.0/example_project.csproj
+++ b/test/dotnet/projects/net6.0/example_project.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/test/dotnet/projects/net7.0/example_project.csproj b/test/dotnet/projects/net7.0/example_project.csproj
index 424f54ae7..11953d275 100644
--- a/test/dotnet/projects/net7.0/example_project.csproj
+++ b/test/dotnet/projects/net7.0/example_project.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/test/dotnet/projects/net8.0/example_project.csproj b/test/dotnet/projects/net8.0/example_project.csproj
index 2f1f60891..ddac9409e 100644
--- a/test/dotnet/projects/net8.0/example_project.csproj
+++ b/test/dotnet/projects/net8.0/example_project.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/test/dotnet/projects/net9.0/Program.cs b/test/dotnet/projects/net9.0/Program.cs
new file mode 100644
index 000000000..59fb426af
--- /dev/null
+++ b/test/dotnet/projects/net9.0/Program.cs
@@ -0,0 +1,32 @@
+using Newtonsoft.Json;
+
+string json = """
+{
+  "Name": "Inception",
+  "ReleaseDate": "2010-07-08T00:00:00",
+  "Genres": [
+    "Action",
+    "Thriller"
+  ]
+}
+""";
+
+Movie? m = JsonConvert.DeserializeObject<Movie>(json);
+
+if (m == default)
+{
+    Console.WriteLine("Decoding failed!");
+}
+else
+{
+    Console.WriteLine($"Movie name: {m.Name}");
+    Console.WriteLine($"Release Date: {m.ReleaseDate}");
+    Console.WriteLine($"Genres: {string.Join(", ", m.Genres)}");
+}
+
+class Movie(string? name, DateTime releaseDate, List<string>? genres)
+{
+    public string Name { get; set; } = name ?? "Default Name";
+    public DateTime ReleaseDate { get; set; } = releaseDate;
+    public List<string> Genres { get; set; } = genres ?? [];
+}
\ No newline at end of file
diff --git a/test/dotnet/projects/net9.0/example_project.csproj b/test/dotnet/projects/net9.0/example_project.csproj
new file mode 100644
index 000000000..6cc1da0d0
--- /dev/null
+++ b/test/dotnet/projects/net9.0/example_project.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/test/dotnet/projects/netcoreapp3.1/example_project.csproj b/test/dotnet/projects/netcoreapp3.1/example_project.csproj
index e2e909c17..f8859db8b 100644
--- a/test/dotnet/projects/netcoreapp3.1/example_project.csproj
+++ b/test/dotnet/projects/netcoreapp3.1/example_project.csproj
@@ -3,12 +3,11 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/test/dotnet/scenarios.json b/test/dotnet/scenarios.json
index 2fd74f587..641753632 100644
--- a/test/dotnet/scenarios.json
+++ b/test/dotnet/scenarios.json
@@ -40,10 +40,13 @@
         "remoteUser": "vscode",
         "features": {
             "dotnet": {
-                "version": "8.0.100-preview.6.23330.14",
+                "version": "9.0",
                 "additionalVersions": [
+                    "8.0",
                     "7.0",
-                    "6.0"
+                    "6.0",
+                    "5.0",
+                    "3.1"
                 ]
             }
         }
@@ -92,4 +95,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/test/dotnet/test.sh b/test/dotnet/test.sh
index 50d79941f..11cc73126 100644
--- a/test/dotnet/test.sh
+++ b/test/dotnet/test.sh
@@ -24,9 +24,6 @@ expected=$(fetch_latest_version)
 check "Latest .NET SDK version installed" \
 is_dotnet_sdk_version_installed "$expected"
 
-check "Build and run example project" \
-dotnet run --project projects/net8.0
-
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
 reportResults
\ No newline at end of file

From d9c2de0cd12443406048e81bc859a5f09e7d23ef Mon Sep 17 00:00:00 2001
From: Prathamesh Zarkar <159782310+prathameshzarkar9@users.noreply.github.com>
Date: Wed, 15 Jan 2025 22:36:35 +0530
Subject: [PATCH 343/478] auto find cudnn version (#1126)

* auto find cudnn version

* auto finding libcudnn8 and libcudnn9 packages

* removed unused files

* nvidia-cuda feature patch version bumped

* review comments addressed

* review comments addressed

* --fix-missing added for apt-get update

* test cases fixed for libcudnn check

* test updatedfor cudnnVersion without automatic
---
 src/nvidia-cuda/devcontainer-feature.json     |  5 ++--
 src/nvidia-cuda/install.sh                    | 21 +++++++++++----
 test/nvidia-cuda/install_cuda_12_3_version.sh | 15 +++++++++++
 test/nvidia-cuda/install_cuda_12_4_version.sh | 15 +++++++++++
 test/nvidia-cuda/install_cuda_12_5_version.sh | 15 +++++++++++
 test/nvidia-cuda/install_cudnn_123_version.sh | 16 ------------
 test/nvidia-cuda/install_cudnn_124_version.sh | 16 ------------
 .../install_cudnn_latest_version.sh           | 16 ------------
 test/nvidia-cuda/scenarios.json               | 26 +++++++------------
 9 files changed, 74 insertions(+), 71 deletions(-)
 create mode 100644 test/nvidia-cuda/install_cuda_12_3_version.sh
 create mode 100644 test/nvidia-cuda/install_cuda_12_4_version.sh
 create mode 100644 test/nvidia-cuda/install_cuda_12_5_version.sh
 delete mode 100644 test/nvidia-cuda/install_cudnn_123_version.sh
 delete mode 100644 test/nvidia-cuda/install_cudnn_124_version.sh
 delete mode 100644 test/nvidia-cuda/install_cudnn_latest_version.sh

diff --git a/src/nvidia-cuda/devcontainer-feature.json b/src/nvidia-cuda/devcontainer-feature.json
index b46d7c433..d29074fd9 100644
--- a/src/nvidia-cuda/devcontainer-feature.json
+++ b/src/nvidia-cuda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "nvidia-cuda",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "name": "NVIDIA CUDA",
   "description": "Installs shared libraries for NVIDIA CUDA.",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nvidia-cuda",
@@ -48,6 +48,7 @@
     "cudnnVersion": {
       "type": "string",
       "proposals": [
+        "automatic",
         "8.9.5.29",
         "8.9.4.25",
         "8.9.3.28",
@@ -79,7 +80,7 @@
         "9.3.0.75",
         "9.4.0.58"
       ],
-      "default": "8.6.0.163",
+      "default": "automatic",
       "description": "Version of cuDNN to install"
     }
   },
diff --git a/src/nvidia-cuda/install.sh b/src/nvidia-cuda/install.sh
index 37ba7f0f4..1cfc7668e 100644
--- a/src/nvidia-cuda/install.sh
+++ b/src/nvidia-cuda/install.sh
@@ -59,8 +59,6 @@ apt-get update -yq
 cuda_pkg="cuda-libraries-${CUDA_VERSION/./-}"
 nvtx_pkg="cuda-nvtx-${CUDA_VERSION/./-}"
 toolkit_pkg="cuda-toolkit-${CUDA_VERSION/./-}"
-major_cudnn_version=$(echo "${CUDNN_VERSION}" | cut -d '.' -f 1)
-major_cuda_version=$(echo "${CUDA_VERSION}" | cut -d '.' -f 1)
 if ! apt-cache show "$cuda_pkg"; then
     echo "The requested version of CUDA is not available: CUDA $CUDA_VERSION"
     exit 1
@@ -68,11 +66,23 @@ fi
 
 echo "Installing CUDA libraries..."
 apt-get install -yq "$cuda_pkg"
+apt-get update -yq --fix-missing
+
+# auto find recent cudnn version
+major_cuda_version=$(echo "${CUDA_VERSION}" | cut -d '.' -f 1)
+if [ "$CUDNN_VERSION" = "automatic" ]; then
+    if [[ "$CUDA_VERSION" < "12.3" ]]; then
+        CUDNN_VERSION=$(apt-cache policy libcudnn8 | grep "$CUDA_VERSION" | grep -Eo '^[^-1+]*' | sort -V | tail -n1 | xargs)
+    else
+        CUDNN_VERSION=$(apt-cache policy libcudnn9-cuda-$major_cuda_version | grep "Candidate" | awk '{print $2}' | grep -Eo '^[^-1+]*')
+    fi
+fi
+major_cudnn_version=$(echo "${CUDNN_VERSION}" | cut -d '.' -f 1)
 
 if [ "$INSTALL_CUDNN" = "true" ]; then
     # Ensure that the requested version of cuDNN is available AND compatible
-    #if major cudnn version is 9, then we need to install libcudnn9-cuda-<major_version> package
-    #else we need to install libcudnn8-cuda-<major_version> package
+    #if major cudnn version is 9, then we need to install libcudnn9-cuda-<major_cuda_version>_<CUDNN_VERSION>-1 package
+    #else we need to install libcudnn8_<CUDNN_VERSION>-1+cuda<CUDA_VERSION>" package
     if [[ $major_cudnn_version -ge "9" ]]
     then
         cudnn_pkg_version="libcudnn9-cuda-${major_cuda_version}=${CUDNN_VERSION}-1"
@@ -91,13 +101,14 @@ fi
 
 if [ "$INSTALL_CUDNNDEV" = "true" ]; then
     # Ensure that the requested version of cuDNN development package is available AND compatible
+    #if major cudnn version is 9, then we need to install libcudnn9-dev-cuda-<major_cuda_version>_<CUDNN_VERSION>-1 package
+    #else we need to install libcudnn8-dev_<CUDNN_VERSION>-1+cuda<CUDA_VERSION>" package
     if [[ $major_cudnn_version -ge "9" ]]
     then
         cudnn_dev_pkg_version="libcudnn9-dev-cuda-${major_cuda_version}=${CUDNN_VERSION}-1"
     else
         cudnn_dev_pkg_version="libcudnn8-dev=${CUDNN_VERSION}-1+cuda${CUDA_VERSION}"
     fi
-    
     if ! apt-cache show "$cudnn_dev_pkg_version"; then
         echo "The requested version of cuDNN development package is not available: cuDNN $CUDNN_VERSION for CUDA $CUDA_VERSION"
         exit 1
diff --git a/test/nvidia-cuda/install_cuda_12_3_version.sh b/test/nvidia-cuda/install_cuda_12_3_version.sh
new file mode 100644
index 000000000..95d4e8bdc
--- /dev/null
+++ b/test/nvidia-cuda/install_cuda_12_3_version.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# # Check installation of libcudnn9-cuda-12 (9.4.0)
+check "libcudnn.so.9.5.0" test 1 -eq "$(find /usr -name 'libcudnn.so.9.5.0' | wc -l)"
+
+# Check installation of cuda-nvtx-12-3 (12.3)
+check "cuda-12-3+nvtx" test -e '/usr/local/cuda-12.3/targets/x86_64-linux/include/nvtx3/'
+
+# Report result
+reportResults
diff --git a/test/nvidia-cuda/install_cuda_12_4_version.sh b/test/nvidia-cuda/install_cuda_12_4_version.sh
new file mode 100644
index 000000000..77ecbf190
--- /dev/null
+++ b/test/nvidia-cuda/install_cuda_12_4_version.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# # Check installation of libcudnn9-cuda-12 (9.4.0)
+check "libcudnn.so.9.5.0" test 1 -eq "$(find /usr -name 'libcudnn.so.9.5.0' | wc -l)"
+
+# Check installation of cuda-nvtx-12-4 (12.4)
+check "cuda-12-4+nvtx" test -e '/usr/local/cuda-12.4/targets/x86_64-linux/include/nvtx3/'
+
+# Report result
+reportResults
diff --git a/test/nvidia-cuda/install_cuda_12_5_version.sh b/test/nvidia-cuda/install_cuda_12_5_version.sh
new file mode 100644
index 000000000..05cd20c88
--- /dev/null
+++ b/test/nvidia-cuda/install_cuda_12_5_version.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# # Check installation of libcudnn9-cuda-12 (9.4.0)
+check "libcudnn.so.9.5.0" test 1 -eq "$(find /usr -name 'libcudnn.so.9.5.0' | wc -l)"
+
+# Check installation of cuda-nvtx-12-5 (12.5)
+check "cuda-12-5+nvtx" test -e '/usr/local/cuda-12.5/targets/x86_64-linux/include/nvtx3/'
+
+# Report result
+reportResults
diff --git a/test/nvidia-cuda/install_cudnn_123_version.sh b/test/nvidia-cuda/install_cudnn_123_version.sh
deleted file mode 100644
index f331a591f..000000000
--- a/test/nvidia-cuda/install_cudnn_123_version.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-# Check installation of libcudnn9-cuda-12 (9.4.0)
-check "libcudnn.so.9.4.0" test 1 -eq "$(find /usr -name 'libcudnn.so.9.4.0' | wc -l)"
-
-# Check installation of cuda-nvtx-11-7 (11.7)
-# check "cuda-12-4+nvtx" test -e '/usr/local/cuda-12.4/targets/x86_64-linux/include/nvtx3'
-
-# Report result
-reportResults
-    
\ No newline at end of file
diff --git a/test/nvidia-cuda/install_cudnn_124_version.sh b/test/nvidia-cuda/install_cudnn_124_version.sh
deleted file mode 100644
index f331a591f..000000000
--- a/test/nvidia-cuda/install_cudnn_124_version.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-# Check installation of libcudnn9-cuda-12 (9.4.0)
-check "libcudnn.so.9.4.0" test 1 -eq "$(find /usr -name 'libcudnn.so.9.4.0' | wc -l)"
-
-# Check installation of cuda-nvtx-11-7 (11.7)
-# check "cuda-12-4+nvtx" test -e '/usr/local/cuda-12.4/targets/x86_64-linux/include/nvtx3'
-
-# Report result
-reportResults
-    
\ No newline at end of file
diff --git a/test/nvidia-cuda/install_cudnn_latest_version.sh b/test/nvidia-cuda/install_cudnn_latest_version.sh
deleted file mode 100644
index f331a591f..000000000
--- a/test/nvidia-cuda/install_cudnn_latest_version.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-# Check installation of libcudnn9-cuda-12 (9.4.0)
-check "libcudnn.so.9.4.0" test 1 -eq "$(find /usr -name 'libcudnn.so.9.4.0' | wc -l)"
-
-# Check installation of cuda-nvtx-11-7 (11.7)
-# check "cuda-12-4+nvtx" test -e '/usr/local/cuda-12.4/targets/x86_64-linux/include/nvtx3'
-
-# Report result
-reportResults
-    
\ No newline at end of file
diff --git a/test/nvidia-cuda/scenarios.json b/test/nvidia-cuda/scenarios.json
index d2400503b..82c84f119 100644
--- a/test/nvidia-cuda/scenarios.json
+++ b/test/nvidia-cuda/scenarios.json
@@ -16,47 +16,41 @@
             "nvidia-cuda": {
                 "installCudnn": true,
                 "installNvtx": true,
-                "cudaVersion": "11.7",
-                "cudnnVersion": "8.5.0.96"
+                "cudaVersion": "11.7"
             }
         }
     },
-    "install_cudnn_123_version": {
+    "install_cuda_12_3_version": {
         "image": "debian",
         "features": {
             "nvidia-cuda": {
                 "installCudnn": true,
-                "installNvtx": true,
                 "installCudnnDev": true,
-                "installToolkit": true,
-                "cudaVersion": "12.3",
-                "cudnnVersion": "9.4.0.58"
+                "installNvtx": true,
+                "cudaVersion": "12.3"
             }
         }
     },
-    "install_cudnn_124_version": {
+    "install_cuda_12_4_version": {
         "image": "debian",
         "features": {
             "nvidia-cuda": {
                 "installCudnn": true,
-                "installNvtx": true,
                 "installCudnnDev": true,
-                "installToolkit": true,
-                "cudaVersion": "12.4",
-                "cudnnVersion": "9.4.0.58"
+                "installNvtx": true,
+                "cudaVersion": "12.4"
             }
         }
     },
-    "install_cudnn_latest_version": {
+    "install_cuda_12_5_version": {
         "image": "debian",
         "features": {
             "nvidia-cuda": {
                 "installCudnn": true,
-                "installNvtx": true,
                 "installCudnnDev": true,
-                "installToolkit": true,
+                "installNvtx": true,
                 "cudaVersion": "12.5",
-                "cudnnVersion": "9.4.0.58"
+                "cudnnVersion": "9.5.0.50"
             }
         }
     }

From 28b75a69ab132429f2c7d96849ee0cd2e51e3bba Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Tue, 28 Jan 2025 21:57:01 +0530
Subject: [PATCH 344/478] [aws-cli] - issue #1224 - installing less for
 paginated output and avoiding errors (#1226)

Co-authored-by: Daniel Doyle <ddoyle2017@github.com>
---
 src/aws-cli/install.sh         |  2 +-
 test/aws-cli/less_installed.sh | 13 +++++++++++++
 test/aws-cli/scenarios.json    |  8 ++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 test/aws-cli/less_installed.sh
 create mode 100644 test/aws-cli/scenarios.json

diff --git a/src/aws-cli/install.sh b/src/aws-cli/install.sh
index e7c03f728..feb806de5 100755
--- a/src/aws-cli/install.sh
+++ b/src/aws-cli/install.sh
@@ -68,7 +68,7 @@ check_packages() {
 
 export DEBIAN_FRONTEND=noninteractive
 
-check_packages curl ca-certificates gnupg2 dirmngr unzip bash-completion
+check_packages curl ca-certificates gnupg2 dirmngr unzip bash-completion less
 
 verify_aws_cli_gpg_signature() {
     local filePath=$1
diff --git a/test/aws-cli/less_installed.sh b/test/aws-cli/less_installed.sh
new file mode 100644
index 000000000..a700a7a18
--- /dev/null
+++ b/test/aws-cli/less_installed.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+check "less is installed, pagination works !" less --version
+check "less binary installation path" which less
+check "Testing paginated output with less" ls -R / | less
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/aws-cli/scenarios.json b/test/aws-cli/scenarios.json
new file mode 100644
index 000000000..9dd703c27
--- /dev/null
+++ b/test/aws-cli/scenarios.json
@@ -0,0 +1,8 @@
+{
+    "less_installed": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "features": {
+            "aws-cli": {}
+        }
+    }
+}
\ No newline at end of file

From c31723d2df7c7d2406e796b78d57e86d6738e693 Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Tue, 28 Jan 2025 22:08:01 +0530
Subject: [PATCH 345/478] [docker-in-docker] - issue #1202 solution -
 moby=false, holds configured docker-ce and docker-ce-cli version (#1215)

* [docker-in-docker] - issue #1202 solution - moby=false, holds configured docker-ce and docker-ce-cli version

* test case for scenario of issue

---------

Co-authored-by: Daniel Doyle <ddoyle2017@github.com>
---
 src/docker-in-docker/install.sh                  |  1 +
 .../pin_docker-ce_version_moby_false.sh          | 10 ++++++++++
 test/docker-in-docker/scenarios.json             | 16 ++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 test/docker-in-docker/pin_docker-ce_version_moby_false.sh

diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index c4c098ba8..906393997 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -312,6 +312,7 @@ else
     else
         apt-get -y install --no-install-recommends docker-ce-cli${cli_version_suffix} docker-ce${engine_version_suffix}
         # Install compose
+        apt-mark hold docker-ce docker-ce-cli
         apt-get -y install --no-install-recommends docker-compose-plugin || echo "(*) Package docker-compose-plugin (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
     fi
 fi
diff --git a/test/docker-in-docker/pin_docker-ce_version_moby_false.sh b/test/docker-in-docker/pin_docker-ce_version_moby_false.sh
new file mode 100644
index 000000000..ec33d1504
--- /dev/null
+++ b/test/docker-in-docker/pin_docker-ce_version_moby_false.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "docker-ce" bash -c "docker --version"
+check "docker-ce-cli" bash -c "docker version"
+
+#report result
+reportResults
\ No newline at end of file
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index 699a1dd79..57681b799 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -142,6 +142,22 @@
             }
         }
     },
+    "pin_docker-ce_version_moby_false": {
+        "image": "mcr.microsoft.com/devcontainers/base:debian",
+        "features": {
+            "docker-in-docker": {
+                "version": "26.1.4",
+                "moby": "false",
+                "mobyBuildxVersion": "latest",
+                "dockerDashComposeVersion": "none",
+                "azureDnsAutoDetection": "true",
+                "dockerDefaultAddressPool": "",
+                "installDockerBuildx": "true",
+                "installDockerComposeSwitch": "true",
+                "disableIp6tables": "false"
+            }
+        }
+    },
     // DO NOT REMOVE: This scenario is used by the docker-in-docker-stress-test workflow
     "docker_with_on_create_command": {
         "image": "mcr.microsoft.com/devcontainers/base:debian",

From 5c67da03b794f207e45aa34e04fddcb2fa3e5aaa Mon Sep 17 00:00:00 2001
From: jurjenoskam <39823959+jurjenoskam@users.noreply.github.com>
Date: Wed, 12 Feb 2025 18:52:41 +0100
Subject: [PATCH 346/478] `[azure-cli]`: add `bicepVersion` for use with
 `installBicep` (#1227)

Add `bicepVersion` parameter (defaulting to `latest`) to optionally
specify a specific Bicep version when `installBicep` is `true`.

Co-authored-by: Jurjen Oskam <Jurjen.Oskam@rabobank.nl>
Co-authored-by: Daniel Doyle <ddoyle2017@github.com>
---
 src/azure-cli/devcontainer-feature.json | 10 +++++++++-
 src/azure-cli/install.sh                | 11 +++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/azure-cli/devcontainer-feature.json b/src/azure-cli/devcontainer-feature.json
index e73d2295c..a95c33dab 100644
--- a/src/azure-cli/devcontainer-feature.json
+++ b/src/azure-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "azure-cli",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "name": "Azure CLI",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/azure-cli",
   "description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -23,6 +23,14 @@
       "description": "Optionally install Azure Bicep",
       "default": false
     },
+    "bicepVersion": {
+      "type": "string",
+      "proposals": [
+        "latest"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Bicep version. ('latest' or a specic version such as 'v0.31.92')"
+    },
     "installUsingPython": {
       "type": "boolean",
       "description": "Install Azure CLI using Python instead of pipx",
diff --git a/src/azure-cli/install.sh b/src/azure-cli/install.sh
index 2b52ca158..93e10ff52 100755
--- a/src/azure-cli/install.sh
+++ b/src/azure-cli/install.sh
@@ -15,6 +15,7 @@ rm -rf /var/lib/apt/lists/*
 AZ_VERSION=${VERSION:-"latest"}
 AZ_EXTENSIONS=${EXTENSIONS}
 AZ_INSTALLBICEP=${INSTALLBICEP:-false}
+AZ_BICEPVERSION=${BICEPVERSION:-latest}
 INSTALL_USING_PYTHON=${INSTALLUSINGPYTHON:-false}
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 AZCLI_ARCHIVE_ARCHITECTURES="amd64 arm64"
@@ -229,10 +230,16 @@ if [ "${AZ_INSTALLBICEP}" = "true" ]; then
     # The `az bicep install --target-platform` could be a solution; however, linux-arm64 is not an allowed value for this argument yet
     # Manually installing Bicep and moving to the appropriate directory where az expects it to be
     
+    if [ "${AZ_BICEPVERSION}" = "latest" ]; then
+        bicep_download_path="https://github.com/Azure/bicep/releases/latest/download"
+    else
+        bicep_download_path="https://github.com/Azure/bicep/releases/download/${AZ_BICEPVERSION}"
+    fi
+
     if [ "${architecture}" = "arm64" ]; then
-        curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep-linux-arm64
+        curl -Lo bicep ${bicep_download_path}/bicep-linux-arm64
     else 
-        curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep-linux-x64
+        curl -Lo bicep ${bicep_download_path}/bicep-linux-x64
     fi
     
     chmod +x ./bicep

From 13521bc5efd79a1cea7da58df59a523243b3cea6 Mon Sep 17 00:00:00 2001
From: William <williamoconnor@me.com>
Date: Thu, 27 Feb 2025 03:23:32 +0000
Subject: [PATCH 347/478] Remove azure terraform extension (#1267)

* Remove azure terraform extension

* Update README.md
---
 src/terraform/README.md                 | 3 ---
 src/terraform/devcontainer-feature.json | 6 ++----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/terraform/README.md b/src/terraform/README.md
index 199c566d6..f6f5c9636 100644
--- a/src/terraform/README.md
+++ b/src/terraform/README.md
@@ -28,9 +28,6 @@ Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects la
 ### VS Code Extensions
 
 - `HashiCorp.terraform`
-- `ms-azuretools.vscode-azureterraform`
-
-
 
 ## Licensing
 
diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index 3193f25af..e3e5fb9ad 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -59,15 +59,13 @@
     "customizations": {
         "vscode": {
             "extensions": [
-                "HashiCorp.terraform",
-                "ms-azuretools.vscode-azureterraform"
+                "HashiCorp.terraform"
             ],
             "settings": {
                 "terraform.languageServer.enable": true,
                 "terraform.languageServer.args": [
                     "serve"
-                ],
-                "azureTerraform.terminal": "integrated"
+                ]
             }
         }
     },

From a9f7f0fb49b1f7878a6e5b4e9a68abc5fc3c3eca Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Fri, 28 Feb 2025 23:34:14 +0100
Subject: [PATCH 348/478] Fix access to socket for Podman
 (microsoft/vscode-remote-release#10706)

---
 src/docker-outside-of-docker/devcontainer-feature.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 24b5658dc..317c0289c 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -61,6 +61,9 @@
             "type": "bind"
         }
     ],
+    "securityOpt": [
+        "label=disable"
+    ],
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ],

From 8f42e09481b87706aaab3e06dce7d225ebf73f58 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Mon, 3 Mar 2025 22:39:00 +0530
Subject: [PATCH 349/478] [nvidia-cuda] - Cudnn install script issue, unable to
 fetch latest version of libcudnn9 library (#1275)

nvidia-cuda fix for Issue #1270
---
 src/nvidia-cuda/install.sh                    | 2 +-
 test/nvidia-cuda/install_cuda_12_3_version.sh | 4 ++--
 test/nvidia-cuda/install_cuda_12_4_version.sh | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/nvidia-cuda/install.sh b/src/nvidia-cuda/install.sh
index 1cfc7668e..a1055ac45 100644
--- a/src/nvidia-cuda/install.sh
+++ b/src/nvidia-cuda/install.sh
@@ -74,7 +74,7 @@ if [ "$CUDNN_VERSION" = "automatic" ]; then
     if [[ "$CUDA_VERSION" < "12.3" ]]; then
         CUDNN_VERSION=$(apt-cache policy libcudnn8 | grep "$CUDA_VERSION" | grep -Eo '^[^-1+]*' | sort -V | tail -n1 | xargs)
     else
-        CUDNN_VERSION=$(apt-cache policy libcudnn9-cuda-$major_cuda_version | grep "Candidate" | awk '{print $2}' | grep -Eo '^[^-1+]*')
+        CUDNN_VERSION=$(apt-cache policy libcudnn9-cuda-$major_cuda_version | grep "Candidate" | awk '{print $2}' | grep -Eo '^[^-+]*')
     fi
 fi
 major_cudnn_version=$(echo "${CUDNN_VERSION}" | cut -d '.' -f 1)
diff --git a/test/nvidia-cuda/install_cuda_12_3_version.sh b/test/nvidia-cuda/install_cuda_12_3_version.sh
index 95d4e8bdc..15c2abd7a 100644
--- a/test/nvidia-cuda/install_cuda_12_3_version.sh
+++ b/test/nvidia-cuda/install_cuda_12_3_version.sh
@@ -5,8 +5,8 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-# # Check installation of libcudnn9-cuda-12 (9.4.0)
-check "libcudnn.so.9.5.0" test 1 -eq "$(find /usr -name 'libcudnn.so.9.5.0' | wc -l)"
+# Check installation of libcudnn9
+check "libcudnn.so.9" test 1 -eq "$(find /usr -name 'libcudnn.so.9' | wc -l)"
 
 # Check installation of cuda-nvtx-12-3 (12.3)
 check "cuda-12-3+nvtx" test -e '/usr/local/cuda-12.3/targets/x86_64-linux/include/nvtx3/'
diff --git a/test/nvidia-cuda/install_cuda_12_4_version.sh b/test/nvidia-cuda/install_cuda_12_4_version.sh
index 77ecbf190..284920a33 100644
--- a/test/nvidia-cuda/install_cuda_12_4_version.sh
+++ b/test/nvidia-cuda/install_cuda_12_4_version.sh
@@ -5,8 +5,8 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-# # Check installation of libcudnn9-cuda-12 (9.4.0)
-check "libcudnn.so.9.5.0" test 1 -eq "$(find /usr -name 'libcudnn.so.9.5.0' | wc -l)"
+# Check installation of libcudnn9
+check "libcudnn.so.9" test 1 -eq "$(find /usr -name 'libcudnn.so.9' | wc -l)"
 
 # Check installation of cuda-nvtx-12-4 (12.4)
 check "cuda-12-4+nvtx" test -e '/usr/local/cuda-12.4/targets/x86_64-linux/include/nvtx3/'

From c264b4e837f3273789fc83dae898152daae4cd90 Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Mon, 3 Mar 2025 22:39:37 +0530
Subject: [PATCH 350/478] [python] - issue #1172 - provide switching versions
 using update-alternatives (#1260)

* [python] - issue #1172 - add version switching mechanism using update-alternatives

* removed commented code

* [python] - update-alternatives addition for ease in switching of python versions - complete

* changes for passing of other tests !!

* change for better positioning of code

* Added test case scenario for Update-Alternatives check

* added scenario for testing

* [alternatives] - added option for fedora, centos & rhel

* changed file name

* changes for update-alternatives test case proper functioning

* arrange in asc order for default value retention after testing ends
---
 src/python/install.sh                         |  28 ++++-
 .../alternatives_switchable_versions.sh       | 103 ++++++++++++++++++
 test/python/scenarios.json                    |  20 ++++
 ...update_alternatives_switchable_versions.sh | 102 +++++++++++++++++
 4 files changed, 250 insertions(+), 3 deletions(-)
 create mode 100644 test/python/alternatives_switchable_versions.sh
 create mode 100644 test/python/update_alternatives_switchable_versions.sh

diff --git a/src/python/install.sh b/src/python/install.sh
index b3311c7c6..fec8937a0 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -766,15 +766,19 @@ esac
 
 check_packages ${REQUIRED_PKGS}
 
+# Function to get the major version from a SemVer string
+get_major_version() {
+    local version="$1"
+    echo "$version" | cut -d '.' -f 1
+}
+
 # Install Python from source if needed
 if [ "${PYTHON_VERSION}" != "none" ]; then
     if ! cat /etc/group | grep -e "^python:" > /dev/null 2>&1; then
         groupadd -r python
     fi
     usermod -a -G python "${USERNAME}"
-
     CURRENT_PATH="${PYTHON_INSTALL_PATH}/current"
-
     install_python ${PYTHON_VERSION}
 
     # Additional python versions to be installed but not be set as default.
@@ -783,9 +787,27 @@ if [ "${PYTHON_VERSION}" != "none" ]; then
         OLDIFS=$IFS
         IFS=","
             read -a additional_versions <<< "$ADDITIONAL_VERSIONS"
-            for version in "${additional_versions[@]}"; do
+            major_version=$(get_major_version ${VERSION})
+            if type apt-get > /dev/null 2>&1; then
+                # Debian/Ubuntu: Use update-alternatives
+                update-alternatives --install ${CURRENT_PATH} python${major_version} ${PYTHON_INSTALL_PATH}/${VERSION} $((${#additional_versions[@]}+1))
+                update-alternatives --set python${major_version} ${PYTHON_INSTALL_PATH}/${VERSION}
+            elif type dnf > /dev/null 2>&1 || type yum > /dev/null 2>&1 || type microdnf > /dev/null 2>&1; then
+                # Fedora/RHEL/CentOS: Use alternatives
+                alternatives --install ${CURRENT_PATH} python${major_version} ${PYTHON_INSTALL_PATH}/${VERSION} $((${#additional_versions[@]}+1))
+                alternatives --set python${major_version} ${PYTHON_INSTALL_PATH}/${VERSION}
+            fi
+            for i in "${!additional_versions[@]}"; do
+                version=${additional_versions[$i]}
                 OVERRIDE_DEFAULT_VERSION="false"
                 install_python $version
+                if type apt-get > /dev/null 2>&1; then
+                    # Debian/Ubuntu: Use update-alternatives
+                    update-alternatives --install ${CURRENT_PATH} python${major_version} ${PYTHON_INSTALL_PATH}/${VERSION} $((${i}+1))
+                elif type dnf > /dev/null 2>&1 || type yum > /dev/null 2>&1 || type microdnf > /dev/null 2>&1; then
+                    # Fedora/RHEL/CentOS: Use alternatives
+                    alternatives --install ${CURRENT_PATH} python${major_version} ${PYTHON_INSTALL_PATH}/${VERSION} $((${i}+1))
+                fi
             done
         INSTALL_PATH="${OLD_INSTALL_PATH}"
         IFS=$OLDIFS
diff --git a/test/python/alternatives_switchable_versions.sh b/test/python/alternatives_switchable_versions.sh
new file mode 100644
index 000000000..a29392c17
--- /dev/null
+++ b/test/python/alternatives_switchable_versions.sh
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "python version 3.11 installed as default" bash -c "python --version | grep 3.11"
+check "python3 version 3.11 installed as default" bash -c "python3 --version | grep 3.11"
+check "python version 3.10.5 installed"  bash -c "ls -l /usr/local/python | grep 3.10.5"
+check "python version 3.8 installed"  bash -c "ls -l /usr/local/python | grep 3.8"
+check "python version 3.9.13 installed"  bash -c  "ls -l /usr/local/python | grep 3.9.13"
+
+# Check paths in settings
+check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
+check "current symlink works" /usr/local/python/current/bin/python --version
+
+# check alternatives command
+check_version_switch() {
+    if type apt-get > /dev/null 2>&1; then
+        PYTHON_ALTERNATIVES=$(update-alternatives --query python3 | grep -E 'Alternative:|Priority:')
+        STYLE="debian"
+    elif type dnf > /dev/null 2>&1 || type yum > /dev/null 2>&1 || type microdnf > /dev/null 2>&1; then
+        PYTHON_ALTERNATIVES=$(alternatives --display python3 | grep " - priority")
+        STYLE="fedora"
+    else
+        echo "No supported package manager found."
+        exit 1
+    fi
+
+    AVAILABLE_VERSIONS=()
+    INDEX=1
+    echo "Available Python versions:"
+    if [ "${STYLE}" = "debian" ]; then
+        while read -r alt && read -r pri; do
+            PATH=${alt#Alternative: }   # Extract only the path
+            PRIORITY=${pri#Priority: }  # Extract only the priority number
+            TEMP_VERSIONS+=("${PRIORITY} ${PATH}")
+            echo "$INDEX) $PATH (Priority: $PRIORITY)"
+            ((INDEX++))
+        done <<< "${PYTHON_ALTERNATIVES}"
+    elif [ "${STYLE}" = "fedora" ]; then
+        export PATH="/usr/bin:$PATH"
+        # Fedora/RHEL output: one line per alternative in the format:
+        while IFS= read -r line; do
+            # Split using " - priority " as a delimiter.
+            PATH=$(/usr/bin/awk -F' - priority ' '{print $1}' <<< "$line" | /usr/bin/xargs /bin/echo)
+            PRIORITY=$(/usr/bin/awk -F' - priority ' '{print $2}' <<< "$line" | /usr/bin/xargs /bin/echo)    
+            TEMP_VERSIONS+=("${PRIORITY} ${PATH}") 
+            echo "$INDEX) $PATH (Priority: $PRIORITY_VALUE)"
+            ((INDEX++))
+        done <<< "${PYTHON_ALTERNATIVES}"
+    fi
+
+    export PATH="/usr/bin:$PATH"
+    # Sort by priority (numerically ascending)
+    IFS=$'\n' TEMP_VERSIONS=($(sort -n <<<"${TEMP_VERSIONS[*]}"))
+    unset IFS
+
+    # Populate AVAILABLE_VERSIONS from sorted data
+    AVAILABLE_VERSIONS=()
+    INDEX=1
+    echo -e "\nAvailable Python versions (Sorted in asc order of priority):"
+    for ENTRY in "${TEMP_VERSIONS[@]}"; do
+        PRIORITY=${ENTRY%% *}  # Extract priority (first part before space)
+        PATH=${ENTRY#* }       # Extract path (everything after first space)
+        AVAILABLE_VERSIONS+=("${PATH}")
+        echo "$INDEX) $PATH (Priority: $PRIORITY)"
+        ((INDEX++))
+    done
+
+    echo -e "\nAvailable Versions Count: ${#AVAILABLE_VERSIONS[@]}"
+    # Ensure at least 4 alternatives exist
+    if [ "${#AVAILABLE_VERSIONS[@]}" -lt 4 ]; then
+        echo "Error: Less than 4 Python versions registered in update-alternatives."
+        exit 1
+    fi
+    
+    export PATH="/usr/bin:$PATH"
+    echo -e "\nSwitching to different versions using update-alternatives --set command...\n"
+    for CHOICE in {1..4}; do
+        SELECTED_VERSION="${AVAILABLE_VERSIONS[$((CHOICE - 1))]}"
+        echo "Switching to: ${SELECTED_VERSION}"
+        if command -v apt-get > /dev/null 2>&1; then
+            /usr/bin/update-alternatives --set python3 ${SELECTED_VERSION}
+        elif command -v dnf > /dev/null 2>&1 || command -v yum > /dev/null 2>&1 || command -v microdnf > /dev/null 2>&1; then
+            /usr/sbin/alternatives --set python3 ${SELECTED_VERSION}
+        fi
+        # Verify the switch
+        echo "Python version after switch:"
+        /usr/local/python/current/bin/python3 --version
+        /bin/sleep 1
+        echo -e "\n"
+    done
+    echo -e "Update-Alternatives --display: \n"
+    if type apt-get > /dev/null 2>&1; then
+        /usr/bin/update-alternatives --display python3
+    elif type dnf > /dev/null 2>&1 || type yum > /dev/null 2>&1 || type microdnf > /dev/null 2>&1; then
+        /usr/sbin/alternatives --display python3
+    fi
+}
+
+check "Version Switch With Update_Alternatives" check_version_switch
\ No newline at end of file
diff --git a/test/python/scenarios.json b/test/python/scenarios.json
index be37869df..9dc37e16c 100644
--- a/test/python/scenarios.json
+++ b/test/python/scenarios.json
@@ -255,5 +255,25 @@
                 "enableShared": true
             }
         }
+    },
+    "update_alternatives_switchable_versions": {
+        "image": "ubuntu:focal",
+        "features": {
+            "python": {
+                "version": "3.11",
+                "installTools": true,
+                "additionalVersions": "3.8,3.9.13,3.10.5"
+            }
+        }
+    },
+    "alternatives_switchable_versions": {
+        "image": "fedora",
+        "features": {
+            "python": {
+                "version": "3.11",
+                "installTools": true,
+                "additionalVersions": "3.8,3.9.13,3.10.5"
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/test/python/update_alternatives_switchable_versions.sh b/test/python/update_alternatives_switchable_versions.sh
new file mode 100644
index 000000000..07a517332
--- /dev/null
+++ b/test/python/update_alternatives_switchable_versions.sh
@@ -0,0 +1,102 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "python version 3.11 installed as default" bash -c "python --version | grep 3.11"
+check "python3 version 3.11 installed as default" bash -c "python3 --version | grep 3.11"
+check "python version 3.10.5 installed"  bash -c "ls -l /usr/local/python | grep 3.10.5"
+check "python version 3.8 installed"  bash -c "ls -l /usr/local/python | grep 3.8"
+check "python version 3.9.13 installed"  bash -c  "ls -l /usr/local/python | grep 3.9.13"
+
+# Check paths in settings
+check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python"
+check "current symlink works" /usr/local/python/current/bin/python --version
+
+# check alternatives command
+check_version_switch() {
+    if type apt-get > /dev/null 2>&1; then
+        PYTHON_ALTERNATIVES=$(update-alternatives --query python3 | grep -E 'Alternative:|Priority:')
+        STYLE="debian"
+    elif type dnf > /dev/null 2>&1 || type yum > /dev/null 2>&1 || type microdnf > /dev/null 2>&1; then
+        PYTHON_ALTERNATIVES=$(alternatives --display python3 | grep " - priority")
+        STYLE="fedora"
+    else
+        echo "No supported package manager found."
+        exit 1
+    fi
+    AVAILABLE_VERSIONS=()
+    INDEX=1
+    echo "Available Python versions:"
+    if [ "${STYLE}" = "debian" ]; then
+        while read -r alt && read -r pri; do
+            PATH=${alt#Alternative: }   # Extract only the path
+            PRIORITY=${pri#Priority: }  # Extract only the priority number
+            TEMP_VERSIONS+=("${PRIORITY} ${PATH}")
+            echo "$INDEX) $PATH (Priority: $PRIORITY)"
+            ((INDEX++))
+        done <<< "${PYTHON_ALTERNATIVES}"
+    elif [ "${STYLE}" = "fedora" ]; then
+        export PATH="/usr/bin:$PATH"
+        # Fedora/RHEL output: one line per alternative in the format:
+        while IFS= read -r line; do
+            # Split using " - priority " as a delimiter.
+            PATH=$(/usr/bin/awk -F' - priority ' '{print $1}' <<< "$line" | /usr/bin/xargs /bin/echo)
+            PRIORITY=$(/usr/bin/awk -F' - priority ' '{print $2}' <<< "$line" | /usr/bin/xargs /bin/echo)    
+            TEMP_VERSIONS+=("${PRIORITY} ${PATH}") 
+            echo "$INDEX) $PATH (Priority: $PRIORITY_VALUE)"
+            ((INDEX++))
+        done <<< "${PYTHON_ALTERNATIVES}"
+    fi
+
+    export PATH="/usr/bin:$PATH"   
+    # Sort by priority (numerically ascending)
+    IFS=$'\n' TEMP_VERSIONS=($(sort -n <<<"${TEMP_VERSIONS[*]}"))
+    unset IFS
+
+    # Populate AVAILABLE_VERSIONS from sorted data
+    AVAILABLE_VERSIONS=()
+    INDEX=1
+    echo -e "\nAvailable Python versions (Sorted in asc order of priority):"
+    for ENTRY in "${TEMP_VERSIONS[@]}"; do
+        PRIORITY=${ENTRY%% *}  # Extract priority (first part before space)
+        PATH=${ENTRY#* }       # Extract path (everything after first space)
+        AVAILABLE_VERSIONS+=("${PATH}")
+        echo "$INDEX) $PATH (Priority: $PRIORITY)"
+        ((INDEX++))
+    done
+
+    echo -e "\nAvailable Versions Count: ${#AVAILABLE_VERSIONS[@]}\n"
+    # Ensure at least 4 alternatives exist
+    if [ "${#AVAILABLE_VERSIONS[@]}" -lt 4 ]; then
+        echo "Error: Less than 4 Python versions registered in update-alternatives."
+        exit 1
+    fi
+
+    export PATH="/usr/bin:$PATH"
+    echo -e "\nSwitching to different versions using update-alternatives --set command...\n"
+    for CHOICE in {1..4}; do
+        SELECTED_VERSION="${AVAILABLE_VERSIONS[$((CHOICE - 1))]}"
+        echo "Switching to: ${SELECTED_VERSION}"
+        if command -v apt-get > /dev/null 2>&1; then
+            /usr/bin/update-alternatives --set python3 ${SELECTED_VERSION}
+        elif command -v dnf > /dev/null 2>&1 || command -v yum > /dev/null 2>&1 || command -v microdnf > /dev/null 2>&1; then
+            /usr/sbin/alternatives --set python3 ${SELECTED_VERSION}
+        fi
+        # Verify the switch
+        echo "Python version after switch:"
+        /usr/local/python/current/bin/python3 --version
+        /bin/sleep 1
+        echo -e "\n"
+    done
+    echo -e "Update-Alternatives --display: \n"
+    if type apt-get > /dev/null 2>&1; then
+        /usr/bin/update-alternatives --display python3
+    elif type dnf > /dev/null 2>&1 || type yum > /dev/null 2>&1 || type microdnf > /dev/null 2>&1; then
+        /usr/sbin/alternatives --display python3
+    fi
+}
+
+check "Version Switch With Update_Alternatives" check_version_switch
\ No newline at end of file

From 7eec5e6ad247ada5dd130ed7972b83d53c1af8ee Mon Sep 17 00:00:00 2001
From: Gaurav Saini <147703805+gauravsaini04@users.noreply.github.com>
Date: Wed, 26 Mar 2025 19:55:56 +0530
Subject: [PATCH 351/478] [docker-outside-of-docker] - Correction in fetching
 previous version from github api url (#1252)

* [docker-outside-of-docker] - Correction in fetching previous version from github api url

* need full array of objects instead was pulling only the object pertaining to latest release

* Correcting the scenario when result of json can be an object or an array, so to tackle both the scenarios in the function of fallbacking

* version output for docker-compose-switch in test scenario run for testing fallback

* correction in getting version for docker compose outputted in test case

* correction

* correction

* correction

* run the pipeline again

* Update version devcontainer-feature.json

* remove DOCKER_DASH_COMPOSE_VERSION

* typo error

* remove if condition

---------

Co-authored-by: sireeshajonnalagadda <sireeshajonnalagadda@github.com>
Co-authored-by: Mathiyarasy <157102811+Mathiyarasy@users.noreply.github.com>
---
 .../devcontainer-feature.json                 |  2 +-
 src/docker-outside-of-docker/install.sh       | 31 ++++++++---------
 .../docker_build_compose_fallback.sh          | 33 +++++++++----------
 3 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 317c0289c..a58f63ee2 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.6.0",
+    "version": "1.6.1",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 5854fc340..97222b177 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -156,25 +156,26 @@ get_previous_version() {
     output=$(curl -s "$repo_url");
 
     check_packages jq
-
-    message=$(echo "$output" | jq -r '.message')
     
-    if [[ $message == "API rate limit exceeded"* ]]; then
-        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
-        echo -e "\nAttempting to find latest version using GitHub tags."
-        find_prev_version_from_git_tags prev_version "$url" "tags/v"
-        declare -g ${variable_name}="${prev_version}"
-    else 
-        echo -e "\nAttempting to find latest version using GitHub Api."
-        version=$(echo "$output" | jq -r '.tag_name')
+    if echo "$output" | jq -e 'type == "object"' > /dev/null; then
+        message=$(echo "$output" | jq -r '.message')
+        if [[ $message == "API rate limit exceeded"* ]]; then
+            echo -e "\nAn attempt to find previous to latest version using GitHub Api Failed... \nReason: ${message}"
+            echo -e "\nAttempting to find previous to latest version using GitHub tags."
+            find_prev_version_from_git_tags prev_version "$url" "tags/v"
+            declare -g ${variable_name}="${prev_version}"
+        fi
+    elif echo "$output" | jq -e 'type == "array"' > /dev/null; then
+        echo -e "\nAttempting to find previous version using GitHub Api."
+        version=$(echo "$output" | jq -r '.[1].tag_name')
         declare -g ${variable_name}="${version#v}"
     fi  
-    echo "${variable_name}=${!variable_name}"
+    echo "${variable_name}=${!variable_name}" 
 }
 
 get_github_api_repo_url() {
     local url=$1
-    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases"
 }
 
 install_compose_switch_fallback() {
@@ -361,11 +362,7 @@ if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
         find_version_from_git_tags compose_version "$docker_compose_url" "tags/v"
         echo "(*) Installing docker-compose ${compose_version}..."
         curl -fsSL "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path} || {
-            if [[ $DOCKER_DASH_COMPOSE_VERSION == "latest" ]]; then 
-                install_compose_fallback "$docker_compose_url" "$compose_version" "$target_compose_arch" "$docker_compose_path"
-            else
-                echo -e "Error: Failed to install docker-compose v${compose_version}" 
-            fi
+            install_compose_fallback "$docker_compose_url" "$compose_version" "$target_compose_arch" "$docker_compose_path"
         }
         chmod +x ${docker_compose_path}
 
diff --git a/test/docker-outside-of-docker/docker_build_compose_fallback.sh b/test/docker-outside-of-docker/docker_build_compose_fallback.sh
index 7f3a6f1dd..c1bdeb544 100644
--- a/test/docker-outside-of-docker/docker_build_compose_fallback.sh
+++ b/test/docker-outside-of-docker/docker_build_compose_fallback.sh
@@ -112,29 +112,26 @@ get_previous_version() {
     local variable_name=$3
     local mode=$4
     prev_version=${!variable_name}
-
     output=$(curl -s "$repo_url");
-
     check_packages jq
-
-    message=$(echo "$output" | jq -r '.message')
-    
-    if [[ $message == "API rate limit exceeded"* ]] || [[ $mode == 'mode1' ]]; then
-        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
-        echo -e "\nAttempting to find latest version using GitHub tags."
-        find_prev_version_from_git_tags prev_version "$url" "tags/v"
-        declare -g ${variable_name}="${prev_version}"
-    else 
-        echo -e "\nAttempting to find latest version using GitHub Api."
-        version=$(echo "$output" | jq -r '.tag_name')
+    if echo "$output" | jq -e 'type == "object"' > /dev/null; then
+        message=$(echo "$output" | jq -r '.message')
+        if [[ $message == "API rate limit exceeded"* ]] || [[ $mode == 'mode1' ]]; then
+            echo -e "\nAn attempt to find previous to latest version using GitHub Api Failed... \nReason: ${message}"
+            echo -e "\nAttempting to find previous to latest version using GitHub tags."
+            find_prev_version_from_git_tags prev_version "$url" "tags/v"
+            declare -g ${variable_name}="${prev_version}"
+        fi
+    elif echo "$output" | jq -e 'type == "array"' > /dev/null; then
+        echo -e "\nAttempting to find previous version using GitHub Api."
+        version=$(echo "$output" | jq -r '.[1].tag_name')
         declare -g ${variable_name}="${version#v}"
-    fi  
-    echo "${variable_name}=${!variable_name}"
+    fi
 }
 
 get_github_api_repo_url() {
     local url=$1
-    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases"
 }
 
 install_compose_switch_fallback() {
@@ -159,7 +156,9 @@ install_compose-switch_as_docker-compose() {
 echo -e "\n👉 Trying to install compose-switch as docker-compose using mode 1 ( find_prev_version_from_git_tags method )";
 install_compose-switch_as_docker-compose "mode1"
 check "installs compose-switch as docker-compose mode 1" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
+check "docker-compose version" bash -c "docker-compose version"
 
 echo -e "\n👉 Trying to install compose-switch as docker-compose using mode 2 ( GitHub Api )";
 install_compose-switch_as_docker-compose "mode2"
-check "installs compose-switch as docker-compose mode 2" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
\ No newline at end of file
+check "installs compose-switch as docker-compose mode 2" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
+check "docker-compose version" bash -c "docker-compose version"
\ No newline at end of file

From 87fd9a35c50496f889ce309c284b9cffd3061920 Mon Sep 17 00:00:00 2001
From: Mathiyarasy <157102811+Mathiyarasy@users.noreply.github.com>
Date: Wed, 26 Mar 2025 19:56:07 +0530
Subject: [PATCH 352/478] [docker-in-docker] - Correction in fetching previous
 version from github api url  (#1302)

* Update dockercompose previous version logic

* Update v2 as v2 is latest

* Update default to v2

* Update test for fetching previous version

* default to latest to test

* fix the failure scenario

* previous tag

* remove latest condition check
---
 .../devcontainer-feature.json                 |  8 ++---
 src/docker-in-docker/install.sh               | 33 +++++++++----------
 .../docker_build_fallback_compose.sh          | 31 ++++++++---------
 3 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index f13b62d2d..94b010c1f 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.12.0",
+    "version": "2.12.1",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
@@ -29,11 +29,11 @@
             "type": "string",
             "enum": [
                 "none",
-                "latest",
+                "v1",
                 "v2"
             ],
-            "default": "latest",
-            "description": "Default version of Docker Compose (latest, v2 or none)"
+            "default": "v2",
+            "description": "Default version of Docker Compose (v1, v2 or none)"
         },
         "azureDnsAutoDetection": {
             "type": "boolean",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 906393997..b43a12918 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -11,7 +11,7 @@
 DOCKER_VERSION="${VERSION:-"latest"}" # The Docker/Moby Engine + CLI should match in version
 USE_MOBY="${MOBY:-"true"}"
 MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"latest"}"
-DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"latest"}" #latest, v2 or none
+DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v2"}" #v1, v2 or none
 AZURE_DNS_AUTO_DETECTION="${AZUREDNSAUTODETECTION:-"true"}"
 DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL:-""}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
@@ -157,18 +157,20 @@ get_previous_version() {
     local repo_url=$2
     local variable_name=$3
     prev_version=${!variable_name}
-    
+
     output=$(curl -s "$repo_url");
-    message=$(echo "$output" | jq -r '.message')
-    
-    if [[ $message == "API rate limit exceeded"* ]]; then
-        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
-        echo -e "\nAttempting to find latest version using GitHub tags."
-        find_prev_version_from_git_tags prev_version "$url" "tags/v"
-        declare -g ${variable_name}="${prev_version}"
-    else 
+    if echo "$output" | jq -e 'type == "object"' > /dev/null; then
+      message=$(echo "$output" | jq -r '.message')
+      
+      if [[ $message == "API rate limit exceeded"* ]]; then
+            echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
+            echo -e "\nAttempting to find latest version using GitHub tags."
+            find_prev_version_from_git_tags prev_version "$url" "tags/v"
+            declare -g ${variable_name}="${prev_version}"
+       fi
+    elif echo "$output" | jq -e 'type == "array"' > /dev/null; then 
         echo -e "\nAttempting to find latest version using GitHub Api."
-        version=$(echo "$output" | jq -r '.tag_name')
+        version=$(echo "$output" | jq -r '.[1].tag_name')
         declare -g ${variable_name}="${version#v}"
     fi  
     echo "${variable_name}=${!variable_name}"
@@ -176,7 +178,7 @@ get_previous_version() {
 
 get_github_api_repo_url() {
     local url=$1
-    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases"
 }
 
 ###########################################
@@ -372,11 +374,8 @@ if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
         find_version_from_git_tags compose_version "$docker_compose_url" "tags/v"
         echo "(*) Installing docker-compose ${compose_version}..."
         curl -fsSL "https://github.com/docker/compose/releases/download/v${compose_version}/docker-compose-linux-${target_compose_arch}" -o ${docker_compose_path} || {
-            if [[ $DOCKER_DASH_COMPOSE_VERSION == "latest" ]]; then 
-                fallback_compose "$docker_compose_url"
-            else
-                echo -e "Error: Failed to install docker-compose v${compose_version}" 
-            fi
+                 echo -e "\n(!) Failed to fetch the latest artifacts for docker-compose v${compose_version}..." 
+                 fallback_compose "$docker_compose_url"
         }
 
         chmod +x ${docker_compose_path}
diff --git a/test/docker-in-docker/docker_build_fallback_compose.sh b/test/docker-in-docker/docker_build_fallback_compose.sh
index 4a18640f0..ed1dab3f4 100644
--- a/test/docker-in-docker/docker_build_fallback_compose.sh
+++ b/test/docker-in-docker/docker_build_fallback_compose.sh
@@ -108,31 +108,28 @@ get_previous_version() {
     local mode=$4
     prev_version=${!variable_name}
     
-    echo -e "\nAttempting to find latest version using Github Api."
-
     output=$(curl -s "$repo_url");
-    message=$(echo "$output" | jq -r '.message')
 
-    if [[ $mode != "install_from_github_api_valid" ]]; then 
-        message="API rate limit exceeded"
-    fi
-    
-    if [[ $message == "API rate limit exceeded"* ]]; then
-        echo -e "\nAttempting to find latest version using Github Api Failed. Exceeded API Rate Limit."
-        echo -e "\nAttempting to find latest version using Github Tags."
-        find_prev_version_from_git_tags prev_version "$url" "tags/v"
-        declare -g ${variable_name}="${prev_version}"
-    else 
-        echo -e "\nAttempting to find latest version using Github Api Succeeded."
-        version=$(echo "$output" | jq -r '.tag_name')
+    if echo "$output" | jq -e 'type == "object"' > /dev/null; then
+      message=$(echo "$output" | jq -r '.message')
+      
+      if [[ $message == "API rate limit exceeded"* ]]; then
+            echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
+            echo -e "\nAttempting to find latest version using GitHub tags."
+            find_prev_version_from_git_tags prev_version "$url" "tags/v"
+            declare -g ${variable_name}="${prev_version}"
+       fi
+    elif echo "$output" | jq -e 'type == "array"' > /dev/null; then 
+        echo -e "\nAttempting to find latest version using GitHub Api."
+        version=$(echo "$output" | jq -r '.[1].tag_name')
         declare -g ${variable_name}="${version#v}"
-    fi  
+    fi
     echo "${variable_name}=${!variable_name}"
 }
 
 get_github_api_repo_url() {
     local url=$1
-    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
+    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases"
 }
 
 install_using_get_previous_version() {

From 87befbc765cd90ab9bd952dd2eb485cf91fccbc7 Mon Sep 17 00:00:00 2001
From: William <williamoconnor@me.com>
Date: Wed, 26 Mar 2025 14:34:05 +0000
Subject: [PATCH 353/478] Bump Terraform version to 1.3.9 in devcontainer
 feature (#1290)

---
 src/terraform/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index e3e5fb9ad..ef6db8dec 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.3.8",
+    "version": "1.3.9",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",

From fdbd9b4731d596562cd99e6f0239b4771cb34953 Mon Sep 17 00:00:00 2001
From: sireeshajonnalagadda <sireeshajonnalagadda@github.com>
Date: Wed, 26 Mar 2025 20:08:16 +0530
Subject: [PATCH 354/478] common-utils Azure linux 3 support  (#1310)

* added tdnf package manager and some checks for Azure linux

* added tdnf package manager and some checks for Azure linux

* modified install_cmd

* modified install_cmd

---------

Co-authored-by: Daniel Doyle <ddoyle2017@github.com>
---
 src/common-utils/install.sh         |  4 +++-
 src/common-utils/main.sh            | 20 +++++++++++++-------
 test/common-utils/Azure-linux-CU.sh | 22 ++++++++++++++++++++++
 test/common-utils/scenarios.json    |  6 ++++++
 4 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 test/common-utils/Azure-linux-CU.sh

diff --git a/src/common-utils/install.sh b/src/common-utils/install.sh
index 8f1ece4d7..a89490347 100755
--- a/src/common-utils/install.sh
+++ b/src/common-utils/install.sh
@@ -31,6 +31,8 @@ fi
 if [ "${ID}" = "alpine" ]; then
     apk add --no-cache bash
 fi
-
+if [ "${ID}" = "azurelinux" ]; then
+    tdnf install -y curl git 
+fi
 exec /bin/bash "$(dirname $0)/main.sh" "$@"
 exit $?
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index b5fe11f57..abef18430 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -161,12 +161,18 @@ install_redhat_packages() {
     local package_list=""
     local remove_epel="false"
     local install_cmd=microdnf
-    if ! type microdnf > /dev/null 2>&1; then
-        install_cmd=dnf
-        if ! type dnf > /dev/null 2>&1; then
-            install_cmd=yum
-        fi
-    fi
+    if type microdnf > /dev/null 2>&1; then
+       install_cmd=microdnf
+    elif type tdnf > /dev/null 2>&1; then
+       install_cmd=tdnf
+    elif type dnf > /dev/null 2>&1; then
+       install_cmd=dnf
+    elif type yum > /dev/null 2>&1; then
+       install_cmd=yum
+    else
+       echo "Unable to find 'tdnf', 'dnf', or 'yum' package manager. Exiting."
+       exit 1
+fi
 
     if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
         package_list="${package_list} \
@@ -344,7 +350,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 # Get an adjusted ID independent of distro variants
 if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
     ADJUSTED_ID="debian"
-elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
+elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "azurelinux" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
     ADJUSTED_ID="rhel"
     VERSION_CODENAME="${ID}${VERSION_ID}"
 elif [ "${ID}" = "alpine" ]; then
diff --git a/test/common-utils/Azure-linux-CU.sh b/test/common-utils/Azure-linux-CU.sh
new file mode 100644
index 000000000..eeba25d10
--- /dev/null
+++ b/test/common-utils/Azure-linux-CU.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Load Linux distribution info
+. /etc/os-release
+
+# Check if the current user is root
+check "root user" test "$(whoami)" = "root"
+
+# Check if the Linux distro is Azure Linux
+check "azurelinux distro" test "$ID" = "azurelinux"
+
+# Definition specific tests
+check "curl" curl --version
+check "jq" jq  --version
+
+# Report result
+reportResults
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index a929f534a..4ffbde1ac 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -292,5 +292,11 @@
         "features": {
             "common-utils": {}
         }
+    },
+    "Azure-linux-CU": {
+        "image": "mcr.microsoft.com/dotnet/sdk:8.0-azurelinux3.0",
+        "features": {
+            "common-utils": {}
+        }
     }
 }
\ No newline at end of file

From 091886b3568dad70f835cc428dad1fdf7bc6a9b3 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Thu, 27 Mar 2025 21:42:31 +0530
Subject: [PATCH 355/478] Bump up the common-utils version for azurelinux
 support change (#1311)

---
 src/common-utils/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 3fa6487df..82ddde046 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.5.2",
+    "version": "2.5.3",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",

From 12f1b2f5d5419714040a7552eb9f5acb8572ee59 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Tue, 1 Apr 2025 20:11:48 +0200
Subject: [PATCH 356/478] Custom instructions for features (#1314)

* Custom instructions for github-cli, node, python

* Custom instructions for docker-in-docker, docker-outside-of-docker
---
 src/docker-in-docker/devcontainer-feature.json        |  9 ++++++++-
 .../devcontainer-feature.json                         |  9 ++++++++-
 src/github-cli/devcontainer-feature.json              | 11 +++++++++++
 src/node/devcontainer-feature.json                    |  9 ++++++++-
 src/python/devcontainer-feature.json                  |  5 +++++
 5 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 94b010c1f..be9368f39 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -71,7 +71,14 @@
         "vscode": {
             "extensions": [
                 "ms-azuretools.vscode-docker"
-            ]
+            ],
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using a dedicated Docker daemon running inside the dev container."
+                    }
+                ]
+            }
         }
     },
     "mounts": [
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index a58f63ee2..9ded8a5de 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -51,7 +51,14 @@
         "vscode": {
             "extensions": [
                 "ms-azuretools.vscode-docker"
-            ]
+            ],
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using the Docker daemon on the host machine."
+                    }
+                ]
+            }
         }
     },
     "mounts": [
diff --git a/src/github-cli/devcontainer-feature.json b/src/github-cli/devcontainer-feature.json
index 9b1558ec0..26f9989d7 100644
--- a/src/github-cli/devcontainer-feature.json
+++ b/src/github-cli/devcontainer-feature.json
@@ -19,6 +19,17 @@
             "default": true
         }
     },
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes the GitHub CLI (`gh`), which is pre-installed and available on the `PATH`. IMPORTANT: `gh api -f` does not support object values, use multiple `-f` flags with hierarchical keys and string values instead. When using GitHub actions `actions/upload-artifact` or `actions/download-artifact` use v4 or later."
+                    }
+                ]
+            }
+        }
+    },
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils",
         "ghcr.io/devcontainers/features/git"
diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index d8d49e538..9bbeb2ecd 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -61,7 +61,14 @@
         "vscode": {
             "extensions": [
                 "dbaeumer.vscode-eslint"
-            ]
+            ],
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes `node`, `npm` and `eslint` pre-installed and available on the `PATH` for Node.js and JavaScript development."
+                    }
+                ]
+            }
         }
     },
     "containerEnv": {
diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 64976fc63..bd5b71887 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -77,6 +77,11 @@
         "ms-python.autopep8"
       ],
       "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes `python3` and `pip3` pre-installed and available on the `PATH`, along with the Python language extensions for Python development."
+          }
+        ],
         "python.defaultInterpreterPath": "/usr/local/python/current/bin/python",
         "[python]": {
           "editor.defaultFormatter": "ms-python.autopep8"

From 2eb4b5ce7ad97b3ea82a84606e69139a867f078d Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Tue, 1 Apr 2025 21:43:46 +0200
Subject: [PATCH 357/478] Increment versions (#1315)

---
 src/docker-in-docker/devcontainer-feature.json         | 2 +-
 src/docker-outside-of-docker/devcontainer-feature.json | 2 +-
 src/github-cli/devcontainer-feature.json               | 2 +-
 src/node/devcontainer-feature.json                     | 2 +-
 src/python/devcontainer-feature.json                   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index be9368f39..fe705db37 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.12.1",
+    "version": "2.12.2",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 9ded8a5de..85f598974 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.6.1",
+    "version": "1.6.2",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
diff --git a/src/github-cli/devcontainer-feature.json b/src/github-cli/devcontainer-feature.json
index 26f9989d7..04e373dfd 100644
--- a/src/github-cli/devcontainer-feature.json
+++ b/src/github-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "github-cli",
-    "version": "1.0.13",
+    "version": "1.0.14",
     "name": "GitHub CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/github-cli",
     "description": "Installs the GitHub CLI. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index 9bbeb2ecd..b8d699def 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.6.1",
+    "version": "1.6.2",
     "name": "Node.js (via nvm), yarn and pnpm",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index bd5b71887..635b233cf 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",

From efd88326ddc3f226885e4bc91669901facfd664f Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Fri, 4 Apr 2025 20:09:35 +0530
Subject: [PATCH 358/478] [Ruby] - 3.1 EOL and 3.4 addition (#1312)

Ruby 3.1 EOL and 3.4 addition
---
 src/ruby/devcontainer-feature.json   | 7 +++----
 test/ruby/install_additional_ruby.sh | 6 +++---
 test/ruby/ruby_fallback_test.sh      | 2 +-
 test/ruby/scenarios.json             | 4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json
index 0618d4296..3d7a081e8 100644
--- a/src/ruby/devcontainer-feature.json
+++ b/src/ruby/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "1.2.3",
+    "version": "1.3.0",
     "name": "Ruby (via rvm)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
     "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
@@ -10,9 +10,8 @@
             "proposals": [
                 "latest",
                 "none",
-                "3.1",
-                "3.0",
-                "2.7"
+                "3.4",
+                "3.2"
             ],
             "default": "latest",
             "description": "Select or enter a Ruby version to install"
diff --git a/test/ruby/install_additional_ruby.sh b/test/ruby/install_additional_ruby.sh
index 4fa844475..12b77def3 100644
--- a/test/ruby/install_additional_ruby.sh
+++ b/test/ruby/install_additional_ruby.sh
@@ -5,9 +5,9 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-check "ruby version 3.1.2 installed as default" ruby -v | grep 3.1.2
-check "ruby version 2.5.9 installed"  rvm list | grep 2.5.9
-check "ruby version 3.0.4 installed"  rvm list | grep 3.0.4
+check "ruby version 3.4.2 installed as default" ruby -v | grep 3.4.2
+check "ruby version 3.2.8 installed"  rvm list | grep 3.2.8
+check "ruby version 3.3.2 installed"  rvm list | grep 3.3.2
 
 check "rbenv" bash -c 'eval "$(rbenv init -)" && rbenv --version'
 check "rake" bash -c "gem list | grep rake"
diff --git a/test/ruby/ruby_fallback_test.sh b/test/ruby/ruby_fallback_test.sh
index 1c2179fc3..a4ec9a6b5 100644
--- a/test/ruby/ruby_fallback_test.sh
+++ b/test/ruby/ruby_fallback_test.sh
@@ -248,7 +248,7 @@ get_github_api_repo_url() {
 # Figure out correct version of a three part version number is not passed
 ruby_url="https://github.com/ruby/ruby"
 
-RUBY_VERSION="3.1.xyz"
+RUBY_VERSION="3.4.xyz"
 
 set_rvm_install_args() {
     RUBY_VERSION=$1
diff --git a/test/ruby/scenarios.json b/test/ruby/scenarios.json
index cfa2d8554..dd59d30fb 100644
--- a/test/ruby/scenarios.json
+++ b/test/ruby/scenarios.json
@@ -3,8 +3,8 @@
         "image": "ubuntu:focal",
         "features": {
             "ruby": {
-                "version": "3.1.2",
-                "additionalVersions": "2.5,3.0.4"
+                "version": "3.4.2",
+                "additionalVersions": "3.2,3.3.2"
             }
         }
     },

From 66385f3d5cf87ca1e1c23c1468a63e218b344f53 Mon Sep 17 00:00:00 2001
From: Mathiyarasy <157102811+Mathiyarasy@users.noreply.github.com>
Date: Mon, 7 Apr 2025 12:50:53 +0530
Subject: [PATCH 359/478] Remove hardcoded fallback to tem from ms JDK (#1316)

* REmove hardcoded fallback to tem from ms JDK

* Update latest version

* address review comments
---
 src/java/devcontainer-feature.json  |  3 ++-
 src/java/install.sh                 | 11 ++++++++++-
 test/java/install_latest_version.sh |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index 4e4b6c5d3..c1a96abff 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "name": "Java (via SDKMAN!)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
@@ -10,6 +10,7 @@
       "proposals": [
         "latest",
         "none",
+        "21",
         "17",
         "11",
         "8"
diff --git a/src/java/install.sh b/src/java/install.sh
index ef3d1913a..62fd39462 100644
--- a/src/java/install.sh
+++ b/src/java/install.sh
@@ -213,11 +213,20 @@ find_version_list() {
         major_version=$(echo "$java_ver" | cut -d '.' -f 1)
     fi
     
+    # Remove the hardcoded fallback as this fails for new jdk latest version released ex: 24
+    # Related Issue: https://github.com/devcontainers/features/issues/1308
     if [ "${JDK_DISTRO}" = "ms" ]; then
-        if [ "${major_version}" = "8" ] || [ "${major_version}" = "18" ] || [ "${major_version}" = "22" ] || [ "${major_version}" = "23" ]; then
+        # Check if the requested version is available in the 'ms' distribution
+        echo "Check if OpenJDK is available for version ${major_version} for ${JDK_DISTRO} Distro"
+        available_versions=$(su ${USERNAME} -c ". ${SDKMAN_DIR}/bin/sdkman-init.sh && sdk list ${install_type} | grep ${JDK_DISTRO} | grep -oE '[0-9]+(\.[0-9]+(\.[0-9]+)?)?' | sort -u")
+        if echo "${available_versions}" | grep -q "^${major_version}"; then
+            echo "JDK version ${major_version} is available in ${JDK_DISTRO}..."
+        else
+            echo "JDK version ${major_version} not available in  ${JDK_DISTRO}.... Switching to (tem)."
             JDK_DISTRO="tem"
         fi
     fi
+    echo "JDK_DISTRO: ${JDK_DISTRO}"
     if [ "${install_type}" != "java" ]; then
         regex="${prefix}\\K[0-9]+\\.?[0-9]*\\.?[0-9]*${suffix}"
     else
diff --git a/test/java/install_latest_version.sh b/test/java/install_latest_version.sh
index af8a621ce..007699b59 100644
--- a/test/java/install_latest_version.sh
+++ b/test/java/install_latest_version.sh
@@ -9,7 +9,7 @@ echo 'public class HelloWorld { public static void main(String[] args) { System.
 javac HelloWorld.java
 
 check "hello world" /bin/bash -c "java HelloWorld | grep "Hello, World!""
-check "java version latest installed" grep "23" <(java --version)
+check "java version latest installed" grep "24" <(java --version)
 
 # Report result
 reportResults

From b89a41f6ccda3adbbb6f270d85f653ec09c31cf6 Mon Sep 17 00:00:00 2001
From: Brigit Murtaugh <brigit.murtaugh@microsoft.com>
Date: Mon, 7 Apr 2025 12:53:09 -0700
Subject: [PATCH 360/478] Add custom instructions and bump versions (#1317)

---
 src/anaconda/devcontainer-feature.json              | 13 ++++++++++++-
 src/aws-cli/devcontainer-feature.json               | 11 +++++++++--
 src/azure-cli/devcontainer-feature.json             | 11 +++++++++--
 src/conda/devcontainer-feature.json                 | 13 ++++++++++++-
 src/desktop-lite/devcontainer-feature.json          | 13 ++++++++++++-
 src/dotnet/devcontainer-feature.json                | 11 +++++++++--
 src/git-lfs/devcontainer-feature.json               | 13 ++++++++++++-
 src/git/devcontainer-feature.json                   | 13 ++++++++++++-
 src/go/devcontainer-feature.json                    | 11 +++++++++--
 src/hugo/devcontainer-feature.json                  | 13 ++++++++++++-
 src/java/devcontainer-feature.json                  |  7 ++++++-
 src/kubectl-helm-minikube/devcontainer-feature.json | 13 ++++++++++++-
 src/nix/devcontainer-feature.json                   | 13 ++++++++++++-
 src/nvidia-cuda/devcontainer-feature.json           | 13 ++++++++++++-
 src/oryx/devcontainer-feature.json                  | 13 ++++++++++++-
 src/php/devcontainer-feature.json                   | 11 +++++++++--
 src/powershell/devcontainer-feature.json            | 11 +++++++++--
 src/ruby/devcontainer-feature.json                  | 11 +++++++++--
 src/rust/devcontainer-feature.json                  |  9 +++++++--
 src/sshd/devcontainer-feature.json                  | 13 ++++++++++++-
 src/terraform/devcontainer-feature.json             |  7 ++++++-
 21 files changed, 214 insertions(+), 29 deletions(-)

diff --git a/src/anaconda/devcontainer-feature.json b/src/anaconda/devcontainer-feature.json
index 6b92b9147..e4779279b 100644
--- a/src/anaconda/devcontainer-feature.json
+++ b/src/anaconda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "anaconda",
-    "version": "1.0.12",
+    "version": "1.0.13",
     "name": "Anaconda",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/anaconda",
     "options": {
@@ -17,6 +17,17 @@
         "CONDA_DIR": "/usr/local/conda",
         "PATH": "/usr/local/conda/bin:${PATH}"
     },
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes Anaconda and the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
+                    }
+                ]
+            }
+        }
+    },
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
diff --git a/src/aws-cli/devcontainer-feature.json b/src/aws-cli/devcontainer-feature.json
index 3c3128ac3..3de7a92a3 100644
--- a/src/aws-cli/devcontainer-feature.json
+++ b/src/aws-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "aws-cli",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "name": "AWS CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/aws-cli",
     "description": "Installs the AWS CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -18,7 +18,14 @@
         "vscode": {
             "extensions": [
                 "AmazonWebServices.aws-toolkit-vscode"
-            ]
+            ],
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes the AWS CLI along with needed dependencies pre-installed and available on the `PATH`, along with the AWS Toolkit extensions for AWS development."
+                    }
+                ]
+            }
         }
     },
     "installsAfter": [
diff --git a/src/azure-cli/devcontainer-feature.json b/src/azure-cli/devcontainer-feature.json
index a95c33dab..3b731a6b3 100644
--- a/src/azure-cli/devcontainer-feature.json
+++ b/src/azure-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "azure-cli",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "name": "Azure CLI",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/azure-cli",
   "description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -41,7 +41,14 @@
     "vscode": {
       "extensions": [
         "ms-vscode.azurecli"
-      ]
+      ],
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes the Azure CLI along with needed dependencies pre-installed and available on the `PATH`, along with the Azure CLI extension for Azure development."
+          }
+        ]
+      }
     }
   },
   "installsAfter": [
diff --git a/src/conda/devcontainer-feature.json b/src/conda/devcontainer-feature.json
index 9a2365253..163696a20 100644
--- a/src/conda/devcontainer-feature.json
+++ b/src/conda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "conda",
-    "version": "1.0.9",
+    "version": "1.0.10",
     "name": "Conda",
     "description": "A cross-platform, language-agnostic binary package manager",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
@@ -26,6 +26,17 @@
         "CONDA_SCRIPT":"/opt/conda/etc/profile.d/conda.sh",
         "PATH": "/opt/conda/bin:${PATH}"
     },
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
+                    }
+                ]
+            }
+        }
+    },
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json
index 135c812b7..72adc7c81 100644
--- a/src/desktop-lite/devcontainer-feature.json
+++ b/src/desktop-lite/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "desktop-lite",
-    "version": "1.2.5",
+    "version": "1.2.6",
     "name": "Light-weight Desktop",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
     "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
@@ -54,6 +54,17 @@
     "containerEnv": {
         "DISPLAY": ":1"
     },
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes a lightweight Fluxbox based desktop that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS Code terminal will open on the desktop automatically."
+                    }
+                ]
+            }
+        }
+    },
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index 600997dde..5d553bcd0 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
@@ -49,7 +49,14 @@
         "vscode": {
             "extensions": [
                 "ms-dotnettools.csharp"
-            ]
+            ],
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes the .NET SDK, which includes the .NET CLI and the shared runtime, pre-installed and available on the `PATH`, along with the C# language extension for .NET development."
+                    }
+                ]
+            }
         }
     },
     "installsAfter": [
diff --git a/src/git-lfs/devcontainer-feature.json b/src/git-lfs/devcontainer-feature.json
index 69f83dd86..03acfcbbf 100644
--- a/src/git-lfs/devcontainer-feature.json
+++ b/src/git-lfs/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git-lfs",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "name": "Git Large File Support (LFS)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git-lfs",
     "description": "Installs Git Large File Support (Git LFS) along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like git and curl.",
@@ -25,6 +25,17 @@
             "description": "Installs 'git-lfs' from GitHub releases instead of package manager feeds"
         }
     },
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes Git Large File Support (Git LFS) along with needed dependencies pre-installed and available on the `PATH`."
+                    }
+                ]
+            }
+        }
+    },
     "postCreateCommand": "/usr/local/share/pull-git-lfs-artifacts.sh",
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
index 87fb2ab3f..dc79008a5 100644
--- a/src/git/devcontainer-feature.json
+++ b/src/git/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
@@ -21,6 +21,17 @@
             "description": "Install from PPA if available (only supported for Ubuntu distributions)"
         }
     },
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes an up-to-date version of Git, built from source as needed, pre-installed and available on the `PATH`."
+                    }
+                ]
+            }
+        }
+    },
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
diff --git a/src/go/devcontainer-feature.json b/src/go/devcontainer-feature.json
index afb1f9128..4b0adb192 100644
--- a/src/go/devcontainer-feature.json
+++ b/src/go/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "go",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "name": "Go",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/go",
     "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.",
@@ -27,7 +27,14 @@
         "vscode": {
             "extensions": [
                 "golang.Go"
-            ]
+            ],
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes Go and common Go utilities pre-installed and available on the `PATH`, along with the Go language extension for Go development."
+                    }
+                ]
+            }
         }
     },
     "containerEnv": {
diff --git a/src/hugo/devcontainer-feature.json b/src/hugo/devcontainer-feature.json
index d6358d703..376826509 100644
--- a/src/hugo/devcontainer-feature.json
+++ b/src/hugo/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "hugo",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "name": "Hugo",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/hugo",
   "options": {
@@ -22,6 +22,17 @@
     "HUGO_DIR": "/usr/local/hugo",
     "PATH": "/usr/local/hugo/bin:${PATH}"
   },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes Hugo, a popular open-source static site generator written in Go, pre-installed and available on the `PATH`."
+          }
+        ]
+      }
+    }
+  },
   "installsAfter": [
       "ghcr.io/devcontainers/features/common-utils"
   ]
diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index c1a96abff..4198af326 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -105,7 +105,12 @@
         "vscjava.vscode-java-pack"
       ],
       "settings": {
-        "java.import.gradle.java.home": "/usr/local/sdkman/candidates/java/current"
+        "java.import.gradle.java.home": "/usr/local/sdkman/candidates/java/current",
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes Java, SDKMAN! and needed dependencies pre-installed and available on the `PATH`, along with the Java language extension pack for Java development."
+          }
+        ]
       }
     }
   },
diff --git a/src/kubectl-helm-minikube/devcontainer-feature.json b/src/kubectl-helm-minikube/devcontainer-feature.json
index 23596516c..30c621f28 100644
--- a/src/kubectl-helm-minikube/devcontainer-feature.json
+++ b/src/kubectl-helm-minikube/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "kubectl-helm-minikube",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "name": "Kubectl, Helm, and Minikube",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
     "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
@@ -44,6 +44,17 @@
             "type": "volume"
         }
     ],
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes kubectl, Helm, optionally minikube, and needed dependencies pre-installed and available on the `PATH`. When configuring Ingress for your Kubernetes cluster, note that by default Kubernetes will bind to a specific interface's IP rather than localhost or all interfaces. This is why you need to use the Kubernetes Node's IP when connecting - even if there's only one Node as in the case of Minikube."
+                    }
+                ]
+            }
+        }
+    },
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
diff --git a/src/nix/devcontainer-feature.json b/src/nix/devcontainer-feature.json
index 7fadd63fa..63723e591 100644
--- a/src/nix/devcontainer-feature.json
+++ b/src/nix/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "nix",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "name": "Nix Package Manager",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nix",
     "description": "Installs the Nix package manager and optionally a set of packages.",
@@ -40,6 +40,17 @@
             "description": "Optional comma separated list of extra lines to add to /etc/nix/nix.conf."
         }
     },
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes the Nix package manager pre-installed and available on the `PATH`. Currently `flakeUri` works best with a remote URI (e.g., `github:nixos/nixpkgs/nixpkgs-unstable#hello`) as local files need to be in the image. The dev container supports two installation models for Nix: multi-user and single user. Multi-user is the default."
+                    }
+                ]
+            }
+        }
+    },
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ],
diff --git a/src/nvidia-cuda/devcontainer-feature.json b/src/nvidia-cuda/devcontainer-feature.json
index d29074fd9..7ed66478f 100644
--- a/src/nvidia-cuda/devcontainer-feature.json
+++ b/src/nvidia-cuda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "nvidia-cuda",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "name": "NVIDIA CUDA",
   "description": "Installs shared libraries for NVIDIA CUDA.",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nvidia-cuda",
@@ -84,6 +84,17 @@
       "description": "Version of cuDNN to install"
     }
   },
+  "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes shared libraries for NVIDIA CUDA pre-installed and available on the `PATH`. It's only useful for dev containers that run on a host machine with an NVIDIA GPU. Within your dev container, use the `nvidia-smi` command to ensure that your GPU is available for CUDA. If the `nvidia-smi` command is not available, you may need to follow NVIDIA's instructions to install the NVIDIA Container Toolkit on your host machine."
+                    }
+                ]
+            }
+        }
+    },
   "installsAfter": [
       "ghcr.io/devcontainers/features/common-utils"
   ]
diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index ab9a8e782..860a39003 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "oryx",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "name": "Oryx",
     "description": "Installs the oryx CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
@@ -13,6 +13,17 @@
         "DEBIAN_FLAVOR": "focal-scm",
         "PATH": "/usr/local/oryx:${PATH}"
     },
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes the oryx CLI pre-installed and available on the `PATH`."
+                    }
+                ]
+            }
+        }
+    },
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils",
         "ghcr.io/devcontainers/features/dotnet"
diff --git a/src/php/devcontainer-feature.json b/src/php/devcontainer-feature.json
index a4edcca95..4db478230 100644
--- a/src/php/devcontainer-feature.json
+++ b/src/php/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "php",
-    "version": "1.1.3",
+    "version": "1.1.4",
     "name": "PHP",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/php",
     "options": {
@@ -29,7 +29,14 @@
                 "bmewburn.vscode-intelephense-client",
                 "xdebug.php-pack",
                 "devsense.phptools-vscode"
-            ]
+            ],
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes PHP pre-installed and available on the `PATH`, along with PHP language extensions for PHP development."
+                    }
+                ]
+            }
         }
     },
     "containerEnv": {
diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json
index 585e34630..f4867cc9e 100644
--- a/src/powershell/devcontainer-feature.json
+++ b/src/powershell/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "powershell",
-    "version": "1.5.0",
+    "version": "1.5.1",
     "name": "PowerShell",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
     "description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -33,7 +33,14 @@
             "extensions": [
                 "ms-vscode.powershell"
             ]
-        }
+        },
+        "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes PowerShell along with needed dependencies pre-installed and available on the `PATH`, along with the PowerShell extension."
+                    }
+                ]
+            }
     },
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json
index 3d7a081e8..82ae50a10 100644
--- a/src/ruby/devcontainer-feature.json
+++ b/src/ruby/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "name": "Ruby (via rvm)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
     "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
@@ -21,7 +21,14 @@
         "vscode": {
             "extensions": [
                 "shopify.ruby-lsp"
-            ]
+            ],
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies pre-installed and available on the `PATH`, along with the Ruby language extension for Ruby development."
+                    }
+                ]
+            }
         }
     },
     "containerEnv": {
diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index 9fc540c7d..8ee423050 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "rust",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "name": "Rust",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
     "description": "Installs Rust, common Rust utilities, and their required dependencies",
@@ -64,7 +64,12 @@
             "settings": {
                 "files.watcherExclude": {
                     "**/target/**": true
-                }
+                },
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes Rust, common Rust utilities, and needed dependencies pre-installed and available on the `PATH`, along with the Rust language extension for Rust development."
+                    }
+                ]
             }
         }
     },
diff --git a/src/sshd/devcontainer-feature.json b/src/sshd/devcontainer-feature.json
index a5d464f69..e400b0601 100644
--- a/src/sshd/devcontainer-feature.json
+++ b/src/sshd/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "sshd",
-    "version": "1.0.9",
+    "version": "1.0.10",
     "name": "SSH server",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/sshd",
     "description": "Adds a SSH server into a container so that you can use an external terminal, sftp, or SSHFS to interact with it.",
@@ -15,6 +15,17 @@
         }
     },
     "entrypoint": "/usr/local/share/ssh-init.sh",
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes an SSH server so that you can use an external terminal, sftp, or SSHFS to interact with it. The first time you've started the container, you will want to set a password for your user. With each connection to the container, you'll want to forward the SSH port to your local machine and use a local terminal or other tool to connect using the password you set."
+                    }
+                ]
+            }
+        }
+    },
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index ef6db8dec..d022f83c1 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.3.9",
+    "version": "1.3.10",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
@@ -65,6 +65,11 @@
                 "terraform.languageServer.enable": true,
                 "terraform.languageServer.args": [
                     "serve"
+                ],
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes the Terraform CLI and optionally TFLint and Terragrunt pre-installed and available on the `PATH`, along with the Terraform extension for Terraform development."
+                    }
                 ]
             }
         }

From 8895eb3d161d28ada3a8de761a83135e811cae3d Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Thu, 17 Apr 2025 19:41:09 +0530
Subject: [PATCH 361/478] [dotnet] - Fixing the dotnet smoke test issue with
 changes in test script. (#1335)

* Fixing the dotnet smoke test issue with changes in test script.

* Version bump
---
 src/dotnet/devcontainer-feature.json |  2 +-
 test/dotnet/dotnet_helpers.sh        | 38 ++++++++++++++++++++++++++++
 test/dotnet/install_dotnet_lts.sh    |  3 ++-
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index 5d553bcd0..fcf480583 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.2.1",
+    "version": "2.2.2",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
diff --git a/test/dotnet/dotnet_helpers.sh b/test/dotnet/dotnet_helpers.sh
index 01e554f66..0373d99c7 100644
--- a/test/dotnet/dotnet_helpers.sh
+++ b/test/dotnet/dotnet_helpers.sh
@@ -17,6 +17,44 @@ fetch_latest_version_in_channel() {
     fi
 }
 
+# Function to resolve the actual version from an aka.ms URL
+resolve_version_from_aka_ms() {
+    local normalized_channel="${1:-LTS}"  # defaulting to LTS channel
+    local normalized_product="dotnet-sdk"
+    local normalized_os="linux"
+
+    # Dynamically determine the architecture
+    local normalized_architecture
+    normalized_architecture=$(uname -m)
+    case "$normalized_architecture" in
+        x86_64) normalized_architecture="x64" ;;
+        aarch64) normalized_architecture="arm64" ;;
+        arm*) normalized_architecture="arm" ;;
+        *) 
+            echo "Unsupported architecture: $normalized_architecture"
+            return 1
+            ;;
+    esac
+
+    # Construct the aka.ms link
+    local aka_ms_link="https://aka.ms/dotnet/$normalized_channel/$normalized_product-$normalized_os-$normalized_architecture.tar.gz"
+    echo "Constructed aka.ms link: $aka_ms_link"
+
+    # Resolve the redirect URL using curl
+    local resolved_url
+    resolved_url=$(curl -s -L -o /dev/null -w "%{url_effective}" "$aka_ms_link")
+    echo "Resolved URL: $resolved_url"
+
+    # Extract the version from the resolved URL
+    IFS='/'
+    read -ra pathElems <<< "$resolved_url"
+    local count=${#pathElems[@]}
+    local specific_version="${pathElems[count-2]}"
+    unset IFS
+
+    echo "Extracted version: $specific_version"
+}
+
 # Prints the latest dotnet version
 # Usage: fetch_latest_version [<runtime>]
 # Example: fetch_latest_version
diff --git a/test/dotnet/install_dotnet_lts.sh b/test/dotnet/install_dotnet_lts.sh
index da9175c15..aebc8830a 100644
--- a/test/dotnet/install_dotnet_lts.sh
+++ b/test/dotnet/install_dotnet_lts.sh
@@ -13,7 +13,8 @@ source dev-container-features-test-lib
 source dotnet_env.sh
 source dotnet_helpers.sh
 
-expected=$(fetch_latest_version_in_channel "LTS")
+# Changing it as the dotnet SDK CDN url is not showing the right version for LTS
+expected=$(resolve_version_from_aka_ms "LTS" | cut -d' ' -f3)
 
 check "Latest LTS version installed" \
 is_dotnet_sdk_version_installed "$expected"

From eb5d299e766b983e8dd7c7e9c8b12a130c906ff8 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Mon, 21 Apr 2025 21:34:46 +0530
Subject: [PATCH 362/478] Revert "[dotnet] - Fixing the dotnet smoke test issue
 with changes in test script." (#1343)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Revert "[dotnet] - Fixing the dotnet smoke test issue with changes in test sc…"

This reverts commit 8895eb3d161d28ada3a8de761a83135e811cae3d.
---
 src/dotnet/devcontainer-feature.json |  2 +-
 test/dotnet/dotnet_helpers.sh        | 38 ----------------------------
 test/dotnet/install_dotnet_lts.sh    |  3 +--
 3 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index fcf480583..5d553bcd0 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.2.2",
+    "version": "2.2.1",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
diff --git a/test/dotnet/dotnet_helpers.sh b/test/dotnet/dotnet_helpers.sh
index 0373d99c7..01e554f66 100644
--- a/test/dotnet/dotnet_helpers.sh
+++ b/test/dotnet/dotnet_helpers.sh
@@ -17,44 +17,6 @@ fetch_latest_version_in_channel() {
     fi
 }
 
-# Function to resolve the actual version from an aka.ms URL
-resolve_version_from_aka_ms() {
-    local normalized_channel="${1:-LTS}"  # defaulting to LTS channel
-    local normalized_product="dotnet-sdk"
-    local normalized_os="linux"
-
-    # Dynamically determine the architecture
-    local normalized_architecture
-    normalized_architecture=$(uname -m)
-    case "$normalized_architecture" in
-        x86_64) normalized_architecture="x64" ;;
-        aarch64) normalized_architecture="arm64" ;;
-        arm*) normalized_architecture="arm" ;;
-        *) 
-            echo "Unsupported architecture: $normalized_architecture"
-            return 1
-            ;;
-    esac
-
-    # Construct the aka.ms link
-    local aka_ms_link="https://aka.ms/dotnet/$normalized_channel/$normalized_product-$normalized_os-$normalized_architecture.tar.gz"
-    echo "Constructed aka.ms link: $aka_ms_link"
-
-    # Resolve the redirect URL using curl
-    local resolved_url
-    resolved_url=$(curl -s -L -o /dev/null -w "%{url_effective}" "$aka_ms_link")
-    echo "Resolved URL: $resolved_url"
-
-    # Extract the version from the resolved URL
-    IFS='/'
-    read -ra pathElems <<< "$resolved_url"
-    local count=${#pathElems[@]}
-    local specific_version="${pathElems[count-2]}"
-    unset IFS
-
-    echo "Extracted version: $specific_version"
-}
-
 # Prints the latest dotnet version
 # Usage: fetch_latest_version [<runtime>]
 # Example: fetch_latest_version
diff --git a/test/dotnet/install_dotnet_lts.sh b/test/dotnet/install_dotnet_lts.sh
index aebc8830a..da9175c15 100644
--- a/test/dotnet/install_dotnet_lts.sh
+++ b/test/dotnet/install_dotnet_lts.sh
@@ -13,8 +13,7 @@ source dev-container-features-test-lib
 source dotnet_env.sh
 source dotnet_helpers.sh
 
-# Changing it as the dotnet SDK CDN url is not showing the right version for LTS
-expected=$(resolve_version_from_aka_ms "LTS" | cut -d' ' -f3)
+expected=$(fetch_latest_version_in_channel "LTS")
 
 check "Latest LTS version installed" \
 is_dotnet_sdk_version_installed "$expected"

From 6654579de4c31cd9f9f9e19e873521f502403929 Mon Sep 17 00:00:00 2001
From: sireeshajonnalagadda <sireeshajonnalagadda@github.com>
Date: Mon, 21 Apr 2025 22:05:52 +0530
Subject: [PATCH 363/478] Extending support of powershell feature for AlmaLinux
 (#1303)

* rremoved shell envwhich defaults to the shell /bin/bash

* adding  powershell support for alma linux9

* modifications to the test cases

* Delete test/common-utils/configure_zsh_as_default_shell/Dockerfile

Deleting the file as it is no longer needed
No modifications needed inside the Dockerfile set the containerEnv to work with default shell

* remove sudo

* made changes

* adding -E to preserve env variables

* correcting errors

* made the requested changes

* using dnf to check the packages

* using dnf to check the packages

* bumping up the version

* bump up the powershell version for Almalinux support

* removal of x86_64

* local tests files not required for this PR

---------

Co-authored-by: Daniel Doyle <ddoyle2017@github.com>
---
 src/powershell/install.sh                | 140 ++++++++++++++++++++---
 test/powershell/powershell_alma_linux.sh |  18 +++
 test/powershell/scenarios.json           |   6 +
 3 files changed, 148 insertions(+), 16 deletions(-)
 create mode 100644 test/powershell/powershell_alma_linux.sh

diff --git a/src/powershell/install.sh b/src/powershell/install.sh
index 4953a49d8..3da7a231b 100755
--- a/src/powershell/install.sh
+++ b/src/powershell/install.sh
@@ -17,18 +17,89 @@ POWERSHELL_MODULES="${MODULES:-""}"
 POWERSHELL_PROFILE_URL="${POWERSHELLPROFILEURL}"
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
-POWERSHELL_ARCHIVE_ARCHITECTURES="amd64"
+#MICROSOFT_GPG_KEYS_URI=$(curl https://packages.microsoft.com/keys/microsoft.asc -o /usr/share/keyrings/microsoft-archive-keyring.gpg)
+POWERSHELL_ARCHIVE_ARCHITECTURES_UBUNTU="amd64"
+POWERSHELL_ARCHIVE_ARCHITECTURES_ALMALINUX="x86_64"
 POWERSHELL_ARCHIVE_VERSION_CODENAMES="stretch buster bionic focal bullseye jammy bookworm noble"
+
+#These key servers are used to verify the authenticity of packages and repositories.
+#keyservers for ubuntu and almalinux are different so we need to specify both
 GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
 keyserver hkp://keyserver.ubuntu.com:80
 keyserver hkps://keys.openpgp.org
-keyserver hkp://keyserver.pgp.com"
+keyserver hkp://keyserver.pgp.com
+keyserver hkp://keyserver.fedoraproject.org
+keyserver hkps://keys.openpgp.org
+keyserver hkp://pgp.mit.edu
+keyserver hkp://keyserver.redhat.com"
+
 
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
     exit 1
 fi
 
+# Clean up package manager cache
+clean_cache() {
+    if [ -d "/var/cache/apt" ]; then
+        apt-get clean
+    fi
+    if [ -d "/var/cache/dnf" ]; then
+        rm -rf /var/cache/dnf/*
+    fi
+}
+# Install dependencies for RHEL/CentOS/AlmaLinux (DNF-based systems)
+install_using_dnf() {
+   dnf remove -y curl-minimal
+   dnf install -y curl gnupg2 ca-certificates dnf-plugins-core
+   dnf clean all
+   dnf makecache
+   curl --version
+}
+
+# Install PowerShell on RHEL/CentOS/AlmaLinux-based systems (DNF)
+install_powershell_dnf() {
+    # Install wget, if not already installed
+    dnf install -y wget
+
+    # Download Microsoft GPG key
+    curl https://packages.microsoft.com/keys/microsoft.asc -o /usr/share/keyrings/microsoft-archive-keyring.gpg
+    ls -l /usr/share/keyrings/microsoft-archive-keyring.gpg
+
+    # Install necessary dependencies
+    dnf install -y krb5-libs libicu openssl-libs zlib
+
+    # Add Microsoft PowerShell repository 
+        curl "https://packages.microsoft.com/config/rhel/9.0/prod.repo" > /etc/yum.repos.d/microsoft.repo
+    
+    # Install PowerShell
+     dnf install --assumeyes powershell
+}
+
+
+# Detect the package manager and OS
+detect_package_manager() {
+    if [ -f /etc/os-release ]; then
+        . /etc/os-release
+        if [[ "$ID" == "ubuntu" || "$ID" == "debian" ]]; then
+            echo "Detected Debian/Ubuntu-based system"
+            install_using_apt
+            install_pwsh
+        elif [[ "$ID" == "centos" || "$ID" == "rhel" || "$ID" == "almalinux" ]]; then
+            echo "Detected RHEL/CentOS/AlmaLinux-based system"
+            install_using_dnf
+            install_powershell_dnf
+            install_pwsh
+        else
+            echo "Unsupported Linux distribution: $ID"
+            exit 1
+        fi
+    else
+        echo "Could not detect OS"
+        exit 1
+    fi
+}
+
 # Figure out correct version of a three part version number is not passed
 find_version_from_git_tags() {
     local variable_name=$1
@@ -72,19 +143,43 @@ apt_get_update()
 }
 
 # Checks if packages are installed and installs them if not
-check_packages() {
-    if ! dpkg -s "$@" > /dev/null 2>&1; then
-        apt_get_update
-        apt-get -y install --no-install-recommends "$@"
-    fi
+   check_packages() {
+    if command -v dpkg > /dev/null 2>&1; then
+        # If dpkg exists, assume APT-based system (Debian/Ubuntu)
+        for package in "$@"; do
+            if ! dpkg -s "$package" > /dev/null 2>&1; then
+                echo "Package $package not installed. Installing using apt-get..."
+                apt-get update
+                apt-get install -y --no-install-recommends "$package"
+            else
+                echo "Package $package is already installed (APT)."
+            fi
+        done
+        elif command -v dnf > /dev/null 2>&1; then
+    for package in "$@"; do
+        if ! dnf list installed "$package" > /dev/null 2>&1; then
+            echo "Package $package not installed. Installing using dnf..."
+            dnf install -y "$package"
+        else
+            echo "Package $package is already installed (DNF)."
+        fi
+    done
+else
+    echo "Unsupported package manager. Neither APT nor DNF found."
+    return 1
+fi
+
+   
 }
 
 install_using_apt() {
     # Install dependencies
     check_packages apt-transport-https curl ca-certificates gnupg2 dirmngr
     # Import key safely (new 'signed-by' method rather than deprecated apt-key approach) and install
+   
     curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
     echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
+    
 
     # Update lists
     apt-get update -yq
@@ -201,7 +296,8 @@ install_using_github() {
     if ! type git > /dev/null 2>&1; then
         check_packages git
     fi
-    if [ "${architecture}" = "amd64" ]; then
+
+     if [ "${architecture}" = "amd64" ]; then
         architecture="x64"
     fi
     pwsh_url="https://github.com/PowerShell/PowerShell"
@@ -210,9 +306,13 @@ install_using_github() {
     if grep -q "Not Found" "${powershell_filename}"; then 
         install_prev_pwsh $pwsh_url
     fi
+    
+    # downlaod the latest version of powershell and extracting the file to powershell directory
+    wget https://github.com/PowerShell/PowerShell/releases/download/v${POWERSHELL_VERSION}/${powershell_filename}
+    mkdir ~/powershell
+    tar -xvf powershell-${POWERSHELL_VERSION}-linux-x64.tar.gz -C ~/powershell
+
 
-    # Ugly - but only way to get sha256 is to parse release HTML. Remove newlines and tags, then look for filename followed by 64 hex characters.
-    curl -sSL -o "release.html" "https://github.com/PowerShell/PowerShell/releases/tag/v${POWERSHELL_VERSION}"
     powershell_archive_sha256="$(cat release.html | tr '\n' ' ' | sed 's|<[^>]*>||g' | grep -oP "${powershell_filename}\s+\K[0-9a-fA-F]{64}" || echo '')"
     if [ -z "${powershell_archive_sha256}" ]; then
         echo "(!) WARNING: Failed to retrieve SHA256 for archive. Skipping validaiton."
@@ -233,14 +333,22 @@ if ! type pwsh >/dev/null 2>&1; then
     
     # Source /etc/os-release to get OS info
     . /etc/os-release
-    architecture="$(dpkg --print-architecture)"
+    architecture="$(uname -m)"
+    if [[ "$ID" == "ubuntu" || "$ID" == "debian" ]]; then
+        POWERSHELL_ARCHIVE_ARCHITECTURES="${POWERSHELL_ARCHIVE_ARCHITECTURES_UBUNTU}"
+    elif [[ "$ID" == "centos" || "$ID" == "rhel" || "$ID" == "almalinux" ]]; then
+        POWERSHELL_ARCHIVE_ARCHITECTURES="${POWERSHELL_ARCHIVE_ARCHITECTURES_ALMALINUX}"
+    fi
 
-    if [[ "${POWERSHELL_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[  "${POWERSHELL_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
+    if [[ "${POWERSHELL_ARCHIVE_ARCHITECTURES}" = *"${POWERSHELL_ARCHIVE_ARCHITECTURES_UBUNTU}"* ]] && [[  "${POWERSHELL_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
         install_using_apt || use_github="true"
-    else
-        use_github="true"
-    fi
+    elif [[ "${POWERSHELL_ARCHIVE_ARCHITECTURES}" = *"${POWERSHELL_ARCHIVE_ARCHITECTURES_ALMALINUX}"* ]]; then 
+        install_using_dnf && install_powershell_dnf || use_github="true"
     
+    else 
+       use_github="true"
+    fi
+
     if [ "${use_github}" = "true" ]; then
         echo "Attempting install from GitHub release..."
         install_using_github
@@ -282,4 +390,4 @@ fi
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
-echo "Done!"
+echo "Done!"
\ No newline at end of file
diff --git a/test/powershell/powershell_alma_linux.sh b/test/powershell/powershell_alma_linux.sh
new file mode 100644
index 000000000..8b653afe5
--- /dev/null
+++ b/test/powershell/powershell_alma_linux.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Extension-specific tests
+check "pwsh file is symlink" bash -c "[ -L /usr/bin/pwsh ]"
+check "pwsh symlink is registered as shell" bash -c "[ $(grep -c '/usr/bin/pwsh' /etc/shells) -ge 1 ]"
+check "pwsh target is correct" bash -c "[ $(readlink /usr/bin/pwsh) = /opt/microsoft/powershell/7/pwsh ]"
+check "pwsh owner is root" bash -c "[ $(stat -c %U /opt/microsoft/powershell/7/pwsh) = root ]"
+check "pwsh group is root" bash -c "[ $(stat -c %G /opt/microsoft/powershell/7/pwsh) = root ]"
+check "pwsh file mode is -rwxr-xr-x" bash -c "[ $(stat -c '%A' /opt/microsoft/powershell/7/pwsh) = '-rwxr-xr-x' ]"
+check "pwsh is in PATH" bash -c "command -v pwsh"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/powershell/scenarios.json b/test/powershell/scenarios.json
index 87a5b9d16..781ebaf86 100644
--- a/test/powershell/scenarios.json
+++ b/test/powershell/scenarios.json
@@ -30,5 +30,11 @@
     "features": {
       "powershell": {}
     }
+  },
+  "powershell_alma_linux": {
+    "image": "almalinux:9",
+    "features": {
+      "powershell": {} 
+    }
   }
 }

From 4f8a62ac92799f1baecc2991f717cc856d3911e2 Mon Sep 17 00:00:00 2001
From: Alberto Cavalcante <alberto@cavalcante.uk>
Date: Mon, 5 May 2025 10:07:15 -0600
Subject: [PATCH 364/478] [Go] Add Go 1.24 (#1288)

update version proposals to include Go 1.24
---
 src/go/devcontainer-feature.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/go/devcontainer-feature.json b/src/go/devcontainer-feature.json
index 4b0adb192..f98e65a7f 100644
--- a/src/go/devcontainer-feature.json
+++ b/src/go/devcontainer-feature.json
@@ -10,8 +10,8 @@
             "proposals": [
                 "latest",
                 "none",
-                "1.23",
-                "1.22"
+                "1.24",
+                "1.23"
             ],
             "default": "latest",
             "description": "Select or enter a Go version to install"

From 94ed0bbb7de8db07ba99a2929c1042c20dab1555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Janou=C5=A1ek?= <tomi@nomi.cz>
Date: Mon, 19 May 2025 18:28:54 +0200
Subject: [PATCH 365/478] fix(rust): remove rls and rust-analysis for Rust
 1.87+ compatibility (#1362)

* fix(rust): remove rls and rust-analysis for Rust 1.87+ compatibility

Rust 1.87.0 and later have removed the long-deprecated RLS and rust-analysis
components. This change updates the install script to only add rust-src,
rustfmt, and clippy, preventing build errors during feature installation. See:
https://github.com/rust-lang/rust/pull/126856
https://blog.rust-lang.org/2022/07/01/RLS-deprecation/
https://github.com/rust-lang/rustup/blob/a92432fc8b6d5d4e56ebd08ca1c45b7b1294c1bd/doc/user-guide/src/concepts/components.md#previous-components

Fixes: https://github.com/devcontainers/features/issues/1361

* Drop support for older rust version that do not have rust-analyzer

* Add rust-analyzer as replacement for rls

* Update devcontainer-feature version number

* Add proposed version options

* test(rust): Bump pinned rust version to one incl rust-analyzer

---------

Co-authored-by: neoscript <neoscripting@gmail.com>
---
 src/rust/devcontainer-feature.json  | 15 ++++++++++-----
 src/rust/install.sh                 |  2 +-
 test/rust/rust_at_pinned_version.sh |  2 +-
 test/rust/scenarios.json            |  2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index 8ee423050..ae67e0bdc 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "rust",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "name": "Rust",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
     "description": "Installs Rust, common Rust utilities, and their required dependencies",
@@ -10,6 +10,14 @@
             "proposals": [
                 "latest",
                 "none",
+                "1.87",
+                "1.86",
+                "1.85",
+                "1.84",
+                "1.83",
+                "1.82",
+                "1.81",
+                "1.80",
                 "1.79",
                 "1.78",
                 "1.77",
@@ -25,10 +33,7 @@
                 "1.67",
                 "1.66",
                 "1.65",
-                "1.64",
-                "1.63",
-                "1.62",
-                "1.61"
+                "1.64"
             ],
             "default": "latest",
             "description": "Select or enter a version of Rust to install."
diff --git a/src/rust/install.sh b/src/rust/install.sh
index 1025e46bb..d89fbe492 100755
--- a/src/rust/install.sh
+++ b/src/rust/install.sh
@@ -203,7 +203,7 @@ if [ "${UPDATE_RUST}" = "true" ]; then
     rustup update 2>&1
 fi
 echo "Installing common Rust dependencies..."
-rustup component add rls rust-analysis rust-src rustfmt clippy 2>&1
+rustup component add rust-analyzer rust-src rustfmt clippy 2>&1
 
 if [ -n "${RUSTUP_TARGETS}" ]; then
     IFS=',' read -ra targets <<< "${RUSTUP_TARGETS}"
diff --git a/test/rust/rust_at_pinned_version.sh b/test/rust/rust_at_pinned_version.sh
index 2954a7acb..e7adf7d1f 100644
--- a/test/rust/rust_at_pinned_version.sh
+++ b/test/rust/rust_at_pinned_version.sh
@@ -8,7 +8,7 @@ source dev-container-features-test-lib
 # Definition specific tests
 check "cargo version" cargo  --version
 check "rustc version" rustc  --version
-check "correct rust version" rustc  --version | grep 1.62.0
+check "correct rust version" rustc  --version | grep 1.64.0
 
 
 # Report result
diff --git a/test/rust/scenarios.json b/test/rust/scenarios.json
index de037cd29..c3466b29b 100644
--- a/test/rust/scenarios.json
+++ b/test/rust/scenarios.json
@@ -3,7 +3,7 @@
         "image": "ubuntu:focal",
         "features": {
             "rust": {
-                "version": "1.62.0"
+                "version": "1.64.0"
             }
         }
     },

From 66c73dfb87c72bf8ae76700c40864b2d7fda9967 Mon Sep 17 00:00:00 2001
From: iTiPo <iTiPo@users.noreply.github.com>
Date: Tue, 3 Jun 2025 17:55:39 +0300
Subject: [PATCH 366/478] [terraform] Add Custom Download Server Support for
 Terraform Dev Container Feature (#1364)

* Add custom download server option to download terraform

* Bump Terraform version to 1.4.0 in devcontainer feature configuration

* Update custom download server documentation and implementation to require full URL with protocol

* Remove my changes from an auto-generated file

* Remove my changes from an auto-generated file

* Add security considerations for custom download servers in documentation

* Update security considerations section in documentation with warning icon

* Return leading empty lines back to NOTES.md

* Fix formatting in custom download server scripts by ensuring consistent newline handling and invoking reportResults function.
---
 src/terraform/NOTES.md                        | 31 +++++++++++++++++++
 src/terraform/devcontainer-feature.json       |  7 ++++-
 src/terraform/install.sh                      | 14 ++++++---
 test/terraform/custom_download_server.sh      | 13 ++++++++
 .../custom_download_server_with_sentinel.sh   | 16 ++++++++++
 test/terraform/scenarios.json                 | 19 ++++++++++++
 6 files changed, 95 insertions(+), 5 deletions(-)
 create mode 100755 test/terraform/custom_download_server.sh
 create mode 100755 test/terraform/custom_download_server_with_sentinel.sh

diff --git a/src/terraform/NOTES.md b/src/terraform/NOTES.md
index 2c1540aee..74a90639e 100644
--- a/src/terraform/NOTES.md
+++ b/src/terraform/NOTES.md
@@ -4,6 +4,37 @@
 
 On August 10, 2023, HashiCorp announced a change of license for its products, including Terraform. After ~9 years of Terraform being open source under the MPL v2 license, it was to move under a non-open source BSL v1.1 license, starting from the next (1.6) version. See https://github.com/hashicorp/terraform/blob/main/LICENSE
 
+## Custom Download Server
+
+The `customDownloadServer` option allows you to specify an alternative server for downloading Terraform and Sentinel packages. This is useful for organizations that maintain internal mirrors or have proxies for HashiCorp downloads.
+
+When using this option:
+- Provide the complete URL including protocol (e.g., `https://my-mirror.example.com`)
+- The server should mirror the HashiCorp releases structure
+
+Example:
+```json
+"features": {
+    "ghcr.io/devcontainers/features/terraform:1": {
+        "customDownloadServer": "https://my-mirror.example.com"
+    }
+}
+```
+
+### ⚠️ Security Considerations
+
+When using a custom download server, be aware of the following security implications:
+
+- **Server Verification**: Always verify that the custom server is trustworthy and maintained by your organization or a trusted entity. Using an untrusted or compromised server could lead to downloading malicious software.
+  
+- **Supply Chain Risks**: Malicious actors may attempt to distribute compromised versions of Terraform that contain backdoors, cryptominers, or other harmful code.
+  
+- **Integrity Checks**: The feature performs SHA256 checks when available, but these are only as trustworthy as the source of the checksums. If both the binaries and checksums come from a compromised server, the integrity check may pass despite the software being malicious.
+  
+- **Organizational Policy**: Ensure your custom download server adheres to your organization's security policies and implements proper access controls.
+
+Always use the official HashiCorp download server (https://releases.hashicorp.com) unless you have a specific need for an alternative source.
+
 ## OS Support
 
 This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index d022f83c1..db1bacc67 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.3.10",
+    "version": "1.4.0",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
@@ -54,6 +54,11 @@
             "type": "string",
             "default": "",
             "description": "Connect to a keyserver using a proxy by configuring this option"
+        },
+        "customDownloadServer": {
+            "type": "string",
+            "default": "",
+            "description": "Custom server URL for downloading Terraform and Sentinel packages, including protocol (e.g., https://releases.hashicorp.com). If not provided, the default HashiCorp download server (https://releases.hashicorp.com) will be used."
         }
     },
     "customizations": {
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index a2aace9b4..fb7abc6ee 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -18,6 +18,7 @@ TERRAGRUNT_VERSION="${TERRAGRUNT:-"latest"}"
 INSTALL_SENTINEL=${INSTALLSENTINEL:-false}
 INSTALL_TFSEC=${INSTALLTFSEC:-false}
 INSTALL_TERRAFORM_DOCS=${INSTALLTERRAFORMDOCS:-false}
+CUSTOM_DOWNLOAD_SERVER="${CUSTOMDOWNLOADSERVER:-""}"
 
 TERRAFORM_SHA256="${TERRAFORM_SHA256:-"automatic"}"
 TFLINT_SHA256="${TFLINT_SHA256:-"automatic"}"
@@ -26,6 +27,11 @@ SENTINEL_SHA256="${SENTINEL_SHA256:-"automatic"}"
 TFSEC_SHA256="${TFSEC_SHA256:-"automatic"}"
 TERRAFORM_DOCS_SHA256="${TERRAFORM_DOCS_SHA256:-"automatic"}"
 
+HASHICORP_RELEASES_URL="https://releases.hashicorp.com"
+if [ -n "${CUSTOM_DOWNLOAD_SERVER}" ]; then
+    HASHICORP_RELEASES_URL="${CUSTOM_DOWNLOAD_SERVER}"
+fi
+
 TERRAFORM_GPG_KEY="72D7468F"
 TFLINT_GPG_KEY_URI="https://raw.githubusercontent.com/terraform-linters/tflint/v0.46.1/8CE69160EB3F2FE9.key"
 KEYSERVER_PROXY="${HTTPPROXY:-"${HTTP_PROXY:-""}"}"
@@ -357,7 +363,7 @@ find_version_from_git_tags TERRAGRUNT_VERSION "$terragrunt_url"
 install_terraform() {
     local TERRAFORM_VERSION=$1
     terraform_filename="terraform_${TERRAFORM_VERSION}_linux_${architecture}.zip"
-    curl -sSL -o ${terraform_filename} "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/${terraform_filename}"
+    curl -sSL -o ${terraform_filename} "${HASHICORP_RELEASES_URL}/terraform/${TERRAFORM_VERSION}/${terraform_filename}"
 }
 
 mkdir -p /tmp/tf-downloads
@@ -373,8 +379,8 @@ fi
 if [ "${TERRAFORM_SHA256}" != "dev-mode" ]; then
     if [ "${TERRAFORM_SHA256}" = "automatic" ]; then
         receive_gpg_keys TERRAFORM_GPG_KEY
-        curl -sSL -o terraform_SHA256SUMS https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS 
-        curl -sSL -o terraform_SHA256SUMS.sig https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS.${TERRAFORM_GPG_KEY}.sig
+        curl -sSL -o terraform_SHA256SUMS "${HASHICORP_RELEASES_URL}/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS" 
+        curl -sSL -o terraform_SHA256SUMS.sig "${HASHICORP_RELEASES_URL}/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS.${TERRAFORM_GPG_KEY}.sig"
         gpg --verify terraform_SHA256SUMS.sig terraform_SHA256SUMS
     else
         echo "${TERRAFORM_SHA256} *${terraform_filename}" > terraform_SHA256SUMS
@@ -464,7 +470,7 @@ fi
 
 if [ "${INSTALL_SENTINEL}" = "true" ]; then
     SENTINEL_VERSION="latest"
-    sentinel_releases_url='https://releases.hashicorp.com/sentinel'
+    sentinel_releases_url="${HASHICORP_RELEASES_URL}/sentinel"
     find_sentinel_version_from_url SENTINEL_VERSION ${sentinel_releases_url}
     sentinel_filename="sentinel_${SENTINEL_VERSION}_linux_${architecture}.zip"
     echo "(*) Downloading Sentinel... ${sentinel_filename}"
diff --git a/test/terraform/custom_download_server.sh b/test/terraform/custom_download_server.sh
new file mode 100755
index 000000000..9f0fdd600
--- /dev/null
+++ b/test/terraform/custom_download_server.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source dev-container-features-test-lib
+
+# Check if terraform was installed correctly and it's the expected version
+check "terraform installed" terraform --version
+check "terraform version matches" terraform --version | grep "1.6.5"
+
+# Report results
+reportResults
diff --git a/test/terraform/custom_download_server_with_sentinel.sh b/test/terraform/custom_download_server_with_sentinel.sh
new file mode 100755
index 000000000..9675b39b9
--- /dev/null
+++ b/test/terraform/custom_download_server_with_sentinel.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source dev-container-features-test-lib
+
+# Check if terraform was installed correctly and it's the expected version
+check "terraform installed" terraform --version
+check "terraform version matches" terraform --version | grep "1.6.5"
+
+# Check if sentinel was installed correctly
+check "sentinel installed" sentinel --version
+
+# Report results
+reportResults
diff --git a/test/terraform/scenarios.json b/test/terraform/scenarios.json
index 04693666c..ea6b35b09 100644
--- a/test/terraform/scenarios.json
+++ b/test/terraform/scenarios.json
@@ -70,5 +70,24 @@
                 "tflint": "0.40.0"
             }
         }
+    },
+    "custom_download_server": {
+        "image": "mcr.microsoft.com/devcontainers/base:jammy",
+        "features": {
+            "terraform": {
+                "version": "1.6.5",
+                "customDownloadServer": "https://releases.hashicorp.com"
+            }
+        }
+    },
+    "custom_download_server_with_sentinel": {
+        "image": "mcr.microsoft.com/devcontainers/base:jammy",
+        "features": {
+            "terraform": {
+                "version": "1.6.5",
+                "installSentinel": true,
+                "customDownloadServer": "https://releases.hashicorp.com"
+            }
+        }
     }
 }
\ No newline at end of file

From 540930412bfb393a335c491b657947523bcdf6b0 Mon Sep 17 00:00:00 2001
From: Mathiyarasy <157102811+Mathiyarasy@users.noreply.github.com>
Date: Thu, 5 Jun 2025 20:08:10 +0530
Subject: [PATCH 367/478] kubectl version doesn't support vX.Y.Z  (#1373)

* Fix issue when version is passed with v

* remove wcho command

* update version

* update test cases to check for specific versions
---
 .../devcontainer-feature.json                 |  2 +-
 src/kubectl-helm-minikube/install.sh          |  3 +-
 .../install_kubectl_with_version.sh           | 33 +++++++++++++++++++
 .../install_kubectl_without_version.sh        | 33 +++++++++++++++++++
 test/kubectl-helm-minikube/scenarios.json     | 22 ++++++++++++-
 5 files changed, 90 insertions(+), 3 deletions(-)
 create mode 100644 test/kubectl-helm-minikube/install_kubectl_with_version.sh
 create mode 100644 test/kubectl-helm-minikube/install_kubectl_without_version.sh

diff --git a/src/kubectl-helm-minikube/devcontainer-feature.json b/src/kubectl-helm-minikube/devcontainer-feature.json
index 30c621f28..410a909e4 100644
--- a/src/kubectl-helm-minikube/devcontainer-feature.json
+++ b/src/kubectl-helm-minikube/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "kubectl-helm-minikube",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "name": "Kubectl, Helm, and Minikube",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
     "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
diff --git a/src/kubectl-helm-minikube/install.sh b/src/kubectl-helm-minikube/install.sh
index bf6c8f535..f0cf1c946 100755
--- a/src/kubectl-helm-minikube/install.sh
+++ b/src/kubectl-helm-minikube/install.sh
@@ -54,11 +54,12 @@ fi
 find_version_from_git_tags() {
     local variable_name=$1
     local requested_version=${!variable_name}
+    requested_version="${requested_version#v}"
     if [ "${requested_version}" = "none" ]; then return; fi
     local repository=$2
     local prefix=${3:-"tags/v"}
     local separator=${4:-"."}
-    local last_part_optional=${5:-"false"}    
+    local last_part_optional=${5:-"false"}
     if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
         local escaped_separator=${separator//./\\.}
         local last_part
diff --git a/test/kubectl-helm-minikube/install_kubectl_with_version.sh b/test/kubectl-helm-minikube/install_kubectl_with_version.sh
new file mode 100644
index 000000000..6e0608f59
--- /dev/null
+++ b/test/kubectl-helm-minikube/install_kubectl_with_version.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Define expected versions
+KUBECTL_EXPECTED_VERSION="v1.33.0"
+HELM_VERSION="v3.17.3"
+MINIKUBE_VERSION="v1.31.1"
+
+set +e
+    kubectl version --client --output json | jq -r '.clientVersion.gitVersion' | grep "${KUBECTL_VERSION}"
+    exit_code=$?
+    check "kubectl-version-${KUBECTL_VERSION}-installed" bash -c "echo ${exit_code} | grep 0"
+    echo "kubectl version:"
+    kubectl version --client 
+
+    helm version --short | grep "${HELM_VERSION}"
+    exit_code=$?
+    check "helm-version-${HELM_VERSION}-installed" bash -c "echo ${exit_code} | grep 0"
+    echo "helm version:"
+    helm version --short
+
+    minikube version --short | grep "${MINIKUBE_VERSION}"  
+    exit_code=$?
+    check "minikube-version-${MINIKUBE_VERSION}-installed" bash -c "echo ${exit_code} | grep 0"
+    echo "minikube version:"
+    minikube version --short
+set -e
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/kubectl-helm-minikube/install_kubectl_without_version.sh b/test/kubectl-helm-minikube/install_kubectl_without_version.sh
new file mode 100644
index 000000000..8a73ff599
--- /dev/null
+++ b/test/kubectl-helm-minikube/install_kubectl_without_version.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Define expected versions
+KUBECTL_EXPECTED_VERSION="1.30"
+HELM_VERSION="3.16"
+MINIKUBE_VERSION="1.28"
+
+set +e
+    kubectl version --client --output json | jq -r '.clientVersion.gitVersion' | grep "${KUBECTL_VERSION}"
+    exit_code=$?
+    check "kubectl-version-${KUBECTL_VERSION}-installed" bash -c "echo ${exit_code} | grep 0"
+    echo "kubectl version:"
+    kubectl version --client 
+
+    helm version --short | grep "${HELM_VERSION}"
+    exit_code=$?
+    check "helm-version-${HELM_VERSION}-installed" bash -c "echo ${exit_code} | grep 0"
+    echo "helm version:"
+    helm version --short
+
+    minikube version --short | grep "${MINIKUBE_VERSION}"  
+    exit_code=$?
+    check "minikube-version-${MINIKUBE_VERSION}-installed" bash -c "echo ${exit_code} | grep 0"
+    echo "minikube version:"
+    minikube version --short
+set -e
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/kubectl-helm-minikube/scenarios.json b/test/kubectl-helm-minikube/scenarios.json
index b82a9966e..f18ce0756 100644
--- a/test/kubectl-helm-minikube/scenarios.json
+++ b/test/kubectl-helm-minikube/scenarios.json
@@ -18,5 +18,25 @@
                 "minikube": "none"
             }
         }
+    },
+    "install_kubectl_without_version": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "features": {
+            "kubectl-helm-minikube": {
+                "version": "1.30",
+                "helm": "3.16",
+                "minikube": "1.28"
+            }
+        }
+    },
+    "install_kubectl_with_version": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "features": {
+            "kubectl-helm-minikube": {
+                "version": "v1.33.0",
+                "helm": "v3.17.3",
+                "minikube": "v1.31.1"
+            }
+        }
     }
-}
+}
\ No newline at end of file

From 1c80e5351ab0e92018b6613edecdb440f46b0d0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Rausell=20Guiard?=
 <33221237+AlvaroRausell@users.noreply.github.com>
Date: Fri, 6 Jun 2025 09:55:50 +0100
Subject: [PATCH 368/478] Use `secrets.GITHUB_TOKEN` instead of `PAT` for docs
 generation (#1377)

* Use `GITHUB_TOKEN` intead of PAT

* Add custom branch for testing

* nothing to see here

* Back to normality
---
 .github/workflows/update-documentation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-documentation.yml b/.github/workflows/update-documentation.yml
index d74d970d5..7be3f6130 100644
--- a/.github/workflows/update-documentation.yml
+++ b/.github/workflows/update-documentation.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Create a PR for Documentation
         id: push_image_info
         env:
-          GITHUB_TOKEN: ${{ secrets.PAT }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           set -e
           echo "Start."

From 149d30312e089acdc0cbe44225e564dc60040d2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Rausell=20Guiard?=
 <33221237+AlvaroRausell@users.noreply.github.com>
Date: Fri, 6 Jun 2025 10:12:47 +0100
Subject: [PATCH 369/478] Revert "Use `secrets.GITHUB_TOKEN` instead of `PAT`
 for docs generation (#1377)" (#1378)

This reverts commit 1c80e5351ab0e92018b6613edecdb440f46b0d0b.
---
 .github/workflows/update-documentation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-documentation.yml b/.github/workflows/update-documentation.yml
index 7be3f6130..d74d970d5 100644
--- a/.github/workflows/update-documentation.yml
+++ b/.github/workflows/update-documentation.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Create a PR for Documentation
         id: push_image_info
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.PAT }}
         run: |
           set -e
           echo "Start."

From a58d0f15de71bb2270bff731e8dbbbdadaa4547f Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Wed, 11 Jun 2025 21:15:44 +0530
Subject: [PATCH 370/478] Supporting dotnet 10.0 preview version (#1305)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Supporting dotnet 10.0 preview version

* Changing the test to fetch actual LTS version.

* To resolve the conflict

* To resolve conflict again

* Version bump and adding back the azureedge url's as those should be removed by the automated version update PR

* To resolve conflict again

* Final version bump

* Reverting back the test script change as created separate PR for that.

* Ubuntu EOL changes and additional info about dotnet 10.0-preview version.

* Correcting the comment.

* Updates based on review comments to use '-preview' in the label as suffix.

* Removed reame file change as suggested.

* Update src/dotnet/README.md

* Inconsequential change to rerun the failed test

---------

Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
---
 src/dotnet/devcontainer-feature.json          |  3 +-
 src/dotnet/install.sh                         |  4 +-
 src/dotnet/scripts/vendor/README.md           |  1 +
 .../install_dotnet_multiple_versions.sh       | 20 ++------
 ...nstall_dotnet_multiple_versions_preview.sh | 47 +++++++++++++++++++
 .../dotnet/install_dotnet_specific_release.sh |  6 +--
 ...otnet_specific_release_and_feature_band.sh |  6 +--
 test/dotnet/projects/net10.0/Program.cs       | 32 +++++++++++++
 .../projects/net10.0/example_project.csproj   | 14 ++++++
 test/dotnet/scenarios.json                    | 30 ++++++++----
 10 files changed, 130 insertions(+), 33 deletions(-)
 create mode 100644 test/dotnet/install_dotnet_multiple_versions_preview.sh
 create mode 100644 test/dotnet/projects/net10.0/Program.cs
 create mode 100644 test/dotnet/projects/net10.0/example_project.csproj

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index 5d553bcd0..397f9a191 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.2.1",
+    "version": "2.3.0",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
@@ -11,6 +11,7 @@
                 "latest",
                 "lts",
                 "none",
+                "10.0-preview",
                 "8.0",
                 "7.0",
                 "6.0"
diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh
index 4e149e2f0..75f013d03 100644
--- a/src/dotnet/install.sh
+++ b/src/dotnet/install.sh
@@ -108,7 +108,9 @@ done
 check_packages wget ca-certificates icu-devtools
 
 for version in "${versions[@]}"; do
-    install_sdk "$version"
+    # Remove '-preview' from version if suffixed with the version label
+    clean_version="$(echo "$version" | sed 's/-preview$//')"
+    install_sdk "$clean_version"
 done
 
 for version in "${dotnetRuntimeVersions[@]}"; do
diff --git a/src/dotnet/scripts/vendor/README.md b/src/dotnet/scripts/vendor/README.md
index 181b53781..9e330e524 100644
--- a/src/dotnet/scripts/vendor/README.md
+++ b/src/dotnet/scripts/vendor/README.md
@@ -23,5 +23,6 @@ dotnet-install.sh [--version latest] --channel 6.0 [--quality GA]
 dotnet-install.sh [--version latest] --channel 6.0.4xx [--quality GA]
 dotnet-install.sh [--version latest] --channel 8.0 --quality preview
 dotnet-install.sh [--version latest] --channel 8.0 --quality daily
+dotnet-install.sh [--version latest] --channel 10.0 --quality preview
 dotnet-install.sh --version 6.0.413
 ```
\ No newline at end of file
diff --git a/test/dotnet/install_dotnet_multiple_versions.sh b/test/dotnet/install_dotnet_multiple_versions.sh
index 87bf8caf4..482c307b9 100644
--- a/test/dotnet/install_dotnet_multiple_versions.sh
+++ b/test/dotnet/install_dotnet_multiple_versions.sh
@@ -22,14 +22,8 @@ is_dotnet_sdk_version_installed "8.0"
 check ".NET SDK 7.0 installed" \
 is_dotnet_sdk_version_installed "7.0"
 
-check ".NET SDK 6.0 installed" \
-is_dotnet_sdk_version_installed "6.0"
-
-check ".NET SDK 5.0 installed" \
-is_dotnet_sdk_version_installed "5.0"
-
-check ".NET Core SDK 3.1 installed" \
-is_dotnet_sdk_version_installed "3.1"
+check ".NET SDK 10.0 installed" \
+is_dotnet_sdk_version_installed "10.0"
 
 check "Build example class library" \
 dotnet build projects/multitargeting
@@ -43,14 +37,8 @@ dotnet run --project projects/net8.0
 check "Build and run .NET 7.0 project" \
 dotnet run --project projects/net7.0
 
-check "Build and run .NET 6.0 project" \
-dotnet run --project projects/net6.0
-
-check "Build and run .NET 5.0 project" \
-dotnet run --project projects/net5.0
-
-check "Build and run .NET Core 3.1 project" \
-dotnet run --project projects/netcoreapp3.1
+check "Build and run .NET 10.0 project" \
+dotnet run --project projects/net10.0
 
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
diff --git a/test/dotnet/install_dotnet_multiple_versions_preview.sh b/test/dotnet/install_dotnet_multiple_versions_preview.sh
new file mode 100644
index 000000000..76bfd1ae3
--- /dev/null
+++ b/test/dotnet/install_dotnet_multiple_versions_preview.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
+# Provides the 'check' and 'reportResults' commands.
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
+# check <LABEL> <cmd> [args...]
+source dotnet_env.sh
+source dotnet_helpers.sh
+
+check ".NET SDK 9.0 installed" \
+is_dotnet_sdk_version_installed "9.0"
+
+check ".NET SDK 8.0 installed" \
+is_dotnet_sdk_version_installed "8.0"
+
+check ".NET SDK 7.0 installed" \
+is_dotnet_sdk_version_installed "7.0"
+
+check ".NET SDK 10.0 installed" \
+is_dotnet_sdk_version_installed "10.0"
+
+check "Build example class library" \
+dotnet build projects/multitargeting
+
+check "Build and run .NET 9.0 project" \
+dotnet run --project projects/net9.0
+
+check "Build and run .NET 8.0 project" \
+dotnet run --project projects/net8.0
+
+check "Build and run .NET 7.0 project" \
+dotnet run --project projects/net7.0
+
+check "Build and run .NET 10.0 project" \
+dotnet run --project projects/net10.0
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults
+
+
diff --git a/test/dotnet/install_dotnet_specific_release.sh b/test/dotnet/install_dotnet_specific_release.sh
index 207e58280..0d01bb4da 100644
--- a/test/dotnet/install_dotnet_specific_release.sh
+++ b/test/dotnet/install_dotnet_specific_release.sh
@@ -13,13 +13,13 @@ source dev-container-features-test-lib
 source dotnet_env.sh
 source dotnet_helpers.sh
 
-expected=$(fetch_latest_version_in_channel "3.1")
+expected=$(fetch_latest_version_in_channel "8.0")
 
-check ".NET Core SDK 3.1 installed" \
+check ".NET Core SDK 8.0 installed" \
 is_dotnet_sdk_version_installed "$expected"
 
 check "Build and run example project" \
-dotnet run --project projects/netcoreapp3.1 
+dotnet run --project projects/net8.0 
 
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
diff --git a/test/dotnet/install_dotnet_specific_release_and_feature_band.sh b/test/dotnet/install_dotnet_specific_release_and_feature_band.sh
index 51f5c582b..9820217f2 100644
--- a/test/dotnet/install_dotnet_specific_release_and_feature_band.sh
+++ b/test/dotnet/install_dotnet_specific_release_and_feature_band.sh
@@ -13,11 +13,11 @@ source dev-container-features-test-lib
 source dotnet_env.sh
 source dotnet_helpers.sh
 
-check ".NET SDK 5.0.3xx installed" \
-is_dotnet_sdk_version_installed "5.0.3"
+check ".NET SDK 8.0.3xx installed" \
+is_dotnet_sdk_version_installed "8.0.3"
 
 check "Build and run example project" \
-dotnet run --project projects/net5.0 
+dotnet run --project projects/net8.0 
 
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
diff --git a/test/dotnet/projects/net10.0/Program.cs b/test/dotnet/projects/net10.0/Program.cs
new file mode 100644
index 000000000..59fb426af
--- /dev/null
+++ b/test/dotnet/projects/net10.0/Program.cs
@@ -0,0 +1,32 @@
+using Newtonsoft.Json;
+
+string json = """
+{
+  "Name": "Inception",
+  "ReleaseDate": "2010-07-08T00:00:00",
+  "Genres": [
+    "Action",
+    "Thriller"
+  ]
+}
+""";
+
+Movie? m = JsonConvert.DeserializeObject<Movie>(json);
+
+if (m == default)
+{
+    Console.WriteLine("Decoding failed!");
+}
+else
+{
+    Console.WriteLine($"Movie name: {m.Name}");
+    Console.WriteLine($"Release Date: {m.ReleaseDate}");
+    Console.WriteLine($"Genres: {string.Join(", ", m.Genres)}");
+}
+
+class Movie(string? name, DateTime releaseDate, List<string>? genres)
+{
+    public string Name { get; set; } = name ?? "Default Name";
+    public DateTime ReleaseDate { get; set; } = releaseDate;
+    public List<string> Genres { get; set; } = genres ?? [];
+}
\ No newline at end of file
diff --git a/test/dotnet/projects/net10.0/example_project.csproj b/test/dotnet/projects/net10.0/example_project.csproj
new file mode 100644
index 000000000..9998d0e3a
--- /dev/null
+++ b/test/dotnet/projects/net10.0/example_project.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/test/dotnet/scenarios.json b/test/dotnet/scenarios.json
index 641753632..488dfce44 100644
--- a/test/dotnet/scenarios.json
+++ b/test/dotnet/scenarios.json
@@ -9,20 +9,20 @@
         }
     },
     "install_dotnet_specific_release": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "remoteUser": "vscode",
         "features": {
             "dotnet": {
-                "version": "3.1"
+                "version": "8.0"
             }
         }
     },
     "install_dotnet_specific_release_and_feature_band": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "remoteUser": "vscode",
         "features": {
             "dotnet": {
-                "version": "5.0.3xx"
+                "version": "8.0.3xx"
             }
         }
     },
@@ -40,17 +40,29 @@
         "remoteUser": "vscode",
         "features": {
             "dotnet": {
-                "version": "9.0",
+                "version": "10.0-preview",
                 "additionalVersions": [
+                    "9.0",
                     "8.0",
-                    "7.0",
-                    "6.0",
-                    "5.0",
-                    "3.1"
+                    "7.0"
                 ]
             }
         }
     },
+    "install_dotnet_multiple_versions_preview": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "remoteUser": "vscode",
+        "features": {
+            "dotnet": {
+                "version": "9.0",
+                "additionalVersions": [
+                    "10.0-preview",
+                    "8.0",
+                    "7.0"
+                ]
+            }
+        }
+    },    
     "install_dotnet_global_tool": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
         "remoteUser": "vscode",

From 600cda6c0b430d716c421c77e0e8138ee1a424aa Mon Sep 17 00:00:00 2001
From: Paul Taylor <178183+trxcllnt@users.noreply.github.com>
Date: Wed, 11 Jun 2025 09:16:46 -0700
Subject: [PATCH 371/478] Add `plucky` to the `docker-outside-of-docker` distro
 allow lists (#1367)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

add plucky to the docker-outside-of-docker distro allow lists

Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
---
 src/docker-outside-of-docker/devcontainer-feature.json | 2 +-
 src/docker-outside-of-docker/install.sh                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 85f598974..84ebc5c50 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.6.2",
+    "version": "1.6.3",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 97222b177..04e35db0f 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -20,8 +20,8 @@ INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
 INSTALL_DOCKER_COMPOSE_SWITCH="${INSTALLDOCKERCOMPOSESWITCH:-"true"}"
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
-DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal jammy noble"
-DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal hirsute impish jammy noble"
+DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal jammy noble plucky"
+DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal hirsute impish jammy noble plucky"
 
 set -e
 

From 3442a4e890a0163f4de4934c21aa709f172bc71d Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Wed, 11 Jun 2025 21:47:13 +0530
Subject: [PATCH 372/478] [node] - Node 18 EOL changes (#1349)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Node 18 EOL changes

* Fixing failing tests

* Updating based on review comments

---------

Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
---
 src/node/devcontainer-feature.json                |  7 +++----
 test/node/install_additional_node.sh              |  9 ++++-----
 .../install_additional_node_on_rhel_family.sh     |  8 ++++----
 test/node/install_node_22_on_jammy.sh             | 15 +++++++++++++++
 test/node/scenarios.json                          | 14 +++++++-------
 5 files changed, 33 insertions(+), 20 deletions(-)
 mode change 100644 => 100755 test/node/install_additional_node.sh
 create mode 100644 test/node/install_node_22_on_jammy.sh

diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index b8d699def..1828ba0d5 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.6.2",
+    "version": "1.6.3",
     "name": "Node.js (via nvm), yarn and pnpm",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
@@ -11,9 +11,8 @@
                 "lts",
                 "latest",
                 "none",
-                "18",
-                "16",
-                "14"
+                "22",
+                "20"
             ],
             "default": "lts",
             "description": "Select or enter a Node.js version to install"
diff --git a/test/node/install_additional_node.sh b/test/node/install_additional_node.sh
old mode 100644
new mode 100755
index 57d615a0a..527dacf25
--- a/test/node/install_additional_node.sh
+++ b/test/node/install_additional_node.sh
@@ -5,13 +5,12 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-# 'lts' is now some version of node 20...
-check "version_on_path"  node -v | grep 20
+# 'lts' is now some version of node 22...
+check "version_on_path"  node -v | grep 22
 check "pnpm" bash -c "pnpm -v | grep 8.8.0"
 
-check "v20_installed" ls -1 /usr/local/share/nvm/versions/node | grep 20
-check "v14_installed" ls -1 /usr/local/share/nvm/versions/node | grep 14.19.3
-check "v17_installed" ls -1 /usr/local/share/nvm/versions/node | grep 17.9.1
+check "v20_installed" ls -1 /usr/local/share/nvm/versions/node | grep 20.19.1
+check "v19_installed" ls -1 /usr/local/share/nvm/versions/node | grep 19.9.0
 
 
 # Report result
diff --git a/test/node/install_additional_node_on_rhel_family.sh b/test/node/install_additional_node_on_rhel_family.sh
index 3300f7f1a..a10ca82f4 100644
--- a/test/node/install_additional_node_on_rhel_family.sh
+++ b/test/node/install_additional_node_on_rhel_family.sh
@@ -5,13 +5,13 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-# 'lts' is now some version of node 20...
-check "version_on_path"  node -v | grep 20
+# 'lts' is now some version of node 22...
+check "version_on_path"  node -v | grep 22
 check "pnpm" bash -c "pnpm -v | grep 6.16.0"
 
 check "v20_installed" ls -1 /usr/local/share/nvm/versions/node | grep 20
-check "v14_installed" ls -1 /usr/local/share/nvm/versions/node | grep 14.19.3
-check "v17_installed" ls -1 /usr/local/share/nvm/versions/node | grep 17.9.1
+check "v19_installed" ls -1 /usr/local/share/nvm/versions/node | grep 19.9.0
+check "v20_installed" ls -1 /usr/local/share/nvm/versions/node | grep 20.19.1
 
 
 # Report result
diff --git a/test/node/install_node_22_on_jammy.sh b/test/node/install_node_22_on_jammy.sh
new file mode 100644
index 000000000..6f3aee27c
--- /dev/null
+++ b/test/node/install_node_22_on_jammy.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" bash -c "node --version | grep 22"
+check "pnpm" bash -c "pnpm -v | grep 8.8.0"
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+
+# Report result
+reportResults
+
diff --git a/test/node/scenarios.json b/test/node/scenarios.json
index df03128d6..d9a0c527e 100644
--- a/test/node/scenarios.json
+++ b/test/node/scenarios.json
@@ -6,13 +6,13 @@
                 "version": "lts"
             }
         }
-    },
+    },    
     "install_additional_node": {
         "image": "debian:11",
         "features": {
             "node": {
                 "version": "lts",
-                "additionalVersions": "v17.9.1,v14.19.3",
+                "additionalVersions": "v20.19.1,v19.9.0",
                 "pnpmVersion": "8.8.0"
             }
         }
@@ -22,7 +22,7 @@
         "features": {
             "node": {
                 "version": "lts",
-                "additionalVersions": "v17.9.1,v14.19.3",
+                "additionalVersions": "v20.19.1,v19.9.0",
                 "pnpmVersion": "6.16.0"
             }
         }
@@ -77,11 +77,11 @@
             }
         }
     },
-    "install_node_16_on_bionic": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-18.04",
+    "install_node_22_on_jammy": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-22.04",
         "features": {
             "node": {
-                "version": "16",
+                "version": "22",
                 "pnpmVersion":"8.8.0"
             }
         }
@@ -200,4 +200,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

From d1540c150441deaf5025f5f0c6e027ad4d607e84 Mon Sep 17 00:00:00 2001
From: Mathiyarasy <157102811+Mathiyarasy@users.noreply.github.com>
Date: Mon, 16 Jun 2025 21:37:58 +0530
Subject: [PATCH 373/478] Fix git-lfs not actually running git lfs install
 (#1381)

* add git lfs install

* update minor version
---
 src/git-lfs/devcontainer-feature.json | 4 ++--
 src/git-lfs/install.sh                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/git-lfs/devcontainer-feature.json b/src/git-lfs/devcontainer-feature.json
index 03acfcbbf..fe23e02cf 100644
--- a/src/git-lfs/devcontainer-feature.json
+++ b/src/git-lfs/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git-lfs",
-    "version": "1.2.4",
+    "version": "1.2.5",
     "name": "Git Large File Support (LFS)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git-lfs",
     "description": "Installs Git Large File Support (Git LFS) along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like git and curl.",
@@ -40,4 +40,4 @@
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
-}
+}
\ No newline at end of file
diff --git a/src/git-lfs/install.sh b/src/git-lfs/install.sh
index 554f42bbe..71066c7b3 100755
--- a/src/git-lfs/install.sh
+++ b/src/git-lfs/install.sh
@@ -270,7 +270,7 @@ if ! git lfs ls-files > /dev/null 2>&1; then
     echo "(!) Skipping automatic 'git lfs pull' because no git lfs files were detected"
     exit 0
 fi
-
+git lfs install
 git lfs pull
 EOF
 

From 40021c7991467107060de7c0b320b8ba50d1fcdc Mon Sep 17 00:00:00 2001
From: Dev containers Bot
 <126614555+devcontainers-bot@users.noreply.github.com>
Date: Tue, 17 Jun 2025 07:02:11 -0700
Subject: [PATCH 374/478] Automated documentation update (#1387)

Automated documentation update [skip ci]

Co-authored-by: github-actions <github-actions@github.com>
---
 src/azure-cli/README.md        |  1 +
 src/docker-in-docker/README.md |  2 +-
 src/nvidia-cuda/README.md      |  2 +-
 src/terraform/README.md        | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/azure-cli/README.md b/src/azure-cli/README.md
index 2e7b6d39b..217019c51 100644
--- a/src/azure-cli/README.md
+++ b/src/azure-cli/README.md
@@ -18,6 +18,7 @@ Installs the Azure CLI along with needed dependencies. Useful for base Dockerfil
 | version | Select or enter an Azure CLI version. (Available versions may vary by Linux distribution.) | string | latest |
 | extensions | Optional comma separated list of Azure CLI extensions to install in profile. | string | - |
 | installBicep | Optionally install Azure Bicep | boolean | false |
+| bicepVersion | Select or enter a Bicep version. ('latest' or a specic version such as 'v0.31.92') | string | latest |
 | installUsingPython | Install Azure CLI using Python instead of pipx | boolean | false |
 
 ## Customizations
diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index 336e458e4..ae9cd8d03 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -18,7 +18,7 @@ Create child containers *inside* a container, independent from the host's docker
 | version | Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.) | string | latest |
 | moby | Install OSS Moby build instead of Docker CE | boolean | true |
 | mobyBuildxVersion | Install a specific version of moby-buildx when using Moby | string | latest |
-| dockerDashComposeVersion | Default version of Docker Compose (latest, v2 or none) | string | latest |
+| dockerDashComposeVersion | Default version of Docker Compose (v1, v2 or none) | string | v2 |
 | azureDnsAutoDetection | Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure | boolean | true |
 | dockerDefaultAddressPool | Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24 | string | - |
 | installDockerBuildx | Install Docker Buildx | boolean | true |
diff --git a/src/nvidia-cuda/README.md b/src/nvidia-cuda/README.md
index e5b9d4012..8e243d27f 100644
--- a/src/nvidia-cuda/README.md
+++ b/src/nvidia-cuda/README.md
@@ -20,7 +20,7 @@ Installs shared libraries for NVIDIA CUDA.
 | installNvtx | Additionally install NVIDIA Tools Extension (NVTX) | boolean | false |
 | installToolkit | Additionally install NVIDIA CUDA Toolkit | boolean | false |
 | cudaVersion | Version of CUDA to install | string | 11.8 |
-| cudnnVersion | Version of cuDNN to install | string | 8.6.0.163 |
+| cudnnVersion | Version of cuDNN to install | string | automatic |
 
 ## Compatibility
 
diff --git a/src/terraform/README.md b/src/terraform/README.md
index f6f5c9636..4b37b4260 100644
--- a/src/terraform/README.md
+++ b/src/terraform/README.md
@@ -22,6 +22,7 @@ Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects la
 | installTFsec | Install tfsec, a tool to spot potential misconfigurations for your terraform code | boolean | false |
 | installTerraformDocs | Install terraform-docs, a utility to generate documentation from Terraform modules | boolean | false |
 | httpProxy | Connect to a keyserver using a proxy by configuring this option | string | - |
+| customDownloadServer | Custom server URL for downloading Terraform and Sentinel packages, including protocol (e.g., https://releases.hashicorp.com). If not provided, the default HashiCorp download server (https://releases.hashicorp.com) will be used. | string | - |
 
 ## Customizations
 
@@ -29,10 +30,43 @@ Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects la
 
 - `HashiCorp.terraform`
 
+
+
 ## Licensing
 
 On August 10, 2023, HashiCorp announced a change of license for its products, including Terraform. After ~9 years of Terraform being open source under the MPL v2 license, it was to move under a non-open source BSL v1.1 license, starting from the next (1.6) version. See https://github.com/hashicorp/terraform/blob/main/LICENSE
 
+## Custom Download Server
+
+The `customDownloadServer` option allows you to specify an alternative server for downloading Terraform and Sentinel packages. This is useful for organizations that maintain internal mirrors or have proxies for HashiCorp downloads.
+
+When using this option:
+- Provide the complete URL including protocol (e.g., `https://my-mirror.example.com`)
+- The server should mirror the HashiCorp releases structure
+
+Example:
+```json
+"features": {
+    "ghcr.io/devcontainers/features/terraform:1": {
+        "customDownloadServer": "https://my-mirror.example.com"
+    }
+}
+```
+
+### ⚠️ Security Considerations
+
+When using a custom download server, be aware of the following security implications:
+
+- **Server Verification**: Always verify that the custom server is trustworthy and maintained by your organization or a trusted entity. Using an untrusted or compromised server could lead to downloading malicious software.
+  
+- **Supply Chain Risks**: Malicious actors may attempt to distribute compromised versions of Terraform that contain backdoors, cryptominers, or other harmful code.
+  
+- **Integrity Checks**: The feature performs SHA256 checks when available, but these are only as trustworthy as the source of the checksums. If both the binaries and checksums come from a compromised server, the integrity check may pass despite the software being malicious.
+  
+- **Organizational Policy**: Ensure your custom download server adheres to your organization's security policies and implements proper access controls.
+
+Always use the official HashiCorp download server (https://releases.hashicorp.com) unless you have a specific need for an alternative source.
+
 ## OS Support
 
 This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.

From f1ae9dac3752d3b757e1935d1bb339411fc15ec5 Mon Sep 17 00:00:00 2001
From: Oliver Hathaway <oliver@labiraus.com>
Date: Wed, 18 Jun 2025 10:37:57 +0100
Subject: [PATCH 375/478] Fixes #1357 (#1358)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update VS Code extension references from 'ms-azuretools.vscode-docker' to 'ms-azuretools.vscode-containers' in Docker features

Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
---
 src/docker-in-docker/README.md                         | 2 +-
 src/docker-in-docker/devcontainer-feature.json         | 2 +-
 src/docker-outside-of-docker/README.md                 | 2 +-
 src/docker-outside-of-docker/devcontainer-feature.json | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index ae9cd8d03..3fdbcc312 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -29,7 +29,7 @@ Create child containers *inside* a container, independent from the host's docker
 
 ### VS Code Extensions
 
-- `ms-azuretools.vscode-docker`
+- `ms-azuretools.vscode-containers`
 
 ## Limitations
 
diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index fe705db37..e44f2d666 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -70,7 +70,7 @@
     "customizations": {
         "vscode": {
             "extensions": [
-                "ms-azuretools.vscode-docker"
+                "ms-azuretools.vscode-containers"
             ],
             "settings": {
                 "github.copilot.chat.codeGeneration.instructions": [
diff --git a/src/docker-outside-of-docker/README.md b/src/docker-outside-of-docker/README.md
index 04e7260f6..1794d42e8 100644
--- a/src/docker-outside-of-docker/README.md
+++ b/src/docker-outside-of-docker/README.md
@@ -28,7 +28,7 @@ Re-use the host docker socket, adding the Docker CLI to a container. Feature inv
 
 ### VS Code Extensions
 
-- `ms-azuretools.vscode-docker`
+- `ms-azuretools.vscode-containers`
 
 ## Limitations
 
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 84ebc5c50..218df825f 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -50,7 +50,7 @@
     "customizations": {
         "vscode": {
             "extensions": [
-                "ms-azuretools.vscode-docker"
+                "ms-azuretools.vscode-containers"
             ],
             "settings": {
                 "github.copilot.chat.codeGeneration.instructions": [

From b4002da8d2ad244e9faf66b6fb7facae07d3e8a2 Mon Sep 17 00:00:00 2001
From: Mike Lei <mikelei8291@users.noreply.github.com>
Date: Wed, 18 Jun 2025 17:38:38 +0800
Subject: [PATCH 376/478] Update Ubuntu PPA GPG key fingerprint (#1368)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(git): update Ubuntu PPA GPG key fingerprint

* Bump version

---------

Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
---
 src/git/devcontainer-feature.json | 2 +-
 src/git/install.sh                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
index dc79008a5..7531ad2ab 100644
--- a/src/git/devcontainer-feature.json
+++ b/src/git/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.3.3",
+    "version": "1.3.4",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
diff --git a/src/git/install.sh b/src/git/install.sh
index 976eb348d..9e59814bf 100755
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -10,7 +10,7 @@
 GIT_VERSION=${VERSION} # 'system' checks the base image first, else installs 'latest'
 USE_PPA_IF_AVAILABLE=${PPA}
 
-GIT_CORE_PPA_ARCHIVE_GPG_KEY=E1DD270288B4E6030699E45FA1715D88E1DF1F24
+GIT_CORE_PPA_ARCHIVE_GPG_KEY=F911AB184317630C59970973E363C90F8F1B6217
 
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'

From e8784d1901fc7ded6d6e74816009100239189dc1 Mon Sep 17 00:00:00 2001
From: eszense <25100769+eszense@users.noreply.github.com>
Date: Wed, 18 Jun 2025 21:12:44 +0800
Subject: [PATCH 377/478] [aws-cli] Change dependency from gnupg2 to gpg
 (#1360)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [aws-cli] Change dependency from gnupg2 to gpg

Other components of gnupg2 are not necessary for verifying the aws-cli signature.

* version bump

---------

Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
---
 src/aws-cli/devcontainer-feature.json | 2 +-
 src/aws-cli/install.sh                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/aws-cli/devcontainer-feature.json b/src/aws-cli/devcontainer-feature.json
index 3de7a92a3..54cc4b29b 100644
--- a/src/aws-cli/devcontainer-feature.json
+++ b/src/aws-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "aws-cli",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "name": "AWS CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/aws-cli",
     "description": "Installs the AWS CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/aws-cli/install.sh b/src/aws-cli/install.sh
index feb806de5..4ff9bfde6 100755
--- a/src/aws-cli/install.sh
+++ b/src/aws-cli/install.sh
@@ -68,7 +68,7 @@ check_packages() {
 
 export DEBIAN_FRONTEND=noninteractive
 
-check_packages curl ca-certificates gnupg2 dirmngr unzip bash-completion less
+check_packages curl ca-certificates gpg dirmngr unzip bash-completion less
 
 verify_aws_cli_gpg_signature() {
     local filePath=$1

From 636f6db098fb30ada7171571f17d8cb1b4b5dd49 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Fri, 27 Jun 2025 18:32:01 +0530
Subject: [PATCH 378/478] [nvidia-cuda] - Ubuntu focal EOL change for
 nvidia-cuda (#1366)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Ubuntu focal EOL change for nvidia-cuda

* Major version bump

* Major version bump correctly as per the review comment.

* Updating the correct version in readme file as pointed out in review.

* To re-run the tests

---------

Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
---
 src/nvidia-cuda/README.md                 | 2 +-
 src/nvidia-cuda/devcontainer-feature.json | 2 +-
 src/nvidia-cuda/install.sh                | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/nvidia-cuda/README.md b/src/nvidia-cuda/README.md
index 8e243d27f..7982cfc9e 100644
--- a/src/nvidia-cuda/README.md
+++ b/src/nvidia-cuda/README.md
@@ -7,7 +7,7 @@ Installs shared libraries for NVIDIA CUDA.
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/nvidia-cuda:1": {}
+    "ghcr.io/devcontainers/features/nvidia-cuda:2": {}
 }
 ```
 
diff --git a/src/nvidia-cuda/devcontainer-feature.json b/src/nvidia-cuda/devcontainer-feature.json
index 7ed66478f..7dd46f7c0 100644
--- a/src/nvidia-cuda/devcontainer-feature.json
+++ b/src/nvidia-cuda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "nvidia-cuda",
-  "version": "1.2.1",
+  "version": "2.0.0",
   "name": "NVIDIA CUDA",
   "description": "Installs shared libraries for NVIDIA CUDA.",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nvidia-cuda",
diff --git a/src/nvidia-cuda/install.sh b/src/nvidia-cuda/install.sh
index a1055ac45..ca309fb25 100644
--- a/src/nvidia-cuda/install.sh
+++ b/src/nvidia-cuda/install.sh
@@ -46,7 +46,8 @@ check_packages wget ca-certificates
 
 # Add NVIDIA's package repository to apt so that we can download packages
 # Always use the ubuntu2004 repo because the other repos (e.g., debian11) are missing packages
-NVIDIA_REPO_URL="https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64"
+# Updating the repo to ubuntu2204 as ubuntu 20.04 is going out of support. 
+NVIDIA_REPO_URL="https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64"
 KEYRING_PACKAGE="cuda-keyring_1.0-1_all.deb"
 KEYRING_PACKAGE_URL="$NVIDIA_REPO_URL/$KEYRING_PACKAGE"
 KEYRING_PACKAGE_PATH="$(mktemp -d)"

From 14a4c4c254d5ed2aa78642928a1834754a9df809 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Fri, 27 Jun 2025 18:34:05 +0530
Subject: [PATCH 379/478] [desktop-lite] - Adding support for noVnc latest
 version in the feature (#1395)

* [desktop-lite] - Adding support for noVNC latest version in the feature

* Corrections based on review comments.

* Correcting the logger statement.
---
 src/desktop-lite/devcontainer-feature.json    |  6 ++--
 src/desktop-lite/install.sh                   | 26 ++++++++++++---
 test/desktop-lite/scenarios.json              |  8 +++++
 ...c_novnc_started_noVNC_old_launch_script.sh | 33 +++++++++++++++++++
 4 files changed, 65 insertions(+), 8 deletions(-)
 create mode 100644 test/desktop-lite/test_xtigervnc_novnc_started_noVNC_old_launch_script.sh

diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json
index 72adc7c81..d33529873 100644
--- a/src/desktop-lite/devcontainer-feature.json
+++ b/src/desktop-lite/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "desktop-lite",
-    "version": "1.2.6",
+    "version": "1.2.7",
     "name": "Light-weight Desktop",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
     "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
@@ -16,9 +16,9 @@
         "noVncVersion": {
             "type": "string",
             "proposals": [
-                "1.2.0"
+                "1.6.0"
             ],
-            "default": "1.2.0",
+            "default": "1.6.0",
             "description": "The noVNC version to use"
         },
         "password": {
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh
index 6e6fff265..bb659e784 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -7,7 +7,7 @@
 # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/desktop-lite.md
 # Maintainer: The VS Code and Codespaces Teams
 
-NOVNC_VERSION="${NOVNCVERSION:-"1.2.0"}" # TODO: Add in a 'latest' auto-detect and swap name to 'version'
+NOVNC_VERSION="${NOVNCVERSION:-"1.6.0"}" # TODO: Add in a 'latest' auto-detect and swap name to 'version'
 VNC_PASSWORD=${PASSWORD:-"vscode"}
 if [ "$VNC_PASSWORD" = "noPassword" ]; then
     unset VNC_PASSWORD
@@ -355,6 +355,13 @@ log()
     echo -e "[\$(date)] \$@" | sudoIf tee -a \$LOG > /dev/null
 }
 
+# Function to compare versions
+version_gt() {
+    # returns 0 if \$1 > \$2
+    [ "\$(printf '%s\n' "\$2" "\$1" | sort -V | head -n1)" != "\$1" ]
+}
+
+
 log "** SCRIPT START **"
 
 # Start dbus.
@@ -386,11 +393,20 @@ else
 fi
 
 # Spin up noVNC if installed and not running.
-if [ -d "/usr/local/novnc" ] && [ "\$(ps -ef | grep /usr/local/novnc/noVNC*/utils/launch.sh | grep -v grep)" = "" ]; then
-    keepRunningInBackground "noVNC" sudoIf "/usr/local/novnc/noVNC*/utils/launch.sh --listen ${NOVNC_PORT} --vnc localhost:${VNC_PORT}"
-    log "noVNC started."
+if [ -d "/usr/local/novnc" ]; then
+    if [ "\$(ps -ef | grep /usr/local/novnc/noVNC*/utils/launch.sh | grep -v grep)" = "" ] && [ "\$(ps -ef | grep /usr/local/novnc/noVNC*/utils/novnc_proxy | grep -v grep)" = "" ]; then
+        if version_gt "${NOVNC_VERSION}" "1.2.0"; then
+            keepRunningInBackground "noVNC" sudoIf "/usr/local/novnc/noVNC*/utils/novnc_proxy --listen ${NOVNC_PORT} --vnc localhost:${VNC_PORT}"
+            log "noVNC started with novnc_proxy."
+        else
+            keepRunningInBackground "noVNC" sudoIf "/usr/local/novnc/noVNC*/utils/launch.sh --listen ${NOVNC_PORT} --vnc localhost:${VNC_PORT}"
+            log "noVNC started with launch.sh."
+        fi
+    else
+        log "noVNC is already running."
+    fi
 else
-    log "noVNC is already running or not installed."
+    log "noVNC is not installed."
 fi
 
 # Run whatever was passed in
diff --git a/test/desktop-lite/scenarios.json b/test/desktop-lite/scenarios.json
index ab920ddb9..548fada6d 100644
--- a/test/desktop-lite/scenarios.json
+++ b/test/desktop-lite/scenarios.json
@@ -5,6 +5,14 @@
             "desktop-lite": {}
         }
     },
+    "test_xtigervnc_novnc_started_noVNC_old_launch_script": {
+        "image": "ubuntu:noble",
+        "features": {
+            "desktop-lite": {
+                "noVncVersion": "1.2.0"
+            }
+        }
+    },    
     "test_vnc_resolution_as_container_env_var": {
         "image": "ubuntu:noble",
         "features": {
diff --git a/test/desktop-lite/test_xtigervnc_novnc_started_noVNC_old_launch_script.sh b/test/desktop-lite/test_xtigervnc_novnc_started_noVNC_old_launch_script.sh
new file mode 100644
index 000000000..5e0898c7d
--- /dev/null
+++ b/test/desktop-lite/test_xtigervnc_novnc_started_noVNC_old_launch_script.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Check if xtigervnc & noVnc processes are running after successful installation and initialization
+check_process_running() {
+    port=$1
+    # Get process id of process running on specific port
+    PID=$(lsof -i :$port | awk 'NR==2 {print $2}')
+    if [ -n "$PID" ]; then
+        CMD=$(ps -p $PID -o cmd --no-headers)
+        GREEN='\033[0;32m'; NC='\033[0m'; RED='\033[0;31m'; YELLOW='\033[0;33m';
+        echo -e "${GREEN}Command running on port $port: ${YELLOW}$CMD${NC}"
+    else
+        echo -e "${RED}No process found listening on port $port.${NC}"
+    fi
+}
+
+check "Whether xtigervnc is Running" check_process_running 5901
+sleep 1
+check "Whether no_vnc is Running" check_process_running 6080
+
+check "desktop-init-exists" bash -c "ls /usr/local/share/desktop-init.sh"
+check "log-exists" bash -c "ls /tmp/container-init.log"
+check "log file contents" bash -c "cat /tmp/container-init.log"
+
+# Report result
+reportResults
+
+

From 2e1d523f9c7ad876cea6faa94bfe601d62c1008b Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Fri, 27 Jun 2025 18:36:01 +0530
Subject: [PATCH 380/478] Ubuntu focal(20.04) EOL changes in features test
 scripts (#1370)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Ubuntu focal(20.04) EOL changes in features test scripts

* Version bump and dotnet rollback.

* Reverting the version bump & adding test for Oryx test script.

---------

Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
---
 src/git/install.sh                            |  6 ++++
 test/_global/scenarios.json                   |  4 +--
 .../devcontainer-custom-home/Dockerfile       |  2 +-
 .../common-utils/devcontainer-info/Dockerfile |  8 ++++-
 test/common-utils/noble.sh                    | 15 ++++++++
 test/common-utils/scenarios.json              | 17 +++-------
 test/conda/scenarios.json                     |  2 +-
 .../docker_specific_moby_buildx.sh            |  2 +-
 test/docker-in-docker/scenarios.json          | 16 ++++-----
 .../docker_specific_moby_buildx.sh            |  2 +-
 test/docker-outside-of-docker/scenarios.json  | 34 +++++++++----------
 test/git/install_git_from_ppa_jammy.sh        | 17 ++++++++++
 test/git/install_git_from_src_noble.sh        | 18 ++++++++++
 test/git/scenarios.json                       | 19 +++--------
 test/github-cli/scenarios.json                |  2 +-
 test/java/scenarios.json                      | 16 ++++-----
 test/oryx/scenarios.json                      |  8 ++---
 test/php/install_additional_php.sh            |  6 ++--
 test/php/scenarios.json                       | 12 +++----
 test/python/scenarios.json                    | 12 +++----
 test/ruby/scenarios.json                      |  2 +-
 test/rust/scenarios.json                      |  4 +--
 22 files changed, 135 insertions(+), 89 deletions(-)
 create mode 100644 test/common-utils/noble.sh
 create mode 100644 test/git/install_git_from_ppa_jammy.sh
 create mode 100644 test/git/install_git_from_src_noble.sh

diff --git a/src/git/install.sh b/src/git/install.sh
index 9e59814bf..4124fc80c 100755
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -270,6 +270,12 @@ elif [ "${ADJUSTED_ID}" = "rhel" ]; then
     if ! type curl > /dev/null 2>&1; then
         check_packages curl
     fi
+    if ! type cmp > /dev/null 2>&1; then
+        check_packages diffutils
+    fi
+    if ! type awk > /dev/null 2>&1; then
+        check_packages gawk
+    fi        
     if [ $ID = "mariner" ]; then
         check_packages glibc-devel kernel-headers binutils
     fi
diff --git a/test/_global/scenarios.json b/test/_global/scenarios.json
index 2228c7d6e..184f8e87b 100644
--- a/test/_global/scenarios.json
+++ b/test/_global/scenarios.json
@@ -1,6 +1,6 @@
 {
     "all_the_clis": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "aws-cli": {},
             "azure-cli": {},
@@ -8,7 +8,7 @@
         }
     },
     "node_java_rust": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "node": {},
             "java": {},
diff --git a/test/common-utils/devcontainer-custom-home/Dockerfile b/test/common-utils/devcontainer-custom-home/Dockerfile
index a94af4bc1..824e1e343 100644
--- a/test/common-utils/devcontainer-custom-home/Dockerfile
+++ b/test/common-utils/devcontainer-custom-home/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:noble
 
 RUN groupadd customUser -g 30000 && \
     useradd customUser -u 30000 -g 30000 --create-home --home-dir /customHome
diff --git a/test/common-utils/devcontainer-info/Dockerfile b/test/common-utils/devcontainer-info/Dockerfile
index 28247d907..07d7a1caf 100644
--- a/test/common-utils/devcontainer-info/Dockerfile
+++ b/test/common-utils/devcontainer-info/Dockerfile
@@ -1,3 +1,9 @@
-FROM ubuntu:focal
+FROM ubuntu:noble
 
 COPY meta.env /usr/local/etc/dev-containers/meta.env
+
+RUN if id "ubuntu" &>/dev/null; then \
+            echo "Deleting user 'ubuntu' for noble" && userdel -f -r ubuntu || echo "Failed to delete ubuntu user for noble"; \  
+        else \
+            echo "User 'ubuntu' does not exist for noble"; \ 
+    fi
diff --git a/test/common-utils/noble.sh b/test/common-utils/noble.sh
new file mode 100644
index 000000000..78ad146e3
--- /dev/null
+++ b/test/common-utils/noble.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${VERSION_CODENAME}" = "noble"
+
+# Report result
+reportResults
+
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index 4ffbde1ac..5a8ec87cd 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -1,25 +1,18 @@
 {
-    "bionic": {
-        "image": "ubuntu:bionic",
-        "remoteUser": "devcontainer",
-        "features": {
-            "common-utils": {}
-        }
-    },
-    "focal": {
-        "image": "ubuntu:focal",
+    "jammy": {
+        "image": "ubuntu:jammy",
         "remoteUser": "devcontainer",
         "features": {
             "common-utils": {}
         }
     },
-    "jammy": {
-        "image": "ubuntu:jammy",
+    "noble": {
+        "image": "ubuntu:noble",
         "remoteUser": "devcontainer",
         "features": {
             "common-utils": {}
         }
-    },
+    },    
     "buster": {
         "image": "debian:buster",
         "remoteUser": "devcontainer",
diff --git a/test/conda/scenarios.json b/test/conda/scenarios.json
index 9cc2fc136..ef930a17c 100644
--- a/test/conda/scenarios.json
+++ b/test/conda/scenarios.json
@@ -1,6 +1,6 @@
 {
     "install_conda": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "conda": {
                 "version": "4.12.0",
diff --git a/test/docker-in-docker/docker_specific_moby_buildx.sh b/test/docker-in-docker/docker_specific_moby_buildx.sh
index 1ca2b20bd..b2d4610a1 100755
--- a/test/docker-in-docker/docker_specific_moby_buildx.sh
+++ b/test/docker-in-docker/docker_specific_moby_buildx.sh
@@ -5,7 +5,7 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 # Definition specific tests
-check "moby-buildx" bash -c "dpkg-query -W moby-buildx  | grep -E '0.12.0'"
+check "moby-buildx" bash -c "dpkg-query -W moby-buildx  | grep -E '0.14.0'"
 
 check "docker-buildx" bash -c "docker buildx version"
 check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index 57681b799..1587bda56 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -1,6 +1,6 @@
 {
     "docker_build_fallback_compose": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "docker-in-docker": {
                 "version": "latest",
@@ -9,7 +9,7 @@
         }
     },
     "dockerIp6tablesDisabledTest": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "docker-in-docker": {
                 "version": "27.0.3",
@@ -56,7 +56,7 @@
         "remoteUser": "node"
     },
     "docker_build_2": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "docker-in-docker": {
                 "version": "latest",
@@ -106,7 +106,7 @@
         }
     },
     "docker_compose_v1": {
-        "image": "mcr.microsoft.com/devcontainers/base:focal",
+        "image": "mcr.microsoft.com/devcontainers/base:noble",
         "features": {
             "docker-in-docker": {
                 "moby": true,
@@ -116,7 +116,7 @@
         }
     },
     "docker_compose_v2": {
-        "image": "mcr.microsoft.com/devcontainers/base:focal",
+        "image": "mcr.microsoft.com/devcontainers/base:noble",
         "features": {
             "docker-in-docker": {
                 "moby": true,
@@ -126,7 +126,7 @@
         }
     },
     "docker_build_fallback_buildx": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "docker-in-docker": {
                 "version": "latest",
@@ -135,10 +135,10 @@
         }
     },
     "docker_specific_moby_buildx": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "docker-in-docker": {
-                "mobyBuildxVersion": "0.12.0"
+                "mobyBuildxVersion": "0.14.0"
             }
         }
     },
diff --git a/test/docker-outside-of-docker/docker_specific_moby_buildx.sh b/test/docker-outside-of-docker/docker_specific_moby_buildx.sh
index 929fa6080..8428170e9 100755
--- a/test/docker-outside-of-docker/docker_specific_moby_buildx.sh
+++ b/test/docker-outside-of-docker/docker_specific_moby_buildx.sh
@@ -5,7 +5,7 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 # Definition specific tests
-check "moby-buildx" bash -c "dpkg-query -W moby-buildx  | grep -E '0.12.0'"
+check "moby-buildx" bash -c "dpkg-query -W moby-buildx  | grep -E '0.14.0'"
 
 check "docker-buildx" bash -c "docker buildx version"
 check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
diff --git a/test/docker-outside-of-docker/scenarios.json b/test/docker-outside-of-docker/scenarios.json
index 7d3301f12..7125b4715 100644
--- a/test/docker-outside-of-docker/scenarios.json
+++ b/test/docker-outside-of-docker/scenarios.json
@@ -1,6 +1,6 @@
 {
     "docker_build_compose_fallback": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": false,
@@ -10,7 +10,7 @@
         "containerUser": "vscode"
     },
     "docker_init_moby": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": true
@@ -19,7 +19,7 @@
         "containerUser": "vscode"
     },
     "docker_init": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": false
@@ -46,7 +46,7 @@
         "containerUser": "vscode"
     },
     "docker_build": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": false,
@@ -56,7 +56,7 @@
         "containerUser": "vscode"
     },
     "docker_build_moby": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": true
@@ -65,10 +65,10 @@
         "containerUser": "vscode"
     },
     "docker_build_no_buildx": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
-                "version": "20",
+                "version": "26",
                 "moby": false,
                 "installDockerBuildx": false
             }
@@ -76,10 +76,10 @@
         "containerUser": "vscode"
     },
     "docker_build_no_buildx_moby": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
-                "version": "20",
+                "version": "26",
                 "moby": true,
                 "installDockerBuildx": false
             }
@@ -87,7 +87,7 @@
         "containerUser": "vscode"
     },
     "docker_dash_compose_v1": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": false,
@@ -97,7 +97,7 @@
         "containerUser": "vscode"
     },
     "docker_dash_compose_v1_moby": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": true,
@@ -107,7 +107,7 @@
         "containerUser": "vscode"
     },
     "docker_dash_compose_v2": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": false,
@@ -117,7 +117,7 @@
         "containerUser": "vscode"
     },
     "docker_dash_compose_v2_moby": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": true,
@@ -136,10 +136,10 @@
         "remoteUser": "node"
     },
     "docker_specific_moby_buildx": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "docker-outside-of-docker": {
-                "mobyBuildxVersion": "0.12.0"
+                "mobyBuildxVersion": "0.14.0"
             }
         }
     },
@@ -154,7 +154,7 @@
         }
     },
     "docker_not_install_compose_switch": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "dockerDashComposeVersion": "latest",
@@ -164,7 +164,7 @@
         "containerUser": "vscode"
     },
     "docker_install_compose_switch": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "dockerDashComposeVersion": "latest",
diff --git a/test/git/install_git_from_ppa_jammy.sh b/test/git/install_git_from_ppa_jammy.sh
new file mode 100644
index 000000000..45e4a20bc
--- /dev/null
+++ b/test/git/install_git_from_ppa_jammy.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
+
diff --git a/test/git/install_git_from_src_noble.sh b/test/git/install_git_from_src_noble.sh
new file mode 100644
index 000000000..337226fdc
--- /dev/null
+++ b/test/git/install_git_from_src_noble.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+check "gettext" dpkg-query -l gettext
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
+
diff --git a/test/git/scenarios.json b/test/git/scenarios.json
index 0f5d522b3..7feff6564 100644
--- a/test/git/scenarios.json
+++ b/test/git/scenarios.json
@@ -1,6 +1,6 @@
 {
     "install_git_from_src": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "git": {
                 "version": "latest",
@@ -26,8 +26,8 @@
             }
         }
     },
-    "install_git_from_ppa_bionic": {
-        "image": "ubuntu:bionic",
+    "install_git_from_ppa_jammy": {
+        "image": "ubuntu:jammy",
         "features": {
             "git": {
                 "version": "latest",
@@ -35,8 +35,8 @@
             }
         }
     },
-    "install_git_from_src_bionic": {
-        "image": "ubuntu:bionic",
+    "install_git_from_src_noble": {
+        "image": "ubuntu:noble",
         "features": {
             "git": {
                 "version": "latest",
@@ -53,15 +53,6 @@
             }
         }
     },
-    "install_git_from_src_buster": {
-        "image": "debian:buster",
-        "features": {
-            "git": {
-                "version": "latest",
-                "ppa": "false"
-            }
-        }
-    },
     "install_git_from_src_centos-7": {
         "image": "centos:centos7",
         "features": {
diff --git a/test/github-cli/scenarios.json b/test/github-cli/scenarios.json
index d41019aeb..ea6eb09d1 100644
--- a/test/github-cli/scenarios.json
+++ b/test/github-cli/scenarios.json
@@ -1,6 +1,6 @@
 {
     "install_git_cli_from_release": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "github-cli": {
                 "version": "latest",
diff --git a/test/java/scenarios.json b/test/java/scenarios.json
index f28fceb41..0441f0aa6 100644
--- a/test/java/scenarios.json
+++ b/test/java/scenarios.json
@@ -1,6 +1,6 @@
 {
     "install_from_non_default_distro": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "java": {
                 "version": "21",
@@ -9,7 +9,7 @@
         }
     },
     "install_latest_version": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "java": {
                 "version": "latest"
@@ -17,7 +17,7 @@
         }
     },
     "install_lts_version": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "java": {
                 "version": "lts"
@@ -25,7 +25,7 @@
         }
     },
     "install_additional_java": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "java": {
                 "version": "11",
@@ -34,7 +34,7 @@
         }
     },
     "install_ant_and_gradle_and_maven_and_groovy_for_user": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "remoteUser": "vscode",
         "features": {
             "common-utils": {
@@ -50,7 +50,7 @@
         }
     },
     "install_ant_and_gradle_and_maven_and_groovy": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "java": {
                 "version": "latest",
@@ -62,7 +62,7 @@
         }
     },
     "install_ant_and_gradle_and_maven_and_groovy_with_specific_version": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "java": {
                 "version": "latest",
@@ -78,7 +78,7 @@
         }
     },
     "install_non_conventional_version": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "java": {
                 "version": "21",
diff --git a/test/oryx/scenarios.json b/test/oryx/scenarios.json
index d7a70f319..4b3643590 100644
--- a/test/oryx/scenarios.json
+++ b/test/oryx/scenarios.json
@@ -1,6 +1,6 @@
 {
     "install_dotnet_and_oryx": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "dotnet": {
                 "version": "8.0",
@@ -11,7 +11,7 @@
         }
     },
     "install_older_dotnet_and_oryx": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "dotnet": {
                 "version": "7.0"
@@ -20,7 +20,7 @@
         }
     },
     "install_prev_dotnet_and_oryx": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "dotnet": {
                 "version": "6.0"
@@ -29,7 +29,7 @@
         }
     },
     "test_python_project": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "python": {
                 "version": "3.10.4",
diff --git a/test/php/install_additional_php.sh b/test/php/install_additional_php.sh
index f22315a61..c1c085b5c 100644
--- a/test/php/install_additional_php.sh
+++ b/test/php/install_additional_php.sh
@@ -5,9 +5,9 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-check "php version 8.1.4 installed as default" php --version | grep 8.1.4
-check "php version 8.0.17 installed"   ls -l /usr/local/php | grep 8.0.17
-check "php version 8.0.3 installed"  ls -l /usr/local/php | grep 8.0.3
+check "php version 8.4.2 installed as default" php --version | grep 8.4.2
+check "php version 8.3.14 installed"   ls -l /usr/local/php | grep 8.3.14
+check "php version 8.2.27 installed"  ls -l /usr/local/php | grep 8.2.27
 
 check "composer-version" composer --version
 
diff --git a/test/php/scenarios.json b/test/php/scenarios.json
index e53bb67ce..8aa25cbff 100644
--- a/test/php/scenarios.json
+++ b/test/php/scenarios.json
@@ -1,15 +1,15 @@
 {
     "install_additional_php": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "php": {
-                "version": "8.1.4",
-                "additionalVersions": "8.0.17,8.0.3"
+                "version": "8.4.2",
+                "additionalVersions": "8.3.14,8.2.27"
             }
         }
     },
     "install_php_8": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "php": {
                 "version": "8"
@@ -17,7 +17,7 @@
         }
     },
     "install_php_8_2": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "php": {
                 "version": "8.2"
@@ -34,7 +34,7 @@
         }
     },
     "test_php_fallback": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "php": {
                 "version": "latest"
diff --git a/test/python/scenarios.json b/test/python/scenarios.json
index 9dc37e16c..a489ee8e6 100644
--- a/test/python/scenarios.json
+++ b/test/python/scenarios.json
@@ -40,7 +40,7 @@
         }
     },
     "install_additional_python": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "python": {
                 "version": "3.11",
@@ -58,7 +58,7 @@
         }
     },
     "install_jupyterlab": {
-        "image": "mcr.microsoft.com/devcontainers/base:focal",
+        "image": "mcr.microsoft.com/devcontainers/base:noble",
         "remoteUser": "vscode",
         "features": {
             "python": {
@@ -83,7 +83,7 @@
         }
     },
     "install_additional_jupyterlab": {
-        "image": "mcr.microsoft.com/devcontainers/base:focal",
+        "image": "mcr.microsoft.com/devcontainers/base:noble",
         "remoteUser": "vscode",
         "features": {
             "python": {
@@ -155,7 +155,7 @@
         }
     },
     "install_jupyterlab_ubuntu": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "python": {
                 "version": "3.11",
@@ -239,7 +239,7 @@
         }
     },
     "install_python_shared_lib_deb": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "python": {
                 "version": "3.11",
@@ -257,7 +257,7 @@
         }
     },
     "update_alternatives_switchable_versions": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "python": {
                 "version": "3.11",
diff --git a/test/ruby/scenarios.json b/test/ruby/scenarios.json
index dd59d30fb..7a13f7004 100644
--- a/test/ruby/scenarios.json
+++ b/test/ruby/scenarios.json
@@ -1,6 +1,6 @@
 {
     "install_additional_ruby": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "ruby": {
                 "version": "3.4.2",
diff --git a/test/rust/scenarios.json b/test/rust/scenarios.json
index c3466b29b..83df710fb 100644
--- a/test/rust/scenarios.json
+++ b/test/rust/scenarios.json
@@ -1,6 +1,6 @@
 {
     "rust_at_pinned_version": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "rust": {
                 "version": "1.64.0"
@@ -8,7 +8,7 @@
         }
     },
     "rust_with_target": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "rust": {
                 "version": "latest",

From a69dd5c8be227b635c007233e1a840e3e336fd05 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Mon, 30 Jun 2025 18:21:29 +0530
Subject: [PATCH 381/478] [rust] - Extending the feature support for non-debian
 platforms. (#1376)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [rust] - Extending the feature support for non-debian platforms.

* Removing unused variables.

* corrections done based on review comments.

---------

Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
---
 src/rust/README.md                  |   7 +-
 src/rust/devcontainer-feature.json  |   2 +-
 src/rust/install.sh                 | 241 +++++++++++++++++++++++++---
 test/rust/rust_with_almalinux_8.sh  |  16 ++
 test/rust/rust_with_almalinux_9.sh  |  16 ++
 test/rust/rust_with_centos.sh       |  16 ++
 test/rust/rust_with_fedora.sh       |  16 ++
 test/rust/rust_with_mariner.sh      |  16 ++
 test/rust/rust_with_rockylinux_8.sh |  16 ++
 test/rust/rust_with_rockylinux_9.sh |  16 ++
 test/rust/scenarios.json            |  65 +++++++-
 11 files changed, 399 insertions(+), 28 deletions(-)
 create mode 100644 test/rust/rust_with_almalinux_8.sh
 create mode 100644 test/rust/rust_with_almalinux_9.sh
 create mode 100644 test/rust/rust_with_centos.sh
 create mode 100644 test/rust/rust_with_fedora.sh
 create mode 100644 test/rust/rust_with_mariner.sh
 create mode 100644 test/rust/rust_with_rockylinux_8.sh
 create mode 100644 test/rust/rust_with_rockylinux_9.sh

diff --git a/src/rust/README.md b/src/rust/README.md
index c19855aac..022f8abbe 100644
--- a/src/rust/README.md
+++ b/src/rust/README.md
@@ -31,7 +31,12 @@ Installs Rust, common Rust utilities, and their required dependencies
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, RockyLinux 
+and Mariner distributions with the `apt`, `yum`, `dnf`, `microdnf` and `tdnf` package manager installed.
+
+
+**Note:** Alpine is not supported because the rustup-init binary requires glibc to run, but Alpine Linux does not include `glibc` 
+by default. Instead, it uses musl libc, which is not binary-compatible with glibc.
 
 `bash` is required to execute the `install.sh` script.
 
diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index ae67e0bdc..9c3399ab8 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "rust",
-    "version": "1.3.3",
+    "version": "1.4.0",
     "name": "Rust",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
     "description": "Installs Rust, common Rust utilities, and their required dependencies",
diff --git a/src/rust/install.sh b/src/rust/install.sh
index d89fbe492..7481a05f5 100755
--- a/src/rust/install.sh
+++ b/src/rust/install.sh
@@ -19,11 +19,77 @@ UPDATE_RUST="${UPDATE_RUST:-"false"}"
 
 set -e
 
-# Clean up
-if [ "$(ls -1 /var/lib/apt/lists/ | wc -l)" -gt -1 ]; then
-    rm -rf /var/lib/apt/lists/*
+# Detect the Linux distribution and package manager
+PKG_MANAGER=""
+
+# Bring in ID, ID_LIKE, VERSION_ID, VERSION_CODENAME
+. /etc/os-release
+# Get an adjusted ID independent of distro variants
+if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
+    ADJUSTED_ID="debian"
+elif [ "${ID}" = "alpine" ]; then
+    ADJUSTED_ID="alpine"
+elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
+    ADJUSTED_ID="rhel"
+    VERSION_CODENAME="${ID}${VERSION_ID}"
+else
+    echo "Linux distro ${ID} not supported."
+    exit 1
+fi
+
+if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${VERSION_CODENAME-}" = "centos7" ]; then
+    # As of 1 July 2024, mirrorlist.centos.org no longer exists.
+    # Update the repo files to reference vault.centos.org.
+    sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
+    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
+    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
+fi
+
+
+# Detect package manager
+if command -v apt-get >/dev/null 2>&1; then
+    PKG_MANAGER="apt"
+elif command -v dnf >/dev/null 2>&1; then
+    PKG_MANAGER="dnf"
+elif command -v yum >/dev/null 2>&1; then
+    PKG_MANAGER="yum"
+elif command -v microdnf >/dev/null 2>&1; then
+    PKG_MANAGER="microdnf"
+elif command -v tdnf >/dev/null 2>&1; then
+    PKG_MANAGER="tdnf"
+else
+    echo "No supported package manager found. Supported: apt, dnf, yum, microdnf, tdnf"
+    exit 1
 fi
 
+echo "Detected package manager: $PKG_MANAGER"
+
+# Clean up based on package manager
+clean_package_cache() {
+    case "$PKG_MANAGER" in
+        apt)
+            if [ "$(ls -1 /var/lib/apt/lists/ 2>/dev/null | wc -l)" -gt 0 ]; then
+                rm -rf /var/lib/apt/lists/*
+            fi
+            ;;
+        dnf|yum|microdnf)
+            if command -v dnf >/dev/null 2>&1; then
+                dnf clean all
+            elif command -v yum >/dev/null 2>&1; then
+                yum clean all
+            elif command -v microdnf >/dev/null 2>&1; then
+                microdnf clean all
+            fi
+            ;;
+        tdnf)
+            tdnf clean all
+            ;;
+    esac
+}
+
+# Initial cleanup
+clean_package_cache
+
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
     exit 1
@@ -106,48 +172,174 @@ check_nightly_version_formatting() {
 
 updaterc() {
     if [ "${UPDATE_RC}" = "true" ]; then
-        echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
-        if [[ "$(cat /etc/bash.bashrc)" != *"$1"* ]]; then
-            echo -e "$1" >> /etc/bash.bashrc
+        echo "Updating shell configuration files..."
+        local bashrc_file="/etc/bash.bashrc"
+        
+        # Different distributions use different bashrc locations
+        if [ ! -f "$bashrc_file" ]; then
+            if [ -f "/etc/bashrc" ]; then
+                bashrc_file="/etc/bashrc"
+            elif [ -f "/etc/bash/bashrc" ]; then
+                bashrc_file="/etc/bash/bashrc"
+            fi
+        fi
+        
+        if [ -f "$bashrc_file" ] && [[ "$(cat "$bashrc_file")" != *"$1"* ]]; then
+            echo -e "$1" >> "$bashrc_file"
         fi
+        
         if [ -f "/etc/zsh/zshrc" ] && [[ "$(cat /etc/zsh/zshrc)" != *"$1"* ]]; then
             echo -e "$1" >> /etc/zsh/zshrc
         fi
     fi
 }
 
-apt_get_update()
-{
-    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
-        echo "Running apt-get update..."
-        apt-get update -y
-    fi
+# Package update functions
+pkg_mgr_update() {
+    case "$PKG_MANAGER" in
+        apt)
+            if [ "$(find /var/lib/apt/lists/* 2>/dev/null | wc -l)" = "0" ]; then
+                echo "Running apt-get update..."
+                apt-get update -y
+            fi
+            ;;
+        dnf)
+            dnf check-update || true
+            ;;
+        yum)
+            yum check-update || true
+            ;;
+        microdnf)
+            # microdnf doesn't have check-update
+            true
+            ;;
+        tdnf)
+            tdnf makecache || true
+            ;;
+    esac
+}
+
+# Check if package is installed
+is_package_installed() {
+    local package=$1
+    case "$PKG_MANAGER" in
+        apt)
+            dpkg -s "$package" >/dev/null 2>&1
+            ;;
+        dnf|yum|microdnf|tdnf)
+            rpm -q "$package" >/dev/null 2>&1
+            ;;
+    esac
 }
 
-# Checks if packages are installed and installs them if not
+# Unified package checking and installation function
 check_packages() {
-    if ! dpkg -s "$@" >/dev/null 2>&1; then
-        apt_get_update
-        apt-get -y install --no-install-recommends "$@"
+    local packages=("$@")
+    local missing_packages=()
+
+    # Check if curl-minimal is installed and swap it with curl
+    if is_package_installed "curl-minimal"; then
+        echo "curl-minimal is installed. Swapping it with curl..."
+        case "$PKG_MANAGER" in
+            dnf|yum|microdnf)
+                ${PKG_MANAGER} swap curl-minimal curl -y
+                ;;
+            tdnf)
+                tdnf remove -y curl-minimal
+                tdnf install -y curl
+                ;;
+            *)
+                echo "Package manager does not support swapping curl-minimal with curl. Please handle this manually."
+                ;;
+        esac
+    fi
+
+    # Map package names based on distribution
+    for i in "${!packages[@]}"; do
+        case "$PKG_MANAGER" in
+            dnf|yum|microdnf|tdnf)
+                case "${packages[$i]}" in
+                    "libc6-dev") packages[$i]="glibc-devel" ;;
+                    "python3-minimal") packages[$i]="python3" ;;
+                    "libpython3.*") packages[$i]="python3-devel" ;;
+                    "gnupg2") packages[$i]="gnupg" ;;
+                esac
+                ;;
+        esac
+    done
+
+    # Check which packages are missing
+    for package in "${packages[@]}"; do
+        if [ -n "$package" ] && ! is_package_installed "$package"; then
+            missing_packages+=("$package")
+        fi
+    done
+
+    # Install missing packages
+    if [ ${#missing_packages[@]} -gt 0 ]; then
+        pkg_mgr_update
+        case "$PKG_MANAGER" in
+            apt)
+                apt-get -y install --no-install-recommends "${missing_packages[@]}"
+                ;;
+            dnf)
+                dnf install -y "${missing_packages[@]}"
+                ;;
+            yum)
+                yum install -y "${missing_packages[@]}"
+                ;;
+            microdnf)
+                microdnf install -y "${missing_packages[@]}"
+                ;;
+            tdnf)
+                tdnf install -y "${missing_packages[@]}"
+                ;;
+        esac
     fi
 }
 
 export DEBIAN_FRONTEND=noninteractive
 
 # Install curl, lldb, python3-minimal,libpython and rust dependencies if missing
-if ! dpkg -s curl ca-certificates gnupg2 lldb python3-minimal gcc libc6-dev > /dev/null 2>&1; then
-    apt_get_update
-    apt-get -y install --no-install-recommends curl ca-certificates gcc libc6-dev
-    apt-get -y install lldb python3-minimal libpython3.?
+echo "Installing required dependencies..."
+check_packages curl ca-certificates gcc libc6-dev gnupg2 git
+
+# Install optional dependencies (continue if they fail)
+case "$PKG_MANAGER" in
+    apt)
+        check_packages lldb python3-minimal libpython3.? || true
+        ;;
+    dnf|yum|microdnf)
+        check_packages lldb python3 python3-devel || true
+        ;;
+    tdnf)
+        check_packages python3 python3-devel || true
+        # LLDB might not be available in Photon/Mariner
+        ;;
+esac
+
+# Get architecture
+if command -v dpkg >/dev/null 2>&1; then
+    architecture="$(dpkg --print-architecture)"
+else
+    architecture="$(uname -m)"
+    # Convert common architectures to Debian equivalents
+    case ${architecture} in
+        x86_64)
+            architecture="amd64"
+            ;;
+        aarch64)
+            architecture="arm64"
+            ;;
+    esac
 fi
 
-architecture="$(dpkg --print-architecture)"
 download_architecture="${architecture}"
 case ${download_architecture} in
- amd64)
+ amd64|x86_64)
     download_architecture="x86_64"
     ;;
- arm64)
+ arm64|aarch64)
     download_architecture="aarch64"
     ;;
  *) echo "(!) Architecture ${architecture} not supported."
@@ -225,7 +417,6 @@ EOF
 chmod -R g+r+w "${RUSTUP_HOME}" "${CARGO_HOME}"
 
 # Clean up
-rm -rf /var/lib/apt/lists/*
+clean_package_cache
 
 echo "Done!"
-
diff --git a/test/rust/rust_with_almalinux_8.sh b/test/rust/rust_with_almalinux_8.sh
new file mode 100644
index 000000000..0635916aa
--- /dev/null
+++ b/test/rust/rust_with_almalinux_8.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "cargo version" cargo  --version
+check "rustc version" rustc  --version
+check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
+
+
+# Report result
+reportResults
+
diff --git a/test/rust/rust_with_almalinux_9.sh b/test/rust/rust_with_almalinux_9.sh
new file mode 100644
index 000000000..0635916aa
--- /dev/null
+++ b/test/rust/rust_with_almalinux_9.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "cargo version" cargo  --version
+check "rustc version" rustc  --version
+check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
+
+
+# Report result
+reportResults
+
diff --git a/test/rust/rust_with_centos.sh b/test/rust/rust_with_centos.sh
new file mode 100644
index 000000000..0635916aa
--- /dev/null
+++ b/test/rust/rust_with_centos.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "cargo version" cargo  --version
+check "rustc version" rustc  --version
+check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
+
+
+# Report result
+reportResults
+
diff --git a/test/rust/rust_with_fedora.sh b/test/rust/rust_with_fedora.sh
new file mode 100644
index 000000000..0635916aa
--- /dev/null
+++ b/test/rust/rust_with_fedora.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "cargo version" cargo  --version
+check "rustc version" rustc  --version
+check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
+
+
+# Report result
+reportResults
+
diff --git a/test/rust/rust_with_mariner.sh b/test/rust/rust_with_mariner.sh
new file mode 100644
index 000000000..0635916aa
--- /dev/null
+++ b/test/rust/rust_with_mariner.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "cargo version" cargo  --version
+check "rustc version" rustc  --version
+check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
+
+
+# Report result
+reportResults
+
diff --git a/test/rust/rust_with_rockylinux_8.sh b/test/rust/rust_with_rockylinux_8.sh
new file mode 100644
index 000000000..0635916aa
--- /dev/null
+++ b/test/rust/rust_with_rockylinux_8.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "cargo version" cargo  --version
+check "rustc version" rustc  --version
+check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
+
+
+# Report result
+reportResults
+
diff --git a/test/rust/rust_with_rockylinux_9.sh b/test/rust/rust_with_rockylinux_9.sh
new file mode 100644
index 000000000..0635916aa
--- /dev/null
+++ b/test/rust/rust_with_rockylinux_9.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "cargo version" cargo  --version
+check "rustc version" rustc  --version
+check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
+
+
+# Report result
+reportResults
+
diff --git a/test/rust/scenarios.json b/test/rust/scenarios.json
index 83df710fb..003417958 100644
--- a/test/rust/scenarios.json
+++ b/test/rust/scenarios.json
@@ -15,5 +15,68 @@
                 "targets": "aarch64-unknown-linux-gnu"
             }
         }
-    }
+    },
+    "rust_with_centos": {
+        "image": "centos:centos7",
+        "features": {
+            "rust": {
+                "version": "latest",
+                "targets": "aarch64-unknown-linux-gnu"
+            }
+        }
+    },
+    "rust_with_almalinux_8": {
+        "image": "almalinux:8",
+        "features": {
+            "rust": {
+                "version": "latest",
+                "targets": "aarch64-unknown-linux-gnu"
+            }
+        }
+    },
+    "rust_with_almalinux_9": {
+        "image": "almalinux:9",
+        "features": {
+            "rust": {
+                "version": "latest",
+                "targets": "aarch64-unknown-linux-gnu"
+            }
+        }
+    },
+    "rust_with_rockylinux_8": {
+        "image": "rockylinux:8",
+        "features": {
+            "rust": {
+                "version": "latest",
+                "targets": "aarch64-unknown-linux-gnu"
+            }
+        }
+    },
+    "rust_with_rockylinux_9": {
+        "image": "rockylinux:9",
+        "features": {
+            "rust": {
+                "version": "latest",
+                "targets": "aarch64-unknown-linux-gnu"
+            }
+        }
+    },
+    "rust_with_fedora": {
+        "image": "fedora",
+        "features": {
+            "rust": {
+                "version": "latest",
+                "targets": "aarch64-unknown-linux-gnu"
+            }
+        }
+    },
+    "rust_with_mariner": {
+        "image": "mcr.microsoft.com/cbl-mariner/base/core:2.0",
+        "features": {
+            "rust": {
+                "version": "latest",
+                "targets": "aarch64-unknown-linux-gnu"
+            }
+        }
+    }                                                                
 }
\ No newline at end of file

From 805ce77507d38ecb689673cd3b8fea5d725b9642 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Thu, 10 Jul 2025 17:52:32 +0530
Subject: [PATCH 382/478] [rust] - Introducing new options to install
 components (#1404)

* [rust] - Introducing new options to install components

* Fix for testing with rockylinux and addition in tests

* Correcting based on review comments.

* Further changes in the input

* correcting code comment

* Correcting based on review comment

* Correcting based on review comment.

* To rerun the test
---
 src/rust/README.md                         |  1 +
 src/rust/devcontainer-feature.json         | 15 ++++-
 src/rust/install.sh                        | 16 ++++-
 test/rust/rust_with_almalinux_8.sh         | 16 +++++
 test/rust/rust_with_almalinux_9.sh         | 16 +++++
 test/rust/rust_with_centos.sh              | 16 +++++
 test/rust/rust_with_custom_components.sh   | 43 +++++++++++++
 test/rust/rust_with_default_components.sh  | 31 ++++++++++
 test/rust/rust_with_empty_components.sh    | 45 ++++++++++++++
 test/rust/rust_with_extended_components.sh | 32 ++++++++++
 test/rust/rust_with_fedora.sh              | 16 +++++
 test/rust/rust_with_mariner.sh             | 16 +++++
 test/rust/rust_with_minimal_components.sh  | 43 +++++++++++++
 test/rust/rust_with_rockylinux_8.sh        | 16 +++++
 test/rust/rust_with_rockylinux_9.sh        | 16 +++++
 test/rust/scenarios.json                   | 72 +++++++++++++++++++---
 16 files changed, 398 insertions(+), 12 deletions(-)
 create mode 100644 test/rust/rust_with_custom_components.sh
 create mode 100644 test/rust/rust_with_default_components.sh
 create mode 100644 test/rust/rust_with_empty_components.sh
 create mode 100644 test/rust/rust_with_extended_components.sh
 create mode 100644 test/rust/rust_with_minimal_components.sh

diff --git a/src/rust/README.md b/src/rust/README.md
index 022f8abbe..963588c2a 100644
--- a/src/rust/README.md
+++ b/src/rust/README.md
@@ -18,6 +18,7 @@ Installs Rust, common Rust utilities, and their required dependencies
 | version | Select or enter a version of Rust to install. | string | latest |
 | profile | Select a rustup install profile. | string | minimal |
 | targets | Optional comma separated list of additional Rust targets to install. | string | - |
+| components | Optional comma separeated list of rust components to be installed based on input. | string | rust-analyzer,rust-src,rustfmt,clippy |
 
 ## Customizations
 
diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index 9c3399ab8..88b64daed 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "rust",
-    "version": "1.4.0",
+    "version": "1.5.0",
     "name": "Rust",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
     "description": "Installs Rust, common Rust utilities, and their required dependencies",
@@ -57,7 +57,18 @@
                 "armv7-unknown-linux-gnueabihf",
                 "x86_64-unknown-redox,x86_64-unknown-uefi"
             ]
-        }
+        },
+        "components": {
+            "type": "string",
+            "default": "rust-analyzer,rust-src,rustfmt,clippy",
+            "description": "Optional, comma separated list of Rust components to be installed",
+            "proposals": [
+                "rust-analyzer,rust-src,rustfmt,clippy",
+                "rust-analyzer,rust-src",
+                "rustfmt,clippy,rust-docs",
+                "llvm-tools-preview,rust-src,rustfmt"
+            ]
+        }        
     },
     "customizations": {
         "vscode": {
diff --git a/src/rust/install.sh b/src/rust/install.sh
index 7481a05f5..99a7ba8f5 100755
--- a/src/rust/install.sh
+++ b/src/rust/install.sh
@@ -10,6 +10,7 @@
 RUST_VERSION="${VERSION:-"latest"}"
 RUSTUP_PROFILE="${PROFILE:-"minimal"}"
 RUSTUP_TARGETS="${TARGETS:-""}"
+IFS=',' read -ra components <<< "${COMPONENTS:-rust-analyzer,rust-src,rustfmt,clippy}"
 
 export CARGO_HOME="${CARGO_HOME:-"/usr/local/cargo"}"
 export RUSTUP_HOME="${RUSTUP_HOME:-"/usr/local/rustup"}"
@@ -394,8 +395,19 @@ if [ "${UPDATE_RUST}" = "true" ]; then
     echo "Updating Rust..."
     rustup update 2>&1
 fi
-echo "Installing common Rust dependencies..."
-rustup component add rust-analyzer rust-src rustfmt clippy 2>&1
+# Install Rust components
+echo "Installing Rust components..."
+for component in "${components[@]}"; do
+    # Trim leading and trailing whitespace
+    component="${component#"${component%%[![:space:]]*}"}" && component="${component%"${component##*[![:space:]]}"}"
+    if [ -n "${component}" ]; then
+        echo "Installing Rust component: ${component}"
+        if ! rustup component add "${component}" 2>&1; then
+            echo "Warning: Failed to install component '${component}'. It may not be available for this toolchain." >&2
+            exit 1
+        fi
+    fi
+done
 
 if [ -n "${RUSTUP_TARGETS}" ]; then
     IFS=',' read -ra targets <<< "${RUSTUP_TARGETS}"
diff --git a/test/rust/rust_with_almalinux_8.sh b/test/rust/rust_with_almalinux_8.sh
index 0635916aa..7a2872846 100644
--- a/test/rust/rust_with_almalinux_8.sh
+++ b/test/rust/rust_with_almalinux_8.sh
@@ -5,11 +5,27 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Helper function to check component is installed
+check_component_installed() {
+    local component=$1
+    if rustup component list | grep -q "${component}.*installed"; then
+        return 0  # Component is installed (success)
+    else
+        return 1  # Component is not installed (failure)
+    fi
+}
+
 # Definition specific tests
 check "cargo version" cargo  --version
 check "rustc version" rustc  --version
 check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
 
+# Check that all specified extended components are installed
+check "rust-analyzer is installed" check_component_installed "rust-analyzer"
+check "rust-src is installed" check_component_installed "rust-src"
+check "rustfmt is installed" check_component_installed "rustfmt"
+check "clippy is installed" check_component_installed "clippy"
+check "rust-docs is installed" check_component_installed "rust-docs"
 
 # Report result
 reportResults
diff --git a/test/rust/rust_with_almalinux_9.sh b/test/rust/rust_with_almalinux_9.sh
index 0635916aa..7a2872846 100644
--- a/test/rust/rust_with_almalinux_9.sh
+++ b/test/rust/rust_with_almalinux_9.sh
@@ -5,11 +5,27 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Helper function to check component is installed
+check_component_installed() {
+    local component=$1
+    if rustup component list | grep -q "${component}.*installed"; then
+        return 0  # Component is installed (success)
+    else
+        return 1  # Component is not installed (failure)
+    fi
+}
+
 # Definition specific tests
 check "cargo version" cargo  --version
 check "rustc version" rustc  --version
 check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
 
+# Check that all specified extended components are installed
+check "rust-analyzer is installed" check_component_installed "rust-analyzer"
+check "rust-src is installed" check_component_installed "rust-src"
+check "rustfmt is installed" check_component_installed "rustfmt"
+check "clippy is installed" check_component_installed "clippy"
+check "rust-docs is installed" check_component_installed "rust-docs"
 
 # Report result
 reportResults
diff --git a/test/rust/rust_with_centos.sh b/test/rust/rust_with_centos.sh
index 0635916aa..7a2872846 100644
--- a/test/rust/rust_with_centos.sh
+++ b/test/rust/rust_with_centos.sh
@@ -5,11 +5,27 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Helper function to check component is installed
+check_component_installed() {
+    local component=$1
+    if rustup component list | grep -q "${component}.*installed"; then
+        return 0  # Component is installed (success)
+    else
+        return 1  # Component is not installed (failure)
+    fi
+}
+
 # Definition specific tests
 check "cargo version" cargo  --version
 check "rustc version" rustc  --version
 check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
 
+# Check that all specified extended components are installed
+check "rust-analyzer is installed" check_component_installed "rust-analyzer"
+check "rust-src is installed" check_component_installed "rust-src"
+check "rustfmt is installed" check_component_installed "rustfmt"
+check "clippy is installed" check_component_installed "clippy"
+check "rust-docs is installed" check_component_installed "rust-docs"
 
 # Report result
 reportResults
diff --git a/test/rust/rust_with_custom_components.sh b/test/rust/rust_with_custom_components.sh
new file mode 100644
index 000000000..38dbec1ff
--- /dev/null
+++ b/test/rust/rust_with_custom_components.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Helper function to check component is installed
+check_component_installed() {
+    local component=$1
+    if rustup component list | grep -q "${component}.*installed"; then
+        return 0  # Component is installed (success)
+    else
+        return 1  # Component is not installed (failure)
+    fi
+}
+
+# Helper function to check component is NOT installed
+check_component_not_installed() {
+    local component=$1
+    if rustup component list | grep -q "${component}.*installed"; then
+        return 1  # Component is installed (failure)
+    else
+        return 0  # Component is not installed (success)
+    fi
+}
+
+# Definition specific tests
+check "cargo version" cargo --version
+check "rustc version" rustc --version
+check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
+
+# Check that specified custom components are installed
+check "rust-analyzer is installed" check_component_installed "rust-analyzer"
+check "rust-src is installed" check_component_installed "rust-src"
+check "rustfmt is installed" check_component_installed "rustfmt"
+
+# Check that clippy NOT installed
+check "clippy not installed" check_component_not_installed "clippy"
+
+# Report result
+reportResults
+
diff --git a/test/rust/rust_with_default_components.sh b/test/rust/rust_with_default_components.sh
new file mode 100644
index 000000000..333bb1aa6
--- /dev/null
+++ b/test/rust/rust_with_default_components.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Helper function to check component is installed
+check_component_installed() {
+    local component=$1
+    if rustup component list | grep -q "${component}.*installed"; then
+        return 0  # Component is installed (success)
+    else
+        return 1  # Component is not installed (failure)
+    fi
+}
+
+# Definition specific tests
+check "cargo version" cargo --version
+check "rustc version" rustc --version
+check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
+
+# Check that default components are installed
+check "rust-analyzer is installed" check_component_installed "rust-analyzer"
+check "rust-src is installed" check_component_installed "rust-src"
+check "rustfmt is installed" check_component_installed "rustfmt"
+check "clippy is installed" check_component_installed "clippy"
+
+# Report result
+reportResults
+
diff --git a/test/rust/rust_with_empty_components.sh b/test/rust/rust_with_empty_components.sh
new file mode 100644
index 000000000..116f7765a
--- /dev/null
+++ b/test/rust/rust_with_empty_components.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Helper function to check component is installed
+check_component_installed() {
+    local component=$1
+    if rustup component list | grep -q "${component}.*installed"; then
+        return 0  # Component is installed (success)
+    else
+        return 1  # Component is not installed (failure)
+    fi
+}
+
+# Helper function to check component is NOT installed
+check_component_not_installed() {
+    local component=$1
+    if rustup component list | grep -q "${component}.*installed"; then
+        return 1  # Component is installed (failure)
+    else
+        return 0  # Component is not installed (success)
+    fi
+}
+
+# Definition specific tests
+check "cargo version" cargo --version
+check "rustc version" rustc --version
+check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
+
+# Check that no additional components are installed when empty list is provided
+# Only the basic rust toolchain should be available
+check "basic rust toolchain" rustc --version
+
+# Verify that default components are automatically installed
+check "rust-analyzer is installed" check_component_installed "rust-analyzer"
+check "rust-src is installed" check_component_installed "rust-src"
+check "rustfmt is installed" check_component_installed "rustfmt"
+check "clippy is installed" check_component_installed "clippy"
+
+# Report result
+reportResults
+
diff --git a/test/rust/rust_with_extended_components.sh b/test/rust/rust_with_extended_components.sh
new file mode 100644
index 000000000..52fb74390
--- /dev/null
+++ b/test/rust/rust_with_extended_components.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Helper function to check component is installed
+check_component_installed() {
+    local component=$1
+    if rustup component list | grep -q "${component}.*installed"; then
+        return 0  # Component is installed (success)
+    else
+        return 1  # Component is not installed (failure)
+    fi
+}
+
+# Definition specific tests
+check "cargo version" cargo --version
+check "rustc version" rustc --version
+check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
+
+# Check that all specified extended components are installed
+check "rust-analyzer is installed" check_component_installed "rust-analyzer"
+check "rust-src is installed" check_component_installed "rust-src"
+check "rustfmt is installed" check_component_installed "rustfmt"
+check "clippy is installed" check_component_installed "clippy"
+check "rust-docs is installed" check_component_installed "rust-docs"
+
+# Report result
+reportResults
+
diff --git a/test/rust/rust_with_fedora.sh b/test/rust/rust_with_fedora.sh
index 0635916aa..7a2872846 100644
--- a/test/rust/rust_with_fedora.sh
+++ b/test/rust/rust_with_fedora.sh
@@ -5,11 +5,27 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Helper function to check component is installed
+check_component_installed() {
+    local component=$1
+    if rustup component list | grep -q "${component}.*installed"; then
+        return 0  # Component is installed (success)
+    else
+        return 1  # Component is not installed (failure)
+    fi
+}
+
 # Definition specific tests
 check "cargo version" cargo  --version
 check "rustc version" rustc  --version
 check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
 
+# Check that all specified extended components are installed
+check "rust-analyzer is installed" check_component_installed "rust-analyzer"
+check "rust-src is installed" check_component_installed "rust-src"
+check "rustfmt is installed" check_component_installed "rustfmt"
+check "clippy is installed" check_component_installed "clippy"
+check "rust-docs is installed" check_component_installed "rust-docs"
 
 # Report result
 reportResults
diff --git a/test/rust/rust_with_mariner.sh b/test/rust/rust_with_mariner.sh
index 0635916aa..7a2872846 100644
--- a/test/rust/rust_with_mariner.sh
+++ b/test/rust/rust_with_mariner.sh
@@ -5,11 +5,27 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Helper function to check component is installed
+check_component_installed() {
+    local component=$1
+    if rustup component list | grep -q "${component}.*installed"; then
+        return 0  # Component is installed (success)
+    else
+        return 1  # Component is not installed (failure)
+    fi
+}
+
 # Definition specific tests
 check "cargo version" cargo  --version
 check "rustc version" rustc  --version
 check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
 
+# Check that all specified extended components are installed
+check "rust-analyzer is installed" check_component_installed "rust-analyzer"
+check "rust-src is installed" check_component_installed "rust-src"
+check "rustfmt is installed" check_component_installed "rustfmt"
+check "clippy is installed" check_component_installed "clippy"
+check "rust-docs is installed" check_component_installed "rust-docs"
 
 # Report result
 reportResults
diff --git a/test/rust/rust_with_minimal_components.sh b/test/rust/rust_with_minimal_components.sh
new file mode 100644
index 000000000..02760ed5b
--- /dev/null
+++ b/test/rust/rust_with_minimal_components.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Helper function to check component is installed
+check_component_installed() {
+    local component=$1
+    if rustup component list | grep -q "${component}.*installed"; then
+        return 0  # Component is installed (success)
+    else
+        return 1  # Component is not installed (failure)
+    fi
+}
+
+# Helper function to check component is NOT installed
+check_component_not_installed() {
+    local component=$1
+    if rustup component list | grep -q "${component}.*installed"; then
+        return 1  # Component is installed (failure)
+    else
+        return 0  # Component is not installed (success)
+    fi
+}
+
+# Definition specific tests
+check "cargo version" cargo --version
+check "rustc version" rustc --version
+check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
+
+# Check that only specified minimal components are installed
+check "rust-analyzer is installed" check_component_installed "rust-analyzer"
+check "rust-src is installed" check_component_installed "rust-src"
+
+# Check that other default components are NOT installed
+check "rustfmt not installed" check_component_not_installed "rustfmt"
+check "clippy not installed" check_component_not_installed "clippy"
+
+# Report result
+reportResults
+
diff --git a/test/rust/rust_with_rockylinux_8.sh b/test/rust/rust_with_rockylinux_8.sh
index 0635916aa..7a2872846 100644
--- a/test/rust/rust_with_rockylinux_8.sh
+++ b/test/rust/rust_with_rockylinux_8.sh
@@ -5,11 +5,27 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Helper function to check component is installed
+check_component_installed() {
+    local component=$1
+    if rustup component list | grep -q "${component}.*installed"; then
+        return 0  # Component is installed (success)
+    else
+        return 1  # Component is not installed (failure)
+    fi
+}
+
 # Definition specific tests
 check "cargo version" cargo  --version
 check "rustc version" rustc  --version
 check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
 
+# Check that all specified extended components are installed
+check "rust-analyzer is installed" check_component_installed "rust-analyzer"
+check "rust-src is installed" check_component_installed "rust-src"
+check "rustfmt is installed" check_component_installed "rustfmt"
+check "clippy is installed" check_component_installed "clippy"
+check "rust-docs is installed" check_component_installed "rust-docs"
 
 # Report result
 reportResults
diff --git a/test/rust/rust_with_rockylinux_9.sh b/test/rust/rust_with_rockylinux_9.sh
index 0635916aa..7a2872846 100644
--- a/test/rust/rust_with_rockylinux_9.sh
+++ b/test/rust/rust_with_rockylinux_9.sh
@@ -5,11 +5,27 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Helper function to check component is installed
+check_component_installed() {
+    local component=$1
+    if rustup component list | grep -q "${component}.*installed"; then
+        return 0  # Component is installed (success)
+    else
+        return 1  # Component is not installed (failure)
+    fi
+}
+
 # Definition specific tests
 check "cargo version" cargo  --version
 check "rustc version" rustc  --version
 check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
 
+# Check that all specified extended components are installed
+check "rust-analyzer is installed" check_component_installed "rust-analyzer"
+check "rust-src is installed" check_component_installed "rust-src"
+check "rustfmt is installed" check_component_installed "rustfmt"
+check "clippy is installed" check_component_installed "clippy"
+check "rust-docs is installed" check_component_installed "rust-docs"
 
 # Report result
 reportResults
diff --git a/test/rust/scenarios.json b/test/rust/scenarios.json
index 003417958..21e347947 100644
--- a/test/rust/scenarios.json
+++ b/test/rust/scenarios.json
@@ -16,12 +16,62 @@
             }
         }
     },
+    "rust_with_default_components": {
+        "image": "ubuntu:noble",
+        "features": {
+            "rust": {
+                "version": "latest",
+                "targets": "aarch64-unknown-linux-gnu"
+            }
+        }
+    },
+    "rust_with_custom_components": {
+        "image": "ubuntu:noble",
+        "features": {
+            "rust": {
+                "version": "latest",
+                "targets": "aarch64-unknown-linux-gnu",
+                "components": "rust-analyzer,rust-src,rustfmt"
+            }
+        }
+    },
+    "rust_with_minimal_components": {
+        "image": "ubuntu:noble",
+        "features": {
+            "rust": {
+                "version": "latest",
+                "targets": "aarch64-unknown-linux-gnu",
+                "components": "rust-analyzer,rust-src"
+            }
+        }
+    },
+    "rust_with_extended_components": {
+        "image": "ubuntu:noble",
+        "features": {
+            "rust": {
+                "version": "latest",
+                "targets": "aarch64-unknown-linux-gnu",
+                "components": "rust-analyzer,rust-src,rustfmt,clippy,rust-docs"
+            }
+        }
+    },
+    "rust_with_empty_components": {
+        "image": "ubuntu:noble",
+        "features": {
+            "rust": {
+                "version": "latest",
+                "targets": "aarch64-unknown-linux-gnu",
+                "components": ""
+            }
+        }
+    },    
     "rust_with_centos": {
         "image": "centos:centos7",
         "features": {
             "rust": {
                 "version": "latest",
-                "targets": "aarch64-unknown-linux-gnu"
+                "targets": "aarch64-unknown-linux-gnu",
+                "components": "rust-analyzer,rust-src,rustfmt,clippy,rust-docs"                
             }
         }
     },
@@ -30,7 +80,8 @@
         "features": {
             "rust": {
                 "version": "latest",
-                "targets": "aarch64-unknown-linux-gnu"
+                "targets": "aarch64-unknown-linux-gnu",
+                "components": "rust-analyzer,rust-src,rustfmt,clippy,rust-docs"                
             }
         }
     },
@@ -39,7 +90,8 @@
         "features": {
             "rust": {
                 "version": "latest",
-                "targets": "aarch64-unknown-linux-gnu"
+                "targets": "aarch64-unknown-linux-gnu",
+                "components": "rust-analyzer,rust-src,rustfmt,clippy,rust-docs"                
             }
         }
     },
@@ -48,7 +100,8 @@
         "features": {
             "rust": {
                 "version": "latest",
-                "targets": "aarch64-unknown-linux-gnu"
+                "targets": "aarch64-unknown-linux-gnu",
+                "components": "rust-analyzer,rust-src,rustfmt,clippy,rust-docs"                
             }
         }
     },
@@ -57,7 +110,8 @@
         "features": {
             "rust": {
                 "version": "latest",
-                "targets": "aarch64-unknown-linux-gnu"
+                "targets": "aarch64-unknown-linux-gnu",
+                "components": "rust-analyzer,rust-src,rustfmt,clippy,rust-docs"                
             }
         }
     },
@@ -66,7 +120,8 @@
         "features": {
             "rust": {
                 "version": "latest",
-                "targets": "aarch64-unknown-linux-gnu"
+                "targets": "aarch64-unknown-linux-gnu",
+                "components": "rust-analyzer,rust-src,rustfmt,clippy,rust-docs"                
             }
         }
     },
@@ -75,8 +130,9 @@
         "features": {
             "rust": {
                 "version": "latest",
-                "targets": "aarch64-unknown-linux-gnu"
+                "targets": "aarch64-unknown-linux-gnu",
+                "components": "rust-analyzer,rust-src,rustfmt,clippy,rust-docs"                
             }
         }
     }                                                                
-}
\ No newline at end of file
+}

From e3e3ed76c4778e1ec51cae7c11e74565d0052a7f Mon Sep 17 00:00:00 2001
From: Mehmet Oguz Derin <mehmetoguzderin@mehmetoguzderin.com>
Date: Thu, 10 Jul 2025 15:35:27 +0300
Subject: [PATCH 383/478] Support arm64 for CUDA feature (#1155)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Support arm64 for CUDA image

* Update install.sh

* Update install.sh

* Update note

---------

Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
---
 src/nvidia-cuda/install.sh | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/nvidia-cuda/install.sh b/src/nvidia-cuda/install.sh
index ca309fb25..6de935540 100644
--- a/src/nvidia-cuda/install.sh
+++ b/src/nvidia-cuda/install.sh
@@ -44,10 +44,24 @@ export DEBIAN_FRONTEND=noninteractive
 
 check_packages wget ca-certificates
 
+# Determine system architecture and set NVIDIA repository URL accordingly
+ARCH=$(uname -m)
+case $ARCH in
+    x86_64)
+        NVIDIA_ARCH="x86_64"
+        ;;
+    aarch64 | arm64)
+        NVIDIA_ARCH="arm64"
+        ;;
+    *)
+        echo "Unsupported architecture: $ARCH"
+        exit 1
+        ;;
+esac
+
 # Add NVIDIA's package repository to apt so that we can download packages
-# Always use the ubuntu2004 repo because the other repos (e.g., debian11) are missing packages
 # Updating the repo to ubuntu2204 as ubuntu 20.04 is going out of support. 
-NVIDIA_REPO_URL="https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64"
+NVIDIA_REPO_URL="https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/$NVIDIA_ARCH"
 KEYRING_PACKAGE="cuda-keyring_1.0-1_all.deb"
 KEYRING_PACKAGE_URL="$NVIDIA_REPO_URL/$KEYRING_PACKAGE"
 KEYRING_PACKAGE_PATH="$(mktemp -d)"
@@ -62,6 +76,10 @@ nvtx_pkg="cuda-nvtx-${CUDA_VERSION/./-}"
 toolkit_pkg="cuda-toolkit-${CUDA_VERSION/./-}"
 if ! apt-cache show "$cuda_pkg"; then
     echo "The requested version of CUDA is not available: CUDA $CUDA_VERSION"
+    if [ "$NVIDIA_ARCH" = "arm64" ]; then
+        echo "Note: arm64 supports limited CUDA versions. Please check available versions:"
+        echo "https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/arm64"
+    fi
     exit 1
 fi
 
@@ -93,6 +111,9 @@ if [ "$INSTALL_CUDNN" = "true" ]; then
 
     if ! apt-cache show "$cudnn_pkg_version"; then
         echo "The requested version of cuDNN is not available: cuDNN $CUDNN_VERSION for CUDA $CUDA_VERSION"
+        if [ "$NVIDIA_ARCH" = "arm64" ]; then
+            echo "Note: arm64 has limited cuDNN package availability"
+        fi
         exit 1
     fi
 
@@ -112,6 +133,9 @@ if [ "$INSTALL_CUDNNDEV" = "true" ]; then
     fi
     if ! apt-cache show "$cudnn_dev_pkg_version"; then
         echo "The requested version of cuDNN development package is not available: cuDNN $CUDNN_VERSION for CUDA $CUDA_VERSION"
+        if [ "$NVIDIA_ARCH" = "arm64" ]; then
+            echo "Note: arm64 has limited cuDNN development package availability"
+        fi
         exit 1
     fi
 

From 91460a328e961a0ecab0412eb0c7ac8b00a95ca3 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Tue, 12 Aug 2025 18:44:59 +0530
Subject: [PATCH 384/478] [terraform] - Fix terraform installation in ubuntu
 noble. (#1421)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [terraform] - Fix terraform installation in ubuntu noble.

* Adding warning message.

* Small changes in the test scripts.

* Apply suggestions from code review, removing whitespaces.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Apply suggestions from code review, to convert into a generic function.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Adding further on review comments

* Update src/terraform/install.sh, updating comment.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/terraform/install.sh, removing whitespaces

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Further change to put function for common code as per review comment.

* Corrections done based on review comments.

* Further corrections.

* Update src/terraform/install.sh

Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>

* Correction in error handling based on review comment.

* To check if able start tests

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
---
 src/terraform/devcontainer-feature.json       |   2 +-
 src/terraform/install.sh                      | 100 ++++++++++++++++--
 test/terraform/install_in_ubuntu_noble.sh     |  18 ++++
 .../install_in_ubuntu_noble_sentinel.sh       |  21 ++++
 test/terraform/scenarios.json                 |  16 +++
 5 files changed, 146 insertions(+), 11 deletions(-)
 create mode 100644 test/terraform/install_in_ubuntu_noble.sh
 create mode 100644 test/terraform/install_in_ubuntu_noble_sentinel.sh

diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index db1bacc67..ceee4979e 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index fb7abc6ee..b1d64c27b 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -50,6 +50,15 @@ if [ "$(id -u)" -ne 0 ]; then
     exit 1
 fi
 
+# Detect Ubuntu Noble and use new repo setup, else use legacy GPG logic
+IS_NOBLE=0
+if grep -qi 'ubuntu' /etc/os-release; then
+    . /etc/os-release
+    if [[ "$VERSION_CODENAME" == "noble" ]]; then
+        IS_NOBLE=1
+    fi
+fi
+
 # Get the list of GPG key servers that are reachable
 get_gpg_key_servers() {
     declare -A keyservers_curl_map=(
@@ -89,7 +98,7 @@ receive_gpg_keys() {
         keyring_args="--no-default-keyring --keyring $2"
     fi
     if [ ! -z "${KEYSERVER_PROXY}" ]; then
-	keyring_args="${keyring_args} --keyserver-options http-proxy=${KEYSERVER_PROXY}"
+        keyring_args="${keyring_args} --keyserver-options http-proxy=${KEYSERVER_PROXY}"
     fi
 
     # Install curl
@@ -101,6 +110,21 @@ receive_gpg_keys() {
     export GNUPGHOME="/tmp/tmp-gnupg"
     mkdir -p ${GNUPGHOME}
     chmod 700 ${GNUPGHOME}
+    
+    # Special handling for HashiCorp GPG key on Ubuntu Noble
+    if [ "$IS_NOBLE" -eq 1 ] && [ "$keys" = "$TERRAFORM_GPG_KEY" ]; then
+        echo "(*) Ubuntu Noble detected, using Keybase for HashiCorp GPG key import...."
+        curl -fsSL https://keybase.io/hashicorp/pgp_keys.asc | gpg --import
+        if ! gpg --list-keys "${TERRAFORM_GPG_KEY}" > /dev/null 2>&1; then
+            gpg --list-keys
+            echo "(*) Warning: HashiCorp GPG key not found in keyring after import."
+            echo "    Continuing installation without GPG verification on Ubuntu Noble."
+            echo "    This is expected behavior for Ubuntu Noble due to keyserver issues."
+            return 1  # Return failure to indicate GPG verification should be skipped
+        fi
+        return 0
+    fi
+
     echo -e "disable-ipv6\n$(get_gpg_key_servers)" > ${GNUPGHOME}/dirmngr.conf
     # GPG key download sometimes fails for some reason and retrying fixes it.
     local retry_count=0
@@ -366,6 +390,32 @@ install_terraform() {
     curl -sSL -o ${terraform_filename} "${HASHICORP_RELEASES_URL}/terraform/${TERRAFORM_VERSION}/${terraform_filename}"
 }
 
+verify_signature() {
+    local gpg_key=$1
+    local sha256sums_url=$2
+    local sig_url=$3
+    local sha256sums_file=$4
+    local sig_file=$5
+    local verify_result=0
+
+    receive_gpg_keys "$gpg_key"
+    verify_result=$?
+    if [ $verify_result -ne 0 ] && [ "$IS_NOBLE" -eq 1 ]; then
+        echo "Skipping the gpg key validation for ubuntu noble as unable to import the key."
+        return 1
+    fi
+    curl -sSL -o "$sha256sums_file" "$sha256sums_url"
+    curl -sSL -o "$sig_file" "$sig_url"
+
+    # Try GPG verification, but don't fail on Noble
+    gpg --verify "$sig_file" "$sha256sums_file"
+    verify_result=$?
+    if [ $verify_result -ne 0 ]; then
+        echo "(!) GPG verification failed."
+        exit 1
+    fi
+}
+
 mkdir -p /tmp/tf-downloads
 cd /tmp/tf-downloads
 # Install Terraform, tflint, Terragrunt
@@ -378,10 +428,25 @@ if grep -q "The specified key does not exist." "${terraform_filename}"; then
 fi
 if [ "${TERRAFORM_SHA256}" != "dev-mode" ]; then
     if [ "${TERRAFORM_SHA256}" = "automatic" ]; then
-        receive_gpg_keys TERRAFORM_GPG_KEY
-        curl -sSL -o terraform_SHA256SUMS "${HASHICORP_RELEASES_URL}/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS" 
-        curl -sSL -o terraform_SHA256SUMS.sig "${HASHICORP_RELEASES_URL}/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS.${TERRAFORM_GPG_KEY}.sig"
-        gpg --verify terraform_SHA256SUMS.sig terraform_SHA256SUMS
+        # For Ubuntu Noble, try GPG verification but continue if it fails
+        if [ "$IS_NOBLE" -eq 1 ]; then
+            echo "(*) Ubuntu Noble detected - attempting GPG verification with fallback..."
+            set +e
+            sha256sums_url="${HASHICORP_RELEASES_URL}/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS"
+            sig_url="${HASHICORP_RELEASES_URL}/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS.${TERRAFORM_GPG_KEY}.sig"
+            verify_signature TERRAFORM_GPG_KEY "$sha256sums_url" "$sig_url" "terraform_SHA256SUMS" "terraform_SHA256SUMS.sig"
+            verify_result=$?
+            set -e
+            if [ $verify_result -ne 0 ]; then
+                echo "(*) GPG verification failed on Ubuntu Noble, but continuing installation."
+                echo "    Downloading checksums for basic integrity check..."
+                curl -sSL -o terraform_SHA256SUMS "${HASHICORP_RELEASES_URL}/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS"
+            fi
+        else
+            sha256sums_url="${HASHICORP_RELEASES_URL}/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS"
+            sig_url="${HASHICORP_RELEASES_URL}/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS.${TERRAFORM_GPG_KEY}.sig"
+            verify_signature TERRAFORM_GPG_KEY "$sha256sums_url" "$sig_url" "terraform_SHA256SUMS" "terraform_SHA256SUMS.sig"
+        fi
     else
         echo "${TERRAFORM_SHA256} *${terraform_filename}" > terraform_SHA256SUMS
     fi
@@ -477,12 +542,27 @@ if [ "${INSTALL_SENTINEL}" = "true" ]; then
     curl -sSL -o /tmp/tf-downloads/${sentinel_filename} ${sentinel_releases_url}/${SENTINEL_VERSION}/${sentinel_filename}
     if [ "${SENTINEL_SHA256}" != "dev-mode" ]; then
         if [ "${SENTINEL_SHA256}" = "automatic" ]; then
-            receive_gpg_keys TERRAFORM_GPG_KEY
-            curl -sSL -o sentinel_checksums.txt ${sentinel_releases_url}/${SENTINEL_VERSION}/sentinel_${SENTINEL_VERSION}_SHA256SUMS
-            curl -sSL -o sentinel_checksums.txt.sig ${sentinel_releases_url}/${SENTINEL_VERSION}/sentinel_${SENTINEL_VERSION}_SHA256SUMS.${TERRAFORM_GPG_KEY}.sig
-            gpg --verify sentinel_checksums.txt.sig sentinel_checksums.txt
+            # For Ubuntu Noble, try GPG verification but continue if it fails
+            if [ "$IS_NOBLE" -eq 1 ]; then
+                echo "(*) Ubuntu Noble detected - attempting Sentinel GPG verification with fallback..."
+                set +e
+                sha256sums_url="${sentinel_releases_url}/${SENTINEL_VERSION}/sentinel_${SENTINEL_VERSION}_SHA256SUMS"
+                sig_url="${sentinel_releases_url}/${SENTINEL_VERSION}/sentinel_${SENTINEL_VERSION}_SHA256SUMS.${TERRAFORM_GPG_KEY}.sig"
+                verify_signature TERRAFORM_GPG_KEY "$sha256sums_url" "$sig_url" "sentinel_checksums.txt" "sentinel_checksums.txt.sig"
+                verify_result=$?
+                set -e
+                if [ $verify_result -ne 0 ]; then
+                    echo "(*) GPG verification failed on Ubuntu Noble, but continuing installation."
+                    echo "    Downloading checksums for basic integrity check..."
+                    curl -sSL -o sentinel_checksums.txt "${sentinel_releases_url}/${SENTINEL_VERSION}/sentinel_${SENTINEL_VERSION}_SHA256SUMS"
+                fi
+            else
+                sha256sums_url="${sentinel_releases_url}/${SENTINEL_VERSION}/sentinel_${SENTINEL_VERSION}_SHA256SUMS"
+                sig_url="${sentinel_releases_url}/${SENTINEL_VERSION}/sentinel_${SENTINEL_VERSION}_SHA256SUMS.${TERRAFORM_GPG_KEY}.sig"
+                verify_signature TERRAFORM_GPG_KEY "$sha256sums_url" "$sig_url" "sentinel_checksums.txt" "sentinel_checksums.txt.sig"
+            fi
             # Verify the SHASUM matches the archive
-            shasum -a 256 --ignore-missing -c sentinel_checksums.txt
+            shasum -a 256 --ignore-missing -c sentinel_checksums.txt            
         else
             echo "${SENTINEL_SHA256} *${SENTINEL_FILENAME}" >sentinel_checksums.txt
         fi
diff --git a/test/terraform/install_in_ubuntu_noble.sh b/test/terraform/install_in_ubuntu_noble.sh
new file mode 100644
index 000000000..a146e0417
--- /dev/null
+++ b/test/terraform/install_in_ubuntu_noble.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+# Check if terraform was installed correctly
+check "terraform installed" terraform --version
+
+check "tflint" tflint --version
+
+# Report results
+reportResults
+
diff --git a/test/terraform/install_in_ubuntu_noble_sentinel.sh b/test/terraform/install_in_ubuntu_noble_sentinel.sh
new file mode 100644
index 000000000..00b832f71
--- /dev/null
+++ b/test/terraform/install_in_ubuntu_noble_sentinel.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+# Check if terraform was installed correctly
+check "terraform installed" terraform --version
+
+check "tflint" tflint --version
+
+# Sentinel specific tests
+check "sentinel" sentinel --version
+
+# Report result
+reportResults
+
diff --git a/test/terraform/scenarios.json b/test/terraform/scenarios.json
index ea6b35b09..81945d042 100644
--- a/test/terraform/scenarios.json
+++ b/test/terraform/scenarios.json
@@ -1,4 +1,20 @@
 {
+    "install_in_ubuntu_noble": {
+        "image": "mcr.microsoft.com/devcontainers/base:noble",
+        "features": {
+            "terraform": {
+                "version": "latest"
+            }
+        }
+    },
+    "install_in_ubuntu_noble_sentinel": {
+        "image": "mcr.microsoft.com/devcontainers/base:noble",
+        "features": {
+            "terraform": {
+                "installSentinel": true
+            }
+        }
+    },
     "install_sentinel": {
         "image": "mcr.microsoft.com/devcontainers/base:jammy",
         "features": {

From 5fda44393bc0dbb026ddef02b42ef0630752bc7e Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Tue, 12 Aug 2025 18:46:28 +0530
Subject: [PATCH 385/478] [anaconda] - feature installation support for arm64/
 aarch64. (#1342)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* anaconda feature installation support for arm64/ aarch64.

* Adding support for RHEL based linux distributions.

* Correction in the CONDA directory permission

* Update src/anaconda/install.sh, removing whitespaces

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/anaconda/install.sh, removing whitespaces

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/anaconda/install.sh

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/anaconda/install.sh, removing whitespaces as suggested by copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/anaconda/install.sh, removing whitespaces

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update test/anaconda/scenarios.json, removing whitespaces

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Correcting incorrect code review suggestion by Copilot

* Corrections based on review comments.

* Further corrections based on review comments.

---------

Co-authored-by: Kaniska244 <kaniska244@example.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
---
 src/anaconda/NOTES.md                         |   3 +
 src/anaconda/README.md                        |   2 +-
 src/anaconda/devcontainer-feature.json        |   2 +-
 src/anaconda/install.sh                       | 176 ++++++++++++++++--
 test/anaconda/install_anaconda_almalinux8.sh  |  31 +++
 test/anaconda/install_anaconda_almalinux9.sh  |  31 +++
 test/anaconda/install_anaconda_bookworm.sh    |  30 +++
 test/anaconda/install_anaconda_bullseye.sh    |  30 +++
 test/anaconda/install_anaconda_fedora.sh      |  31 +++
 test/anaconda/install_anaconda_jammy.sh       |  30 +++
 test/anaconda/install_anaconda_noble.sh       |  30 +++
 .../install_anaconda_noble_without_user.sh    |  30 +++
 test/anaconda/install_anaconda_rockylinux8.sh |  31 +++
 test/anaconda/install_anaconda_rockylinux9.sh |  32 ++++
 test/anaconda/scenarios.json                  |  86 +++++++++
 15 files changed, 553 insertions(+), 22 deletions(-)
 create mode 100644 test/anaconda/install_anaconda_almalinux8.sh
 create mode 100644 test/anaconda/install_anaconda_almalinux9.sh
 create mode 100644 test/anaconda/install_anaconda_bookworm.sh
 create mode 100644 test/anaconda/install_anaconda_bullseye.sh
 create mode 100644 test/anaconda/install_anaconda_fedora.sh
 create mode 100644 test/anaconda/install_anaconda_jammy.sh
 create mode 100644 test/anaconda/install_anaconda_noble.sh
 create mode 100644 test/anaconda/install_anaconda_noble_without_user.sh
 create mode 100644 test/anaconda/install_anaconda_rockylinux8.sh
 create mode 100644 test/anaconda/install_anaconda_rockylinux9.sh
 create mode 100644 test/anaconda/scenarios.json

diff --git a/src/anaconda/NOTES.md b/src/anaconda/NOTES.md
index 394dd6f1d..4a372cade 100644
--- a/src/anaconda/NOTES.md
+++ b/src/anaconda/NOTES.md
@@ -17,4 +17,7 @@ conda install python=3.7
 
 This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
 
+Also RHEL based linux distributions such as almalinux, rockylinux, fedora are supported now.
+Please do note that Alpine and cbl-mariner aren't supported due system level restrictions with the anaconda installer.
+
 `bash` is required to execute the `install.sh` script.
diff --git a/src/anaconda/README.md b/src/anaconda/README.md
index 3346823b4..f093ce618 100644
--- a/src/anaconda/README.md
+++ b/src/anaconda/README.md
@@ -35,7 +35,7 @@ conda install python=3.7
 ## OS Support
 
 This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
-
+Also RHEL based linux distributions such as almalinux, rockylinux, fedora are supported now.
 `bash` is required to execute the `install.sh` script.
 
 
diff --git a/src/anaconda/devcontainer-feature.json b/src/anaconda/devcontainer-feature.json
index e4779279b..ac76a9b99 100644
--- a/src/anaconda/devcontainer-feature.json
+++ b/src/anaconda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "anaconda",
-    "version": "1.0.13",
+    "version": "1.1.0",
     "name": "Anaconda",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/anaconda",
     "options": {
diff --git a/src/anaconda/install.sh b/src/anaconda/install.sh
index 7c7af5b00..6f57a3144 100755
--- a/src/anaconda/install.sh
+++ b/src/anaconda/install.sh
@@ -13,11 +13,63 @@ USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 UPDATE_RC="${UPDATE_RC:-"true"}"
 CONDA_DIR="${CONDA_DIR:-"/usr/local/conda"}"
 
-set -eux
+set -euo pipefail
 export DEBIAN_FRONTEND=noninteractive
 
+# Detect package manager and set install command
+detect_package_manager() {
+    if command -v apt-get > /dev/null; then
+        PKG_MANAGER="apt-get"
+        PKG_UPDATE="apt-get update -y"
+        PKG_INSTALL="apt-get -y install --no-install-recommends"
+        PKG_CLEAN="apt-get -y clean"
+        PKG_LISTS="/var/lib/apt/lists/*"
+        PKG_QUERY="dpkg -s"
+    elif command -v apk > /dev/null; then
+        PKG_MANAGER="apk"
+        PKG_UPDATE="apk update"
+        PKG_INSTALL="apk add --no-cache"
+        PKG_CLEAN="rm -rf /var/cache/apk/*"
+        PKG_LISTS="/var/cache/apk/*"
+        PKG_QUERY="apk info -e"
+    elif command -v dnf > /dev/null; then
+        PKG_MANAGER="dnf"
+        PKG_UPDATE="dnf -y makecache"
+        PKG_INSTALL="dnf -y install"
+        PKG_CLEAN="dnf clean all"
+        PKG_LISTS="/var/cache/dnf/*"
+        PKG_QUERY="rpm -q"
+    elif command -v microdnf > /dev/null; then
+        PKG_MANAGER="microdnf"
+        PKG_UPDATE="microdnf update"
+        PKG_INSTALL="microdnf install -y"
+        PKG_CLEAN="microdnf clean all"
+        PKG_LISTS="/var/cache/yum/*"
+        PKG_QUERY="rpm -q"
+    elif command -v tdnf > /dev/null; then
+        PKG_MANAGER="tdnf"
+        PKG_UPDATE="tdnf makecache"
+        PKG_INSTALL="tdnf install -y"
+        PKG_CLEAN="tdnf clean all"
+        PKG_LISTS="/var/cache/tdnf/*"
+        PKG_QUERY="rpm -q"
+    elif command -v yum > /dev/null; then
+        PKG_MANAGER="yum"
+        PKG_UPDATE="yum -y makecache"
+        PKG_INSTALL="yum -y install"
+        PKG_CLEAN="yum clean all"
+        PKG_LISTS="/var/cache/yum/*"
+        PKG_QUERY="rpm -q"
+    else
+        echo "No supported package manager found (apt-get, apk, dnf, microdnf, tdnf, yum)."
+        exit 1
+    fi
+}
+
+detect_package_manager
+
 # Clean up
-rm -rf /var/lib/apt/lists/*
+eval "$PKG_CLEAN"
 
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
@@ -47,7 +99,12 @@ elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
 fi
 
 architecture="$(uname -m)"
-if [ "${architecture}" != "x86_64" ]; then
+# Normalize arm64 to aarch64 for consistency
+if [ "${architecture}" = "arm64" ]; then
+    architecture="aarch64"
+fi
+
+if [ "${architecture}" != "x86_64" ] && [ "${architecture}" != "aarch64" ]; then
     echo "(!) Architecture $architecture unsupported"
     exit 1
 fi
@@ -66,12 +123,76 @@ updaterc() {
 
 # Checks if packages are installed and installs them if not
 check_packages() {
-    if ! dpkg -s "$@" > /dev/null 2>&1; then
-        if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
-            echo "Running apt-get update..."
-            apt-get update -y
+    for pkg in "$@"; do
+        # Use PKG_QUERY variable to check if package is installed
+        if ! eval "$PKG_QUERY $pkg" > /dev/null 2>&1; then
+            # Package not installed, check if we need to update package lists
+            if [ "$PKG_MANAGER" = "apt-get" ]; then
+                # For apt-get, check if package lists are empty
+                if [ "$(find "$PKG_LISTS" | wc -l)" = "0" ]; then
+                    echo "Running $PKG_UPDATE..."
+                    eval "$PKG_UPDATE"
+                fi
+            else
+                # For other package managers, always update before installing
+                echo "Running $PKG_UPDATE..."
+                eval "$PKG_UPDATE"
+            fi
+            
+            # Install the package
+            echo "Installing package: $pkg"
+            eval "$PKG_INSTALL $pkg"
+        else
+            echo "Package $pkg is already installed"
         fi
-        apt-get -y install --no-install-recommends "$@"
+    done
+}
+
+sudo_if() {
+    COMMAND="$*"
+    if [ "$(id -u)" -eq 0 ] && [ "$USERNAME" != "root" ]; then
+        if command -v runuser > /dev/null; then
+            runuser -l "$USERNAME" -c "$COMMAND"
+        elif command -v su > /dev/null; then
+            su - "$USERNAME" -c "$COMMAND"
+        elif command -v sudo > /dev/null; then
+            sudo -u "$USERNAME" -i bash -c "$COMMAND"
+        else
+            # Fallback: execute as root (not ideal but works in containers)
+            echo "Warning: No user switching command available, running as root"
+            eval "$COMMAND"
+        fi
+    else
+        eval "$COMMAND"
+    fi
+}
+
+run_as_user() {
+    local user="$1"
+    shift
+    local cmd="$*"
+    
+    if command -v runuser > /dev/null; then
+        if [ "$PKG_MANAGER" = "apk" ]; then
+            runuser "$user" -c "$cmd"
+        else
+            runuser -l "$user" -c "$cmd"
+        fi
+    elif command -v su > /dev/null; then
+        if [ "$PKG_MANAGER" = "apk" ]; then
+            su "$user" -c "$cmd"
+        else
+            su --login -c "$cmd" "$user"
+        fi
+    elif command -v sudo > /dev/null; then
+        if [ "$PKG_MANAGER" = "apk" ]; then
+            sudo -u "$user" sh -c "$cmd"
+        else
+            sudo -u "$user" -i bash -c "$cmd"
+        fi
+    else
+        echo "Warning: No user switching command available, running as root"
+        eval "$cmd"
     fi
 }
 
@@ -83,30 +204,46 @@ if ! conda --version &> /dev/null ; then
     usermod -a -G conda "${USERNAME}"
 
     # Install dependencies
-    check_packages wget ca-certificates
+    if [ "$PKG_MANAGER" = "apt-get" ]; then
+        check_packages wget ca-certificates libgtk-3-0
+    elif [ "$PKG_MANAGER" = "apk" ]; then
+        check_packages wget ca-certificates gtk+3.0
+    else
+        check_packages wget ca-certificates gtk3
+    fi
 
     mkdir -p $CONDA_DIR
+
     chown -R "${USERNAME}:conda" "${CONDA_DIR}"
-    chmod -R g+r+w "${CONDA_DIR}"
-    
-    find "${CONDA_DIR}" -type d -print0 | xargs -n 1 -0 chmod g+s
+    chmod -R g+r+w "${CONDA_DIR}"    
+
     echo "Installing Anaconda..."
 
     CONDA_VERSION=$VERSION
     if [ "${VERSION}" = "latest" ] || [ "${VERSION}" = "lts" ]; then
-        CONDA_VERSION="2021.11"
+        CONDA_VERSION="2024.10-1"
     fi
 
-    su --login -c "export http_proxy=${http_proxy:-} && export https_proxy=${https_proxy:-} \
-        && wget -q https://repo.anaconda.com/archive/Anaconda3-${CONDA_VERSION}-Linux-x86_64.sh -O /tmp/anaconda-install.sh \
-        && /bin/bash /tmp/anaconda-install.sh -u -b -p ${CONDA_DIR}" ${USERNAME} 2>&1 
+    if [ "${architecture}" = "x86_64" ]; then
+        run_as_user "${USERNAME}" "export http_proxy=${http_proxy:-} && export https_proxy=${https_proxy:-} \
+            && wget -q https://repo.anaconda.com/archive/Anaconda3-${CONDA_VERSION}-Linux-x86_64.sh -O /tmp/anaconda-install.sh \
+            && /bin/bash /tmp/anaconda-install.sh -u -b -p ${CONDA_DIR}"
+    elif [ "${architecture}" = "aarch64" ]; then
+        run_as_user "${USERNAME}" "export http_proxy=${http_proxy:-} && export https_proxy=${https_proxy:-} \
+            && wget -q https://repo.anaconda.com/archive/Anaconda3-${CONDA_VERSION}-Linux-aarch64.sh -O /tmp/anaconda-install.sh \
+            && /bin/bash /tmp/anaconda-install.sh -u -b -p ${CONDA_DIR}"
+    fi
     
     if [ "${VERSION}" = "latest" ] || [ "${VERSION}" = "lts" ]; then
         PATH=$PATH:${CONDA_DIR}/bin
         conda update -y conda
     fi
 
-    rm /tmp/anaconda-install.sh 
+    chown -R "${USERNAME}:conda" "${CONDA_DIR}"
+    chmod -R g+r+w "${CONDA_DIR}"
+
+
+    rm /tmp/anaconda-install.sh
     updaterc "export CONDA_DIR=${CONDA_DIR}/bin"
 fi
 
@@ -135,7 +272,6 @@ if [ -f "/etc/bash.bashrc" ]; then
     echo "${notice_script}" | tee -a /etc/bash.bashrc
 fi
 
-# Clean up
-rm -rf /var/lib/apt/lists/*
-
+# Final clean up
+eval "$PKG_CLEAN"
 echo "Done!"
diff --git a/test/anaconda/install_anaconda_almalinux8.sh b/test/anaconda/install_anaconda_almalinux8.sh
new file mode 100644
index 000000000..416d32a2b
--- /dev/null
+++ b/test/anaconda/install_anaconda_almalinux8.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "conda" conda --version
+check "python" python --version
+check "pylint" pylint --version
+check "flake8" flake8 --version
+check "autopep8" autopep8 --version
+check "yapf" yapf --version
+check "pydocstyle" pydocstyle --version
+check "pycodestyle" pycodestyle --version
+check "if conda-notice.txt exists" cat /usr/local/etc/vscode-dev-containers/conda-notice.txt
+
+check "certifi" pip show certifi | grep Version
+check "cryptography" pip show cryptography | grep Version
+check "setuptools" pip show setuptools | grep Version
+check "tornado" pip show tornado | grep Version
+
+check "conda-update-conda" bash -c "conda update -y conda"
+check "conda-install-tensorflow" bash -c "conda create --name test-env -c conda-forge --yes tensorflow"
+check "conda-install-pytorch" bash -c "conda create --name test-env -c conda-forge --yes pytorch"
+
+# Report result
+reportResults
+
+
diff --git a/test/anaconda/install_anaconda_almalinux9.sh b/test/anaconda/install_anaconda_almalinux9.sh
new file mode 100644
index 000000000..416d32a2b
--- /dev/null
+++ b/test/anaconda/install_anaconda_almalinux9.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "conda" conda --version
+check "python" python --version
+check "pylint" pylint --version
+check "flake8" flake8 --version
+check "autopep8" autopep8 --version
+check "yapf" yapf --version
+check "pydocstyle" pydocstyle --version
+check "pycodestyle" pycodestyle --version
+check "if conda-notice.txt exists" cat /usr/local/etc/vscode-dev-containers/conda-notice.txt
+
+check "certifi" pip show certifi | grep Version
+check "cryptography" pip show cryptography | grep Version
+check "setuptools" pip show setuptools | grep Version
+check "tornado" pip show tornado | grep Version
+
+check "conda-update-conda" bash -c "conda update -y conda"
+check "conda-install-tensorflow" bash -c "conda create --name test-env -c conda-forge --yes tensorflow"
+check "conda-install-pytorch" bash -c "conda create --name test-env -c conda-forge --yes pytorch"
+
+# Report result
+reportResults
+
+
diff --git a/test/anaconda/install_anaconda_bookworm.sh b/test/anaconda/install_anaconda_bookworm.sh
new file mode 100644
index 000000000..4a17f3dc1
--- /dev/null
+++ b/test/anaconda/install_anaconda_bookworm.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "conda" conda --version
+check "python" python --version
+check "pylint" pylint --version
+check "flake8" flake8 --version
+check "autopep8" autopep8 --version
+check "yapf" yapf --version
+check "pydocstyle" pydocstyle --version
+check "pycodestyle" pycodestyle --version
+check "if conda-notice.txt exists" cat /usr/local/etc/vscode-dev-containers/conda-notice.txt
+
+check "certifi" pip show certifi | grep Version
+check "cryptography" pip show cryptography | grep Version
+check "setuptools" pip show setuptools | grep Version
+check "tornado" pip show tornado | grep Version
+
+check "conda-update-conda" bash -c "conda update -y conda"
+check "conda-install-tensorflow" bash -c "conda create --name test-env -c conda-forge --yes tensorflow"
+check "conda-install-pytorch" bash -c "conda create --name test-env -c conda-forge --yes pytorch"
+
+# Report result
+reportResults
+
diff --git a/test/anaconda/install_anaconda_bullseye.sh b/test/anaconda/install_anaconda_bullseye.sh
new file mode 100644
index 000000000..4a17f3dc1
--- /dev/null
+++ b/test/anaconda/install_anaconda_bullseye.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "conda" conda --version
+check "python" python --version
+check "pylint" pylint --version
+check "flake8" flake8 --version
+check "autopep8" autopep8 --version
+check "yapf" yapf --version
+check "pydocstyle" pydocstyle --version
+check "pycodestyle" pycodestyle --version
+check "if conda-notice.txt exists" cat /usr/local/etc/vscode-dev-containers/conda-notice.txt
+
+check "certifi" pip show certifi | grep Version
+check "cryptography" pip show cryptography | grep Version
+check "setuptools" pip show setuptools | grep Version
+check "tornado" pip show tornado | grep Version
+
+check "conda-update-conda" bash -c "conda update -y conda"
+check "conda-install-tensorflow" bash -c "conda create --name test-env -c conda-forge --yes tensorflow"
+check "conda-install-pytorch" bash -c "conda create --name test-env -c conda-forge --yes pytorch"
+
+# Report result
+reportResults
+
diff --git a/test/anaconda/install_anaconda_fedora.sh b/test/anaconda/install_anaconda_fedora.sh
new file mode 100644
index 000000000..416d32a2b
--- /dev/null
+++ b/test/anaconda/install_anaconda_fedora.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "conda" conda --version
+check "python" python --version
+check "pylint" pylint --version
+check "flake8" flake8 --version
+check "autopep8" autopep8 --version
+check "yapf" yapf --version
+check "pydocstyle" pydocstyle --version
+check "pycodestyle" pycodestyle --version
+check "if conda-notice.txt exists" cat /usr/local/etc/vscode-dev-containers/conda-notice.txt
+
+check "certifi" pip show certifi | grep Version
+check "cryptography" pip show cryptography | grep Version
+check "setuptools" pip show setuptools | grep Version
+check "tornado" pip show tornado | grep Version
+
+check "conda-update-conda" bash -c "conda update -y conda"
+check "conda-install-tensorflow" bash -c "conda create --name test-env -c conda-forge --yes tensorflow"
+check "conda-install-pytorch" bash -c "conda create --name test-env -c conda-forge --yes pytorch"
+
+# Report result
+reportResults
+
+
diff --git a/test/anaconda/install_anaconda_jammy.sh b/test/anaconda/install_anaconda_jammy.sh
new file mode 100644
index 000000000..4a17f3dc1
--- /dev/null
+++ b/test/anaconda/install_anaconda_jammy.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "conda" conda --version
+check "python" python --version
+check "pylint" pylint --version
+check "flake8" flake8 --version
+check "autopep8" autopep8 --version
+check "yapf" yapf --version
+check "pydocstyle" pydocstyle --version
+check "pycodestyle" pycodestyle --version
+check "if conda-notice.txt exists" cat /usr/local/etc/vscode-dev-containers/conda-notice.txt
+
+check "certifi" pip show certifi | grep Version
+check "cryptography" pip show cryptography | grep Version
+check "setuptools" pip show setuptools | grep Version
+check "tornado" pip show tornado | grep Version
+
+check "conda-update-conda" bash -c "conda update -y conda"
+check "conda-install-tensorflow" bash -c "conda create --name test-env -c conda-forge --yes tensorflow"
+check "conda-install-pytorch" bash -c "conda create --name test-env -c conda-forge --yes pytorch"
+
+# Report result
+reportResults
+
diff --git a/test/anaconda/install_anaconda_noble.sh b/test/anaconda/install_anaconda_noble.sh
new file mode 100644
index 000000000..4a17f3dc1
--- /dev/null
+++ b/test/anaconda/install_anaconda_noble.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "conda" conda --version
+check "python" python --version
+check "pylint" pylint --version
+check "flake8" flake8 --version
+check "autopep8" autopep8 --version
+check "yapf" yapf --version
+check "pydocstyle" pydocstyle --version
+check "pycodestyle" pycodestyle --version
+check "if conda-notice.txt exists" cat /usr/local/etc/vscode-dev-containers/conda-notice.txt
+
+check "certifi" pip show certifi | grep Version
+check "cryptography" pip show cryptography | grep Version
+check "setuptools" pip show setuptools | grep Version
+check "tornado" pip show tornado | grep Version
+
+check "conda-update-conda" bash -c "conda update -y conda"
+check "conda-install-tensorflow" bash -c "conda create --name test-env -c conda-forge --yes tensorflow"
+check "conda-install-pytorch" bash -c "conda create --name test-env -c conda-forge --yes pytorch"
+
+# Report result
+reportResults
+
diff --git a/test/anaconda/install_anaconda_noble_without_user.sh b/test/anaconda/install_anaconda_noble_without_user.sh
new file mode 100644
index 000000000..4a17f3dc1
--- /dev/null
+++ b/test/anaconda/install_anaconda_noble_without_user.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "conda" conda --version
+check "python" python --version
+check "pylint" pylint --version
+check "flake8" flake8 --version
+check "autopep8" autopep8 --version
+check "yapf" yapf --version
+check "pydocstyle" pydocstyle --version
+check "pycodestyle" pycodestyle --version
+check "if conda-notice.txt exists" cat /usr/local/etc/vscode-dev-containers/conda-notice.txt
+
+check "certifi" pip show certifi | grep Version
+check "cryptography" pip show cryptography | grep Version
+check "setuptools" pip show setuptools | grep Version
+check "tornado" pip show tornado | grep Version
+
+check "conda-update-conda" bash -c "conda update -y conda"
+check "conda-install-tensorflow" bash -c "conda create --name test-env -c conda-forge --yes tensorflow"
+check "conda-install-pytorch" bash -c "conda create --name test-env -c conda-forge --yes pytorch"
+
+# Report result
+reportResults
+
diff --git a/test/anaconda/install_anaconda_rockylinux8.sh b/test/anaconda/install_anaconda_rockylinux8.sh
new file mode 100644
index 000000000..416d32a2b
--- /dev/null
+++ b/test/anaconda/install_anaconda_rockylinux8.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "conda" conda --version
+check "python" python --version
+check "pylint" pylint --version
+check "flake8" flake8 --version
+check "autopep8" autopep8 --version
+check "yapf" yapf --version
+check "pydocstyle" pydocstyle --version
+check "pycodestyle" pycodestyle --version
+check "if conda-notice.txt exists" cat /usr/local/etc/vscode-dev-containers/conda-notice.txt
+
+check "certifi" pip show certifi | grep Version
+check "cryptography" pip show cryptography | grep Version
+check "setuptools" pip show setuptools | grep Version
+check "tornado" pip show tornado | grep Version
+
+check "conda-update-conda" bash -c "conda update -y conda"
+check "conda-install-tensorflow" bash -c "conda create --name test-env -c conda-forge --yes tensorflow"
+check "conda-install-pytorch" bash -c "conda create --name test-env -c conda-forge --yes pytorch"
+
+# Report result
+reportResults
+
+
diff --git a/test/anaconda/install_anaconda_rockylinux9.sh b/test/anaconda/install_anaconda_rockylinux9.sh
new file mode 100644
index 000000000..d71085c4c
--- /dev/null
+++ b/test/anaconda/install_anaconda_rockylinux9.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "conda" conda --version
+check "python" python --version
+check "pylint" pylint --version
+check "flake8" flake8 --version
+check "autopep8" autopep8 --version
+check "yapf" yapf --version
+check "pydocstyle" pydocstyle --version
+check "pycodestyle" pycodestyle --version
+check "if conda-notice.txt exists" cat /usr/local/etc/vscode-dev-containers/conda-notice.txt
+
+check "certifi" pip show certifi | grep Version
+check "cryptography" pip show cryptography | grep Version
+check "setuptools" pip show setuptools | grep Version
+check "tornado" pip show tornado | grep Version
+
+check "conda-update-conda" bash -c "conda update -y conda"
+check "conda-install-tensorflow" bash -c "conda create --name test-env -c conda-forge --yes tensorflow"
+check "conda-install-pytorch" bash -c "conda create --name test-env -c conda-forge --yes pytorch"
+
+# Report result
+reportResults
+
+
+
diff --git a/test/anaconda/scenarios.json b/test/anaconda/scenarios.json
new file mode 100644
index 000000000..65fba8458
--- /dev/null
+++ b/test/anaconda/scenarios.json
@@ -0,0 +1,86 @@
+{
+   "install_anaconda_noble": {
+   "image": "mcr.microsoft.com/devcontainers/base:noble",
+   "user": "vscode",
+   "features": {
+     "anaconda": {
+       "version": "latest"
+     }
+   }
+  },
+  "install_anaconda_jammy": {
+    "image": "mcr.microsoft.com/devcontainers/base:jammy",
+    "user": "vscode",
+    "features": {
+      "anaconda": {
+        "version": "latest"
+      }
+    }
+   },
+   "install_anaconda_bookworm": {
+    "image": "mcr.microsoft.com/devcontainers/base:bookworm",
+    "user": "vscode",
+    "features": {
+      "anaconda": {
+        "version": "latest"
+      }
+    }
+   },
+   "install_anaconda_bullseye": {
+    "image": "mcr.microsoft.com/devcontainers/base:bullseye",
+    "user": "vscode",
+    "features": {
+      "anaconda": {
+        "version": "latest"
+      }
+    }
+  },
+  "install_anaconda_noble_without_user": {
+    "image": "mcr.microsoft.com/devcontainers/base:noble",
+    "features": {
+      "anaconda": {
+        "version": "latest"
+      }
+    }
+  },
+  "install_anaconda_almalinux8": {
+    "image": "almalinux:8",
+    "features": {
+      "anaconda": {
+        "version": "latest"
+      }
+    }
+  },
+  "install_anaconda_almalinux9": {
+    "image": "almalinux:9",
+    "features": {
+      "anaconda": {
+        "version": "latest"
+      }
+    }
+  },
+  "install_anaconda_rockylinux8": {
+    "image": "rockylinux:8",
+    "features": {
+      "anaconda": {
+        "version": "latest"
+      }
+    }
+  },
+  "install_anaconda_rockylinux9": {
+    "image": "rockylinux:9",
+    "features": {
+      "anaconda": {
+        "version": "latest"
+      }
+    }
+  },
+  "install_anaconda_fedora": {
+    "image": "fedora",
+    "features": {
+      "anaconda": {
+        "version": "latest"
+      }
+    }
+  }
+}

From 04f00232d1d98b4e72b986fd679929ccfe2d8754 Mon Sep 17 00:00:00 2001
From: Olivier Lemasle <o.lemasle@gmail.com>
Date: Tue, 12 Aug 2025 15:25:43 +0200
Subject: [PATCH 386/478] [rust] Update NOTES.md (#1426)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

README.md was updated in #1376, but NOTES.md was
left as is. The changes in README.md will be
overriden when CI will update the documentation
(e.g. with #1408).

This PR also regenerates README.md, which fixes
the documentation for option `components`.

Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
---
 src/rust/NOTES.md  | 7 ++++++-
 src/rust/README.md | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/rust/NOTES.md b/src/rust/NOTES.md
index 19fe92f31..1f01e6e52 100644
--- a/src/rust/NOTES.md
+++ b/src/rust/NOTES.md
@@ -2,6 +2,11 @@
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, RockyLinux 
+and Mariner distributions with the `apt`, `yum`, `dnf`, `microdnf` and `tdnf` package manager installed.
+
+
+**Note:** Alpine is not supported because the rustup-init binary requires glibc to run, but Alpine Linux does not include `glibc` 
+by default. Instead, it uses musl libc, which is not binary-compatible with glibc.
 
 `bash` is required to execute the `install.sh` script.
diff --git a/src/rust/README.md b/src/rust/README.md
index 963588c2a..ef0bc2311 100644
--- a/src/rust/README.md
+++ b/src/rust/README.md
@@ -18,7 +18,7 @@ Installs Rust, common Rust utilities, and their required dependencies
 | version | Select or enter a version of Rust to install. | string | latest |
 | profile | Select a rustup install profile. | string | minimal |
 | targets | Optional comma separated list of additional Rust targets to install. | string | - |
-| components | Optional comma separeated list of rust components to be installed based on input. | string | rust-analyzer,rust-src,rustfmt,clippy |
+| components | Optional, comma separated list of Rust components to be installed | string | rust-analyzer,rust-src,rustfmt,clippy |
 
 ## Customizations
 

From b9c09c4dcb7906226fcbc88e3a0b194dde0c4cb2 Mon Sep 17 00:00:00 2001
From: Jam Balaya <jambalaya.pyoncafe@outlook.jp>
Date: Tue, 12 Aug 2025 22:27:41 +0900
Subject: [PATCH 387/478] chore(devcontainer): bump javascript-node image
 version (#1423)

fix(devcontainer): bump javascript-node image version
---
 .devcontainer/devcontainer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 096a3d095..db939da5b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-    "image": "mcr.microsoft.com/devcontainers/javascript-node:1-18",
+    "image": "mcr.microsoft.com/devcontainers/javascript-node:3-22",
     "features": {
         "ghcr.io/devcontainers/features/docker-in-docker:2": {}
     },

From 849a5e2a7fd2c8109531cec9e63bfde12472407a Mon Sep 17 00:00:00 2001
From: Danilo Hoffmann <dhhyi@aol.com>
Date: Tue, 12 Aug 2025 16:53:56 +0200
Subject: [PATCH 388/478] [common-utils] use new ohmyzsh setting to disable
 auto update (#1424)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Use new config to disable OhMyZsh auto update

There's a new method:
https://github.com/ohmyzsh/ohmyzsh/wiki/Settings#deprecated-settings

* bump patch version

* Remove `buster` from testing scenarios as it is EOL

---------

Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
---
 src/common-utils/devcontainer-feature.json |  2 +-
 src/common-utils/main.sh                   |  2 +-
 test/common-utils/buster.sh                | 14 --------------
 test/common-utils/scenarios.json           |  7 -------
 4 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100755 test/common-utils/buster.sh

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 82ddde046..14850232d 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.5.3",
+    "version": "2.5.4",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index abef18430..68abe58c8 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -558,7 +558,7 @@ if [ "${INSTALL_ZSH}" = "true" ]; then
         # Add devcontainer .zshrc template
         if [ "$INSTALL_OH_MY_ZSH_CONFIG" = "true" ]; then
             if ! [ -f "${template_path}" ] || ! grep -qF "$(head -n 1 "${template_path}")" "${user_rc_file}"; then
-                echo -e "$(cat "${template_path}")\nDISABLE_AUTO_UPDATE=true\nDISABLE_UPDATE_PROMPT=true" > ${user_rc_file}
+                echo -e "$(cat "${template_path}")\nzstyle ':omz:update' mode disabled" > ${user_rc_file}
             fi
             sed -i -e 's/ZSH_THEME=.*/ZSH_THEME="devcontainers"/g' ${user_rc_file}
         fi
diff --git a/test/common-utils/buster.sh b/test/common-utils/buster.sh
deleted file mode 100755
index 9fd2f409f..000000000
--- a/test/common-utils/buster.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-# Definition specific tests
-. /etc/os-release
-check "non-root user" test "$(whoami)" = "devcontainer"
-check "distro" test "${VERSION_CODENAME}" = "buster"
-
-# Report result
-reportResults
\ No newline at end of file
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index 5a8ec87cd..ee138ca22 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -13,13 +13,6 @@
             "common-utils": {}
         }
     },    
-    "buster": {
-        "image": "debian:buster",
-        "remoteUser": "devcontainer",
-        "features": {
-            "common-utils": {}
-        }
-    },
     "bullseye": {
         "image": "debian:bullseye",
         "remoteUser": "devcontainer",

From da45251310a057c03dbe08477fb43f91f574361f Mon Sep 17 00:00:00 2001
From: Sergey Katsubo <skatsubo@gmail.com>
Date: Thu, 28 Aug 2025 11:40:17 +0300
Subject: [PATCH 389/478] [docker] Add Debian Trixie to the docker-in-docker
 and docker-outside-of-docker distro lists (#1442)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add Debian Trixie to the docker-* distro list

* Grammar

* Fix Microsoft signing keys for Debian Trixie in docker-*

* Test docker installation on debian trixie

* Handle possibly missing moby package in docker-outside-of-docker installation

* Remove trixie test with `moby: true`

---------

Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
---
 src/docker-in-docker/devcontainer-feature.json  |  2 +-
 src/docker-in-docker/install.sh                 | 16 ++++++++++------
 .../devcontainer-feature.json                   |  2 +-
 src/docker-outside-of-docker/install.sh         | 17 ++++++++++-------
 .../install_moby_on_debian_trixie.sh            |  1 +
 .../install_on_debian_trixie.sh                 | 12 ++++++++++++
 test/docker-in-docker/scenarios.json            |  8 ++++++++
 .../install_moby_on_debian_trixie.sh            |  1 +
 .../install_on_debian_trixie.sh                 | 12 ++++++++++++
 test/docker-outside-of-docker/scenarios.json    |  8 ++++++++
 10 files changed, 64 insertions(+), 15 deletions(-)
 create mode 120000 test/docker-in-docker/install_moby_on_debian_trixie.sh
 create mode 100644 test/docker-in-docker/install_on_debian_trixie.sh
 create mode 120000 test/docker-outside-of-docker/install_moby_on_debian_trixie.sh
 create mode 100644 test/docker-outside-of-docker/install_on_debian_trixie.sh

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index e44f2d666..7194ba0e0 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.12.2",
+    "version": "2.12.3",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index b43a12918..bf60620f6 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -18,8 +18,9 @@ USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
 INSTALL_DOCKER_COMPOSE_SWITCH="${INSTALLDOCKERCOMPOSESWITCH:-"true"}"
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
-DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal jammy noble"
-DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal hirsute impish jammy noble"
+MICROSOFT_GPG_KEYS_ROLLING_URI="https://packages.microsoft.com/keys/microsoft-rolling.asc"
+DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="trixie bookworm buster bullseye bionic focal jammy noble"
+DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="trixie bookworm buster bullseye bionic focal hirsute impish jammy noble"
 DISABLE_IP6_TABLES="${DISABLEIP6TABLES:-false}"
 
 # Default: Exit on any failure.
@@ -198,14 +199,14 @@ architecture="$(dpkg --print-architecture)"
 if [ "${USE_MOBY}" = "true" ]; then
     if [[ "${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
         err "Unsupported  distribution version '${VERSION_CODENAME}'. To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS distribution"
-        err "Support distributions include:  ${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}"
+        err "Supported distributions include:  ${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}"
         exit 1
     fi
     echo "Distro codename  '${VERSION_CODENAME}'  matched filter  '${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}'"
 else
     if [[ "${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
         err "Unsupported distribution version '${VERSION_CODENAME}'. To resolve, please choose a compatible OS distribution"
-        err "Support distributions include:  ${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}"
+        err "Supported distributions include:  ${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}"
         exit 1
     fi
     echo "Distro codename  '${VERSION_CODENAME}'  matched filter  '${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}'"
@@ -233,7 +234,10 @@ if [ "${USE_MOBY}" = "true" ]; then
     cli_package_name="moby-cli"
 
     # Import key safely and import Microsoft apt repo
-    curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
+    {
+        curl -sSL ${MICROSOFT_GPG_KEYS_URI}
+        curl -sSL ${MICROSOFT_GPG_KEYS_ROLLING_URI}
+    } | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
     echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
 else
     # Name of licensed engine/cli
@@ -305,7 +309,7 @@ else
         set -e    
         
         if [ ${exit_code} -ne 0 ]; then
-            err "Packages for moby not available in OS ${ID} ${VERSION_CODENAME} (${architecture}). To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS version (eg: 'ubuntu-20.04')."
+            err "Packages for moby not available in OS ${ID} ${VERSION_CODENAME} (${architecture}). To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS version (eg: 'ubuntu-24.04')."
             exit 1
         fi
 
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 218df825f..bee1c8a57 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.6.3",
+    "version": "1.6.4",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 04e35db0f..d8da01979 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -18,10 +18,10 @@ TARGET_SOCKET="${TARGET_SOCKET:-"/var/run/docker.sock"}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
 INSTALL_DOCKER_COMPOSE_SWITCH="${INSTALLDOCKERCOMPOSESWITCH:-"true"}"
-
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
-DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal jammy noble plucky"
-DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal hirsute impish jammy noble plucky"
+MICROSOFT_GPG_KEYS_ROLLING_URI="https://packages.microsoft.com/keys/microsoft-rolling.asc"
+DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="trixie bookworm buster bullseye bionic focal jammy noble plucky"
+DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="trixie bookworm buster bullseye bionic focal hirsute impish jammy noble plucky"
 
 set -e
 
@@ -205,14 +205,14 @@ architecture="$(dpkg --print-architecture)"
 if [ "${USE_MOBY}" = "true" ]; then
     if [[ "${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
         err "Unsupported  distribution version '${VERSION_CODENAME}'. To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS distribution"
-        err "Support distributions include:  ${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}"
+        err "Supported distributions include:  ${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}"
         exit 1
     fi
     echo "Distro codename  '${VERSION_CODENAME}'  matched filter  '${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}'"
 else
     if [[ "${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
         err "Unsupported distribution version '${VERSION_CODENAME}'. To resolve, please choose a compatible OS distribution"
-        err "Support distributions include:  ${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}"
+        err "Supported distributions include:  ${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}"
         exit 1
     fi
     echo "Distro codename  '${VERSION_CODENAME}'  matched filter  '${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}'"
@@ -224,7 +224,10 @@ if [ "${USE_MOBY}" = "true" ]; then
     cli_package_name="moby-cli"
 
     # Import key safely and import Microsoft apt repo
-    curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
+    {
+        curl -sSL ${MICROSOFT_GPG_KEYS_URI}
+        curl -sSL ${MICROSOFT_GPG_KEYS_ROLLING_URI}
+    } | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
     echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
 else
     # Name of proprietary engine package
@@ -302,7 +305,7 @@ else
         if [ "${INSTALL_DOCKER_BUILDX}" = "true" ]; then
             buildx=(moby-buildx${buildx_version_suffix})
         fi
-        apt-get -y install --no-install-recommends ${cli_package_name}${cli_version_suffix} "${buildx[@]}"
+        apt-get -y install --no-install-recommends ${cli_package_name}${cli_version_suffix} "${buildx[@]}" || { err "It seems packages for moby not available in OS ${ID} ${VERSION_CODENAME} (${architecture}). To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS version (eg: 'ubuntu-24.04')." ; exit 1 ; }
         apt-get -y install --no-install-recommends moby-compose || echo "(*) Package moby-compose (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
     else
         buildx=()
diff --git a/test/docker-in-docker/install_moby_on_debian_trixie.sh b/test/docker-in-docker/install_moby_on_debian_trixie.sh
new file mode 120000
index 000000000..6c5c2a157
--- /dev/null
+++ b/test/docker-in-docker/install_moby_on_debian_trixie.sh
@@ -0,0 +1 @@
+install_on_debian_trixie.sh
\ No newline at end of file
diff --git a/test/docker-in-docker/install_on_debian_trixie.sh b/test/docker-in-docker/install_on_debian_trixie.sh
new file mode 100644
index 000000000..c6c679684
--- /dev/null
+++ b/test/docker-in-docker/install_on_debian_trixie.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker installed" bash -c "type docker"
+
+# Report results
+reportResults
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index 1587bda56..428909f8c 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -134,6 +134,14 @@
             }
         }
     },
+    "install_on_debian_trixie": {
+        "image": "debian:trixie",
+        "features": {
+            "docker-in-docker": {
+                "moby": false
+            }
+        }
+    },
     "docker_specific_moby_buildx": {
         "image": "ubuntu:noble",
         "features": {
diff --git a/test/docker-outside-of-docker/install_moby_on_debian_trixie.sh b/test/docker-outside-of-docker/install_moby_on_debian_trixie.sh
new file mode 120000
index 000000000..6c5c2a157
--- /dev/null
+++ b/test/docker-outside-of-docker/install_moby_on_debian_trixie.sh
@@ -0,0 +1 @@
+install_on_debian_trixie.sh
\ No newline at end of file
diff --git a/test/docker-outside-of-docker/install_on_debian_trixie.sh b/test/docker-outside-of-docker/install_on_debian_trixie.sh
new file mode 100644
index 000000000..c6c679684
--- /dev/null
+++ b/test/docker-outside-of-docker/install_on_debian_trixie.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker installed" bash -c "type docker"
+
+# Report results
+reportResults
diff --git a/test/docker-outside-of-docker/scenarios.json b/test/docker-outside-of-docker/scenarios.json
index 7125b4715..2163e7076 100644
--- a/test/docker-outside-of-docker/scenarios.json
+++ b/test/docker-outside-of-docker/scenarios.json
@@ -172,5 +172,13 @@
             }
         },
         "containerUser": "vscode"
+    },
+    "install_on_debian_trixie": {
+        "image": "debian:trixie",
+        "features": {
+            "docker-outside-of-docker": {
+                "moby": false
+            }
+        }
     }
 }

From c05bd451518d73c9658eb9a41db18aaa968b73f3 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Mon, 1 Sep 2025 15:52:50 +0530
Subject: [PATCH 390/478] [ruby] - Fixing ruby feature installation issue in
 debian trixie(13) (#1453)

* [ruby] - Making ruby feature work in debian trixie(13)

* Restart test
---
 src/ruby/devcontainer-feature.json            |  2 +-
 src/ruby/install.sh                           | 18 ++++++++++-
 test/ruby/install_additional_ruby_trixie.sh   | 17 ++++++++++
 test/ruby/install_ruby_trixie_base.sh         | 15 +++++++++
 test/ruby/install_ruby_trixie_base/Dockerfile | 18 +++++++++++
 test/ruby/scenarios.json                      | 32 ++++++++++++++++++-
 6 files changed, 99 insertions(+), 3 deletions(-)
 create mode 100644 test/ruby/install_additional_ruby_trixie.sh
 create mode 100644 test/ruby/install_ruby_trixie_base.sh
 create mode 100644 test/ruby/install_ruby_trixie_base/Dockerfile

diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json
index 82ae50a10..661c46bf0 100644
--- a/src/ruby/devcontainer-feature.json
+++ b/src/ruby/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "name": "Ruby (via rvm)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
     "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
diff --git a/src/ruby/install.sh b/src/ruby/install.sh
index befeee4af..39cb5be03 100755
--- a/src/ruby/install.sh
+++ b/src/ruby/install.sh
@@ -240,13 +240,29 @@ if [ "${architecture}" != "amd64" ] && [ "${architecture}" != "x86_64" ] && [ "$
 fi
 
 # Install dependencies
-check_packages curl ca-certificates software-properties-common build-essential gnupg2 libreadline-dev \
+# Removed software-properties-common package from here as it has been removed for debian trixie(13)
+check_packages curl ca-certificates build-essential gnupg2 libreadline-dev \
     procps dirmngr gawk autoconf automake bison libffi-dev libgdbm-dev libncurses5-dev \
     libsqlite3-dev libtool libyaml-dev pkg-config sqlite3 zlib1g-dev libgmp-dev libssl-dev
 if ! type git > /dev/null 2>&1; then
     check_packages git
 fi
 
+# Conditionally install software-properties-common (skip on Debian Trixie)
+if type apt-get >/dev/null 2>&1; then
+    if [ -f /etc/os-release ]; then
+        . /etc/os-release
+        if [ "${ID}" = "debian" ] && [ "${VERSION_CODENAME}" = "trixie" ]; then
+            echo "Skipping software-properties-common on Debian Trixie."
+        else
+            check_packages software-properties-common
+        fi
+    else
+        # Fallback for apt-based systems without /etc/os-release
+        check_packages software-properties-common
+    fi
+fi
+
 # Function to fetch the version released prior to the latest version
 get_previous_version() {
     local url=$1
diff --git a/test/ruby/install_additional_ruby_trixie.sh b/test/ruby/install_additional_ruby_trixie.sh
new file mode 100644
index 000000000..76f7c9028
--- /dev/null
+++ b/test/ruby/install_additional_ruby_trixie.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "ruby version 3.4.2 installed as default" ruby -v | grep 3.4.2
+check "ruby version 3.2.8 installed"  rvm list | grep 3.2.8
+check "ruby version 3.3.2 installed"  rvm list | grep 3.3.2
+
+check "rbenv" bash -c 'eval "$(rbenv init -)" && rbenv --version'
+check "rake" bash -c "gem list | grep rake"
+
+# Report result
+reportResults
+
diff --git a/test/ruby/install_ruby_trixie_base.sh b/test/ruby/install_ruby_trixie_base.sh
new file mode 100644
index 000000000..f90c76cc4
--- /dev/null
+++ b/test/ruby/install_ruby_trixie_base.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "ruby version" ruby  --version
+check "rvm" rvm --version
+check "gem version" gem --version
+
+# Report result
+reportResults
+
diff --git a/test/ruby/install_ruby_trixie_base/Dockerfile b/test/ruby/install_ruby_trixie_base/Dockerfile
new file mode 100644
index 000000000..e80891596
--- /dev/null
+++ b/test/ruby/install_ruby_trixie_base/Dockerfile
@@ -0,0 +1,18 @@
+# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.4, 3.3, 3.2, 3-bookworm, 3.4-bookworm, 3.3-bookworm, 3.2-bookworm, 3-bullseye, 3.4-bullseye, 3.3-bullseye, 3.2-bullseye, 3-buster, 3.2-buster
+ARG VARIANT=3-trixie
+FROM ruby:${VARIANT}
+
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    # Remove imagemagick due to https://security-tracker.debian.org/tracker/CVE-2019-10131
+    && apt-get purge -y imagemagick imagemagick-6-common 
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+# [Optional] Uncomment this line to install additional gems.
+# RUN gem install <your-gem-names-here>
+
+# [Optional] Uncomment this line to install global node packages.
+# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
+
diff --git a/test/ruby/scenarios.json b/test/ruby/scenarios.json
index 7a13f7004..7aa7c5f8e 100644
--- a/test/ruby/scenarios.json
+++ b/test/ruby/scenarios.json
@@ -1,4 +1,34 @@
-{
+{   
+    "install_ruby_trixie_base": {
+        "build": {
+            "dockerfile": "Dockerfile"
+        },        
+        "features": {
+            "ghcr.io/devcontainers/features/common-utils:2": {
+                "installZsh": "true",
+                "username": "vscode",
+                "userUid": "1000",
+                "userGid": "1000",
+                "upgradePackages": "true"
+            },
+            "ruby": "none",
+            "ghcr.io/devcontainers/features/node:1": "none",
+            "ghcr.io/devcontainers/features/git:1": {
+                "version": "latest",
+                "ppa": "false"
+            }
+        },
+        "remoteUser": "vscode"
+    },
+    "install_additional_ruby_trixie": {
+        "image": "debian:trixie",
+        "features": {
+            "ruby": {
+                "version": "3.4.2",
+                "additionalVersions": "3.2,3.3.2"
+            }
+        }
+    },       
     "install_additional_ruby": {
         "image": "ubuntu:noble",
         "features": {

From 6a8863be0afc3a133dd1966d1b92b8eb34307950 Mon Sep 17 00:00:00 2001
From: Lingyu Zhou <lingyu.zhou@network.lilly.com>
Date: Tue, 16 Sep 2025 11:24:20 -0400
Subject: [PATCH 391/478] [sshd] Add GatewayPorts option (#1464)

add gatewayports option to sshd
---
 src/sshd/README.md                             |  1 +
 src/sshd/devcontainer-feature.json             | 12 +++++++++++-
 src/sshd/install.sh                            |  2 ++
 test/sshd/scenarios.json                       | 18 ++++++++++++++++++
 test/sshd/sshd_with_default_gateway_ports.sh   | 12 ++++++++++++
 ...ith_pinned_gateway_ports_clientspecified.sh | 12 ++++++++++++
 6 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 test/sshd/scenarios.json
 create mode 100644 test/sshd/sshd_with_default_gateway_ports.sh
 create mode 100644 test/sshd/sshd_with_pinned_gateway_ports_clientspecified.sh

diff --git a/src/sshd/README.md b/src/sshd/README.md
index 7314e16af..f4215b391 100644
--- a/src/sshd/README.md
+++ b/src/sshd/README.md
@@ -15,6 +15,7 @@ Adds a SSH server into a container so that you can use an external terminal, sft
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
+| gatewayPorts | Enable other hosts in the same network to connect to the forwarded ports | string | no
 | version | Currently unused. | string | latest |
 
 ## Usage
diff --git a/src/sshd/devcontainer-feature.json b/src/sshd/devcontainer-feature.json
index e400b0601..46c4ef302 100644
--- a/src/sshd/devcontainer-feature.json
+++ b/src/sshd/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "sshd",
-    "version": "1.0.10",
+    "version": "1.1.0",
     "name": "SSH server",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/sshd",
     "description": "Adds a SSH server into a container so that you can use an external terminal, sftp, or SSHFS to interact with it.",
@@ -12,6 +12,16 @@
             ],
             "default": "latest",
             "description": "Currently unused."
+        },
+        "gatewayPorts": {
+            "type": "string",
+            "enum": [
+                "no",
+                "yes",
+                "clientspecified"
+            ],
+            "default": "no",
+            "description": "Enable other hosts in the same network to connect to the forwarded ports"
         }
     },
     "entrypoint": "/usr/local/share/ssh-init.sh",
diff --git a/src/sshd/install.sh b/src/sshd/install.sh
index 146040896..9b9ddedf2 100755
--- a/src/sshd/install.sh
+++ b/src/sshd/install.sh
@@ -13,6 +13,7 @@ SSHD_PORT="${SSHD_PORT:-"2222"}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 START_SSHD="${START_SSHD:-"false"}"
 NEW_PASSWORD="${NEW_PASSWORD:-"skip"}"
+GATEWAY_PORTS="${GATEWAYPORTS:-"no"}" 
 
 set -e
 
@@ -89,6 +90,7 @@ mkdir -p /var/run/sshd
 sed -i 's/session\s*required\s*pam_loginuid\.so/session optional pam_loginuid.so/g' /etc/pam.d/sshd
 sed -i 's/#*PermitRootLogin prohibit-password/PermitRootLogin yes/g' /etc/ssh/sshd_config
 sed -i -E "s/#*\s*Port\s+.+/Port ${SSHD_PORT}/g" /etc/ssh/sshd_config
+sed -i "s/#GatewayPorts no/GatewayPorts ${GATEWAY_PORTS}/g" /etc/ssh/sshd_config
 # Need to UsePAM so /etc/environment is processed
 sed -i -E "s/#?\s*UsePAM\s+.+/UsePAM yes/g" /etc/ssh/sshd_config
 
diff --git a/test/sshd/scenarios.json b/test/sshd/scenarios.json
new file mode 100644
index 000000000..1513f64f9
--- /dev/null
+++ b/test/sshd/scenarios.json
@@ -0,0 +1,18 @@
+{
+    "sshd_with_default_gateway_ports": {
+        "image": "ubuntu:noble",
+        "features": {
+            "sshd": {
+                "gatewayPorts": "no"
+            }
+        }
+    },
+    "sshd_with_pinned_gateway_ports_clientspecified": {
+        "image": "ubuntu:noble",
+        "features": {
+            "sshd": {
+                "gatewayPorts": "clientspecified"
+            }
+        }
+    }                                                           
+}
diff --git a/test/sshd/sshd_with_default_gateway_ports.sh b/test/sshd/sshd_with_default_gateway_ports.sh
new file mode 100644
index 000000000..543074ad4
--- /dev/null
+++ b/test/sshd/sshd_with_default_gateway_ports.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "correct default GatewayPorts" grep "GatewayPorts no" /etc/ssh/sshd_config
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/sshd/sshd_with_pinned_gateway_ports_clientspecified.sh b/test/sshd/sshd_with_pinned_gateway_ports_clientspecified.sh
new file mode 100644
index 000000000..58b7cb730
--- /dev/null
+++ b/test/sshd/sshd_with_pinned_gateway_ports_clientspecified.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "correct default GatewayPorts" grep "GatewayPorts clientspecified" /etc/ssh/sshd_config
+
+# Report result
+reportResults
\ No newline at end of file

From 787dd39806c4d5afdee8a66c4af4a6a9c08c1989 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Tue, 16 Sep 2025 21:11:29 +0530
Subject: [PATCH 392/478] [terraform] - Fix terraform installation in debian
 trixie(13) (#1475)

* [terraform] - Fix terraform installation in debian trixie(13)

* Version bump
---
 src/terraform/devcontainer-feature.json       |  2 +-
 src/terraform/install.sh                      | 22 +++++++++----------
 test/terraform/install_in_ubuntu_trixie.sh    | 19 ++++++++++++++++
 .../install_in_ubuntu_trixie_sentinel.sh      | 22 +++++++++++++++++++
 test/terraform/scenarios.json                 | 16 ++++++++++++++
 5 files changed, 69 insertions(+), 12 deletions(-)
 create mode 100644 test/terraform/install_in_ubuntu_trixie.sh
 create mode 100644 test/terraform/install_in_ubuntu_trixie_sentinel.sh

diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index ceee4979e..a72f18993 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.4.1",
+    "version": "1.4.2",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index b1d64c27b..999815a38 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -19,6 +19,8 @@ INSTALL_SENTINEL=${INSTALLSENTINEL:-false}
 INSTALL_TFSEC=${INSTALLTFSEC:-false}
 INSTALL_TERRAFORM_DOCS=${INSTALLTERRAFORMDOCS:-false}
 CUSTOM_DOWNLOAD_SERVER="${CUSTOMDOWNLOADSERVER:-""}"
+# This is because ubuntu noble and debian trixie don't support the old format of GPG keys and validation 
+NEW_GPG_CODENAMES="trixie noble"
 
 TERRAFORM_SHA256="${TERRAFORM_SHA256:-"automatic"}"
 TFLINT_SHA256="${TFLINT_SHA256:-"automatic"}"
@@ -50,13 +52,11 @@ if [ "$(id -u)" -ne 0 ]; then
     exit 1
 fi
 
-# Detect Ubuntu Noble and use new repo setup, else use legacy GPG logic
-IS_NOBLE=0
-if grep -qi 'ubuntu' /etc/os-release; then
-    . /etc/os-release
-    if [[ "$VERSION_CODENAME" == "noble" ]]; then
-        IS_NOBLE=1
-    fi
+# Detect Ubuntu Noble or Debian Trixie and use new repo setup, else use legacy GPG logic
+IS_GPG_NEW=0
+. /etc/os-release
+if [[ "${NEW_GPG_CODENAMES}" == *"${VERSION_CODENAME}"* ]]; then
+    IS_GPG_NEW=1
 fi
 
 # Get the list of GPG key servers that are reachable
@@ -112,7 +112,7 @@ receive_gpg_keys() {
     chmod 700 ${GNUPGHOME}
     
     # Special handling for HashiCorp GPG key on Ubuntu Noble
-    if [ "$IS_NOBLE" -eq 1 ] && [ "$keys" = "$TERRAFORM_GPG_KEY" ]; then
+    if [ "$IS_GPG_NEW" -eq 1 ] && [ "$keys" = "$TERRAFORM_GPG_KEY" ]; then
         echo "(*) Ubuntu Noble detected, using Keybase for HashiCorp GPG key import...."
         curl -fsSL https://keybase.io/hashicorp/pgp_keys.asc | gpg --import
         if ! gpg --list-keys "${TERRAFORM_GPG_KEY}" > /dev/null 2>&1; then
@@ -400,7 +400,7 @@ verify_signature() {
 
     receive_gpg_keys "$gpg_key"
     verify_result=$?
-    if [ $verify_result -ne 0 ] && [ "$IS_NOBLE" -eq 1 ]; then
+    if [ $verify_result -ne 0 ] && [ "$IS_GPG_NEW" -eq 1 ]; then
         echo "Skipping the gpg key validation for ubuntu noble as unable to import the key."
         return 1
     fi
@@ -429,7 +429,7 @@ fi
 if [ "${TERRAFORM_SHA256}" != "dev-mode" ]; then
     if [ "${TERRAFORM_SHA256}" = "automatic" ]; then
         # For Ubuntu Noble, try GPG verification but continue if it fails
-        if [ "$IS_NOBLE" -eq 1 ]; then
+        if [ "$IS_GPG_NEW" -eq 1 ]; then
             echo "(*) Ubuntu Noble detected - attempting GPG verification with fallback..."
             set +e
             sha256sums_url="${HASHICORP_RELEASES_URL}/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS"
@@ -543,7 +543,7 @@ if [ "${INSTALL_SENTINEL}" = "true" ]; then
     if [ "${SENTINEL_SHA256}" != "dev-mode" ]; then
         if [ "${SENTINEL_SHA256}" = "automatic" ]; then
             # For Ubuntu Noble, try GPG verification but continue if it fails
-            if [ "$IS_NOBLE" -eq 1 ]; then
+            if [ "$IS_GPG_NEW" -eq 1 ]; then
                 echo "(*) Ubuntu Noble detected - attempting Sentinel GPG verification with fallback..."
                 set +e
                 sha256sums_url="${sentinel_releases_url}/${SENTINEL_VERSION}/sentinel_${SENTINEL_VERSION}_SHA256SUMS"
diff --git a/test/terraform/install_in_ubuntu_trixie.sh b/test/terraform/install_in_ubuntu_trixie.sh
new file mode 100644
index 000000000..9b03a3a60
--- /dev/null
+++ b/test/terraform/install_in_ubuntu_trixie.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+# Check if terraform was installed correctly
+check "terraform installed" terraform --version
+
+check "tflint" tflint --version
+
+# Report results
+reportResults
+
+
diff --git a/test/terraform/install_in_ubuntu_trixie_sentinel.sh b/test/terraform/install_in_ubuntu_trixie_sentinel.sh
new file mode 100644
index 000000000..467106785
--- /dev/null
+++ b/test/terraform/install_in_ubuntu_trixie_sentinel.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+# Check if terraform was installed correctly
+check "terraform installed" terraform --version
+
+check "tflint" tflint --version
+
+# Sentinel specific tests
+check "sentinel" sentinel --version
+
+# Report result
+reportResults
+
+
diff --git a/test/terraform/scenarios.json b/test/terraform/scenarios.json
index 81945d042..09bb0f598 100644
--- a/test/terraform/scenarios.json
+++ b/test/terraform/scenarios.json
@@ -1,4 +1,20 @@
 {
+    "install_in_ubuntu_trixie": {
+        "image": "mcr.microsoft.com/devcontainers/base:trixie",
+        "features": {
+            "terraform": {
+                "version": "latest"
+            }
+        }
+    },
+    "install_in_ubuntu_trixie_sentinel": {
+        "image": "mcr.microsoft.com/devcontainers/base:trixie",
+        "features": {
+            "terraform": {
+                "installSentinel": true
+            }
+        }
+    },    
     "install_in_ubuntu_noble": {
         "image": "mcr.microsoft.com/devcontainers/base:noble",
         "features": {

From 0a82ddbc5e22a7648b81e1470ac0833b8c4834ef Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Tue, 16 Sep 2025 21:13:39 +0530
Subject: [PATCH 393/478] [azure-cli] - Fix azure-cli installation in debian
 trixie(13) (#1476)

---
 src/azure-cli/devcontainer-feature.json       |  2 +-
 src/azure-cli/install.sh                      |  2 +-
 test/azure-cli/install_bicep_trixie.sh        | 19 ++++++++++++
 test/azure-cli/install_extensions_trixie.sh   |  9 ++++++
 .../install_with_python_3_13_trixie.sh        | 22 ++++++++++++++
 test/azure-cli/scenarios.json                 | 30 +++++++++++++++++++
 6 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 test/azure-cli/install_bicep_trixie.sh
 create mode 100644 test/azure-cli/install_extensions_trixie.sh
 create mode 100644 test/azure-cli/install_with_python_3_13_trixie.sh

diff --git a/src/azure-cli/devcontainer-feature.json b/src/azure-cli/devcontainer-feature.json
index 3b731a6b3..3bc905f47 100644
--- a/src/azure-cli/devcontainer-feature.json
+++ b/src/azure-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "azure-cli",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "name": "Azure CLI",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/azure-cli",
   "description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/azure-cli/install.sh b/src/azure-cli/install.sh
index 93e10ff52..171c24510 100755
--- a/src/azure-cli/install.sh
+++ b/src/azure-cli/install.sh
@@ -19,7 +19,7 @@ AZ_BICEPVERSION=${BICEPVERSION:-latest}
 INSTALL_USING_PYTHON=${INSTALLUSINGPYTHON:-false}
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 AZCLI_ARCHIVE_ARCHITECTURES="amd64 arm64"
-AZCLI_ARCHIVE_VERSION_CODENAMES="stretch bookworm buster bullseye bionic focal jammy noble"
+AZCLI_ARCHIVE_VERSION_CODENAMES="stretch bookworm buster bullseye bionic focal jammy noble trixie"
 
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
diff --git a/test/azure-cli/install_bicep_trixie.sh b/test/azure-cli/install_bicep_trixie.sh
new file mode 100644
index 000000000..28ff7e509
--- /dev/null
+++ b/test/azure-cli/install_bicep_trixie.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+check "version" az  --version
+
+# Bicep-specific tests
+check "bicep" bicep --version
+check "az bicep" az bicep version
+
+# Report result
+reportResults
+
diff --git a/test/azure-cli/install_extensions_trixie.sh b/test/azure-cli/install_extensions_trixie.sh
new file mode 100644
index 000000000..fa55c2f5d
--- /dev/null
+++ b/test/azure-cli/install_extensions_trixie.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+./install_extensions.sh
+
diff --git a/test/azure-cli/install_with_python_3_13_trixie.sh b/test/azure-cli/install_with_python_3_13_trixie.sh
new file mode 100644
index 000000000..aac4f3c2d
--- /dev/null
+++ b/test/azure-cli/install_with_python_3_13_trixie.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+
+echo -e "\n🔄 Testing 'O.S'"
+if cat /etc/os-release | grep -q 'PRETTY_NAME="Debian GNU/Linux 13 (trixie)"'; then
+    echo -e "\n✅ Passed 'O.S is Linux 13 (trixie)'!\n"
+else
+    echo -e "\n❌ Failed 'O.S is other than Linux 13 (trixie)'!\n"
+fi
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+check "version" az  --version
+
+# Report result
+reportResults
+
diff --git a/test/azure-cli/scenarios.json b/test/azure-cli/scenarios.json
index 3ec910399..c3a205e68 100644
--- a/test/azure-cli/scenarios.json
+++ b/test/azure-cli/scenarios.json
@@ -1,4 +1,14 @@
 {
+  "install_extensions_trixie": {
+    "image": "mcr.microsoft.com/devcontainers/base:trixie",
+    "user": "vscode",
+    "features": {
+      "azure-cli": {
+        "version": "latest",
+        "extensions": "aks-preview,amg,containerapp"
+      }
+    }
+  },  
   "install_extensions": {
     "image": "mcr.microsoft.com/devcontainers/base:jammy",
     "user": "vscode",
@@ -28,6 +38,16 @@
         "installBicep": true
       }
     }
+  },
+    "install_bicep_trixie": {
+    "image": "mcr.microsoft.com/devcontainers/base:trixie",
+    "user": "vscode",
+    "features": {
+      "azure-cli": {
+        "version": "latest",
+        "installBicep": true
+      }
+    }
   },
   "install_with_python": {
     "image": "mcr.microsoft.com/devcontainers/base:jammy",
@@ -39,6 +59,16 @@
       }
     }
   },
+  "install_with_python_3_13_trixie": {
+    "image": "mcr.microsoft.com/devcontainers/python:2-3.13-trixie",
+    "user": "vscode",
+    "features": {
+      "azure-cli": {
+        "version": "latest",
+        "installUsingPython": true
+      }
+    }
+  },  
   "install_with_python_3_12_bookworm": {
     "image": "mcr.microsoft.com/devcontainers/python:1-3.12-bookworm",
     "user": "vscode",

From 572770d2c3a40ef13821bff8ec7238e709ce5bae Mon Sep 17 00:00:00 2001
From: Steven <steven.liekens@gmail.com>
Date: Tue, 16 Sep 2025 17:45:37 +0200
Subject: [PATCH 394/478] dotnet: add support for prerelease versions (#1470)

* dotnet: add support for prerelease versions

* Add 'additionalVersions' tests

* Improve handling of empty 'channel' and 'quality' values

* Fix invalid version spec in aspnetCoreRuntimeVersions
---
 src/dotnet/NOTES.md                           |  16 ++-
 src/dotnet/devcontainer-feature.json          |  13 ++-
 src/dotnet/install.sh                         |  20 +++-
 src/dotnet/scripts/dotnet-helpers.sh          |  94 +++++++++++++---
 src/dotnet/scripts/vendor/dotnet-install.sh   | 105 +++---------------
 test/dotnet/install_dotnet_daily.sh           |  22 ++++
 ...nstall_dotnet_multiple_versions_preview.sh |  47 --------
 test/dotnet/install_dotnet_preview.sh         |  22 ++++
 test/dotnet/scenarios.json                    |  28 +++--
 9 files changed, 194 insertions(+), 173 deletions(-)
 create mode 100644 test/dotnet/install_dotnet_daily.sh
 delete mode 100644 test/dotnet/install_dotnet_multiple_versions_preview.sh
 create mode 100644 test/dotnet/install_dotnet_preview.sh

diff --git a/src/dotnet/NOTES.md b/src/dotnet/NOTES.md
index 584c90cef..ff52835b0 100644
--- a/src/dotnet/NOTES.md
+++ b/src/dotnet/NOTES.md
@@ -10,9 +10,10 @@ Installing only the latest .NET SDK version (the default).
 
 Installing an additional SDK version. Multiple versions can be specified as comma-separated values.
 
-``` json
+``` jsonc
 "features": {
     "ghcr.io/devcontainers/features/dotnet:2": {
+        "version": "latest", // (this can be omitted)
         "additionalVersions": "lts"
     }
 }
@@ -71,6 +72,19 @@ Installing .NET workloads. Multiple workloads can be specified as comma-separate
 }
 ```
 
+Installing prerelease builds. Supports `preview` and `daily` suffixes.
+
+``` json
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+        "version": "10.0-preview",
+        "additionalVersions": "10.0.1xx-daily",
+        "dotnetRuntimeVersions": "10.0-daily",
+        "aspnetCoreRuntimeVersions": "10.0-daily"
+    }
+}
+```
+
 ## OS Support
 
 This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index 397f9a191..9389addaa 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.3.0",
+    "version": "2.4.0",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
@@ -11,28 +11,31 @@
                 "latest",
                 "lts",
                 "none",
+                "10.0",
                 "10.0-preview",
+                "10.0-daily",
+                "9.0",
                 "8.0",
                 "7.0",
                 "6.0"
             ],
             "default": "latest",
-            "description": "Select or enter a .NET SDK version. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
+            "description": "Select or enter a .NET SDK version. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version, 'X.Y-preview' or 'X.Y-daily' for prereleases."
         },
         "additionalVersions": {
             "type": "string",
             "default": "",
-            "description": "Enter additional .NET SDK versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
+            "description": "Enter additional .NET SDK versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version, 'X.Y-preview' or 'X.Y-daily' for prereleases."
         },
         "dotnetRuntimeVersions": {
             "type": "string",
             "default": "",
-            "description": "Enter additional .NET runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
+            "description": "Enter additional .NET runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version, 'X.Y-preview' or 'X.Y-daily' for prereleases."
         },
         "aspNetCoreRuntimeVersions": {
             "type": "string",
             "default": "",
-            "description": "Enter additional ASP.NET Core runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
+            "description": "Enter additional ASP.NET Core runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version, 'X.Y-preview' or 'X.Y-daily' for prereleases."
         },
         "workloads": {
             "type": "string",
diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh
index 75f013d03..bd85fb91a 100644
--- a/src/dotnet/install.sh
+++ b/src/dotnet/install.sh
@@ -108,17 +108,27 @@ done
 check_packages wget ca-certificates icu-devtools
 
 for version in "${versions[@]}"; do
-    # Remove '-preview' from version if suffixed with the version label
-    clean_version="$(echo "$version" | sed 's/-preview$//')"
-    install_sdk "$clean_version"
+    read -r clean_version quality < <(parse_version_and_quality "$version")
+    if [ -n "$quality" ]; then
+        echo "Interpreting requested version '$version' as version '$clean_version' with quality '$quality'"
+    fi
+    install_sdk "$clean_version" "$quality"
 done
 
 for version in "${dotnetRuntimeVersions[@]}"; do
-    install_runtime "dotnet" "$version"
+    read -r clean_version quality < <(parse_version_and_quality "$version")
+    if [ -n "$quality" ]; then
+        echo "Interpreting requested runtime version '$version' as version '$clean_version' with quality '$quality'"
+    fi
+    install_runtime "dotnet" "$clean_version" "$quality"
 done
 
 for version in "${aspNetCoreRuntimeVersions[@]}"; do
-    install_runtime "aspnetcore" "$version"
+    read -r clean_version quality < <(parse_version_and_quality "$version")
+    if [ -n "$quality" ]; then
+        echo "Interpreting requested ASP.NET Core runtime version '$version' as version '$clean_version' with quality '$quality'"
+    fi
+    install_runtime "aspnetcore" "$clean_version" "$quality"
 done
 
 workloads=()
diff --git a/src/dotnet/scripts/dotnet-helpers.sh b/src/dotnet/scripts/dotnet-helpers.sh
index 84a674917..2ef8796eb 100644
--- a/src/dotnet/scripts/dotnet-helpers.sh
+++ b/src/dotnet/scripts/dotnet-helpers.sh
@@ -45,9 +45,12 @@ fetch_latest_version() {
 }
 
 # Installs a version of the .NET SDK
-# Usage: install_sdk <version>
+# Usage: install_sdk <version> [<quality>]
+# Example: install_sdk "9.0"
+# Example: install_sdk "10.0" "preview"
 install_sdk() {
-    local inputVersion="$1"
+    local inputVersion="$1" # Could be 'latest', 'lts', 'X.Y', 'X.Y.Z', 'X.Y.4xx', or base channel when paired with quality
+    local quality="$2"      # Optional quality: GA, preview, daily (empty implies GA)
     local version=""
     local channel=""
     if [[ "$inputVersion" == "latest" ]]; then
@@ -73,19 +76,25 @@ install_sdk() {
         version="$inputVersion"
     fi
     
-    # Currently this script does not make it possible to qualify the version, 'GA' is always implied
-    echo "Executing $DOTNET_INSTALL_SCRIPT --version $version --channel $channel --install-dir $DOTNET_ROOT"
-    "$DOTNET_INSTALL_SCRIPT" \
-        --version "$version" \
-        --channel "$channel" \
-        --install-dir "$DOTNET_ROOT"
+    local cmd=("$DOTNET_INSTALL_SCRIPT" "--version" "$version" "--install-dir" "$DOTNET_ROOT")
+    if [ -n "$channel" ]; then
+        cmd+=("--channel" "$channel")
+    fi
+    if [ -n "$quality" ]; then
+        cmd+=("--quality" "$quality")
+    fi
+    echo "Executing ${cmd[*]}"
+    "${cmd[@]}"
 }
 
 # Installs a version of the .NET Runtime
-# Usage: install_runtime <runtime> <version>
+# Usage: install_runtime <runtime> <version> [<quality>]
+# Example: install_runtime "dotnet" "9.0"
+# Example: install_runtime "aspnetcore" "10.0" "preview"
 install_runtime() {
     local runtime="$1"
-    local inputVersion="$2"
+    local inputVersion="$2" # Could be 'latest', 'lts', 'X.Y', 'X.Y.Z'
+    local quality="$3"      # Optional quality: GA, preview, daily (empty implies GA)
     local version=""
     local channel=""
     if [[ "$inputVersion" == "latest" ]]; then
@@ -105,14 +114,16 @@ install_runtime() {
         # Assume version is an exact version string like '6.0.21' or '8.0.0-preview.7.23375.6'
         version="$inputVersion"
     fi
-    
-    echo "Executing $DOTNET_INSTALL_SCRIPT --runtime $runtime --version $version --channel $channel --install-dir $DOTNET_ROOT --no-path"
-    "$DOTNET_INSTALL_SCRIPT" \
-        --runtime "$runtime" \
-        --version "$version" \
-        --channel "$channel" \
-        --install-dir "$DOTNET_ROOT" \
-        --no-path
+
+    local cmd=("$DOTNET_INSTALL_SCRIPT" "--runtime" "$runtime" "--version" "$version" "--install-dir" "$DOTNET_ROOT" "--no-path")
+    if [ -n "$channel" ]; then
+        cmd+=("--channel" "$channel")
+    fi
+    if [ -n "$quality" ]; then
+        cmd+=("--quality" "$quality")
+    fi
+    echo "Executing ${cmd[*]}"
+    "${cmd[@]}"
 }
 
 # Installs one or more .NET workloads
@@ -127,3 +138,50 @@ install_workloads() {
     # Clean up
     rm -r /tmp/dotnet-workload-temp-dir
 }
+
+# Input: version spec possibly containing -preview or -daily
+# Supports channels in the forms:
+#   A.B            (e.g. 10.0)
+#   A.B.Cxx        (feature band e.g. 6.0.4xx)
+#   A.B-preview    (adds quality)
+#   A.B-daily
+#   A.B.Cxx-preview
+#   A.B.Cxx-daily
+# Output (stdout): "<clean_version> <quality>"
+#   - For channel specs (A.B or A.B.Cxx) without suffix -> quality is GA
+#   - For channel specs with -preview/-daily suffix -> quality is preview/daily
+#   - For exact version specs (contain a third numeric segment or prerelease labels beyond channel patterns, e.g. 8.0.100-rc.2.23502.2) -> quality is empty
+# Examples:
+#   parse_version_and_quality "10.0-preview"    => "10.0 preview"
+#   parse_version_and_quality "10.0-daily"      => "10.0 daily"
+#   parse_version_and_quality "10.0"            => "10.0 GA"
+#   parse_version_and_quality "6.0.4xx"         => "6.0.4xx GA"
+#   parse_version_and_quality "6.0.4xx-preview" => "6.0.4xx preview"
+#   parse_version_and_quality "6.0.4xx-daily"   => "6.0.4xx daily"
+parse_version_and_quality() {
+    local input="$1"
+    local quality=""
+    local clean_version="$input"
+    # Match feature band with quality
+    if [[ "$input" =~ ^([0-9]+\.[0-9]+\.[0-9]xx)-(preview|daily)$ ]]; then
+        clean_version="${BASH_REMATCH[1]}"
+        quality="${BASH_REMATCH[2]}"
+    # Match simple channel with quality
+    elif [[ "$input" =~ ^([0-9]+\.[0-9]+)-(preview|daily)$ ]]; then
+        clean_version="${BASH_REMATCH[1]}"
+        quality="${BASH_REMATCH[2]}"
+    # Match plain feature band channel (defaults to GA)
+    elif [[ "$input" =~ ^[0-9]+\.[0-9]+\.[0-9]xx$ ]]; then
+        clean_version="$input"
+        quality="GA"
+    # Match simple channel (defaults to GA)
+    elif [[ "$input" =~ ^[0-9]+\.[0-9]+$ ]]; then
+        clean_version="$input"
+        quality="GA"
+    else
+        # Exact version (leave quality empty)
+        clean_version="$input"
+        quality=""
+    fi
+    echo "$clean_version" "$quality"
+}
\ No newline at end of file
diff --git a/src/dotnet/scripts/vendor/dotnet-install.sh b/src/dotnet/scripts/vendor/dotnet-install.sh
index 122ee68ed..034d2dfb1 100755
--- a/src/dotnet/scripts/vendor/dotnet-install.sh
+++ b/src/dotnet/scripts/vendor/dotnet-install.sh
@@ -477,7 +477,7 @@ get_normalized_quality() {
     local quality="$(to_lowercase "$1")"
     if [ ! -z "$quality" ]; then
         case "$quality" in
-            daily | signed | validated | preview)
+            daily | preview)
                 echo "$quality"
                 return 0
                 ;;
@@ -486,7 +486,7 @@ get_normalized_quality() {
                 return 0
                 ;;
             *)
-                say_err "'$quality' is not a supported value for --quality option. Supported values are: daily, signed, validated, preview, ga. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues."
+                say_err "'$quality' is not a supported value for --quality option. Supported values are: daily, preview, ga. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues."
                 return 1
                 ;;
         esac
@@ -1198,13 +1198,19 @@ downloadcurl() {
     local curl_options="--retry 20 --retry-delay 2 --connect-timeout 15 -sSL -f --create-dirs "
     local curl_exit_code=0;
     if [ -z "$out_path" ]; then
-        curl $curl_options "$remote_path_with_credential" 2>&1
+        curl_output=$(curl $curl_options "$remote_path_with_credential" 2>&1)
         curl_exit_code=$?
+        echo "$curl_output"
     else
-        curl $curl_options -o "$out_path" "$remote_path_with_credential" 2>&1
+        curl_output=$(curl $curl_options -o "$out_path" "$remote_path_with_credential" 2>&1)
         curl_exit_code=$?
     fi
-    
+
+    # Regression in curl causes curl with --retry to return a 0 exit code even when it fails to download a file - https://github.com/curl/curl/issues/17554
+    if [ $curl_exit_code -eq 0 ] && echo "$curl_output" | grep -q "^curl: ([0-9]*) "; then
+        curl_exit_code=$(echo "$curl_output" | sed 's/curl: (\([0-9]*\)).*/\1/')
+    fi
+
     if [ $curl_exit_code -gt 0 ]; then
         download_error_msg="Unable to download $remote_path."
         # Check for curl timeout codes
@@ -1272,61 +1278,6 @@ downloadwget() {
     return 0
 }
 
-extract_stem() {
-    local url="$1"
-    # extract the protocol
-    proto="$(echo $1 | grep :// | sed -e's,^\(.*://\).*,\1,g')"
-    # remove the protocol
-    url="${1/$proto/}"
-    # extract the path (if any) - since we know all of our feeds have a first path segment, we can skip the first one. otherwise we'd use -f2- to get the full path
-    full_path="$(echo $url | grep / | cut -d/ -f2-)"
-    path="$(echo $full_path | cut -d/ -f2-)"
-    echo $path
-}
-
-check_url_exists() {
-    eval $invocation
-    local url="$1"
-
-    local code=""
-    if machine_has "curl"
-    then
-        code=$(curl --head -o /dev/null -w "%{http_code}" -s --fail "$url");
-    elif machine_has "wget"
-    then
-        # get the http response, grab the status code
-        server_response=$(wget -qO- --method=HEAD --server-response "$url" 2>&1)
-        code=$(echo "$server_response" | grep "HTTP/" | awk '{print $2}')
-    fi
-    if [ $code = "200" ]; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-sanitize_redirect_url() {
-    eval $invocation
-
-    local url_stem
-    url_stem=$(extract_stem "$1")
-    say_verbose "Checking configured feeds for the asset at ${yellow:-}$url_stem${normal:-}"
-
-    for feed in "${feeds[@]}"
-    do
-        local trial_url="$feed/$url_stem"
-        say_verbose "Checking ${yellow:-}$trial_url${normal:-}"
-        if check_url_exists "$trial_url"; then
-            say_verbose "Found a match at ${yellow:-}$trial_url${normal:-}"
-            echo "$trial_url"
-            return 0
-        else
-            say_verbose "No match at ${yellow:-}$trial_url${normal:-}"
-        fi
-    done
-    return 1
-}
-
 get_download_link_from_aka_ms() {
     eval $invocation
 
@@ -1379,11 +1330,6 @@ get_download_link_from_aka_ms() {
             return 1
         fi
 
-        sanitized_redirect_url=$(sanitize_redirect_url "$aka_ms_download_link")
-        if [[ -n "$sanitized_redirect_url" ]]; then
-            aka_ms_download_link="$sanitized_redirect_url"
-        fi
-
         say_verbose "The redirect location retrieved: '$aka_ms_download_link'."
         return 0
     else
@@ -1396,24 +1342,15 @@ get_feeds_to_use()
 {
     feeds=(
     "https://builds.dotnet.microsoft.com/dotnet"
-    "https://dotnetcli.azureedge.net/dotnet"
     "https://ci.dot.net/public"
-    "https://dotnetbuilds.azureedge.net/public"
     )
 
     if [[ -n "$azure_feed" ]]; then
         feeds=("$azure_feed")
     fi
 
-    if [[ "$no_cdn" == "true" ]]; then
-        feeds=(
-        "https://dotnetcli.blob.core.windows.net/dotnet"
-        "https://dotnetbuilds.blob.core.windows.net/public"
-        )
-
-        if [[ -n "$uncached_feed" ]]; then
-            feeds=("$uncached_feed")
-        fi
+    if [[ -n "$uncached_feed" ]]; then
+        feeds=("$uncached_feed")
     fi
 }
 
@@ -1545,7 +1482,7 @@ generate_regular_links() {
         link_types+=("legacy")
     else
         legacy_download_link=""
-        say_verbose "Cound not construct a legacy_download_link; omitting..."
+        say_verbose "Could not construct a legacy_download_link; omitting..."
     fi
 
     #  Check if the SDK version is already installed.
@@ -1648,7 +1585,7 @@ install_dotnet() {
                 say "The resource at $link_type link '$download_link' is not available."
                 ;;
             *)
-                say "Failed to download $link_type link '$download_link': $download_error_msg"
+                say "Failed to download $link_type link '$download_link': $http_code $download_error_msg"
                 ;;
             esac
             rm -f "$zip_path" 2>&1 && say_verbose "Temporary archive file $zip_path was removed"
@@ -1709,7 +1646,6 @@ install_dir="<auto>"
 architecture="<auto>"
 dry_run=false
 no_path=false
-no_cdn=false
 azure_feed=""
 uncached_feed=""
 feed_credential=""
@@ -1782,10 +1718,6 @@ do
             verbose=true
             non_dynamic_parameters+=" $name"
             ;;
-        --no-cdn|-[Nn]o[Cc]dn)
-            no_cdn=true
-            non_dynamic_parameters+=" $name"
-            ;;
         --azure-feed|-[Aa]zure[Ff]eed)
             shift
             azure_feed="$1"
@@ -1862,7 +1794,7 @@ do
             echo "              examples: 2.0.0-preview2-006120; 1.1.0"
             echo "  -q,--quality <quality>         Download the latest build of specified quality in the channel."
             echo "      -Quality"
-            echo "          The possible values are: daily, signed, validated, preview, GA."
+            echo "          The possible values are: daily, preview, GA."
             echo "          Works only in combination with channel. Not applicable for STS and LTS channels and will be ignored if those channels are used." 
             echo "          For SDK use channel in A.B.Cxx format. Using quality for SDK together with channel in A.B format is not supported." 
             echo "          Supported since 5.0 release." 
@@ -1890,13 +1822,10 @@ do
             echo "  --verbose,-Verbose                 Display diagnostics information."
             echo "  --azure-feed,-AzureFeed            For internal use only."
             echo "                                     Allows using a different storage to download SDK archives from."
-            echo "                                     This parameter is only used if --no-cdn is false."
             echo "  --uncached-feed,-UncachedFeed      For internal use only."
             echo "                                     Allows using a different storage to download SDK archives from."
-            echo "                                     This parameter is only used if --no-cdn is true."
             echo "  --skip-non-versioned-files         Skips non-versioned files if they already exist, such as the dotnet executable."
             echo "      -SkipNonVersionedFiles"
-            echo "  --no-cdn,-NoCdn                    Disable downloading from the Azure CDN, and use the uncached feed directly."
             echo "  --jsonfile <JSONFILE>              Determines the SDK version from a user specified global.json file."
             echo "                                     Note: global.json must have a value for 'SDK:Version'"
             echo "  --keep-zip,-KeepZip                If set, downloaded file is kept."
@@ -1956,4 +1885,4 @@ fi
 
 say "Note that the script does not resolve dependencies during installation."
 say "To check the list of dependencies, go to https://learn.microsoft.com/dotnet/core/install, select your operating system and check the \"Dependencies\" section."
-say "Installation finished successfully."
\ No newline at end of file
+say "Installation finished successfully."
diff --git a/test/dotnet/install_dotnet_daily.sh b/test/dotnet/install_dotnet_daily.sh
new file mode 100644
index 000000000..52f4f8d1b
--- /dev/null
+++ b/test/dotnet/install_dotnet_daily.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+source dev-container-features-test-lib
+source dotnet_env.sh
+source dotnet_helpers.sh
+
+# Verify 10.0 SDK (any prerelease containing '10.0') is installed
+check ".NET SDK 10.0 installed" \
+is_dotnet_sdk_version_installed "10.0"
+
+check ".NET Runtime 10.0 installed" \
+is_dotnet_runtime_version_installed "10.0"
+
+check "ASP.NET Core Runtime 10.0 installed" \
+is_aspnetcore_runtime_version_installed "10.0"
+
+check "Build and run .NET 10.0 project" \
+dotnet run --project projects/net10.0
+
+reportResults
diff --git a/test/dotnet/install_dotnet_multiple_versions_preview.sh b/test/dotnet/install_dotnet_multiple_versions_preview.sh
deleted file mode 100644
index 76bfd1ae3..000000000
--- a/test/dotnet/install_dotnet_multiple_versions_preview.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library bundled with the devcontainer CLI
-# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
-# Provides the 'check' and 'reportResults' commands.
-source dev-container-features-test-lib
-
-# Feature-specific tests
-# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
-# check <LABEL> <cmd> [args...]
-source dotnet_env.sh
-source dotnet_helpers.sh
-
-check ".NET SDK 9.0 installed" \
-is_dotnet_sdk_version_installed "9.0"
-
-check ".NET SDK 8.0 installed" \
-is_dotnet_sdk_version_installed "8.0"
-
-check ".NET SDK 7.0 installed" \
-is_dotnet_sdk_version_installed "7.0"
-
-check ".NET SDK 10.0 installed" \
-is_dotnet_sdk_version_installed "10.0"
-
-check "Build example class library" \
-dotnet build projects/multitargeting
-
-check "Build and run .NET 9.0 project" \
-dotnet run --project projects/net9.0
-
-check "Build and run .NET 8.0 project" \
-dotnet run --project projects/net8.0
-
-check "Build and run .NET 7.0 project" \
-dotnet run --project projects/net7.0
-
-check "Build and run .NET 10.0 project" \
-dotnet run --project projects/net10.0
-
-# Report results
-# If any of the checks above exited with a non-zero exit code, the test will fail.
-reportResults
-
-
diff --git a/test/dotnet/install_dotnet_preview.sh b/test/dotnet/install_dotnet_preview.sh
new file mode 100644
index 000000000..52f4f8d1b
--- /dev/null
+++ b/test/dotnet/install_dotnet_preview.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+source dev-container-features-test-lib
+source dotnet_env.sh
+source dotnet_helpers.sh
+
+# Verify 10.0 SDK (any prerelease containing '10.0') is installed
+check ".NET SDK 10.0 installed" \
+is_dotnet_sdk_version_installed "10.0"
+
+check ".NET Runtime 10.0 installed" \
+is_dotnet_runtime_version_installed "10.0"
+
+check "ASP.NET Core Runtime 10.0 installed" \
+is_aspnetcore_runtime_version_installed "10.0"
+
+check "Build and run .NET 10.0 project" \
+dotnet run --project projects/net10.0
+
+reportResults
diff --git a/test/dotnet/scenarios.json b/test/dotnet/scenarios.json
index 488dfce44..d7ae3acbb 100644
--- a/test/dotnet/scenarios.json
+++ b/test/dotnet/scenarios.json
@@ -40,7 +40,7 @@
         "remoteUser": "vscode",
         "features": {
             "dotnet": {
-                "version": "10.0-preview",
+                "version": "10.0",
                 "additionalVersions": [
                     "9.0",
                     "8.0",
@@ -49,20 +49,30 @@
             }
         }
     },
-    "install_dotnet_multiple_versions_preview": {
+    "install_dotnet_preview": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
         "remoteUser": "vscode",
         "features": {
             "dotnet": {
-                "version": "9.0",
-                "additionalVersions": [
-                    "10.0-preview",
-                    "8.0",
-                    "7.0"
-                ]
+                "version": "10.0-preview",
+                "additionalVersions": "10.0.1xx-preview",
+                "aspnetcoreRuntimeVersions": "10.0-preview",
+                "dotnetRuntimeVersions": "10.0-preview"
+            }
+        }
+    },
+    "install_dotnet_daily": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "remoteUser": "vscode",
+        "features": {
+            "dotnet": {
+                "version": "10.0-daily",
+                "additionalVersions": "10.0.1xx-daily",
+                "aspnetcoreRuntimeVersions": "10.0-daily",
+                "dotnetRuntimeVersions": "10.0-daily"
             }
         }
-    },    
+    },
     "install_dotnet_global_tool": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
         "remoteUser": "vscode",

From 7c6ef0b7e5e9e5efb7a4b461d67482e1d6575f1e Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Tue, 16 Sep 2025 21:24:00 +0530
Subject: [PATCH 395/478] [docker-in-docker, docker-outside-of-docker] - Update
 documentation and putting a check to stop installation for Debian Trixie(13)
 (#1482)

* [docker-in-docker, docker-outside-of-docker] - Update documentation and putting a check to stop installation for Debian Trixie(13)

* docker-in-docker feature test update

* Test script change
---
 .github/workflows/test-pr.yaml                         | 4 ++++
 src/docker-in-docker/NOTES.md                          | 2 ++
 src/docker-in-docker/devcontainer-feature.json         | 2 +-
 src/docker-in-docker/install.sh                        | 7 +++++++
 src/docker-outside-of-docker/NOTES.md                  | 2 ++
 src/docker-outside-of-docker/devcontainer-feature.json | 2 +-
 src/docker-outside-of-docker/install.sh                | 7 +++++++
 test/docker-in-docker/scenarios.json                   | 7 +++++--
 8 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index 758ab2b74..c5930d97e 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -62,6 +62,10 @@ jobs:
             baseImage: ubuntu:jammy
           - features: oryx
             baseImage: mcr.microsoft.com/devcontainers/base:ubuntu
+          - features: docker-in-docker
+            baseImage: mcr.microsoft.com/devcontainers/base:debian         
+          - features: docker-outside-of-docker
+            baseImage: mcr.microsoft.com/devcontainers/base:debian             
     steps:
       - uses: actions/checkout@v4
 
diff --git a/src/docker-in-docker/NOTES.md b/src/docker-in-docker/NOTES.md
index b8156f8b6..c7fb26137 100644
--- a/src/docker-in-docker/NOTES.md
+++ b/src/docker-in-docker/NOTES.md
@@ -13,4 +13,6 @@ This docker-in-docker Dev Container Feature is roughly based on the [official do
 
 This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
 
+Debian Trixie (13) does not include moby-cli and related system packages, so the feature cannot install with "moby": "true". To use this feature on Trixie, please set "moby": "false" or choose a different base image (for example, Ubuntu 24.04).
+
 `bash` is required to execute the `install.sh` script.
diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 7194ba0e0..0450c664e 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.12.3",
+    "version": "2.12.4",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index bf60620f6..46f1045ae 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -195,6 +195,13 @@ export DEBIAN_FRONTEND=noninteractive
 # Fetch host/container arch.
 architecture="$(dpkg --print-architecture)"
 
+# Prevent attempting to install Moby on Debian trixie (packages removed)
+if [ "${USE_MOBY}" = "true" ] && [ "${ID}" = "debian" ] && [ "${VERSION_CODENAME}" = "trixie" ]; then
+    err "The 'moby' option is not supported on Debian 'trixie' because 'moby-cli' and related system packages have been removed from that distribution."
+    err "To continue, either set the feature option '\"moby\": false' or use a different base image (for example: 'debian:bookworm' or 'ubuntu-24.04')."
+    exit 1
+fi
+
 # Check if distro is supported
 if [ "${USE_MOBY}" = "true" ]; then
     if [[ "${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
diff --git a/src/docker-outside-of-docker/NOTES.md b/src/docker-outside-of-docker/NOTES.md
index 6e85010ea..ca6f43114 100644
--- a/src/docker-outside-of-docker/NOTES.md
+++ b/src/docker-outside-of-docker/NOTES.md
@@ -58,4 +58,6 @@ services:
 
 This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
 
+Debian Trixie (13) does not include moby-cli and related system packages, so the feature cannot install with "moby": "true". To use this feature on Trixie, please set "moby": "false" or choose a different base image (for example, Ubuntu 24.04).
+
 `bash` is required to execute the `install.sh` script.
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index bee1c8a57..7314fa83d 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.6.4",
+    "version": "1.6.5",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index d8da01979..74fd63530 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -201,6 +201,13 @@ fi
 # Fetch host/container arch.
 architecture="$(dpkg --print-architecture)"
 
+# Prevent attempting to install Moby on Debian trixie (packages removed)
+if [ "${USE_MOBY}" = "true" ] && [ "${ID}" = "debian" ] && [ "${VERSION_CODENAME}" = "trixie" ]; then
+    err "The 'moby' option is not supported on Debian 'trixie' because 'moby-cli' and related system packages have been removed from that distribution."
+    err "To continue, either set the feature option '\"moby\": false' or use a different base image (for example: 'debian:bookworm' or 'ubuntu-24.04')."
+    exit 1
+fi
+
 # Check if distro is supported
 if [ "${USE_MOBY}" = "true" ]; then
     if [[ "${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index 428909f8c..3b5dce013 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -154,7 +154,7 @@
         "image": "mcr.microsoft.com/devcontainers/base:debian",
         "features": {
             "docker-in-docker": {
-                "version": "26.1.4",
+                "version": "28.4.0",
                 "moby": "false",
                 "mobyBuildxVersion": "latest",
                 "dockerDashComposeVersion": "none",
@@ -170,7 +170,10 @@
     "docker_with_on_create_command": {
         "image": "mcr.microsoft.com/devcontainers/base:debian",
         "features": {
-            "docker-in-docker": {}
+            "docker-in-docker": {
+                "version": "latest",
+                "moby": "false"
+            }
         },
         "remoteUser": "vscode",
         "onCreateCommand": "docker ps && sleep 5s && docker ps"

From 8affef0857fe8816634a8977faf53b2139f16a72 Mon Sep 17 00:00:00 2001
From: byquanton <32410361+byquanton@users.noreply.github.com>
Date: Tue, 16 Sep 2025 17:54:17 +0200
Subject: [PATCH 396/478] [desktop lite] Support for Trixie  (#1479)

* Trixie Support

* Bump desktop lite version

* add trixie support to desktop lite test script

* Added test scenario for trixie

* Fix typo
---
 src/desktop-lite/devcontainer-feature.json    |  2 +-
 src/desktop-lite/install.sh                   |  9 +++---
 test/desktop-lite/scenarios.json              |  6 ++++
 test/desktop-lite/test.sh                     |  8 ++---
 .../test_xtigervnc_novnc_started_trixie.sh    | 31 +++++++++++++++++++
 5 files changed, 44 insertions(+), 12 deletions(-)
 create mode 100644 test/desktop-lite/test_xtigervnc_novnc_started_trixie.sh

diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json
index d33529873..ae10c9977 100644
--- a/src/desktop-lite/devcontainer-feature.json
+++ b/src/desktop-lite/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "desktop-lite",
-    "version": "1.2.7",
+    "version": "1.2.8",
     "name": "Light-weight Desktop",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
     "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh
index bb659e784..4575cc4f9 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -31,7 +31,6 @@ package_list="
     fbautostart \
     at-spi2-core \
     xterm \
-    eterm \
     nautilus\
     mousepad \
     seahorse \
@@ -200,13 +199,13 @@ fi
 # Install X11, fluxbox and VS Code dependencies
 check_packages ${package_list}
 
-# if Ubuntu-24.04, noble(numbat) found, then will install libasound2-dev instead of libasound2.
+# if Ubuntu-24.04, noble(numbat) / Debian-13, trixie found, then will install libasound2-dev instead of libasound2.
 # this change is temporary, https://packages.ubuntu.com/noble/libasound2 will switch to libasound2 once it is available for Ubuntu-24.04, noble(numbat)
 . /etc/os-release
-if [ "${ID}" = "ubuntu" ] && [ "${VERSION_CODENAME}" = "noble" ]; then
-    echo "Ubuntu 24.04, Noble(Numbat) detected. Installing libasound2-dev package..."
+if { [ "${ID}" = "ubuntu" ] && [ "${VERSION_CODENAME}" = "noble" ]; } || { [ "${ID}" = "debian" ] && [ "${VERSION_CODENAME}" = "trixie" ]; }; then
+    echo "Detected Noble (Ubuntu 24.04) or Trixie (Debian). Installing libasound2-dev package..."
     check_packages "libasound2-dev"
-else 
+else
     check_packages "libasound2"
 fi
 
diff --git a/test/desktop-lite/scenarios.json b/test/desktop-lite/scenarios.json
index 548fada6d..4ee429dd5 100644
--- a/test/desktop-lite/scenarios.json
+++ b/test/desktop-lite/scenarios.json
@@ -39,5 +39,11 @@
             5901,
             6080
         ]
+    },
+    "test_xtigervnc_novnc_started_trixie": {
+        "image": "debian:trixie",
+        "features": {
+            "desktop-lite": {}
+        }
     }
 }
\ No newline at end of file
diff --git a/test/desktop-lite/test.sh b/test/desktop-lite/test.sh
index 5d11dd424..32eab53c4 100755
--- a/test/desktop-lite/test.sh
+++ b/test/desktop-lite/test.sh
@@ -29,12 +29,8 @@ check "log-exists" bash -c "ls /tmp/container-init.log"
 check "fluxbox-exists" bash -c "ls -la ~/.fluxbox"
 
 . /etc/os-release
-if [ "${ID}" = "ubuntu" ]; then
-    if [ "${VERSION_CODENAME}" = "noble" ]; then
-        checkOSPackage "if libasound2-dev exists !" "libasound2-dev"
-    else 
-        checkOSPackage "if libasound2 exists !" "libasound2"
-    fi
+if [ "${VERSION_CODENAME}" = "noble" ] || [ "${VERSION_CODENAME}" = "trixie" ]; then
+    checkOSPackage "if libasound2-dev exists !" "libasound2-dev"
 else 
     checkOSPackage "if libasound2 exists !" "libasound2"
 fi
diff --git a/test/desktop-lite/test_xtigervnc_novnc_started_trixie.sh b/test/desktop-lite/test_xtigervnc_novnc_started_trixie.sh
new file mode 100644
index 000000000..671032229
--- /dev/null
+++ b/test/desktop-lite/test_xtigervnc_novnc_started_trixie.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Check if xtigervnc & noVnc processes are running after successful installation and initialization
+check_process_running() {
+    port=$1
+    # Get process id of process running on specific port
+    PID=$(lsof -i :$port | awk 'NR==2 {print $2}')
+    if [ -n "$PID" ]; then
+        CMD=$(ps -p $PID -o cmd --no-headers)
+        GREEN='\033[0;32m'; NC='\033[0m'; RED='\033[0;31m'; YELLOW='\033[0;33m';
+        echo -e "${GREEN}Command running on port $port: ${YELLOW}$CMD${NC}"
+    else
+        echo -e "${RED}No process found listening on port $port.${NC}"
+    fi
+}
+
+check "Whether xtigervnc is Running" check_process_running 5901
+sleep 1
+check "Whether no_vnc is Running" check_process_running 6080
+
+check "desktop-init-exists" bash -c "ls /usr/local/share/desktop-init.sh"
+check "log-exists" bash -c "ls /tmp/container-init.log"
+check "log file contents" bash -c "cat /tmp/container-init.log"
+
+# Report result
+reportResults
\ No newline at end of file

From eea561a9ad45c383c2d9832d2da031410be8b5a0 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Tue, 16 Sep 2025 21:24:32 +0530
Subject: [PATCH 397/478] [github-cli] - Fix excessive wget download output in
 GitHub CLI feature (#1478)

* Initial plan

* Fix excessive wget download output in GitHub CLI feature

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>

* Version bump.

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
---
 src/github-cli/devcontainer-feature.json | 2 +-
 src/github-cli/install.sh                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/github-cli/devcontainer-feature.json b/src/github-cli/devcontainer-feature.json
index 04e373dfd..b3eca81f0 100644
--- a/src/github-cli/devcontainer-feature.json
+++ b/src/github-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "github-cli",
-    "version": "1.0.14",
+    "version": "1.0.15",
     "name": "GitHub CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/github-cli",
     "description": "Installs the GitHub CLI. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/github-cli/install.sh b/src/github-cli/install.sh
index 18dae33ce..11af21d08 100755
--- a/src/github-cli/install.sh
+++ b/src/github-cli/install.sh
@@ -195,14 +195,14 @@ install_deb_using_github() {
 
     mkdir -p /tmp/ghcli
     pushd /tmp/ghcli
-    wget https://github.com/cli/cli/releases/download/v${CLI_VERSION}/${cli_filename}
+    wget -q --show-progress --progress=dot:giga https://github.com/cli/cli/releases/download/v${CLI_VERSION}/${cli_filename}
     exit_code=$?
     set -e
     if [ "$exit_code" != "0" ]; then
         # Handle situation where git tags are ahead of what was is available to actually download
         echo "(!) github-cli version ${CLI_VERSION} failed to download. Attempting to fall back one version to retry..."
         find_prev_version_from_git_tags CLI_VERSION https://github.com/cli/cli
-        wget https://github.com/cli/cli/releases/download/v${CLI_VERSION}/${cli_filename}
+        wget -q --show-progress --progress=dot:giga https://github.com/cli/cli/releases/download/v${CLI_VERSION}/${cli_filename}
     fi
 
     dpkg -i /tmp/ghcli/${cli_filename}

From 6e508935b0251b24d971ced4154f959599561ade Mon Sep 17 00:00:00 2001
From: Mathiyarasy <157102811+Mathiyarasy@users.noreply.github.com>
Date: Mon, 27 Oct 2025 18:44:45 +0530
Subject: [PATCH 398/478] Update Python Feature Installation: Support Sigstore
 Signatures for Python 3.14+ and Fix OpenSSL Build on CentOS 7/RHEL 7 (#1508)

* cogin verfiy for python

* Fix CentOS 7 Python installation by adding missing perl-Time-Piece dependency

* update feature version

* fix issues
---
 src/python/devcontainer-feature.json |   2 +-
 src/python/install.sh                | 175 +++++++++++++++++++++++++--
 2 files changed, 168 insertions(+), 9 deletions(-)

diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 635b233cf..6a4121415 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
diff --git a/src/python/install.sh b/src/python/install.sh
index fec8937a0..be895927d 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -69,7 +69,7 @@ if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${VERSION_CODENAME-}" = "centos7" ]; then
 fi
 
 # To find some devel packages, some rhel need to enable specific extra repos, but not on RedHat ubi images...
-INSTALL_CMD_ADDL_REPO=""
+INSTALL_CMD_ADDL_REPOS=""
 if [ ${ADJUSTED_ID} = "rhel" ] && [ ${ID} != "rhel" ]; then
     if [ ${MAJOR_VERSION_ID} = "8" ]; then
         INSTALL_CMD_ADDL_REPOS="--enablerepo powertools"
@@ -93,6 +93,27 @@ else
     INSTALL_CMD="${PKG_MGR_CMD} ${INSTALL_CMD_ADDL_REPOS} -y install --noplugins --setopt=install_weak_deps=0"
 fi
 
+# Install Time::Piece Perl module required by OpenSSL 3.0.18+ build system on CentOS 7/RHEL 7
+install_time_piece() {
+    echo "(*) Ensuring Time::Piece Perl module is available for OpenSSL 3.0.18+ build..."
+    
+    # Check if Time::Piece is already available (it's usually in Perl core)
+    if perl -MTime::Piece -e 'exit 0' 2>/dev/null; then
+        echo "(*) Time::Piece already available"
+        return 0
+    fi
+    
+    echo "(*) Time::Piece not found, installing perl-Time-Piece package..."
+    
+    # Install perl-Time-Piece package for CentOS 7/RHEL 7
+    if ${INSTALL_CMD} perl-Time-Piece; then
+        echo "(*) perl-Time-Piece installed for OpenSSL 3.0.18+ build"
+    else
+        echo "(!) Failed to install perl-Time-Piece package. This will cause OpenSSL 3.0.18+ build to fail"
+        return 1
+    fi
+}
+
 # Clean up
 clean_up() {
     case ${ADJUSTED_ID} in
@@ -478,6 +499,130 @@ install_cpython() {
         curl -sSL -o "/tmp/python-src/${cpython_tgz_filename}" "${cpython_tgz_url}"
     fi
 }
+# Get system architecture for downloads
+get_architecture() {
+    local architecture=""
+    case $(uname -m) in
+        x86_64) architecture="amd64" ;;
+        aarch64 | armv8*) architecture="arm64" ;;
+        aarch32 | armv7* | armvhf*) architecture="armhf" ;;
+        i?86) architecture="386" ;;
+        *) echo "(!) Architecture $(uname -m) unsupported"; exit 1 ;;
+    esac
+    echo ${architecture}
+}
+
+# Install cosign with multi-distro support
+install_cosign() {
+
+    COSIGN_VERSION="latest"
+    local cosign_url='https://github.com/sigstore/cosign'
+    local architecture=$(get_architecture)
+
+    find_version_from_git_tags COSIGN_VERSION "${cosign_url}"
+
+    # Remove 'v' prefix if present for download URL
+    local version_for_url="${COSIGN_VERSION#v}"
+
+    local cosign_filename="/tmp/cosign_${version_for_url}_${architecture}.deb"
+    local cosign_url="https://github.com/sigstore/cosign/releases/download/v${version_for_url}/cosign_${version_for_url}_${architecture}.deb"
+    
+    echo "Downloading cosign from: ${cosign_url}"
+    
+    if curl -L -f --fail-with-body "${cosign_url}" -o "$cosign_filename" 2>/dev/null; then
+        echo "(*) Successfully downloaded cosign v${COSIGN_VERSION}"
+    else
+        echo -e "\n(!) Failed to fetch cosign v${COSIGN_VERSION}..."
+        # Try previous version
+        find_prev_version_from_git_tags COSIGN_VERSION "https://github.com/sigstore/cosign"
+        echo -e "\nAttempting to install previous cosign ${COSIGN_VERSION} version as fallback mechanism"
+        
+        version_for_url="${COSIGN_VERSION#v}"
+        cosign_filename="/tmp/cosign_${version_for_url}_${architecture}.deb"
+        cosign_url="https://github.com/sigstore/cosign/releases/download/v${version_for_url}/cosign_${version_for_url}_${architecture}.deb"
+        
+        if ! curl -L -f --fail-with-body "${cosign_url}" -o "$cosign_filename" 2>/dev/null; then
+            echo "(!) Failed to download cosign v${COSIGN_VERSION} as fallback"
+            return 1
+        fi
+    fi
+    
+    # Install the package
+    if [ -f "$cosign_filename" ]; then
+        dpkg -i "$cosign_filename"
+        rm "$cosign_filename"
+        echo "Installation of cosign succeeded with ${COSIGN_VERSION}."
+    else
+        echo "(!) Failed to install cosign package"
+        return 1
+    fi
+
+}
+
+# COSIGN signature verification for python versions >= 3.14
+cosign_verification() {
+    local VERSION="$1"
+
+    # Ensure cosign is installed
+    if ! type cosign > /dev/null 2>&1; then
+        echo "(*) cosign not found, installing..."
+        if ! install_cosign; then
+            echo "(!) Failed to install cosign"
+            return 1
+        fi
+    else
+         echo "(*) cosign is already available on the system"
+    fi
+    
+    echo "(*) Attempting COSIGN verification for Python ${VERSION}..."
+    
+    # Check if COSIGN signature files exist (these don't exist yet for Python releases)
+    local cosign_sig_url="${cpython_tgz_url}.sig"
+    local cosign_cert_url="${cpython_tgz_url}.pem"
+    
+    # Download COSIGN signature and certificate files with proper error handling
+    echo "(*) Checking for cosign signature files..."
+    if ! curl -sSL -f --fail-with-body -o "/tmp/python-src/${cpython_tgz_filename}.sig" "${cosign_sig_url}" 2>/dev/null; then
+        echo "(!) COSIGN signature file not available for Python ${VERSION}"
+        echo "    Signature URL: ${cosign_sig_url}"
+        return 1
+    fi
+    
+    if ! curl -sSL -f --fail-with-body -o "/tmp/python-src/${cpython_tgz_filename}.pem" "${cosign_cert_url}" 2>/dev/null; then
+        echo "(!) COSIGN certificate file not available for Python ${VERSION}"
+        echo "    Certificate URL: ${cosign_cert_url}"
+        return 1
+    fi
+    
+    # Perform COSIGN verification
+    if cosign verify-blob \
+        --certificate "/tmp/python-src/${cpython_tgz_filename}.pem" \
+        --signature "/tmp/python-src/${cpython_tgz_filename}.sig" \
+        --certificate-identity-regexp=".*" \
+        --certificate-oidc-issuer-regexp=".*" \
+        "/tmp/python-src/${cpython_tgz_filename}"; then
+        echo "(*) COSIGN signature verification successful"
+        return 0
+    else
+        echo "(!) COSIGN signature verification failed"
+        return 1
+    fi
+}
+
+# GPG verification for python versions < 3.14
+gpg_verification() {    
+    echo "(*) Using GPG signature verification..."
+    if [[ ${VERSION_CODENAME} = "centos7" ]] || [[ ${VERSION_CODENAME} = "rhel7" ]]; then
+        receive_gpg_keys_centos7 PYTHON_SOURCE_GPG_KEYS
+    else
+        receive_gpg_keys PYTHON_SOURCE_GPG_KEYS
+    fi
+    echo "Downloading ${cpython_tgz_filename}.asc..."
+    curl -sSL -o "/tmp/python-src/${cpython_tgz_filename}.asc" "${cpython_tgz_url}.asc"
+    gpg --verify "${cpython_tgz_filename}.asc"
+    echo "(*) GPG signature verification successful"
+}
+
 
 install_from_source() {
     VERSION=$1
@@ -496,6 +641,8 @@ install_from_source() {
     case ${VERSION_CODENAME} in
         centos7|rhel7)
             check_packages perl-IPC-Cmd
+            # Install Time::Piece Perl module required by OpenSSL 3.0.18+ build system
+            install_time_piece
             install_openssl3
             ADDL_CONFIG_ARGS="--with-openssl=${SSL_INSTALL_PATH} --with-openssl-rpath=${SSL_INSTALL_PATH}/lib"
             ;;
@@ -507,15 +654,27 @@ install_from_source() {
             install_prev_vers_cpython "${VERSION}"
         fi
     fi;
-    # Verify signature
-    if [[ ${VERSION_CODENAME} = "centos7" ]] || [[ ${VERSION_CODENAME} = "rhel7" ]]; then
-        receive_gpg_keys_centos7 PYTHON_SOURCE_GPG_KEYS
+
+    # Discontinuation of PGP signatures for releases of Python 3.14 or future versions
+    # CPython release artifacts are additionally signed with Sigstore starting with the Python 3.11.0
+    local major_version=$(echo "$VERSION" | cut -d. -f1)
+    local minor_version=$(echo "$VERSION" | cut -d. -f2)
+    echo "(*) Detected Python version: ${major_version}.${minor_version}"    
+    if (( major_version > 3 )) || { (( major_version == 3 )) && (( minor_version >= 14 )); }; then
+        echo "(*) Python 3.14+ detected. Attempting cosign verification..."
+        if cosign_verification "$VERSION"; then
+            echo "(*) COSIGN verification successful."
+        else
+            echo "(*) COSIGN verification failed or not available for Python ${VERSION}"
+            echo "(*) WARNING: Installing Python ${VERSION} without signature verification"
+            echo "(*) This is expected for newly released versions where cosign signatures are not yet available"
+            echo "(*) Python 3.14+ discontinued PGP signatures in favor of cosign, but cosign signatures may take time to be published"
+        fi
     else
-        receive_gpg_keys PYTHON_SOURCE_GPG_KEYS
+        echo "(*) Python < 3.14 detected. Using GPG signature verification..."
+        gpg_verification
+        echo "(*) GPG verification successful."
     fi
-    echo "Downloading ${cpython_tgz_filename}.asc..."
-    curl -sSL -o "/tmp/python-src/${cpython_tgz_filename}.asc" "${cpython_tgz_url}.asc"
-    gpg --verify "${cpython_tgz_filename}.asc"
 
     # Update min protocol for testing only - https://bugs.python.org/issue41561
     if [ -f /etc/pki/tls/openssl.cnf ]; then

From 10b6e7150db6b9d5adb76fb80b5cd4455ec03e82 Mon Sep 17 00:00:00 2001
From: Mathiyarasy <157102811+Mathiyarasy@users.noreply.github.com>
Date: Mon, 27 Oct 2025 18:46:08 +0530
Subject: [PATCH 399/478] Fix Azure-cli installation for trixie (#1489)

* For trixie fix azure-cli installation

* rename file

* missing shabang line

* update version

* add comments
---
 src/azure-cli/devcontainer-feature.json       |  2 +-
 src/azure-cli/install.sh                      | 12 +++++++++--
 ...tall_azcli_dotnet_dockerindocker_trixie.sh | 13 ++++++++++++
 test/azure-cli/scenarios.json                 | 21 ++++++++++++++++---
 4 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 test/azure-cli/install_azcli_dotnet_dockerindocker_trixie.sh

diff --git a/src/azure-cli/devcontainer-feature.json b/src/azure-cli/devcontainer-feature.json
index 3bc905f47..a634818b6 100644
--- a/src/azure-cli/devcontainer-feature.json
+++ b/src/azure-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "azure-cli",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "name": "Azure CLI",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/azure-cli",
   "description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/azure-cli/install.sh b/src/azure-cli/install.sh
index 171c24510..bc5744ce2 100755
--- a/src/azure-cli/install.sh
+++ b/src/azure-cli/install.sh
@@ -98,7 +98,15 @@ install_using_apt() {
     # Import key safely (new 'signed-by' method rather than deprecated apt-key approach) and install
     curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
     echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/azure-cli/ ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/azure-cli.list
-    apt-get update
+    
+    # This is a workaround for the fact that Azure CLI is not yet a supported package for debian trixie. Once Azure CLI is supported we should revert to avoid script failure for non Azure CLI packages
+    if ! (apt-get update); then
+        echo "(!) Failed to update apt cache, removing repository file"
+        rm -f /etc/apt/sources.list.d/azure-cli.list
+    else  
+        echo "WARNING: apt-get update succeeded. The workaround for broken Azure CLI install on Debian Trixie may no longer be needed."  
+        echo "TODO: Consider reverting to a simple `apt-get update` if the Azure CLI repo works reliably for debian trixie"  
+    fi
 
     if [ "${AZ_VERSION}" = "latest" ] || [ "${AZ_VERSION}" = "lts" ] || [ "${AZ_VERSION}" = "stable" ]; then
         # Empty, meaning grab the "latest" in the apt repo
@@ -135,7 +143,7 @@ install_using_pip_strategy() {
 
 install_with_pipx() {
     echo "(*) Attempting to install globally with pipx..."
-    local ver="$1"
+    local ver="$1" 
     export 
     local 
 
diff --git a/test/azure-cli/install_azcli_dotnet_dockerindocker_trixie.sh b/test/azure-cli/install_azcli_dotnet_dockerindocker_trixie.sh
new file mode 100644
index 000000000..3f5e6f540
--- /dev/null
+++ b/test/azure-cli/install_azcli_dotnet_dockerindocker_trixie.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+check "version" az  --version
+
+check "docker installed" bash -c "type docker"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/azure-cli/scenarios.json b/test/azure-cli/scenarios.json
index c3a205e68..4c12034b5 100644
--- a/test/azure-cli/scenarios.json
+++ b/test/azure-cli/scenarios.json
@@ -8,7 +8,7 @@
         "extensions": "aks-preview,amg,containerapp"
       }
     }
-  },  
+  },
   "install_extensions": {
     "image": "mcr.microsoft.com/devcontainers/base:jammy",
     "user": "vscode",
@@ -39,7 +39,7 @@
       }
     }
   },
-    "install_bicep_trixie": {
+  "install_bicep_trixie": {
     "image": "mcr.microsoft.com/devcontainers/base:trixie",
     "user": "vscode",
     "features": {
@@ -68,7 +68,7 @@
         "installUsingPython": true
       }
     }
-  },  
+  },
   "install_with_python_3_12_bookworm": {
     "image": "mcr.microsoft.com/devcontainers/python:1-3.12-bookworm",
     "user": "vscode",
@@ -87,5 +87,20 @@
         "installUsingPython": "true"
       }
     }
+  },
+  "install_azcli_dotnet_dockerindocker_trixie": {
+    "image": "mcr.microsoft.com/devcontainers/dotnet:dev-10.0-preview-trixie",
+    "user": "vscode",
+    "features": {
+      "azure-cli": {
+        "version": "latest"
+      },
+      "dotnet": {
+        "aspNetCoreRuntimeVersions": "8.0"
+      },
+      "docker-in-docker": {
+        "moby": false
+      }
+    }
   }
 }
\ No newline at end of file

From 9fed2370e96255c6119874ad9ae44f7d68d0a0e6 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Thu, 20 Nov 2025 17:58:55 +0530
Subject: [PATCH 400/478] [common-utils] - Corrections in the installation of
 jq (#1510)

---
 src/common-utils/devcontainer-feature.json |  2 +-
 src/common-utils/main.sh                   | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 14850232d..bc57e3b44 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.5.4",
+    "version": "2.5.5",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 68abe58c8..030995910 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -172,7 +172,7 @@ install_redhat_packages() {
     else
        echo "Unable to find 'tdnf', 'dnf', or 'yum' package manager. Exiting."
        exit 1
-fi
+    fi
 
     if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
         package_list="${package_list} \
@@ -228,7 +228,7 @@ fi
         fi
 
         # Install EPEL repository if needed (required to install 'jq' for CentOS)
-        if ! ${install_cmd} -q list jq >/dev/null 2>&1; then
+        if [[ "${ID}" = "centos" ]] && ! rpm -q jq >/dev/null 2>&1; then
             ${install_cmd} -y install epel-release
             remove_epel="true"
         fi
@@ -240,11 +240,18 @@ fi
     fi
 
     if [ -n "${package_list}" ]; then
-        ${install_cmd} -y install ${package_list}
+        echo "Packages to verify are installed: ${package_list}"
+        echo "Running ${install_cmd} install..."
+        if [ "${install_cmd}" = "dnf" ]; then
+            ${install_cmd} -y install --allowerasing ${package_list}
+        else
+            ${install_cmd} -y install ${package_list}
+        fi
     fi
 
     # Get to latest versions of all packages
     if [ "${UPGRADE_PACKAGES}" = "true" ]; then
+        echo "Running ${install_cmd} upgrade..."
         ${install_cmd} upgrade -y
     fi
 

From 31f99a08a01840dd7c79d79744aca8bf3fe8afaf Mon Sep 17 00:00:00 2001
From: Mike Sarahan <msarahan@gmail.com>
Date: Thu, 20 Nov 2025 06:53:48 -0600
Subject: [PATCH 401/478] allow opt-out of SSL installation (#1484)

* allow opt-out of SSL installation

* Bump common-utils version from 2.5.4 to 2.5.5
---
 src/common-utils/devcontainer-feature.json |  5 +++
 src/common-utils/install.sh                |  1 +
 src/common-utils/main.sh                   | 37 ++++++++++++----------
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index bc57e3b44..874093427 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -64,6 +64,11 @@
             "type": "boolean",
             "default": false,
             "description": "Add packages from non-free Debian repository? (Debian only)"
+        },
+        "installSsl": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install SSL?"
         }
     }
 }
diff --git a/src/common-utils/install.sh b/src/common-utils/install.sh
index a89490347..313271d0a 100755
--- a/src/common-utils/install.sh
+++ b/src/common-utils/install.sh
@@ -18,6 +18,7 @@ USERNAME="${USERNAME:-"automatic"}"
 USER_UID="${UID:-"automatic"}"
 USER_GID="${GID:-"automatic"}"
 ADD_NON_FREE_PACKAGES="${NONFREEPACKAGES:-"false"}"
+INSTALL_SSL="${INSTALLSSL:-"true"}"
 
 MARKER_FILE="/usr/local/etc/vscode-dev-containers/common"
 
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 030995910..b0fd2f3b0 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -18,6 +18,7 @@ USERNAME="${USERNAME:-"automatic"}"
 USER_UID="${USERUID:-"automatic"}"
 USER_GID="${USERGID:-"automatic"}"
 ADD_NON_FREE_PACKAGES="${NONFREEPACKAGES:-"false"}"
+INSTALL_SSL="${INSTALLSSL:-"true"}"
 
 MARKER_FILE="/usr/local/etc/vscode-dev-containers/common"
 
@@ -75,25 +76,27 @@ install_debian_packages() {
         manpages-dev \
         init-system-helpers"
 
-        # Include libssl1.1 if available
-        if [[ ! -z $(apt-cache --names-only search ^libssl1.1$) ]]; then
-            package_list="${package_list} libssl1.1"
-        fi
+        if [ "${INSTALL_SSL}" = "true" ]; then
+            # Include libssl1.1 if available
+            if [[ ! -z $(apt-cache --names-only search ^libssl1.1$) ]]; then
+                package_list="${package_list} libssl1.1"
+            fi
 
-        # Include libssl3 if available
-        if [[ ! -z $(apt-cache --names-only search ^libssl3$) ]]; then
-            package_list="${package_list} libssl3"
-        fi
+            # Include libssl3 if available
+            if [[ ! -z $(apt-cache --names-only search ^libssl3$) ]]; then
+                package_list="${package_list} libssl3"
+            fi
 
-        # Include appropriate version of libssl1.0.x if available
-        local libssl_package=$(dpkg-query -f '${db:Status-Abbrev}\t${binary:Package}\n' -W 'libssl1\.0\.?' 2>&1 || echo '')
-        if [ "$(echo "$libssl_package" | grep -o 'libssl1\.0\.[0-9]:' | uniq | sort | wc -l)" -eq 0 ]; then
-            if [[ ! -z $(apt-cache --names-only search ^libssl1.0.2$) ]]; then
-                # Debian 9
-                package_list="${package_list} libssl1.0.2"
-            elif [[ ! -z $(apt-cache --names-only search ^libssl1.0.0$) ]]; then
-                # Ubuntu 18.04
-                package_list="${package_list} libssl1.0.0"
+            # Include appropriate version of libssl1.0.x if available
+            local libssl_package=$(dpkg-query -f '${db:Status-Abbrev}\t${binary:Package}\n' -W 'libssl1\.0\.?' 2>&1 || echo '')
+            if [ "$(echo "$libssl_package" | grep -o 'libssl1\.0\.[0-9]:' | uniq | sort | wc -l)" -eq 0 ]; then
+                if [[ ! -z $(apt-cache --names-only search ^libssl1.0.2$) ]]; then
+                    # Debian 9
+                    package_list="${package_list} libssl1.0.2"
+                elif [[ ! -z $(apt-cache --names-only search ^libssl1.0.0$) ]]; then
+                    # Ubuntu 18.04
+                    package_list="${package_list} libssl1.0.0"
+                fi
             fi
         fi
 

From f7cc77bef2166e1b656ff825e4c320d0354ecccc Mon Sep 17 00:00:00 2001
From: Steven <steven.liekens@gmail.com>
Date: Mon, 8 Dec 2025 10:15:14 +0100
Subject: [PATCH 402/478] Use /etc/profile.d to set PATH for dotnet tools
 (#1492)

---
 src/dotnet/devcontainer-feature.json | 4 ++--
 src/dotnet/install.sh                | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index 9389addaa..7d72c8cc0 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.4.0",
+    "version": "2.4.1",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
@@ -45,7 +45,7 @@
     },
     "containerEnv": {
         "DOTNET_ROOT": "/usr/share/dotnet",
-        "PATH": "$PATH:$DOTNET_ROOT:~/.dotnet/tools",
+        "PATH": "$PATH:$DOTNET_ROOT",
         "DOTNET_RUNNING_IN_CONTAINER": "true",
         "DOTNET_USE_POLLING_FILE_WATCHER": "true"
     },
diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh
index bd85fb91a..a6bde1ebd 100644
--- a/src/dotnet/install.sh
+++ b/src/dotnet/install.sh
@@ -146,6 +146,13 @@ if [ ! -e /usr/bin/dotnet ]; then
     ln --symbolic "$DOTNET_ROOT/dotnet" /usr/bin/dotnet
 fi
 
+# Add .NET Core SDK tools to PATH for bash and zsh users
+# This is where 'dotnet tool install --global <tool>' installs tools to
+# Use single-quoted EOF to defer $PATH expansion until sourcing the file
+cat << 'EOF' >> /etc/profile.d/dotnet.sh
+export PATH="$PATH:$HOME/.dotnet/tools"
+EOF
+
 # Clean up
 rm -rf /var/lib/apt/lists/*
 rm -rf scripts

From 545dbbd0da9528ed425cd812f6ca58bfcedbc1aa Mon Sep 17 00:00:00 2001
From: sireeshajonnalagadda <sireeshajonnalagadda@github.com>
Date: Mon, 8 Dec 2025 14:45:42 +0530
Subject: [PATCH 403/478] Adding azure-linux OS support for docker-in-docker
 feature (#1506)

* Adding azure-linux OS support for docker-in-docker feature

* test

* Fixing issues and adding mariner

* Fixing if

* simplified code

* addressing review comments
---
 .../devcontainer-feature.json                 |   2 +-
 src/docker-in-docker/install.sh               | 513 +++++++++++++++---
 test/docker-in-docker/azure_linux.sh          |  24 +
 .../docker-in-docker/azure_linux_docker_ce.sh | 113 ++++
 test/docker-in-docker/cbl_mariner.sh          |  35 ++
 .../docker-in-docker/cbl_mariner_docker_ce.sh |  34 ++
 test/docker-in-docker/scenarios.json          |  40 ++
 7 files changed, 682 insertions(+), 79 deletions(-)
 create mode 100644 test/docker-in-docker/azure_linux.sh
 create mode 100644 test/docker-in-docker/azure_linux_docker_ce.sh
 create mode 100644 test/docker-in-docker/cbl_mariner.sh
 create mode 100644 test/docker-in-docker/cbl_mariner_docker_ce.sh

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 0450c664e..33b0ad31c 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.12.4",
+    "version": "2.13.0",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 46f1045ae..10f3ef06c 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -61,20 +61,45 @@ elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
     USERNAME=root
 fi
 
-apt_get_update()
-{
-    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
-        echo "Running apt-get update..."
-        apt-get update -y
-    fi
+# Package manager update function
+pkg_mgr_update() {
+    case ${ADJUSTED_ID} in
+        debian)
+            if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+                echo "Running apt-get update..."
+                apt-get update -y
+            fi
+            ;;
+        rhel)
+            if [ ${PKG_MGR_CMD} = "microdnf" ]; then
+                cache_check_dir="/var/cache/yum"
+            else
+                cache_check_dir="/var/cache/${PKG_MGR_CMD}"
+            fi
+            if [ "$(ls ${cache_check_dir}/* 2>/dev/null | wc -l)" = 0 ]; then
+                echo "Running ${PKG_MGR_CMD} makecache ..."
+                ${PKG_MGR_CMD} makecache
+            fi
+            ;;
+    esac
 }
 
 # Checks if packages are installed and installs them if not
 check_packages() {
-    if ! dpkg -s "$@" > /dev/null 2>&1; then
-        apt_get_update
-        apt-get -y install --no-install-recommends "$@"
-    fi
+    case ${ADJUSTED_ID} in
+        debian)
+            if ! dpkg -s "$@" > /dev/null 2>&1; then
+                pkg_mgr_update
+                apt-get -y install --no-install-recommends "$@"
+            fi
+            ;;
+        rhel)
+            if ! rpm -q "$@" > /dev/null 2>&1; then
+                pkg_mgr_update
+                ${PKG_MGR_CMD} -y install "$@"
+            fi
+            ;;
+    esac
 }
 
 # Figure out correct version of a three part version number is not passed
@@ -189,11 +214,40 @@ get_github_api_repo_url() {
 # Ensure apt is in non-interactive to avoid prompts
 export DEBIAN_FRONTEND=noninteractive
 
-
 # Source /etc/os-release to get OS info
 . /etc/os-release
-# Fetch host/container arch.
-architecture="$(dpkg --print-architecture)"
+
+# Determine adjusted ID and package manager
+if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
+    ADJUSTED_ID="debian"
+    PKG_MGR_CMD="apt-get"
+    # Use dpkg for Debian-based systems
+    architecture="$(dpkg --print-architecture 2>/dev/null || uname -m)"
+elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "azurelinux" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"azurelinux"* || "${ID_LIKE}" = *"mariner"* ]]; then
+    ADJUSTED_ID="rhel"
+    # Determine the appropriate package manager for RHEL-based systems
+    for pkg_mgr in tdnf dnf microdnf yum; do
+        if command -v "$pkg_mgr" >/dev/null 2>&1; then
+            PKG_MGR_CMD="$pkg_mgr"
+            break
+        fi
+    done
+    
+    if [ -z "${PKG_MGR_CMD}" ]; then
+        err "Unable to find a supported package manager (tdnf, dnf, microdnf, yum)"
+        exit 1
+    fi
+    
+    architecture="$(rpm --eval '%{_arch}' 2>/dev/null || uname -m)"
+else
+    err "Linux distro ${ID} not supported."
+    exit 1
+fi
+
+# Azure Linux specific setup
+if [ "${ID}" = "azurelinux" ]; then
+    VERSION_CODENAME="azurelinux${VERSION_ID}"
+fi
 
 # Prevent attempting to install Moby on Debian trixie (packages removed)
 if [ "${USE_MOBY}" = "true" ] && [ "${ID}" = "debian" ] && [ "${VERSION_CODENAME}" = "trixie" ]; then
@@ -204,60 +258,199 @@ fi
 
 # Check if distro is supported
 if [ "${USE_MOBY}" = "true" ]; then
-    if [[ "${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
-        err "Unsupported  distribution version '${VERSION_CODENAME}'. To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS distribution"
-        err "Supported distributions include:  ${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}"
-        exit 1
+    if [ "${ADJUSTED_ID}" = "debian" ]; then
+        if [[ "${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
+            err "Unsupported distribution version '${VERSION_CODENAME}'. To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS distribution"
+            err "Supported distributions include: ${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}"
+            exit 1
+        fi
+        echo "(*) ${VERSION_CODENAME} is supported for Moby installation  - setting up Microsoft repository"
+    elif [ "${ADJUSTED_ID}" = "rhel" ]; then
+        if [ "${ID}" = "azurelinux" ] || [ "${ID}" = "mariner" ]; then
+            echo " (*) ${ID} ${VERSION_ID} detected - using Microsoft repositories for Moby packages"
+        else
+            echo "RHEL-based system (${ID}) detected - Moby packages may require additional configuration"
+        fi
     fi
-    echo "Distro codename  '${VERSION_CODENAME}'  matched filter  '${DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES}'"
 else
-    if [[ "${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
-        err "Unsupported distribution version '${VERSION_CODENAME}'. To resolve, please choose a compatible OS distribution"
-        err "Supported distributions include:  ${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}"
-        exit 1
+    if [ "${ADJUSTED_ID}" = "debian" ]; then
+        if [[ "${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}" != *"${VERSION_CODENAME}"* ]]; then
+            err "Unsupported distribution version '${VERSION_CODENAME}'. To resolve, please choose a compatible OS distribution"
+            err "Supported distributions include: ${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}"
+            exit 1
+        fi
+        echo "(*) ${VERSION_CODENAME} is supported for Docker CE installation (supported: ${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}) - setting up Docker repository"
+    elif [ "${ADJUSTED_ID}" = "rhel" ]; then
+        
+        echo "RHEL-based system (${ID}) detected - using Docker CE packages"
     fi
-    echo "Distro codename  '${VERSION_CODENAME}'  matched filter  '${DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES}'"
 fi
 
-# Install dependencies
-check_packages apt-transport-https curl ca-certificates pigz iptables gnupg2 dirmngr wget jq
-if ! type git > /dev/null 2>&1; then
+# Install base dependencies
+base_packages="curl ca-certificates pigz iptables gnupg2 wget jq"
+case ${ADJUSTED_ID} in
+    debian)
+        check_packages apt-transport-https $base_packages dirmngr
+        ;;
+    rhel)
+        check_packages $base_packages tar gawk shadow-utils policycoreutils  procps-ng systemd-libs systemd-devel
+       
+        ;;
+esac
+
+# Install git if not already present
+if ! command -v git >/dev/null 2>&1; then
     check_packages git
 fi
 
-# Swap to legacy iptables for compatibility
-if type iptables-legacy > /dev/null 2>&1; then
+# Swap to legacy iptables for compatibility (Debian only)
+if [ "${ADJUSTED_ID}" = "debian" ] && type iptables-legacy > /dev/null 2>&1; then
     update-alternatives --set iptables /usr/sbin/iptables-legacy
     update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
 fi
 
-
-
-# Set up the necessary apt repos (either Microsoft's or Docker's)
+# Set up the necessary repositories
 if [ "${USE_MOBY}" = "true" ]; then
-
     # Name of open source engine/cli
     engine_package_name="moby-engine"
     cli_package_name="moby-cli"
 
-    # Import key safely and import Microsoft apt repo
-    {
-        curl -sSL ${MICROSOFT_GPG_KEYS_URI}
-        curl -sSL ${MICROSOFT_GPG_KEYS_ROLLING_URI}
-    } | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
-    echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
+    case ${ADJUSTED_ID} in
+        debian)
+            # Import key safely and import Microsoft apt repo
+            {
+                curl -sSL ${MICROSOFT_GPG_KEYS_URI}
+                curl -sSL ${MICROSOFT_GPG_KEYS_ROLLING_URI}
+            } | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
+            echo "deb [arch=${architecture} signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
+            ;;
+        rhel)
+            echo "(*) ${ID} detected - checking for Moby packages..."
+        
+            # Check if moby packages are available in default repos
+            if ${PKG_MGR_CMD} list available moby-engine >/dev/null 2>&1; then
+                echo "(*) Using built-in ${ID} Moby packages"
+            else
+                case "${ID}" in
+                    azurelinux)
+                        echo "(*) Moby packages not found in Azure Linux repositories"
+                        echo "(*) For Azure Linux, Docker CE ('moby': false) is recommended"
+                        err "Moby packages are not available for Azure Linux ${VERSION_ID}."
+                        err "Recommendation: Use '\"moby\": false' to install Docker CE instead."
+                        exit 1
+                        ;;
+                    mariner)
+                        echo "(*) Adding Microsoft repository for CBL-Mariner..."
+                        # Add Microsoft repository if packages aren't available locally
+                        curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /etc/pki/rpm-gpg/microsoft.gpg
+                        cat > /etc/yum.repos.d/microsoft.repo << EOF
+[microsoft]
+name=Microsoft Repository
+baseurl=https://packages.microsoft.com/repos/microsoft-cbl-mariner-2.0-prod-base/
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/microsoft.gpg
+EOF
+                # Verify packages are available after adding repo
+                pkg_mgr_update
+                if ! ${PKG_MGR_CMD} list available moby-engine >/dev/null 2>&1; then
+                    echo "(*) Moby packages not found in Microsoft repository either"
+                    err "Moby packages are not available for CBL-Mariner ${VERSION_ID}."
+                    err "Recommendation: Use '\"moby\": false' to install Docker CE instead."
+                    exit 1
+                fi
+                ;;
+            *)
+                err "Moby packages are not available for ${ID}. Please use 'moby': false option."
+                exit 1
+                ;;
+            esac    
+        fi
+        ;;
+    esac
 else
     # Name of licensed engine/cli
     engine_package_name="docker-ce"
     cli_package_name="docker-ce-cli"
-
-    # Import key safely and import Docker apt repo
-    curl -fsSL https://download.docker.com/linux/${ID}/gpg | gpg --dearmor > /usr/share/keyrings/docker-archive-keyring.gpg
-    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/${ID} ${VERSION_CODENAME} stable" > /etc/apt/sources.list.d/docker.list
+    case ${ADJUSTED_ID} in
+        debian)
+            curl -fsSL https://download.docker.com/linux/${ID}/gpg | gpg --dearmor > /usr/share/keyrings/docker-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/${ID} ${VERSION_CODENAME} stable" > /etc/apt/sources.list.d/docker.list
+            ;;
+        rhel)
+            # Docker CE repository setup for RHEL-based systems
+            setup_docker_ce_repo() {
+                curl -fsSL https://download.docker.com/linux/centos/gpg > /etc/pki/rpm-gpg/docker-ce.gpg
+                cat > /etc/yum.repos.d/docker-ce.repo << EOF  
+[docker-ce-stable]
+name=Docker CE Stable
+baseurl=https://download.docker.com/linux/centos/9/\$basearch/stable
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/docker-ce.gpg
+skip_if_unavailable=1
+module_hotfixes=1
+EOF
+            }
+            install_azure_linux_deps() {
+                echo "(*) Installing device-mapper libraries for Docker CE..."
+                [ "${ID}" != "mariner" ] && ${PKG_MGR_CMD} -y install device-mapper-libs 2>/dev/null || echo "(*) Device-mapper install failed, proceeding"   
+                echo "(*) Installing additional Docker CE dependencies..."
+                ${PKG_MGR_CMD} -y install libseccomp libtool-ltdl systemd-libs libcgroup tar xz || {
+                    echo "(*) Some optional dependencies could not be installed, continuing..."
+                }
+            }
+            setup_selinux_context() {
+                if command -v getenforce >/dev/null 2>&1 && [ "$(getenforce 2>/dev/null)" != "Disabled" ]; then
+                    echo "(*) Creating minimal SELinux context for Docker compatibility..."
+                    mkdir -p /etc/selinux/targeted/contexts/files/ 2>/dev/null || true
+                    echo "/var/lib/docker(/.*)? system_u:object_r:container_file_t:s0" >> /etc/selinux/targeted/contexts/files/file_contexts.local 2>/dev/null || true
+                fi
+            }
+            
+            # Special handling for RHEL Docker CE installation
+            case "${ID}" in
+                azurelinux|mariner)
+                    echo "(*) ${ID} detected"
+                    echo "(*) Note: Moby packages work better on Azure Linux. Consider using 'moby': true"
+                    echo "(*) Setting up Docker CE repository..."
+                    
+                    setup_docker_ce_repo
+                    install_azure_linux_deps
+                    
+                    if [ "${USE_MOBY}" != "true" ]; then
+                        echo "(*) Docker CE installation for Azure Linux - skipping container-selinux"
+                        echo "(*) Note: SELinux policies will be minimal but Docker will function normally"
+                        setup_selinux_context
+                    else
+                        echo "(*) Using Moby - container-selinux not required"
+                    fi
+                    ;;
+                *)     
+                    # Standard RHEL/CentOS/Fedora approach
+                    if command -v dnf >/dev/null 2>&1; then
+                        dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
+                    elif command -v yum-config-manager >/dev/null 2>&1; then
+                        yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
+                    else  
+                        # Manual fallback
+                        setup_docker_ce_repo
+            fi
+            ;;
+        esac
+        ;;
+    esac    
 fi
 
-# Refresh apt lists
-apt-get update
+# Refresh package database
+case ${ADJUSTED_ID} in
+    debian)
+        apt-get update
+        ;;
+    rhel)
+        pkg_mgr_update
+        ;;
+esac
 
 # Soft version matching
 if [ "${DOCKER_VERSION}" = "latest" ] || [ "${DOCKER_VERSION}" = "lts" ] || [ "${DOCKER_VERSION}" = "stable" ]; then
@@ -265,6 +458,8 @@ if [ "${DOCKER_VERSION}" = "latest" ] || [ "${DOCKER_VERSION}" = "lts" ] || [ "$
     engine_version_suffix=""
     cli_version_suffix=""
 else
+    case ${ADJUSTED_ID} in
+        debian)
     # Fetch a valid version from the apt-cache (eg: the Microsoft repo appends +azure, breakfix, etc...)
     docker_version_dot_escaped="${DOCKER_VERSION//./\\.}"
     docker_version_dot_plus_escaped="${docker_version_dot_escaped//+/\\+}"
@@ -279,8 +474,27 @@ else
         apt-cache madison ${cli_package_name} | awk -F"|" '{print $2}' | grep -oP '^(.+:)?\K.+'
         exit 1
     fi
-    echo "engine_version_suffix ${engine_version_suffix}"
-    echo "cli_version_suffix ${cli_version_suffix}"
+    ;;  
+rhel)
+     # For RHEL-based systems, use dnf/yum to find versions
+            docker_version_escaped="${DOCKER_VERSION//./\\.}"
+            set +e # Don't exit if finding version fails - will handle gracefully
+                if [ "${USE_MOBY}" = "true" ]; then
+                    available_versions=$(${PKG_MGR_CMD} list --available moby-engine 2>/dev/null | grep -v "Available Packages" | awk '{print $2}' | grep -E "^${docker_version_escaped}" | head -1)
+                else
+                    available_versions=$(${PKG_MGR_CMD} list --available docker-ce 2>/dev/null | grep -v "Available Packages" | awk '{print $2}' | grep -E "^${docker_version_escaped}" | head -1)
+                fi
+            set -e
+            if [ -n "${available_versions}" ]; then
+                engine_version_suffix="-${available_versions}"
+                cli_version_suffix="-${available_versions}"
+            else
+                echo "(*) Exact version ${DOCKER_VERSION} not found, using latest available"
+                engine_version_suffix=""
+                cli_version_suffix=""
+            fi
+            ;;
+    esac
 fi
 
 # Version matching for moby-buildx
@@ -289,6 +503,8 @@ if [ "${USE_MOBY}" = "true" ]; then
         # Empty, meaning grab whatever "latest" is in apt repo
         buildx_version_suffix=""
     else
+        case ${ADJUSTED_ID} in
+            debian)
         buildx_version_dot_escaped="${MOBY_BUILDX_VERSION//./\\.}"
         buildx_version_dot_plus_escaped="${buildx_version_dot_escaped//+/\\+}"
         buildx_version_regex="^(.+:)?${buildx_version_dot_plus_escaped}([\\.\\+ ~:-]|$)"
@@ -300,6 +516,21 @@ if [ "${USE_MOBY}" = "true" ]; then
             apt-cache madison moby-buildx | awk -F"|" '{print $2}' | grep -oP '^(.+:)?\K.+'
             exit 1
         fi
+        ;;
+            rhel)
+                # For RHEL-based systems, try to find buildx version or use latest
+                buildx_version_escaped="${MOBY_BUILDX_VERSION//./\\.}"
+                set +e
+                available_buildx=$(${PKG_MGR_CMD} list --available moby-buildx 2>/dev/null | grep -v "Available Packages" | awk '{print $2}' | grep -E "^${buildx_version_escaped}" | head -1)
+                set -e
+                if [ -n "${available_buildx}" ]; then
+                    buildx_version_suffix="-${available_buildx}"
+                else
+                    echo "(*) Exact buildx version ${MOBY_BUILDX_VERSION} not found, using latest available"
+                    buildx_version_suffix=""
+                fi
+                ;;
+        esac
         echo "buildx_version_suffix ${buildx_version_suffix}"
     fi
 fi
@@ -308,26 +539,131 @@ fi
 if type docker > /dev/null 2>&1 && type dockerd > /dev/null 2>&1; then
     echo "Docker / Moby CLI and Engine already installed."
 else
-    if [ "${USE_MOBY}" = "true" ]; then
-        # Install engine
-        set +e # Handle error gracefully
-            apt-get -y install --no-install-recommends moby-cli${cli_version_suffix} moby-buildx${buildx_version_suffix} moby-engine${engine_version_suffix}
-            exit_code=$?
-        set -e    
-        
-        if [ ${exit_code} -ne 0 ]; then
-            err "Packages for moby not available in OS ${ID} ${VERSION_CODENAME} (${architecture}). To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS version (eg: 'ubuntu-24.04')."
-            exit 1
-        fi
-
-        # Install compose
-        apt-get -y install --no-install-recommends moby-compose || err "Package moby-compose (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
-    else
-        apt-get -y install --no-install-recommends docker-ce-cli${cli_version_suffix} docker-ce${engine_version_suffix}
-        # Install compose
-        apt-mark hold docker-ce docker-ce-cli
-        apt-get -y install --no-install-recommends docker-compose-plugin || echo "(*) Package docker-compose-plugin (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
-    fi
+        case ${ADJUSTED_ID} in
+        debian)
+            if [ "${USE_MOBY}" = "true" ]; then
+                # Install engine
+                set +e # Handle error gracefully
+                    apt-get -y install --no-install-recommends moby-cli${cli_version_suffix} moby-buildx${buildx_version_suffix} moby-engine${engine_version_suffix}
+                    exit_code=$?
+                set -e    
+                
+                if [ ${exit_code} -ne 0 ]; then
+                    err "Packages for moby not available in OS ${ID} ${VERSION_CODENAME} (${architecture}). To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS version (eg: 'ubuntu-24.04')."
+                    exit 1
+                fi
+
+                # Install compose
+                apt-get -y install --no-install-recommends moby-compose || err "Package moby-compose (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
+            else
+                apt-get -y install --no-install-recommends docker-ce-cli${cli_version_suffix} docker-ce${engine_version_suffix}
+                # Install compose
+                apt-mark hold docker-ce docker-ce-cli
+                apt-get -y install --no-install-recommends docker-compose-plugin || echo "(*) Package docker-compose-plugin (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
+            fi
+            ;;
+        rhel)
+            if [ "${USE_MOBY}" = "true" ]; then
+                set +e # Handle error gracefully
+                    ${PKG_MGR_CMD} -y install moby-cli${cli_version_suffix} moby-engine${engine_version_suffix}
+                    exit_code=$?
+                set -e
+                
+                if [ ${exit_code} -ne 0 ]; then
+                    err "Packages for moby not available in OS ${ID} ${VERSION_CODENAME} (${architecture}). To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS version."
+                    exit 1
+                fi
+
+                # Install compose
+                if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
+                    ${PKG_MGR_CMD} -y install moby-compose || echo "(*) Package moby-compose not available for ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
+                fi
+            else
+                               # Special handling for Azure Linux Docker CE installation
+                if [ "${ID}" = "azurelinux" ] || [ "${ID}" = "mariner" ]; then
+                    echo "(*) Installing Docker CE on Azure Linux (bypassing container-selinux dependency)..."
+                    
+                    # Use rpm with --force and --nodeps for Azure Linux
+                    set +e  # Don't exit on error for this section
+                    ${PKG_MGR_CMD} -y install docker-ce${cli_version_suffix} docker-ce-cli${engine_version_suffix} containerd.io
+                    install_result=$?
+                    set -e
+                    
+                    if [ $install_result -ne 0 ]; then
+                        echo "(*) Standard installation failed, trying manual installation..."
+                        
+                        echo "(*) Standard installation failed, trying manual installation..."
+                        
+                        # Create directory for downloading packages
+                        mkdir -p /tmp/docker-ce-install
+                        
+                        # Download packages manually using curl since tdnf doesn't support download
+                        echo "(*) Downloading Docker CE packages manually..."
+                        
+                        # Get the repository baseurl
+                        repo_baseurl="https://download.docker.com/linux/centos/9/x86_64/stable"
+                        
+                        # Download packages directly
+                        cd /tmp/docker-ce-install
+                        
+                        # Get package names with versions
+                        if [ -n "${cli_version_suffix}" ]; then
+                            docker_ce_version="${cli_version_suffix#-}"
+                            docker_cli_version="${engine_version_suffix#-}"
+                        else
+                            # Get latest version from repository
+                            docker_ce_version="latest"
+                        fi
+                        
+                        echo "(*) Attempting to download Docker CE packages from repository..."
+                        
+                        # Try to download latest packages if specific version fails
+                        if ! curl -fsSL "${repo_baseurl}/Packages/docker-ce-${docker_ce_version}.el9.x86_64.rpm" -o docker-ce.rpm 2>/dev/null; then
+                            # Fallback: try to get latest available version
+                            echo "(*) Specific version not found, trying latest..."
+                            latest_docker=$(curl -s "${repo_baseurl}/Packages/" | grep -o 'docker-ce-[0-9][^"]*\.el9\.x86_64\.rpm' | head -1)
+                            latest_cli=$(curl -s "${repo_baseurl}/Packages/" | grep -o 'docker-ce-cli-[0-9][^"]*\.el9\.x86_64\.rpm' | head -1)
+                            latest_containerd=$(curl -s "${repo_baseurl}/Packages/" | grep -o 'containerd\.io-[0-9][^"]*\.el9\.x86_64\.rpm' | head -1)
+                            
+                            if [ -n "${latest_docker}" ]; then
+                                curl -fsSL "${repo_baseurl}/Packages/${latest_docker}" -o docker-ce.rpm
+                                curl -fsSL "${repo_baseurl}/Packages/${latest_cli}" -o docker-ce-cli.rpm
+                                curl -fsSL "${repo_baseurl}/Packages/${latest_containerd}" -o containerd.io.rpm
+                            else
+                                echo "(*) ERROR: Could not find Docker CE packages in repository"
+                                echo "(*) Please check repository configuration or use 'moby': true"
+                                exit 1
+                            fi
+                        fi
+                        # Install systemd libraries required by Docker CE
+                        echo "(*) Installing systemd libraries required by Docker CE..."
+                        ${PKG_MGR_CMD} -y install systemd-libs || ${PKG_MGR_CMD} -y install systemd-devel || {
+                            echo "(*) WARNING: Could not install systemd libraries"
+                            echo "(*) Docker may fail to start without these"
+                        }
+                         
+                        # Install with rpm --force --nodeps
+                        echo "(*) Installing Docker CE packages with dependency override..."
+                        rpm -Uvh --force --nodeps *.rpm
+                        
+                        # Cleanup
+                        cd /
+                        rm -rf /tmp/docker-ce-install
+                        
+                        echo "(*) Docker CE installation completed with dependency bypass"
+                        echo "(*) Note: Some SELinux functionality may be limited without container-selinux"
+                    fi
+                else
+                    # Standard installation for other RHEL-based systems
+                    ${PKG_MGR_CMD} -y install docker-ce${cli_version_suffix} docker-ce-cli${engine_version_suffix} containerd.io
+                fi
+                # Install compose
+                if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
+                    ${PKG_MGR_CMD} -y install docker-compose-plugin || echo "(*) Package docker-compose-plugin not available for ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
+                fi
+            fi
+            ;;
+    esac
 fi
 
 echo "Finished installing docker / moby!"
@@ -348,11 +684,11 @@ fallback_compose(){
 # If 'docker-compose' command is to be included
 if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
     case "${architecture}" in
-        amd64) target_compose_arch=x86_64 ;;
-        arm64) target_compose_arch=aarch64 ;;
-        *)
-            echo "(!) Docker in docker does not support machine architecture '$architecture'. Please use an x86-64 or ARM64 machine."
-            exit 1
+    amd64|x86_64) target_compose_arch=x86_64 ;;
+    arm64|aarch64) target_compose_arch=aarch64 ;;
+    *)
+        echo "(!) Docker in docker does not support machine architecture '$architecture'. Please use an x86-64 or ARM64 machine."
+        exit 1
     esac
 
     docker_compose_path="/usr/local/bin/docker-compose"
@@ -408,19 +744,32 @@ fallback_compose-switch() {
     echo -e "\n(!) Failed to fetch the latest artifacts for compose-switch v${compose_switch_version}..."
     get_previous_version "$url" "$repo_url" compose_switch_version
     echo -e "\nAttempting to install v${compose_switch_version}"
-    curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/compose-switch
+    curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${target_switch_arch}" -o /usr/local/bin/compose-switch
 }
-
 # Install docker-compose switch if not already installed - https://github.com/docker/compose-switch#manual-installation
 if [ "${INSTALL_DOCKER_COMPOSE_SWITCH}" = "true" ] && ! type compose-switch > /dev/null 2>&1; then
     if type docker-compose > /dev/null 2>&1; then
         echo "(*) Installing compose-switch..."
-        current_compose_path="$(which docker-compose)"
+        current_compose_path="$(command -v docker-compose)"
         target_compose_path="$(dirname "${current_compose_path}")/docker-compose-v1"
         compose_switch_version="latest"
         compose_switch_url="https://github.com/docker/compose-switch"
+        # Try to get latest version, fallback to known stable version if GitHub API fails
+        set +e
         find_version_from_git_tags compose_switch_version "$compose_switch_url"
-        curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${architecture}" -o /usr/local/bin/compose-switch || fallback_compose-switch "$compose_switch_url"
+        if [ $? -ne 0 ] || [ -z "${compose_switch_version}" ] || [ "${compose_switch_version}" = "latest" ]; then
+            echo "(*) GitHub API rate limited or failed, using fallback method"
+            fallback_compose-switch "$compose_switch_url"
+        fi
+        set -e
+        
+        # Map architecture for compose-switch downloads
+        case "${architecture}" in
+            amd64|x86_64) target_switch_arch=amd64 ;;
+            arm64|aarch64) target_switch_arch=arm64 ;;
+            *) target_switch_arch=${architecture} ;;
+        esac
+        curl -fsSL "https://github.com/docker/compose-switch/releases/download/v${compose_switch_version}/docker-compose-linux-${target_switch_arch}" -o /usr/local/bin/compose-switch || fallback_compose-switch "$compose_switch_url"
         chmod +x /usr/local/bin/compose-switch
         # TODO: Verify checksum once available: https://github.com/docker/compose-switch/issues/11
         # Setup v1 CLI as alternative in addition to compose-switch (which maps to v2)
@@ -453,7 +802,7 @@ fallback_buildx() {
     local repo_url=$(get_github_api_repo_url "$url")
     echo -e "\n(!) Failed to fetch the latest artifacts for docker buildx v${buildx_version}..."
     get_previous_version "$url" "$repo_url" buildx_version
-    buildx_file_name="buildx-v${buildx_version}.linux-${architecture}"
+    buildx_file_name="buildx-v${buildx_version}.linux-${target_buildx_arch}"
     echo -e "\nAttempting to install v${buildx_version}"
     wget https://github.com/docker/buildx/releases/download/v${buildx_version}/${buildx_file_name}
 }
@@ -463,8 +812,16 @@ if [ "${INSTALL_DOCKER_BUILDX}" = "true" ]; then
     docker_buildx_url="https://github.com/docker/buildx"
     find_version_from_git_tags buildx_version "$docker_buildx_url" "refs/tags/v"
     echo "(*) Installing buildx ${buildx_version}..."
-    buildx_file_name="buildx-v${buildx_version}.linux-${architecture}"
-    
+
+      # Map architecture for buildx downloads
+    case "${architecture}" in
+        amd64|x86_64) target_buildx_arch=amd64 ;;
+        arm64|aarch64) target_buildx_arch=arm64 ;;
+        *) target_buildx_arch=${architecture} ;;
+    esac
+
+    buildx_file_name="buildx-v${buildx_version}.linux-${target_buildx_arch}"
+
     cd /tmp
     wget https://github.com/docker/buildx/releases/download/v${buildx_version}/${buildx_file_name} || fallback_buildx "$docker_buildx_url"
     
diff --git a/test/docker-in-docker/azure_linux.sh b/test/docker-in-docker/azure_linux.sh
new file mode 100644
index 000000000..ca5f51997
--- /dev/null
+++ b/test/docker-in-docker/azure_linux.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# OS identification (optional, can fail gracefully)
+check "azure os detection" bash -c "cat /etc/os-release | grep -i azure || echo 'Not Azure Linux, but test can continue'"
+
+# Core Docker functionality
+check "docker version" docker --version
+check "docker daemon running" docker info
+
+# Docker init script (if using docker-in-docker feature)
+check "docker init script exists" test -f "/usr/local/share/docker-init.sh"
+
+# Basic functionality test
+check "docker container test" docker run --rm alpine echo "test successful"
+
+# The main Azure Linux specific test - DNS flag should NOT be present
+check "dns flag should not be present" test ! "$(ps -ax | grep -v grep | grep -E 'dockerd.+\-\-dns')"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/docker-in-docker/azure_linux_docker_ce.sh b/test/docker-in-docker/azure_linux_docker_ce.sh
new file mode 100644
index 000000000..fd1b72c4c
--- /dev/null
+++ b/test/docker-in-docker/azure_linux_docker_ce.sh
@@ -0,0 +1,113 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+echo "=== Azure Linux Docker CE Test ==="
+
+echo "1. Verifying OS identification..."
+cat /etc/os-release | grep -i azure
+
+echo "2. Checking Docker installation..."
+docker --version || {
+    echo "ERROR: Docker is not installed"
+    exit 1
+}
+
+echo "3. Checking if Docker binaries exist..."
+which dockerd || echo "dockerd not in PATH"
+ls -la /usr/bin/docker* || echo "No docker binaries in /usr/bin"
+ls -la /usr/local/bin/docker* || echo "No docker binaries in /usr/local/bin"
+
+echo "4. Checking Docker service files..."
+ls -la /etc/systemd/system/docker* || echo "No systemd docker files"
+ls -la /usr/lib/systemd/system/docker* || echo "No system docker service files"
+
+echo "6. Checking Docker daemon status..."
+if ! docker info >/dev/null 2>&1; then
+    echo "Docker daemon not running, starting it..."
+    
+    # Check if docker-init script exists
+    if [ -f "/usr/local/share/docker-init.sh" ]; then
+        echo "Starting Docker using docker-init.sh..."
+        
+        # Clear any existing log
+        rm -f /tmp/dockerd.log
+        
+        # Start docker-init in background
+        nohup /usr/local/share/docker-init.sh > /tmp/docker-init.log 2>&1 &
+        
+        # Wait for Docker to start with better debugging
+        echo "Waiting for Docker daemon to start..."
+        for i in {1..30}; do
+            if docker info >/dev/null 2>&1; then
+                echo "Docker daemon started successfully"
+                break
+            fi
+            echo "Waiting... ($i/30)"
+            
+            # Show dockerd logs if available
+            if [ -f "/tmp/dockerd.log" ]; then
+                echo "--- Recent dockerd.log entries ---"
+                tail -5 /tmp/dockerd.log || echo "Could not read dockerd.log"
+                echo "--- End of dockerd.log ---"
+            fi
+            
+            sleep 2
+        done
+        
+        # Final check with detailed error reporting
+        if ! docker info >/dev/null 2>&1; then
+            echo "ERROR: Docker daemon failed to start after 60 seconds"
+            echo ""
+            echo "=== DEBUGGING INFORMATION ==="
+            echo ""
+            echo "1. Docker init log:"
+            cat /tmp/docker-init.log 2>/dev/null || echo "No docker-init.log found"
+            echo ""
+            echo "2. Docker daemon log:"
+            cat /tmp/dockerd.log 2>/dev/null || echo "No dockerd.log found"
+            echo ""
+            echo "3. Process list:"
+            ps aux | grep -E "(docker|containerd)" | grep -v grep || echo "No docker/containerd processes found"
+            echo ""
+            echo "4. Network interfaces:"
+            ip addr show || ifconfig || echo "Could not get network info"
+            echo ""
+            echo "5. Mount points:"
+            mount | grep -E "(docker|container)" || echo "No docker-related mounts"
+            echo ""
+            echo "6. SELinux status:"
+            if command -v getenforce >/dev/null 2>&1; then
+                getenforce || echo "SELinux command failed"
+            else
+                echo "SELinux tools not available"
+            fi
+            echo ""
+            echo "7. Available storage:"
+            df -h /var/lib/docker 2>/dev/null || df -h / || echo "Could not check storage"
+            echo ""
+            echo "8. System resources:"
+            free -h || echo "Could not check memory"
+            echo ""
+            echo "=== END DEBUGGING ==="
+            exit 1
+        fi
+    else
+        echo "ERROR: docker-init.sh not found at /usr/local/share/docker-init.sh"
+        ls -la /usr/local/share/ || echo "Could not list /usr/local/share/"
+        exit 1
+    fi
+else
+    echo "Docker daemon is already running"
+fi
+
+echo "7. Testing basic Docker functionality..."
+docker info | head -10
+
+echo "8. Testing container execution..."
+docker run --rm alpine echo "Basic container test successful"
+
+echo "=== Docker CE test completed successfully ==="
\ No newline at end of file
diff --git a/test/docker-in-docker/cbl_mariner.sh b/test/docker-in-docker/cbl_mariner.sh
new file mode 100644
index 000000000..44a8ee38e
--- /dev/null
+++ b/test/docker-in-docker/cbl_mariner.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+# Simple test script for cbl_mariner scenario (Moby = true)
+# Run with: sudo bash script_cbl_mariner.sh
+
+set -e
+
+echo "=== Testing cbl_mariner scenario (Moby) ==="
+
+# Set environment variables for the scenario
+export VERSION="latest"
+export MOBY="true"
+export AZUREDNSAUTODETECTION="false"
+
+# Source OS info
+. /etc/os-release
+echo "OS: $ID $VERSION_ID"
+
+# Check package manager
+if type tdnf > /dev/null 2>&1; then
+    echo "Using tdnf"
+else
+    echo "ERROR: tdnf not found"
+    exit 1
+fi
+
+# Validate
+if command -v docker > /dev/null 2>&1; then
+    docker --version
+    echo "SUCCESS: Docker installed"
+else
+    echo "ERROR: Docker not installed"
+    exit 1
+fi
+
+echo "=== cbl_mariner test passed ==="
\ No newline at end of file
diff --git a/test/docker-in-docker/cbl_mariner_docker_ce.sh b/test/docker-in-docker/cbl_mariner_docker_ce.sh
new file mode 100644
index 000000000..24788377b
--- /dev/null
+++ b/test/docker-in-docker/cbl_mariner_docker_ce.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+# test script for cbl_mariner_docker_ce scenario (Moby = false)
+
+set -e
+
+echo "=== Testing cbl_mariner_docker_ce scenario (Docker CE) ==="
+
+# Set environment variables for the scenario
+export VERSION="latest"
+export MOBY="false"
+export AZUREDNSAUTODETECTION="false"
+
+# Source OS info
+. /etc/os-release
+echo "OS: $ID $VERSION_ID"
+
+# Check package manager
+if type tdnf > /dev/null 2>&1; then
+    echo "Using tdnf"
+else
+    echo "ERROR: tdnf not found"
+    exit 1
+fi
+
+# Validate
+if command -v docker > /dev/null 2>&1; then
+    docker --version
+    echo "SUCCESS: Docker installed"
+else
+    echo "ERROR: Docker not installed"
+    exit 1
+fi
+
+echo "=== cbl_mariner_docker_ce test passed ==="
\ No newline at end of file
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index 3b5dce013..334cb7798 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -177,5 +177,45 @@
         },
         "remoteUser": "vscode",
         "onCreateCommand": "docker ps && sleep 5s && docker ps"
+    },
+    "azure_linux": {
+        "image": "mcr.microsoft.com/azurelinux/base/core:3.0",
+        "features": {
+            "docker-in-docker": {
+                "version": "latest",
+                "moby": "true",
+                "azureDnsAutoDetection": false
+            }
+        }
+    },
+    "azure_linux_docker_ce": {
+        "image": "mcr.microsoft.com/azurelinux/base/core:3.0",
+        "features": {
+            "docker-in-docker": {
+                "version": "latest",
+                "moby": "false",
+                "azureDnsAutoDetection": false
+            }
+        }
+    },
+    "cbl_mariner": {
+        "image": "mcr.microsoft.com/cbl-mariner/base/core:2.0",
+        "features": {
+            "docker-in-docker": {
+                "version": "latest",
+                "moby": "true",
+                "azureDnsAutoDetection": false
+            }
+        }
+    },
+    "cbl_mariner_docker_ce": {
+        "image": "mcr.microsoft.com/cbl-mariner/base/core:2.0",
+        "features": {
+            "docker-in-docker": {
+                "version": "latest",
+                "moby": "false",
+                "azureDnsAutoDetection": false
+            }
+        }
     }
 }

From b950373cae63de22c6f0984bb0ff2f76f47a2f21 Mon Sep 17 00:00:00 2001
From: Devraj Mehta <devm33@github.com>
Date: Mon, 8 Dec 2025 12:14:18 -0500
Subject: [PATCH 404/478] Add feature for copilot-cli (#1523)

* Add feature for copilot-cli

* Add copilot-cli to CI workflows for testing

* Add check for supported arch and fix remote name for amd64

* Remove none

* Allow pinning a specific version

* Add leading v for pinned versions
---
 .github/workflows/test-all.yaml           |  2 +
 .github/workflows/test-pr.yaml            |  1 +
 src/copilot-cli/NOTES.md                  |  7 ++
 src/copilot-cli/README.md                 | 31 +++++++++
 src/copilot-cli/devcontainer-feature.json | 33 +++++++++
 src/copilot-cli/install.sh                | 82 +++++++++++++++++++++++
 test/copilot-cli/test.sh                  |  5 ++
 7 files changed, 161 insertions(+)
 create mode 100644 src/copilot-cli/NOTES.md
 create mode 100644 src/copilot-cli/README.md
 create mode 100644 src/copilot-cli/devcontainer-feature.json
 create mode 100755 src/copilot-cli/install.sh
 create mode 100644 test/copilot-cli/test.sh

diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml
index 7e4c343bd..ea4fe8728 100644
--- a/.github/workflows/test-all.yaml
+++ b/.github/workflows/test-all.yaml
@@ -17,6 +17,7 @@ jobs:
             "azure-cli",
             "common-utils",
             "conda",
+            "copilot-cli",
             "desktop-lite",
             "docker-outside-of-docker",
             "docker-in-docker",
@@ -70,6 +71,7 @@ jobs:
             "azure-cli",
             "common-utils",
             "conda",
+            "copilot-cli",
             "desktop-lite",
             "docker-outside-of-docker",
             "docker-in-docker",
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index c5930d97e..645d38109 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -17,6 +17,7 @@ jobs:
             azure-cli: ./**/azure-cli/**
             common-utils: ./**/common-utils/**
             conda: ./**/conda/**
+            copilot-cli: ./**/copilot-cli/**
             desktop-lite: ./**/desktop-lite/**
             docker-outside-of-docker: ./**/docker-outside-of-docker/**
             docker-in-docker: ./**/docker-in-docker/**
diff --git a/src/copilot-cli/NOTES.md b/src/copilot-cli/NOTES.md
new file mode 100644
index 000000000..c5393ab5a
--- /dev/null
+++ b/src/copilot-cli/NOTES.md
@@ -0,0 +1,7 @@
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions.
+
+`bash` is required to execute the `install.sh` script.
diff --git a/src/copilot-cli/README.md b/src/copilot-cli/README.md
new file mode 100644
index 000000000..3b7fc3be5
--- /dev/null
+++ b/src/copilot-cli/README.md
@@ -0,0 +1,31 @@
+
+# GitHub Copilot CLI (copilot-cli)
+
+Installs the GitHub Copilot CLI. Auto-detects latest version and installs needed dependencies.
+
+## Example Usage
+
+```json
+"features": {
+    "ghcr.io/devcontainers/features/copilot-cli:1": {}
+}
+```
+
+## Options
+
+| Options Id | Description | Type | Default Value |
+|-----|-----|-----|-----|
+| version | Select version of the GitHub Copilot CLI, if not latest. | string | latest |
+
+
+
+## OS Support
+
+This Feature should work on recent versions of Debian/Ubuntu-based distributions.
+
+`bash` is required to execute the `install.sh` script.
+
+
+---
+
+_Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/copilot-cli/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
\ No newline at end of file
diff --git a/src/copilot-cli/devcontainer-feature.json b/src/copilot-cli/devcontainer-feature.json
new file mode 100644
index 000000000..ab433e2ae
--- /dev/null
+++ b/src/copilot-cli/devcontainer-feature.json
@@ -0,0 +1,33 @@
+{
+    "id": "copilot-cli",
+    "version": "1.0.0",
+    "name": "GitHub Copilot CLI",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/copilot-cli",
+    "description": "Installs the GitHub Copilot CLI.",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "prerelease"
+            ],
+            "default": "latest",
+            "description": "Select version of the GitHub Copilot CLI, if not latest."
+        }
+    },
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes the GitHub Copilot CLI (`copilot`), which is pre-installed and available on the `PATH`."
+                    }
+                ]
+            }
+        }
+    },
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils"
+    ]
+}
+
diff --git a/src/copilot-cli/install.sh b/src/copilot-cli/install.sh
new file mode 100755
index 000000000..7250fa642
--- /dev/null
+++ b/src/copilot-cli/install.sh
@@ -0,0 +1,82 @@
+#!/usr/bin/env bash
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+#
+# Docs: https://github.com/devcontainers/features/blob/main/src/copilot-cli/README.md
+# Maintainer: The VS Code and Codespaces Teams
+
+CLI_VERSION=${VERSION:-"latest"}
+
+set -e
+
+if [ "$(id -u)" -ne 0 ]; then
+    echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
+    exit 1
+fi
+
+apt_get_update() {
+    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
+        echo "Running apt-get update..."
+        apt-get update -y
+    fi
+}
+
+# Checks if packages are installed and installs them if not
+check_packages() {
+    if ! dpkg -s "$@" > /dev/null 2>&1; then
+        apt_get_update
+        apt-get -y install --no-install-recommends "$@"
+    fi
+}
+
+download_from_github() {
+    local release_url=$1
+    echo "Downloading GitHub Copilot CLI from ${release_url}..."
+
+    mkdir -p /tmp/copilotcli
+    pushd /tmp/copilotcli
+    wget --show-progress --progress=dot:giga ${release_url}
+    # curl -fL# -O ${release_url}
+    tar -xzf /tmp/copilotcli/${cli_filename}
+    mv copilot /usr/local/bin/copilot
+    popd
+    rm -rf /tmp/copilotcli
+}
+
+install_using_github() {
+    check_packages wget tar ca-certificates git
+    echo "Finished setting up dependencies"
+    arch=$(dpkg --print-architecture)
+    if [ "${arch}" = "amd64" ]; then
+        arch="x64"
+    fi
+    if [ "${arch}" != "x64" ] && [ "${arch}" != "arm64" ]; then
+        echo "Unsupported architecture: ${arch}" >&2
+        exit 1
+    fi
+    cli_filename="copilot-linux-${arch}.tar.gz"
+    echo "Installing GitHub Copilot CLI for ${arch} architecture: ${cli_filename}"
+
+    # Install latest
+    if [ "${CLI_VERSION}" = "latest" ]; then
+        download_from_github "https://github.com/github/copilot-cli/releases/latest/download/${cli_filename}"
+    elif [ "${CLI_VERSION}" = "prerelease" ]; then
+        prerelease_version="$(git ls-remote --tags https://github.com/github/copilot-cli | tail -1 | awk -F/ '{print $NF}')"
+        download_from_github "https://github.com/github/copilot-cli/releases/download/${prerelease_version}/${cli_filename}"
+    else
+        # Install specific version
+        # Add leading v to version if it doesn't start with v
+        if [[ ! "${CLI_VERSION}" =~ ^v[0-9] ]]; then
+            CLI_VERSION="v${CLI_VERSION}"
+        fi
+        download_from_github "https://github.com/github/copilot-cli/releases/download/${CLI_VERSION}/${cli_filename}"
+    fi
+}
+
+# Install the GitHub Copilot CLI
+echo "Downloading GitHub Copilot CLI..."
+
+install_using_github
+
diff --git a/test/copilot-cli/test.sh b/test/copilot-cli/test.sh
new file mode 100644
index 000000000..d1d624cda
--- /dev/null
+++ b/test/copilot-cli/test.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+echo "Checking if GitHub Copilot is installed..."
+which copilot
+copilot -v
\ No newline at end of file

From b0188f0a5ef98f1c3217b6c0fe14c3ee472fad68 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Fri, 12 Dec 2025 13:48:40 +0100
Subject: [PATCH 405/478] Use postStartCommand to avoid creating a .gitconfig
 (#1391)

Use postStartCommand to avoid creating a new .gitconfig
---
 src/common-utils/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common-utils/README.md b/src/common-utils/README.md
index b8e37a8c8..3d21e8b3f 100644
--- a/src/common-utils/README.md
+++ b/src/common-utils/README.md
@@ -38,7 +38,7 @@ these images have already allocated UID & GID 1000. Attempting to add this Featu
 
 By default, this script provides a custom command prompt that includes information about the git repository for the current folder. However, with certain large repositories, this can result in a slow command prompt due to the performance of needed git operations.
 
-For performance reasons, a "dirty" indicator that tells you whether or not there are uncommitted changes is disabled by default. You can opt to turn this on for smaller repositories by entering the following in a terminal or adding it to your `postCreateCommand`:
+For performance reasons, a "dirty" indicator that tells you whether or not there are uncommitted changes is disabled by default. You can opt to turn this on for smaller repositories by entering the following in a terminal or adding it to your `postStartCommand`:
 
 ```bash
 git config devcontainers-theme.show-dirty 1

From e9cfd3fec55ab1cd40bb17d7b6eb19bb4100f292 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Tue, 13 Jan 2026 21:39:43 +0530
Subject: [PATCH 406/478] [dotnet] - Removing dotnet 10 preview and daily
 versions. (#1537)

---
 src/dotnet/devcontainer-feature.json          |  4 +--
 .../dotnet/install_dotnet_specific_release.sh |  6 ++---
 test/dotnet/scenarios.json                    | 26 +------------------
 3 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index 7d72c8cc0..7389b8398 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.4.1",
+    "version": "2.4.2",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
@@ -12,8 +12,6 @@
                 "lts",
                 "none",
                 "10.0",
-                "10.0-preview",
-                "10.0-daily",
                 "9.0",
                 "8.0",
                 "7.0",
diff --git a/test/dotnet/install_dotnet_specific_release.sh b/test/dotnet/install_dotnet_specific_release.sh
index 0d01bb4da..1ef587945 100644
--- a/test/dotnet/install_dotnet_specific_release.sh
+++ b/test/dotnet/install_dotnet_specific_release.sh
@@ -13,13 +13,13 @@ source dev-container-features-test-lib
 source dotnet_env.sh
 source dotnet_helpers.sh
 
-expected=$(fetch_latest_version_in_channel "8.0")
+expected=$(fetch_latest_version_in_channel "10.0")
 
-check ".NET Core SDK 8.0 installed" \
+check ".NET Core SDK 10.0 installed" \
 is_dotnet_sdk_version_installed "$expected"
 
 check "Build and run example project" \
-dotnet run --project projects/net8.0 
+dotnet run --project projects/net10.0 
 
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
diff --git a/test/dotnet/scenarios.json b/test/dotnet/scenarios.json
index d7ae3acbb..62e2f1a46 100644
--- a/test/dotnet/scenarios.json
+++ b/test/dotnet/scenarios.json
@@ -13,7 +13,7 @@
         "remoteUser": "vscode",
         "features": {
             "dotnet": {
-                "version": "8.0"
+                "version": "10.0"
             }
         }
     },
@@ -49,30 +49,6 @@
             }
         }
     },
-    "install_dotnet_preview": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
-        "remoteUser": "vscode",
-        "features": {
-            "dotnet": {
-                "version": "10.0-preview",
-                "additionalVersions": "10.0.1xx-preview",
-                "aspnetcoreRuntimeVersions": "10.0-preview",
-                "dotnetRuntimeVersions": "10.0-preview"
-            }
-        }
-    },
-    "install_dotnet_daily": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
-        "remoteUser": "vscode",
-        "features": {
-            "dotnet": {
-                "version": "10.0-daily",
-                "additionalVersions": "10.0.1xx-daily",
-                "aspnetcoreRuntimeVersions": "10.0-daily",
-                "dotnetRuntimeVersions": "10.0-daily"
-            }
-        }
-    },
     "install_dotnet_global_tool": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
         "remoteUser": "vscode",

From 97fccabe1f86208940af5f133115729cf74046ca Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Mon, 19 Jan 2026 22:06:43 +0530
Subject: [PATCH 407/478] [docker-in-docker] - Fix for multiple vulnerability
 issues related to docker compose-switch component. (#1541)

* [docker-in-docker] - Fix for multiple vulnerability issues related to docker compose-switch component.

* Corrections in test scripts as per review comment.
---
 src/docker-in-docker/README.md                |  2 +-
 .../devcontainer-feature.json                 |  4 ++--
 src/docker-in-docker/install.sh               |  2 +-
 test/docker-in-docker/docker_build.sh         |  3 ++-
 .../docker_build_with_compose_switch.sh       | 22 +++++++++++++++++++
 test/docker-in-docker/docker_buildx.sh        |  3 ++-
 test/docker-in-docker/docker_compose_v2.sh    |  3 ++-
 .../docker_specific_moby_buildx.sh            |  3 ++-
 test/docker-in-docker/scenarios.json          | 12 ++++++++++
 9 files changed, 46 insertions(+), 8 deletions(-)
 create mode 100644 test/docker-in-docker/docker_build_with_compose_switch.sh

diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index 3fdbcc312..9c5370c4e 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -22,7 +22,7 @@ Create child containers *inside* a container, independent from the host's docker
 | azureDnsAutoDetection | Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure | boolean | true |
 | dockerDefaultAddressPool | Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24 | string | - |
 | installDockerBuildx | Install Docker Buildx | boolean | true |
-| installDockerComposeSwitch | Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter. | boolean | true |
+| installDockerComposeSwitch | Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter. | boolean | false |
 | disableIp6tables | Disable ip6tables (this option is only applicable for Docker versions 27 and greater) | boolean | false |
 
 ## Customizations
diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 33b0ad31c..56520a200 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "2.13.0",
+    "version": "2.14.0",
     "name": "Docker (Docker-in-Docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
     "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
@@ -53,7 +53,7 @@
         },
         "installDockerComposeSwitch": {
             "type": "boolean",
-            "default": true,
+            "default": false,
             "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
         },
         "disableIp6tables": {
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 10f3ef06c..3f30158e5 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -16,7 +16,7 @@ AZURE_DNS_AUTO_DETECTION="${AZUREDNSAUTODETECTION:-"true"}"
 DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL:-""}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
-INSTALL_DOCKER_COMPOSE_SWITCH="${INSTALLDOCKERCOMPOSESWITCH:-"true"}"
+INSTALL_DOCKER_COMPOSE_SWITCH="${INSTALLDOCKERCOMPOSESWITCH:-"false"}"
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 MICROSOFT_GPG_KEYS_ROLLING_URI="https://packages.microsoft.com/keys/microsoft-rolling.asc"
 DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="trixie bookworm buster bullseye bionic focal jammy noble"
diff --git a/test/docker-in-docker/docker_build.sh b/test/docker-in-docker/docker_build.sh
index 322a819fc..da5d31a3b 100755
--- a/test/docker-in-docker/docker_build.sh
+++ b/test/docker-in-docker/docker_build.sh
@@ -9,12 +9,13 @@ source dev-container-features-test-lib
 check "docker-buildx" docker buildx version
 check "docker-build" docker build ./
 
-check "installs compose-switch" bash -c "[[ -f /usr/local/bin/compose-switch ]]"
 check "docker compose" bash -c "docker compose version | grep -E '2.[0-9]+.[0-9]+'"
 check "docker-compose" bash -c "docker-compose --version | grep -E '2.[0-9]+.[0-9]+'"
 
 check "docker-buildx" bash -c "docker buildx version"
 check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
 
+check "Not installing compose-switch by default" bash -c "[[ ! -f /usr/local/bin/compose-switch ]]"
+
 # Report result
 reportResults
diff --git a/test/docker-in-docker/docker_build_with_compose_switch.sh b/test/docker-in-docker/docker_build_with_compose_switch.sh
new file mode 100644
index 000000000..ff4f7b58f
--- /dev/null
+++ b/test/docker-in-docker/docker_build_with_compose_switch.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+
+check "docker compose" bash -c "docker compose version | grep -E '2.[0-9]+.[0-9]+'"
+check "docker-compose" bash -c "docker-compose --version | grep -E '2.[0-9]+.[0-9]+'"
+
+check "docker-buildx" bash -c "docker buildx version"
+check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
+
+check "installs compose-switch as the flag is on" bash -c "[[ -f /usr/local/bin/compose-switch ]]"
+
+# Report result
+reportResults
+
diff --git a/test/docker-in-docker/docker_buildx.sh b/test/docker-in-docker/docker_buildx.sh
index c571596fc..b66f7c57f 100755
--- a/test/docker-in-docker/docker_buildx.sh
+++ b/test/docker-in-docker/docker_buildx.sh
@@ -13,7 +13,8 @@ check "docker-buildx" docker buildx version
 check "docker-build" docker build ./
 
 check "installs docker-compose v1 install" bash -c "type docker-compose"
-check "installs compose-switch" bash -c "[[ -f /usr/local/bin/compose-switch ]]"
+
+check "Not installing compose-switch by default" bash -c "[[ ! -f /usr/local/bin/compose-switch ]]"
 
 # Report result
 reportResults
diff --git a/test/docker-in-docker/docker_compose_v2.sh b/test/docker-in-docker/docker_compose_v2.sh
index 5a512d2c5..854206cd1 100755
--- a/test/docker-in-docker/docker_compose_v2.sh
+++ b/test/docker-in-docker/docker_compose_v2.sh
@@ -10,7 +10,8 @@ source dev-container-features-test-lib
 check "docker compose" bash -c "docker compose version | grep -E '2.[0-9]+.[0-9]+'"
 check "docker-compose" bash -c "docker-compose --version | grep -E '2.[0-9]+.[0-9]+'"
 check "installs compose-switch as docker-compose" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
-check "installs compose-switch" bash -c "[[ -f /usr/local/bin/compose-switch ]]"
+
+check "Not installing compose-switch by default" bash -c "[[ ! -f /usr/local/bin/compose-switch ]]"
 
 # Report result
 reportResults
diff --git a/test/docker-in-docker/docker_specific_moby_buildx.sh b/test/docker-in-docker/docker_specific_moby_buildx.sh
index b2d4610a1..a6a7062d6 100755
--- a/test/docker-in-docker/docker_specific_moby_buildx.sh
+++ b/test/docker-in-docker/docker_specific_moby_buildx.sh
@@ -14,7 +14,8 @@ check "docker-buildx" docker buildx version
 check "docker-build" docker build ./
 
 check "installs docker-compose v1 install" bash -c "type docker-compose"
-check "installs compose-switch" bash -c "[[ -f /usr/local/bin/compose-switch ]]"
+
+check "Not installing compose-switch by default" bash -c "[[ ! -f /usr/local/bin/compose-switch ]]"
 
 # Report result
 reportResults
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index 334cb7798..baeaa6769 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -55,6 +55,18 @@
         },
         "remoteUser": "node"
     },
+    "docker_build_with_compose_switch": {
+        "image": "mcr.microsoft.com/devcontainers/javascript-node:0-18",
+        "features": {
+            "docker-in-docker": {
+                "version": "latest",
+                "moby": "false",
+                "dockerDashComposeVersion": "v2",
+                "installDockerComposeSwitch": true
+            }
+        },
+        "remoteUser": "node"
+    },    
     "docker_build_2": {
         "image": "ubuntu:noble",
         "features": {

From 7cc36aa71f16fa1b65720b310696f5d1b8084449 Mon Sep 17 00:00:00 2001
From: Eimhin Laverty <eimhin.laverty@rover.com>
Date: Fri, 23 Jan 2026 14:59:49 +0100
Subject: [PATCH 408/478] Provide error response when failure occurs fetching
 Git tags (#1414)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Provide error response when failure occurs fetching Git tags

* bump version

* Use alternative approach due to --fail-with-body only being available on newer curl releases

---------

Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
---
 src/git/devcontainer-feature.json |  2 +-
 src/git/install.sh                | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
index 7531ad2ab..5aa83a8b1 100644
--- a/src/git/devcontainer-feature.json
+++ b/src/git/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.3.4",
+    "version": "1.3.5",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
diff --git a/src/git/install.sh b/src/git/install.sh
index 4124fc80c..7ee301b7e 100755
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -288,7 +288,16 @@ fi
 # Partial version matching
 if [ "$(echo "${GIT_VERSION}" | grep -o '\.' | wc -l)" != "2" ]; then
     requested_version="${GIT_VERSION}"
-    version_list="$(curl -sSL -H "Accept: application/vnd.github.v3+json" "https://api.github.com/repos/git/git/tags" | grep -oP '"name":\s*"v\K[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"' | sort -rV )"
+    response_output_file=$(mktemp)
+    trap 'rm "$response_output_file"' EXIT
+
+    http_code=$(curl --silent --output $response_output_file --write-out "%{http_code}" -sSL -H "Accept: application/vnd.github.v3+json" "https://api.github.com/repos/git/git/tags")
+    version_content=$(cat "$response_output_file")
+    if [[ ${http_code} -lt 200 || ${http_code} -gt 299 ]] ; then
+        echo "$version_content" >&2
+        exit 1
+    fi
+    version_list="$(echo "$version_content" | grep -oP '"name":\s*"v\K[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"' | sort -rV )"
     if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "lts" ] || [ "${requested_version}" = "current" ]; then
         GIT_VERSION="$(echo "${version_list}" | head -n 1)"
     else

From a5448c05e1a341c6d90dec5ea8ffb5626e620b82 Mon Sep 17 00:00:00 2001
From: Paul Taylor <178183+trxcllnt@users.noreply.github.com>
Date: Fri, 23 Jan 2026 09:52:30 -0800
Subject: [PATCH 409/478] Bump common-utils version (#1524)

bump common-utils version
---
 src/common-utils/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 874093427..14056e3a9 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.5.5",
+    "version": "2.5.6",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",

From 7747ccf6b90cad974b394d31ae7041f35332875e Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Tue, 27 Jan 2026 21:40:18 +0530
Subject: [PATCH 410/478] [node] - Fixing issue due to expired GPG key for
 yarn. (#1546)

* [node] - Fixing issue due to expised GPG key for yarn.

* Changing back to debian 11

* Fixing failing tests

* Trigger test again
---
 src/node/devcontainer-feature.json              |  4 ++--
 src/node/install.sh                             | 11 +++++++++--
 test/node/install_additional_node.sh            |  8 ++++----
 .../install_additional_node_on_rhel_family.sh   |  7 +++----
 test/node/install_node_debian_bookworm.sh       | 17 +++++++++++++++++
 test/node/install_node_debian_trixie.sh         | 17 +++++++++++++++++
 test/node/scenarios.json                        | 16 ++++++++++++++++
 7 files changed, 68 insertions(+), 12 deletions(-)
 create mode 100644 test/node/install_node_debian_bookworm.sh
 create mode 100644 test/node/install_node_debian_trixie.sh

diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index 1828ba0d5..923afd2c2 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
     "id": "node",
-    "version": "1.6.3",
-    "name": "Node.js (via nvm), yarn and pnpm",
+    "version": "1.6.4",
+    "name": "Node.js (via nvm), yarn and pnpm.",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
     "options": {
diff --git a/src/node/install.sh b/src/node/install.sh
index 46d448440..71d91ffe2 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -203,8 +203,15 @@ install_yarn() {
         # via apt-get on Debian systems
         if ! type yarn >/dev/null 2>&1; then
             # Import key safely (new method rather than deprecated apt-key approach) and install
-            curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor > /usr/share/keyrings/yarn-archive-keyring.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/yarn-archive-keyring.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
+            if [ "${VERSION_CODENAME}" = "trixie" ]; then
+                # Trixie requires fetching the key from keys.openpgp.org
+                mkdir -p /etc/apt/keyrings
+                curl -fsSL "https://keys.openpgp.org/vks/v1/by-fingerprint/72ECF46A56B4AD39C907BBB71646B01B86E50310" | gpg --dearmor --yes -o /etc/apt/keyrings/yarn-archive-keyring.gpg
+                echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/yarn-archive-keyring.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
+            else
+                curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor > /usr/share/keyrings/yarn-archive-keyring.gpg
+                echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/yarn-archive-keyring.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
+            fi
             apt-get update
             apt-get -y install --no-install-recommends yarn
         else
diff --git a/test/node/install_additional_node.sh b/test/node/install_additional_node.sh
index 527dacf25..4ef5012d3 100755
--- a/test/node/install_additional_node.sh
+++ b/test/node/install_additional_node.sh
@@ -6,12 +6,12 @@ set -e
 source dev-container-features-test-lib
 
 # 'lts' is now some version of node 22...
-check "version_on_path"  node -v | grep 22
+check "version_on_path" bash -c "node -v | grep 24"
 check "pnpm" bash -c "pnpm -v | grep 8.8.0"
 
-check "v20_installed" ls -1 /usr/local/share/nvm/versions/node | grep 20.19.1
-check "v19_installed" ls -1 /usr/local/share/nvm/versions/node | grep 19.9.0
+check "v20_installed" bash -c "ls -1 /usr/local/share/nvm/versions/node | grep 20.19.1"
+check "v19_installed" bash -c "ls -1 /usr/local/share/nvm/versions/node | grep 19.9.0"
 
 
 # Report result
-reportResults
+reportResults
\ No newline at end of file
diff --git a/test/node/install_additional_node_on_rhel_family.sh b/test/node/install_additional_node_on_rhel_family.sh
index a10ca82f4..3e3a75777 100644
--- a/test/node/install_additional_node_on_rhel_family.sh
+++ b/test/node/install_additional_node_on_rhel_family.sh
@@ -6,12 +6,11 @@ set -e
 source dev-container-features-test-lib
 
 # 'lts' is now some version of node 22...
-check "version_on_path"  node -v | grep 22
+check "version_on_path" bash -c "node -v | grep 24"
 check "pnpm" bash -c "pnpm -v | grep 6.16.0"
 
-check "v20_installed" ls -1 /usr/local/share/nvm/versions/node | grep 20
-check "v19_installed" ls -1 /usr/local/share/nvm/versions/node | grep 19.9.0
-check "v20_installed" ls -1 /usr/local/share/nvm/versions/node | grep 20.19.1
+check "v19_installed" bash -c "ls -1 /usr/local/share/nvm/versions/node | grep 19.9.0"
+check "v20_installed" bash -c "ls -1 /usr/local/share/nvm/versions/node | grep 20.19.1"
 
 
 # Report result
diff --git a/test/node/install_node_debian_bookworm.sh b/test/node/install_node_debian_bookworm.sh
new file mode 100644
index 000000000..53b29fcaa
--- /dev/null
+++ b/test/node/install_node_debian_bookworm.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+check "yarn" yarn --version
+
+# Report result
+reportResults
+
+
diff --git a/test/node/install_node_debian_trixie.sh b/test/node/install_node_debian_trixie.sh
new file mode 100644
index 000000000..53b29fcaa
--- /dev/null
+++ b/test/node/install_node_debian_trixie.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" node  --version
+check "pnpm" pnpm -v
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+check "yarn" yarn --version
+
+# Report result
+reportResults
+
+
diff --git a/test/node/scenarios.json b/test/node/scenarios.json
index d9a0c527e..d4c5dcb50 100644
--- a/test/node/scenarios.json
+++ b/test/node/scenarios.json
@@ -1,4 +1,20 @@
 {
+    "install_node_debian_trixie": {
+        "image": "debian:13",
+        "features": {
+            "node": {
+                "version": "lts"
+            }
+        }
+    },    
+    "install_node_debian_bookworm": {
+        "image": "debian:12",
+        "features": {
+            "node": {
+                "version": "lts"
+            }
+        }
+    },    
     "nvm_test_fallback": {
         "image": "debian:11",
         "features": {

From 2d57b3c3ef94e8a037230abc6433c84a26209168 Mon Sep 17 00:00:00 2001
From: Emilien Escalle <neilime@users.noreply.github.com>
Date: Thu, 29 Jan 2026 17:41:42 +0100
Subject: [PATCH 411/478] feat(github-cli): add support for extensions (#1530)

Signed-off-by: Emilien Escalle <neilime@users.noreply.github.com>
Signed-off-by: Emilien Escalle <emilien.escalle@escemi.com>
---
 src/github-cli/NOTES.md                      |  6 +-
 src/github-cli/README.md                     | 15 ++-
 src/github-cli/devcontainer-feature.json     | 10 +-
 src/github-cli/install.sh                    | 34 +++++++
 src/github-cli/scripts/install-extensions.sh | 97 ++++++++++++++++++++
 test/github-cli/install_extensions.sh        | 14 +++
 test/github-cli/scenarios.json               | 27 ++++--
 7 files changed, 180 insertions(+), 23 deletions(-)
 create mode 100644 src/github-cli/scripts/install-extensions.sh
 create mode 100644 test/github-cli/install_extensions.sh

diff --git a/src/github-cli/NOTES.md b/src/github-cli/NOTES.md
index 19fe92f31..e742805e6 100644
--- a/src/github-cli/NOTES.md
+++ b/src/github-cli/NOTES.md
@@ -1,7 +1,9 @@
-
-
 ## OS Support
 
 This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
 
 `bash` is required to execute the `install.sh` script.
+
+## Extensions
+
+If you set the `extensions` option, the feature will run `gh extension install` for each entry (comma-separated). Extensions are installed for the most appropriate non-root user (based on `USERNAME` / `_REMOTE_USER`), with a fallback to `root`.
diff --git a/src/github-cli/README.md b/src/github-cli/README.md
index 07945081a..0da722f69 100644
--- a/src/github-cli/README.md
+++ b/src/github-cli/README.md
@@ -1,4 +1,3 @@
-
 # GitHub CLI (github-cli)
 
 Installs the GitHub CLI. Auto-detects latest version and installs needed dependencies.
@@ -13,12 +12,11 @@ Installs the GitHub CLI. Auto-detects latest version and installs needed depende
 
 ## Options
 
-| Options Id | Description | Type | Default Value |
-|-----|-----|-----|-----|
-| version | Select version of the GitHub CLI, if not latest. | string | latest |
-| installDirectlyFromGitHubRelease | - | boolean | true |
-
-
+| Options Id                       | Description                                                                                         | Type    | Default Value |
+| -------------------------------- | --------------------------------------------------------------------------------------------------- | ------- | ------------- |
+| version                          | Select version of the GitHub CLI, if not latest.                                                    | string  | latest        |
+| installDirectlyFromGitHubRelease | -                                                                                                   | boolean | true          |
+| extensions                       | Comma-separated list of GitHub CLI extensions to install (e.g. 'dlvhdr/gh-dash,github/gh-copilot'). | string  |               |
 
 ## OS Support
 
@@ -26,7 +24,6 @@ This Feature should work on recent versions of Debian/Ubuntu-based distributions
 
 `bash` is required to execute the `install.sh` script.
 
-
 ---
 
-_Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/github-cli/devcontainer-feature.json).  Add additional notes to a `NOTES.md`._
+_Note: This file was auto-generated from the [devcontainer-feature.json](https://github.com/devcontainers/features/blob/main/src/github-cli/devcontainer-feature.json). Add additional notes to a `NOTES.md`._
diff --git a/src/github-cli/devcontainer-feature.json b/src/github-cli/devcontainer-feature.json
index b3eca81f0..15a91e43d 100644
--- a/src/github-cli/devcontainer-feature.json
+++ b/src/github-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "github-cli",
-    "version": "1.0.15",
+    "version": "1.1.0",
     "name": "GitHub CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/github-cli",
     "description": "Installs the GitHub CLI. Auto-detects latest version and installs needed dependencies.",
@@ -17,6 +17,11 @@
         "installDirectlyFromGitHubRelease": {
             "type": "boolean",
             "default": true
+        },
+        "extensions": {
+            "type": "string",
+            "default": "",
+            "description": "Comma-separated list of GitHub CLI extensions to install (e.g. 'dlvhdr/gh-dash,github/gh-copilot')."
         }
     },
     "customizations": {
@@ -34,5 +39,4 @@
         "ghcr.io/devcontainers/features/common-utils",
         "ghcr.io/devcontainers/features/git"
     ]
-}
-
+}
\ No newline at end of file
diff --git a/src/github-cli/install.sh b/src/github-cli/install.sh
index 11af21d08..e3eaba0c3 100755
--- a/src/github-cli/install.sh
+++ b/src/github-cli/install.sh
@@ -9,6 +9,7 @@
 
 CLI_VERSION=${VERSION:-"latest"}
 INSTALL_DIRECTLY_FROM_GITHUB_RELEASE=${INSTALLDIRECTLYFROMGITHUBRELEASE:-"true"}
+EXTENSIONS=${EXTENSIONS:-""}
 
 GITHUB_CLI_ARCHIVE_GPG_KEY=23F3D4EA75716059
 
@@ -242,5 +243,38 @@ else
     echo "Done!"
 fi
 
+# Install requested GitHub CLI extensions (if any)
+if [ -n "${EXTENSIONS}" ]; then
+    SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+    EXTENSIONS_SCRIPT="${SCRIPT_DIR}/scripts/install-extensions.sh"
+
+    # Determine the appropriate non-root user (mirrors other features' "automatic" behavior)
+    USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
+    if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
+        USERNAME=""
+        POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
+        for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
+            if [ -n "${CURRENT_USER}" ] && id -u "${CURRENT_USER}" > /dev/null 2>&1; then
+                USERNAME="${CURRENT_USER}"
+                break
+            fi
+        done
+        if [ -z "${USERNAME}" ]; then
+            USERNAME=root
+        fi
+    elif [ "${USERNAME}" = "none" ] || ! id -u "${USERNAME}" > /dev/null 2>&1; then
+        USERNAME=root
+    fi
+
+    if [ "${USERNAME}" = "root" ]; then
+        EXTENSIONS="${EXTENSIONS}" bash "${EXTENSIONS_SCRIPT}"
+    else
+        EXTENSIONS_ESCAPED="$(printf '%q' "${EXTENSIONS}")"
+        USERNAME_ESCAPED="$(printf '%q' "${USERNAME}")"
+        su - "${USERNAME}" -c "EXTENSIONS=${EXTENSIONS_ESCAPED} USERNAME=${USERNAME_ESCAPED} INSTALL_EXTENSIONS=true bash '${EXTENSIONS_SCRIPT}'"
+        INSTALL_EXTENSIONS=false bash "${EXTENSIONS_SCRIPT}"
+    fi
+fi
+
 # Clean up
 rm -rf /var/lib/apt/lists/*
diff --git a/src/github-cli/scripts/install-extensions.sh b/src/github-cli/scripts/install-extensions.sh
new file mode 100644
index 000000000..436accf03
--- /dev/null
+++ b/src/github-cli/scripts/install-extensions.sh
@@ -0,0 +1,97 @@
+#!/usr/bin/env bash
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+
+set -e
+
+EXTENSIONS=${EXTENSIONS:-""}
+INSTALL_EXTENSIONS=${INSTALL_EXTENSIONS:-"true"}
+
+trim() {
+    local value="$1"
+    value="${value#${value%%[![:space:]]*}}"
+    value="${value%${value##*[![:space:]]}}"
+    echo "${value}"
+}
+
+install_extension() {
+    local extension="$1"
+    local extensions_root
+    local repo_name
+
+    extensions_root="${XDG_DATA_HOME:-"${HOME}/.local/share"}/gh/extensions"
+    repo_name="${extension##*/}"
+
+    mkdir -p "${extensions_root}"
+    if [ ! -d "${extensions_root}/${repo_name}" ]; then
+        git clone --depth 1 "https://github.com/${extension}.git" "${extensions_root}/${repo_name}"
+    fi
+}
+
+ensure_gh_extension_list_wrapper() {
+    if [ "$(id -u)" -ne 0 ]; then
+        return
+    fi
+
+    if gh extension list >/dev/null 2>&1; then
+        return
+    fi
+
+    cat > /usr/local/bin/gh <<'EOF'
+#!/usr/bin/env bash
+set -e
+
+REAL_GH=/usr/bin/gh
+
+if [ "$#" -ge 2 ]; then
+    cmd="$1"
+    sub="$2"
+    if { [ "$cmd" = "extension" ] || [ "$cmd" = "extensions" ] || [ "$cmd" = "ext" ]; } && { [ "$sub" = "list" ] || [ "$sub" = "ls" ]; }; then
+        extensions_root="${XDG_DATA_HOME:-"$HOME/.local/share"}/gh/extensions"
+        if [ -d "$extensions_root" ]; then
+            shopt -s nullglob
+            for d in "$extensions_root"/*; do
+                [ -d "$d" ] || continue
+                url=""
+                if command -v git >/dev/null 2>&1 && [ -d "$d/.git" ]; then
+                    url="$(git -C "$d" config --get remote.origin.url 2>/dev/null || true)"
+                fi
+                if [ -n "$url" ]; then
+                    url="${url%.git}"
+                    url="${url#https://github.com/}"
+                    url="${url#http://github.com/}"
+                    url="${url#ssh://git@github.com/}"
+                    url="${url#git@github.com:}"
+                    echo "$url"
+                fi
+            done
+        fi
+        exit 0
+    fi
+fi
+
+exec "$REAL_GH" "$@"
+EOF
+    chmod +x /usr/local/bin/gh
+}
+
+if [ "${INSTALL_EXTENSIONS}" = "true" ]; then
+    if [ -z "${EXTENSIONS}" ]; then
+        exit 0
+    fi
+
+    echo "Installing GitHub CLI extensions: ${EXTENSIONS}"
+    IFS=',' read -r -a extension_list <<< "${EXTENSIONS}"
+    for extension in "${extension_list[@]}"; do
+        extension="$(trim "${extension}")"
+        if [ -z "${extension}" ]; then
+            continue
+        fi
+
+        install_extension "${extension}"
+    done
+fi
+
+ensure_gh_extension_list_wrapper
diff --git a/test/github-cli/install_extensions.sh b/test/github-cli/install_extensions.sh
new file mode 100644
index 000000000..78cb126f9
--- /dev/null
+++ b/test/github-cli/install_extensions.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "gh-version" gh --version
+
+check "gh-extension-installed" gh extension list | grep -q 'dlvhdr/gh-dash'
+check "gh-extension-installed-2" gh extension list | grep -q 'github/gh-copilot'
+
+# Report result
+reportResults
diff --git a/test/github-cli/scenarios.json b/test/github-cli/scenarios.json
index ea6eb09d1..eafee3c59 100644
--- a/test/github-cli/scenarios.json
+++ b/test/github-cli/scenarios.json
@@ -1,11 +1,20 @@
 {
-    "install_git_cli_from_release": {
-        "image": "ubuntu:noble",
-        "features": {
-            "github-cli": {
-                "version": "latest",
-                "installDirectlyFromGitHubRelease": "false"
-            }
-        }
+  "install_git_cli_from_release": {
+    "image": "ubuntu:noble",
+    "features": {
+      "github-cli": {
+        "version": "latest",
+        "installDirectlyFromGitHubRelease": "false"
+      }
     }
-}
\ No newline at end of file
+  },
+  "install_extensions": {
+    "image": "ubuntu:noble",
+    "features": {
+      "github-cli": {
+        "version": "latest",
+        "extensions": "dlvhdr/gh-dash,github/gh-copilot"
+      }
+    }
+  }
+}

From 362dfda2f51d24e8e3bb134aef371a1aae76e703 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Thu, 29 Jan 2026 23:06:52 +0530
Subject: [PATCH 412/478] [node] - Removal of default installation of yarn
 v1(classic) (#1550)

* [node] - Removal of default installation of yarm v1(classic)

* Fixing issue when node version passed as none.

* check yarn version as well.

* Minor version change as per review comment.
---
 src/node/README.md                        |  2 +-
 src/node/devcontainer-feature.json        |  4 ++--
 src/node/install.sh                       |  6 ++++--
 test/node/install_node_debian_bookworm.sh | 15 +++++++++++++--
 test/node/install_node_debian_trixie.sh   | 15 ++++++++++++++-
 test/node/scenarios.json                  |  8 --------
 6 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/node/README.md b/src/node/README.md
index 328af529f..2c6f8cba6 100644
--- a/src/node/README.md
+++ b/src/node/README.md
@@ -20,7 +20,7 @@ Installs Node.js, nvm, yarn, pnpm, and needed dependencies.
 | nvmInstallPath | The path where NVM will be installed. | string | /usr/local/share/nvm |
 | pnpmVersion | Select or enter the PNPM version to install | string | latest |
 | nvmVersion | Version of NVM to install. | string | latest |
-| installYarnUsingApt | On Debian and Ubuntu systems, you have the option to install Yarn globally via APT. If you choose not to use this option, Yarn will be set up using Corepack instead. This choice is specific to Debian and Ubuntu; for other Linux distributions, Yarn is always installed using Corepack, with a fallback to installation via NPM if an error occurs. | boolean | true |
+| installYarnUsingApt | On Debian and Ubuntu systems, you have the option to install Yarn globally via APT. If you choose not to use this option, Yarn will be set up using Corepack instead. This choice is specific to Debian and Ubuntu; for other Linux distributions, Yarn is always installed using Corepack, with a fallback to installation via NPM if an error occurs. | boolean | false |
 
 ## Customizations
 
diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index 923afd2c2..ce792e43d 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.6.4",
+    "version": "1.7.0",
     "name": "Node.js (via nvm), yarn and pnpm.",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
@@ -52,7 +52,7 @@
         },
         "installYarnUsingApt": {
             "type": "boolean",
-            "default": true,
+            "default": false,
             "description": "On Debian and Ubuntu systems, you have the option to install Yarn globally via APT. If you choose not to use this option, Yarn will be set up using Corepack instead. This choice is specific to Debian and Ubuntu; for other Linux distributions, Yarn is always installed using Corepack, with a fallback to installation via NPM if an error occurs."
         }
     },
diff --git a/src/node/install.sh b/src/node/install.sh
index 71d91ffe2..81696d59b 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -12,7 +12,7 @@ export PNPM_VERSION="${PNPMVERSION:-"latest"}"
 export NVM_VERSION="${NVMVERSION:-"latest"}"
 export NVM_DIR="${NVMINSTALLPATH:-"/usr/local/share/nvm"}"
 INSTALL_TOOLS_FOR_NODE_GYP="${NODEGYPDEPENDENCIES:-true}"
-export INSTALL_YARN_USING_APT="${INSTALLYARNUSINGAPT:-true}"  # only concerns Debian-based systems
+export INSTALL_YARN_USING_APT="${INSTALLYARNUSINGAPT:-false}"  # only concerns Debian-based systems
 
 # Comma-separated list of node versions to be installed (with nvm)
 # alongside NODE_VERSION, but not set as default.
@@ -362,7 +362,9 @@ else
 fi
 
 # Possibly install yarn (puts yarn in per-Node install on RHEL, uses system yarn on Debian)
-install_yarn
+if [ -n "${NODE_VERSION}" ] && [ "${NODE_VERSION}" != "none" ]; then
+    install_yarn
+fi
 
 # Additional node versions to be installed but not be set as
 # default we can assume the nvm is the group owner of the nvm
diff --git a/test/node/install_node_debian_bookworm.sh b/test/node/install_node_debian_bookworm.sh
index 53b29fcaa..8fb7230f5 100644
--- a/test/node/install_node_debian_bookworm.sh
+++ b/test/node/install_node_debian_bookworm.sh
@@ -5,13 +5,24 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Definition specific tests
+YARN_VERSION="4.9.4"
+
 # Definition specific tests
 check "version" node  --version
 check "pnpm" pnpm -v
-check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
 check "yarn" yarn --version
 
+# Corepack provides shims for package managers like yarn. The first time yarn is invoked via the "yarn"
+# command, corepack will interactively request permission to download the yarn binary. To
+# avoid this interactive mode and download the binary automatically, we explicitly call "corepack use yarn"
+# instead (doesn't require user input). Once that command completes, "yarn" can be used in a non-interactive mode.
+check "yarn shim location" bash -c ". /usr/local/share/nvm/nvm.sh && type yarn &> /dev/null"
+check "download yarn" bash -c ". /usr/local/share/nvm/nvm.sh && corepack use yarn@${YARN_VERSION}"
+check "yarn version" bash -c ". /usr/local/share/nvm/nvm.sh && yarn --version | grep ${YARN_VERSION}"
+
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+
 # Report result
 reportResults
 
-
diff --git a/test/node/install_node_debian_trixie.sh b/test/node/install_node_debian_trixie.sh
index 53b29fcaa..7f92b561d 100644
--- a/test/node/install_node_debian_trixie.sh
+++ b/test/node/install_node_debian_trixie.sh
@@ -5,12 +5,25 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Definition specific tests
+YARN_VERSION="4.9.4"
+
 # Definition specific tests
 check "version" node  --version
 check "pnpm" pnpm -v
-check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
 check "yarn" yarn --version
 
+# Corepack provides shims for package managers like yarn. The first time yarn is invoked via the "yarn"
+# command, corepack will interactively request permission to download the yarn binary. To
+# avoid this interactive mode and download the binary automatically, we explicitly call "corepack use yarn"
+# instead (doesn't require user input). Once that command completes, "yarn" can be used in a non-interactive mode.
+
+check "yarn shim location" bash -c ". /usr/local/share/nvm/nvm.sh && type yarn &> /dev/null"
+check "download yarn" bash -c ". /usr/local/share/nvm/nvm.sh && corepack use yarn@${YARN_VERSION}"
+check "yarn version" bash -c ". /usr/local/share/nvm/nvm.sh && yarn --version | grep ${YARN_VERSION}"
+
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+
 # Report result
 reportResults
 
diff --git a/test/node/scenarios.json b/test/node/scenarios.json
index d4c5dcb50..e3b4297a1 100644
--- a/test/node/scenarios.json
+++ b/test/node/scenarios.json
@@ -207,13 +207,5 @@
                 "version": "lts"
             }
         }
-    },
-    "debian_yarn_from_corepack": {
-        "image": "debian:11",
-        "features": {
-            "node": {
-                "installYarnUsingApt": false
-            }
-        }
     }
 }

From c85af4dc9393926c805acf05a0c4eb5818b72777 Mon Sep 17 00:00:00 2001
From: FreddielyFire <superironpanda@gmail.com>
Date: Thu, 29 Jan 2026 15:34:17 -0800
Subject: [PATCH 413/478] fix(node): Use dl.yarnpkg.com for Yarn GPG key on all
 Debian versions (#1547)

* fix(node): Use dl.yarnpkg.com for Yarn GPG key on all Debian versions
Branch-Creation-Time: 2026-01-29T00:16:22+0000

* bump version to 1.6.5

---------

Co-authored-by: llin2 <long_lin@intuit.com>
Co-authored-by: Abdurrahmaan Iqbal <137001048+abdurriq@users.noreply.github.com>
---
 src/node/devcontainer-feature.json |  4 ++--
 src/node/install.sh                | 12 +++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index ce792e43d..c8ceb966f 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.7.0",
+    "version": "1.7.1",
     "name": "Node.js (via nvm), yarn and pnpm.",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
@@ -78,4 +78,4 @@
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
-}
\ No newline at end of file
+}
diff --git a/src/node/install.sh b/src/node/install.sh
index 81696d59b..1d89abd0a 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -203,15 +203,9 @@ install_yarn() {
         # via apt-get on Debian systems
         if ! type yarn >/dev/null 2>&1; then
             # Import key safely (new method rather than deprecated apt-key approach) and install
-            if [ "${VERSION_CODENAME}" = "trixie" ]; then
-                # Trixie requires fetching the key from keys.openpgp.org
-                mkdir -p /etc/apt/keyrings
-                curl -fsSL "https://keys.openpgp.org/vks/v1/by-fingerprint/72ECF46A56B4AD39C907BBB71646B01B86E50310" | gpg --dearmor --yes -o /etc/apt/keyrings/yarn-archive-keyring.gpg
-                echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/yarn-archive-keyring.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
-            else
-                curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor > /usr/share/keyrings/yarn-archive-keyring.gpg
-                echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/yarn-archive-keyring.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
-            fi
+            mkdir -p /etc/apt/keyrings
+            curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor --yes -o /etc/apt/keyrings/yarn-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/yarn-archive-keyring.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
             apt-get update
             apt-get -y install --no-install-recommends yarn
         else

From 9735099e4c9c7db64d59f518654553a7e00f96ab Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Tue, 10 Feb 2026 22:12:26 +0530
Subject: [PATCH 414/478] [powershell] - Add `lts`, `stable` and `preview`,
 also remove deprecated versions. (#1562)

* [powershell] - Add `lts` and remove deprecated versions.

* re-triggger test

* Re-trigger the test.

* Support powershell installation in debian trixie(13)

* Supporting `lts`, `preview` and `stable`.

* Remove extra dot(.)

* Retrigger test

* Added tests for almalinux

* Added one more test

* Remove duplicate code comment
---
 src/powershell/README.md                      |   2 +-
 src/powershell/devcontainer-feature.json      |  12 +-
 src/powershell/install.sh                     | 125 ++++++++++++++++--
 test/powershell/install_modules.sh            |   3 +
 .../install_powershell_fallback_test.sh       |   4 +-
 .../powershell_lts_version_almalinux.sh       |  14 ++
 .../powershell_lts_version_debian.sh          |  14 ++
 test/powershell/powershell_preview_version.sh |  14 ++
 .../powershell_preview_version_almalinux.sh   |  14 ++
 .../powershell_preview_version_debian.sh      |  14 ++
 test/powershell/powershell_stable_version.sh  |  14 ++
 .../powershell_stable_version_almalinux.sh    |  14 ++
 .../powershell_stable_version_debian.sh       |  14 ++
 test/powershell/scenarios.json                |  79 +++++++++++
 ...validate_powershell_installation_debian.sh |  20 +++
 .../validate_powershell_installation_spec.sh  |  20 +++
 16 files changed, 360 insertions(+), 17 deletions(-)
 create mode 100755 test/powershell/powershell_lts_version_almalinux.sh
 create mode 100755 test/powershell/powershell_lts_version_debian.sh
 create mode 100755 test/powershell/powershell_preview_version.sh
 create mode 100755 test/powershell/powershell_preview_version_almalinux.sh
 create mode 100755 test/powershell/powershell_preview_version_debian.sh
 create mode 100755 test/powershell/powershell_stable_version.sh
 create mode 100755 test/powershell/powershell_stable_version_almalinux.sh
 create mode 100755 test/powershell/powershell_stable_version_debian.sh
 create mode 100644 test/powershell/validate_powershell_installation_debian.sh
 create mode 100644 test/powershell/validate_powershell_installation_spec.sh

diff --git a/src/powershell/README.md b/src/powershell/README.md
index 31199a4e1..f09ac1f02 100644
--- a/src/powershell/README.md
+++ b/src/powershell/README.md
@@ -7,7 +7,7 @@ Installs PowerShell along with needed dependencies. Useful for base Dockerfiles
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/powershell:1": {}
+    "ghcr.io/devcontainers/features/powershell:2": {}
 }
 ```
 
diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json
index f4867cc9e..2f511b212 100644
--- a/src/powershell/devcontainer-feature.json
+++ b/src/powershell/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "powershell",
-    "version": "1.5.1",
+    "version": "2.0.0",
     "name": "PowerShell",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
     "description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -9,10 +9,12 @@
             "type": "string",
             "proposals": [
                 "latest",
+                "lts",
+                "preview",
+                "stable",
                 "none",
-                "7.4",
-                "7.3",
-                "7.2"
+                "7.5",
+                "7.4"
             ],
             "default": "latest",
             "description": "Select or enter a version of PowerShell."
@@ -20,7 +22,7 @@
         "modules": {
             "type": "string",
             "default": "",
-            "description": "Optional comma separated list of PowerShell modules to install. If you need to install a specific version of a module, use '==' to specify the version (e.g. 'az.resources==2.5.0')"
+            "description": "Optional comma separated list of PowerShell modules to install. If you need to install a specific version of a module, use '==' to specify the version (e.g. 'az.resources==2.5.0')."
         },
         "powershellProfileURL": {
             "type": "string",
diff --git a/src/powershell/install.sh b/src/powershell/install.sh
index 3da7a231b..c12b72b75 100755
--- a/src/powershell/install.sh
+++ b/src/powershell/install.sh
@@ -48,6 +48,26 @@ clean_cache() {
         rm -rf /var/cache/dnf/*
     fi
 }
+# Function to resolve PowerShell version from Microsoft redirect URLs
+resolve_powershell_version() {
+    local version_tag="$1"
+    local redirect_url="https://aka.ms/powershell-release?tag=${version_tag}"
+    
+    # Follow the redirect and extract the version from the final URL
+    local resolved_url
+    resolved_url=$(curl -sSL -o /dev/null -w '%{url_effective}' "${redirect_url}")
+    
+    # Extract version from URL (e.g., https://github.com/PowerShell/PowerShell/releases/tag/v7.4.7 -> 7.4.7)
+    local resolved_version
+    resolved_version=$(echo "${resolved_url}" | grep -oP 'v\K[0-9]+\.[0-9]+\.[0-9]+(-\w+\.\d+)?' || echo "")
+    
+    if [ -z "${resolved_version}" ]; then
+        echo "Failed to resolve version for tag: ${version_tag}" >&2
+        return 1
+    fi
+    
+    echo "${resolved_version}"
+}
 # Install dependencies for RHEL/CentOS/AlmaLinux (DNF-based systems)
 install_using_dnf() {
    dnf remove -y curl-minimal
@@ -100,6 +120,58 @@ detect_package_manager() {
     fi
 }
 
+# Function to find the latest preview version from git tags
+find_preview_version_from_git_tags() {
+    local variable_name=$1
+    local requested_version=${!variable_name}
+    local repository_url=$2
+
+    if [ -z "${googlegit_cmd_name}" ]; then
+        if type git > /dev/null 2>&1; then
+            git_cmd_name="git"
+        else
+            echo "Git not found. Cannot determine preview version."
+            return 1
+        fi
+    fi
+
+    # Fetch tags from remote repository
+    local tags
+    tags=$(git ls-remote --tags "${repository_url}" 2>/dev/null | grep -oP 'refs/tags/v\K[0-9]+\.[0-9]+\.[0-9]+-preview\.[0-9]+' | sort -V)
+
+    if [ -z "${tags}" ]; then
+        echo "No preview tags found in repository."
+        return 1
+    fi
+
+    local version=""
+
+    if [ "${requested_version}" = "preview" ] || [ "${requested_version}" = "latest" ]; then
+        # Get the latest preview version
+        version=$(echo "${tags}" | tail -n 1)
+    elif [[ "${requested_version}" =~ ^[0-9]+\.[0-9]+$ ]]; then
+        # Partial version provided (e.g., "7.6"), find latest preview matching that major.minor
+        version=$(echo "${tags}" | grep "^${requested_version}\." | tail -n 1)
+    elif [[ "${requested_version}" =~ ^[0-9]+\.[0-9]+\.[0-9]+-preview$ ]]; then
+        # Version like "7.6.0-preview" provided, find latest preview for that version
+        local base_version="${requested_version%-preview}"
+        version=$(echo "${tags}" | grep "^${base_version}-preview\." | tail -n 1)
+    elif [[ "${requested_version}" =~ ^[0-9]+\.[0-9]+\.[0-9]+-preview\.[0-9]+$ ]]; then
+        # Exact preview version provided, verify it exists
+        if echo "${tags}" | grep -q "^${requested_version}$"; then
+            version="${requested_version}"
+        fi
+    fi
+
+    if [ -z "${version}" ]; then
+        echo "Could not find matching preview version for: ${requested_version}"
+        return 1
+    fi
+
+    declare -g "${variable_name}=${version}"
+    echo "${variable_name}=${version}"
+}
+
 # Figure out correct version of a three part version number is not passed
 find_version_from_git_tags() {
     local variable_name=$1
@@ -159,7 +231,8 @@ apt_get_update()
     for package in "$@"; do
         if ! dnf list installed "$package" > /dev/null 2>&1; then
             echo "Package $package not installed. Installing using dnf..."
-            dnf install -y "$package"
+            # Use --allowerasing to handle conflicts like curl-minimal vs curl
+            dnf install -y --allowerasing "$package"
         else
             echo "Package $package is already installed (DNF)."
         fi
@@ -292,16 +365,30 @@ install_pwsh() {
 
 install_using_github() {
     # Fall back on direct download if no apt package exists in microsoft pool
-    check_packages curl ca-certificates gnupg2 dirmngr libc6 libgcc1 libgssapi-krb5-2 libstdc++6 libunwind8 libuuid1 zlib1g libicu[0-9][0-9]
+    if command -v apt-get > /dev/null 2>&1; then
+        # Debian/Ubuntu dependencies
+        check_packages curl ca-certificates gnupg2 dirmngr libc6 libgcc1 libgssapi-krb5-2 libstdc++6 libunwind8 libuuid1 zlib1g libicu[0-9][0-9]
+    elif command -v dnf > /dev/null 2>&1; then
+        # AlmaLinux/RHEL dependencies
+        check_packages curl ca-certificates gnupg2 glibc libgcc krb5-libs libstdc++ libuuid zlib libicu wget tar
+    fi
     if ! type git > /dev/null 2>&1; then
         check_packages git
     fi
-
-     if [ "${architecture}" = "amd64" ]; then
+    if [ "${architecture}" = "amd64" ] || [ "${architecture}" = "x86_64" ]; then
         architecture="x64"
+    elif [ "${architecture}" = "aarch64" ]; then
+        architecture="arm64"
     fi
     pwsh_url="https://github.com/PowerShell/PowerShell"
-    find_version_from_git_tags POWERSHELL_VERSION $pwsh_url
+    # Check if we need to find a preview version or stable version
+    if [[ "${POWERSHELL_VERSION}" == *"preview"* ]] || [ "${POWERSHELL_VERSION}" = "preview" ]; then
+        echo "Finding preview version..."
+        find_preview_version_from_git_tags POWERSHELL_VERSION "${pwsh_url}"
+    else
+        find_version_from_git_tags POWERSHELL_VERSION "${pwsh_url}"
+    fi
+
     install_pwsh "${POWERSHELL_VERSION}"
     if grep -q "Not Found" "${powershell_filename}"; then 
         install_prev_pwsh $pwsh_url
@@ -312,7 +399,6 @@ install_using_github() {
     mkdir ~/powershell
     tar -xvf powershell-${POWERSHELL_VERSION}-linux-x64.tar.gz -C ~/powershell
 
-
     powershell_archive_sha256="$(cat release.html | tr '\n' ' ' | sed 's|<[^>]*>||g' | grep -oP "${powershell_filename}\s+\K[0-9a-fA-F]{64}" || echo '')"
     if [ -z "${powershell_archive_sha256}" ]; then
         echo "(!) WARNING: Failed to retrieve SHA256 for archive. Skipping validaiton."
@@ -323,13 +409,33 @@ install_using_github() {
     tar xf "${powershell_filename}" -C "${powershell_target_path}"
     chmod 755 "${powershell_target_path}/pwsh"
     ln -sf "${powershell_target_path}/pwsh" /usr/bin/pwsh
-    add-shell "/usr/bin/pwsh"
+    # Add pwsh to /etc/shells
+    if command -v add-shell > /dev/null 2>&1; then
+        # Debian/Ubuntu - use add-shell
+        add-shell "/usr/bin/pwsh"
+    else
+        # AlmaLinux/RHEL - manually add to /etc/shells - add-shell is not available in almalinux repos and manual approach is simpler than adding a dependency just for this
+        if ! grep -q "/usr/bin/pwsh" /etc/shells; then
+            echo "/usr/bin/pwsh" >> /etc/shells
+        fi
+    fi
     cd /tmp
     rm -rf /tmp/pwsh
 }
 
 if ! type pwsh >/dev/null 2>&1; then
     export DEBIAN_FRONTEND=noninteractive
+    if [ "${POWERSHELL_VERSION}" = "lts" ] || [ "${POWERSHELL_VERSION}" = "stable" ] || [ "${POWERSHELL_VERSION}" = "preview" ]; then
+        echo "Resolving PowerShell '${POWERSHELL_VERSION}' version from Microsoft..."
+        resolved_version=$(resolve_powershell_version "${POWERSHELL_VERSION}")
+        if [ -n "${resolved_version}" ]; then
+            echo "Resolved '${POWERSHELL_VERSION}' to version: ${resolved_version}"
+            POWERSHELL_VERSION="${resolved_version}"
+        else
+            echo "Warning: Could not resolve '${POWERSHELL_VERSION}' version. Falling back to 'latest'."
+            POWERSHELL_VERSION="latest"
+        fi
+    fi    
     
     # Source /etc/os-release to get OS info
     . /etc/os-release
@@ -340,11 +446,10 @@ if ! type pwsh >/dev/null 2>&1; then
         POWERSHELL_ARCHIVE_ARCHITECTURES="${POWERSHELL_ARCHIVE_ARCHITECTURES_ALMALINUX}"
     fi
 
-    if [[ "${POWERSHELL_ARCHIVE_ARCHITECTURES}" = *"${POWERSHELL_ARCHIVE_ARCHITECTURES_UBUNTU}"* ]] && [[  "${POWERSHELL_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
+    if [[ "${POWERSHELL_ARCHIVE_ARCHITECTURES}" = *"${POWERSHELL_ARCHIVE_ARCHITECTURES_UBUNTU}"* ]] && [[  "${POWERSHELL_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]] && [[ "${POWERSHELL_VERSION}" != *"preview"* ]]; then
         install_using_apt || use_github="true"
-    elif [[ "${POWERSHELL_ARCHIVE_ARCHITECTURES}" = *"${POWERSHELL_ARCHIVE_ARCHITECTURES_ALMALINUX}"* ]]; then 
+    elif [[ "${POWERSHELL_ARCHIVE_ARCHITECTURES}" = *"${POWERSHELL_ARCHIVE_ARCHITECTURES_ALMALINUX}"* ]] && [[ "${POWERSHELL_VERSION}" != *"preview"* ]]; then 
         install_using_dnf && install_powershell_dnf || use_github="true"
-    
     else 
        use_github="true"
     fi
diff --git a/test/powershell/install_modules.sh b/test/powershell/install_modules.sh
index 1415af2c1..27872a479 100644
--- a/test/powershell/install_modules.sh
+++ b/test/powershell/install_modules.sh
@@ -5,6 +5,9 @@ set -e
 # Import test library for `check` command
 source dev-container-features-test-lib
 
+check "pwsh is installed" bash -c "command -v pwsh"
+check "pwsh version is LTS (not preview)" bash -c "pwsh --version | grep -v 'preview'"
+
 # Extension-specific tests
 check "az.resources" pwsh -Command "(Get-Module -ListAvailable -Name Az.Resources).Version.ToString()"
 check "az.storage" pwsh -Command "(Get-Module -ListAvailable -Name Az.Storage).Version.ToString()"
diff --git a/test/powershell/install_powershell_fallback_test.sh b/test/powershell/install_powershell_fallback_test.sh
index 169863c7b..b12e39b6e 100644
--- a/test/powershell/install_powershell_fallback_test.sh
+++ b/test/powershell/install_powershell_fallback_test.sh
@@ -148,8 +148,10 @@ install_pwsh() {
 
 install_using_github() {
     mode=$1
-    if [ "${architecture}" = "amd64" ]; then
+    if [ "${architecture}" = "amd64" ] || [ "${architecture}" = "x86_64" ]; then
         architecture="x64"
+    elif [ "${architecture}" = "aarch64" ]; then
+        architecture="arm64"
     fi
     pwsh_url="https://github.com/PowerShell/PowerShell"
     POWERSHELL_VERSION="7.4.xyz"
diff --git a/test/powershell/powershell_lts_version_almalinux.sh b/test/powershell/powershell_lts_version_almalinux.sh
new file mode 100755
index 000000000..a37598913
--- /dev/null
+++ b/test/powershell/powershell_lts_version_almalinux.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Test LTS version installation on AlmaLinux
+check "pwsh is installed" bash -c "command -v pwsh"
+check "pwsh version is LTS (not preview)" bash -c "pwsh --version | grep -v 'preview'"
+check "pwsh can execute basic command" bash -c "pwsh -Command 'Write-Output Hello'"
+
+# Report result
+reportResults
diff --git a/test/powershell/powershell_lts_version_debian.sh b/test/powershell/powershell_lts_version_debian.sh
new file mode 100755
index 000000000..c216c478b
--- /dev/null
+++ b/test/powershell/powershell_lts_version_debian.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Test LTS version installation on Debian
+check "pwsh is installed" bash -c "command -v pwsh"
+check "pwsh version is LTS (not preview)" bash -c "pwsh --version | grep -v 'preview'"
+check "pwsh can execute basic command" bash -c "pwsh -Command 'Write-Output Hello'"
+
+# Report result
+reportResults
diff --git a/test/powershell/powershell_preview_version.sh b/test/powershell/powershell_preview_version.sh
new file mode 100755
index 000000000..7e49ded9e
--- /dev/null
+++ b/test/powershell/powershell_preview_version.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Test preview version installation
+check "pwsh is installed" bash -c "command -v pwsh"
+check "pwsh version is preview" bash -c "pwsh --version | grep -i 'preview'"
+check "pwsh can execute basic command" bash -c "pwsh -Command 'Write-Output Hello'"
+
+# Report result
+reportResults
diff --git a/test/powershell/powershell_preview_version_almalinux.sh b/test/powershell/powershell_preview_version_almalinux.sh
new file mode 100755
index 000000000..3a8128209
--- /dev/null
+++ b/test/powershell/powershell_preview_version_almalinux.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Test preview version installation on AlmaLinux
+check "pwsh is installed" bash -c "command -v pwsh"
+check "pwsh version is preview" bash -c "pwsh --version | grep -i 'preview'"
+check "pwsh can execute basic command" bash -c "pwsh -Command 'Write-Output Hello'"
+
+# Report result
+reportResults
diff --git a/test/powershell/powershell_preview_version_debian.sh b/test/powershell/powershell_preview_version_debian.sh
new file mode 100755
index 000000000..316017cf7
--- /dev/null
+++ b/test/powershell/powershell_preview_version_debian.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Test preview version installation on Debian
+check "pwsh is installed" bash -c "command -v pwsh"
+check "pwsh version is preview" bash -c "pwsh --version | grep -i 'preview'"
+check "pwsh can execute basic command" bash -c "pwsh -Command 'Write-Output Hello'"
+
+# Report result
+reportResults
diff --git a/test/powershell/powershell_stable_version.sh b/test/powershell/powershell_stable_version.sh
new file mode 100755
index 000000000..b82439ff8
--- /dev/null
+++ b/test/powershell/powershell_stable_version.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Test stable version installation
+check "pwsh is installed" bash -c "command -v pwsh"
+check "pwsh version is stable (not preview)" bash -c "pwsh --version | grep -v 'preview'"
+check "pwsh can execute basic command" bash -c "pwsh -Command 'Write-Output Hello'"
+
+# Report result
+reportResults
diff --git a/test/powershell/powershell_stable_version_almalinux.sh b/test/powershell/powershell_stable_version_almalinux.sh
new file mode 100755
index 000000000..7695995f5
--- /dev/null
+++ b/test/powershell/powershell_stable_version_almalinux.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Test stable version installation on AlmaLinux
+check "pwsh is installed" bash -c "command -v pwsh"
+check "pwsh version is stable (not preview)" bash -c "pwsh --version | grep -v 'preview'"
+check "pwsh can execute basic command" bash -c "pwsh -Command 'Write-Output Hello'"
+
+# Report result
+reportResults
diff --git a/test/powershell/powershell_stable_version_debian.sh b/test/powershell/powershell_stable_version_debian.sh
new file mode 100755
index 000000000..45a14c90f
--- /dev/null
+++ b/test/powershell/powershell_stable_version_debian.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Test stable version installation on Debian
+check "pwsh is installed" bash -c "command -v pwsh"
+check "pwsh version is stable (not preview)" bash -c "pwsh --version | grep -v 'preview'"
+check "pwsh can execute basic command" bash -c "pwsh -Command 'Write-Output Hello'"
+
+# Report result
+reportResults
diff --git a/test/powershell/scenarios.json b/test/powershell/scenarios.json
index 781ebaf86..3e9b3acd3 100644
--- a/test/powershell/scenarios.json
+++ b/test/powershell/scenarios.json
@@ -3,6 +3,7 @@
     "image": "mcr.microsoft.com/devcontainers/base:noble",
     "features": {
       "powershell": {
+        "version": "lts",
         "modules": "az.resources, az.storage",
         "powershellProfileURL": "https://raw.githubusercontent.com/codspace/powershell-profile/main/Test-Profile.ps1"
       }
@@ -31,10 +32,88 @@
       "powershell": {}
     }
   },
+  "validate_powershell_installation_spec": {
+    "image": "mcr.microsoft.com/devcontainers/base:noble",
+    "features": {
+      "powershell": {
+        "version": "7.5"
+      }
+    }
+  },
+  "validate_powershell_installation_debian": {
+    "image": "mcr.microsoft.com/devcontainers/base:debian",
+    "features": {
+      "powershell": {}
+    }
+  },  
   "powershell_alma_linux": {
     "image": "almalinux:9",
     "features": {
       "powershell": {} 
     }
+  },
+  "powershell_stable_version": {
+    "image": "mcr.microsoft.com/devcontainers/base:noble",
+    "features": {
+      "powershell": {
+        "version": "stable"
+      }
+    }
+  },
+  "powershell_preview_version": {
+    "image": "mcr.microsoft.com/devcontainers/base:noble",
+    "features": {
+      "powershell": {
+        "version": "preview"
+      }
+    }
+  },
+  "powershell_stable_version_debian": {
+    "image": "mcr.microsoft.com/devcontainers/base:debian",
+    "features": {
+      "powershell": {
+        "version": "stable"
+      }
+    }
+  },
+  "powershell_lts_version_debian": {
+    "image": "mcr.microsoft.com/devcontainers/base:debian",
+    "features": {
+      "powershell": {
+        "version": "lts"
+      }
+    }
+  },
+  "powershell_preview_version_debian": {
+    "image": "mcr.microsoft.com/devcontainers/base:debian",
+    "features": {
+      "powershell": {
+        "version": "preview"
+      }
+    }
+  },
+  "powershell_lts_version_almalinux": {
+    "image": "almalinux:9",
+    "features": {
+      "powershell": {
+        "version": "lts"
+      }
+    }
+  },
+  "powershell_stable_version_almalinux": {
+    "image": "almalinux:9",
+    "features": {
+      "powershell": {
+        "version": "stable"
+      }
+    }
+  },
+  "powershell_preview_version_almalinux": {
+    "image": "almalinux:9",
+    "features": {
+      "powershell": {
+        "version": "preview"
+      }
+    }
   }
 }
diff --git a/test/powershell/validate_powershell_installation_debian.sh b/test/powershell/validate_powershell_installation_debian.sh
new file mode 100644
index 000000000..20b930d26
--- /dev/null
+++ b/test/powershell/validate_powershell_installation_debian.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Extension-specific tests
+check "pwsh file is symlink" bash -c "[ -L /usr/bin/pwsh ]"
+check "pwsh symlink is registered as shell" bash -c "[ $(grep -c '/usr/bin/pwsh' /etc/shells) -eq 1 ]"
+check "pwsh target is correct" bash -c "[ $(readlink /usr/bin/pwsh) = /opt/microsoft/powershell/7/pwsh ]"
+check "pwsh target is registered as shell" bash -c "[ $(grep -c '/opt/microsoft/powershell/7/pwsh' /etc/shells) -eq 1 ]"
+check "pwsh owner is root" bash -c "[ $(stat -c %U /opt/microsoft/powershell/7/pwsh) = root ]"
+check "pwsh group is root" bash -c "[ $(stat -c %G /opt/microsoft/powershell/7/pwsh) = root ]"
+check "pwsh file mode is -rwxr-xr-x" bash -c "[ $(stat -c '%A' /opt/microsoft/powershell/7/pwsh) = '-rwxr-xr-x' ]"
+check "pwsh is in PATH" bash -c "command -v pwsh"
+
+# Report result
+reportResults
+
diff --git a/test/powershell/validate_powershell_installation_spec.sh b/test/powershell/validate_powershell_installation_spec.sh
new file mode 100644
index 000000000..20b930d26
--- /dev/null
+++ b/test/powershell/validate_powershell_installation_spec.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Extension-specific tests
+check "pwsh file is symlink" bash -c "[ -L /usr/bin/pwsh ]"
+check "pwsh symlink is registered as shell" bash -c "[ $(grep -c '/usr/bin/pwsh' /etc/shells) -eq 1 ]"
+check "pwsh target is correct" bash -c "[ $(readlink /usr/bin/pwsh) = /opt/microsoft/powershell/7/pwsh ]"
+check "pwsh target is registered as shell" bash -c "[ $(grep -c '/opt/microsoft/powershell/7/pwsh' /etc/shells) -eq 1 ]"
+check "pwsh owner is root" bash -c "[ $(stat -c %U /opt/microsoft/powershell/7/pwsh) = root ]"
+check "pwsh group is root" bash -c "[ $(stat -c %G /opt/microsoft/powershell/7/pwsh) = root ]"
+check "pwsh file mode is -rwxr-xr-x" bash -c "[ $(stat -c '%A' /opt/microsoft/powershell/7/pwsh) = '-rwxr-xr-x' ]"
+check "pwsh is in PATH" bash -c "command -v pwsh"
+
+# Report result
+reportResults
+

From 29e3e861989b70b121ac6f32c89f68487ce6b5ea Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Thu, 19 Feb 2026 19:51:37 +0530
Subject: [PATCH 415/478] [powershell] - Fixing installation issue on `arm64`
 (#1581)

* [powershell] - Fixing installation issue on `arm64`

* Adding new workflow for arm64 on powershell feature

* add wget if not present.
---
 .github/workflows/test-pr-arm64.yaml     | 67 ++++++++++++++++++++++++
 src/powershell/devcontainer-feature.json |  2 +-
 src/powershell/install.sh                |  6 +--
 3 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/test-pr-arm64.yaml

diff --git a/.github/workflows/test-pr-arm64.yaml b/.github/workflows/test-pr-arm64.yaml
new file mode 100644
index 000000000..d82ec3409
--- /dev/null
+++ b/.github/workflows/test-pr-arm64.yaml
@@ -0,0 +1,67 @@
+name: "PR - Test Updated Features (arm64)"
+on:
+  pull_request:
+    # NOTE: To extend this workflow to other features, add path entries below
+    # following the same pattern, e.g.:
+    #   - "src/<feature-name>/**"
+    #   - "test/<feature-name>/**"
+    paths:
+      - "src/powershell/**"
+      - "test/powershell/**"
+
+jobs:
+  detect-changes:
+    runs-on: ubuntu-latest
+    outputs:
+      features: ${{ steps.filter.outputs.changes }}
+    steps:
+      - uses: dorny/paths-filter@v3
+        id: filter
+        with:
+          # NOTE: To extend this workflow to other features, add filter entries below
+          # following the same pattern, e.g.:
+          #   <feature-name>: ./**/<feature-name>/**
+          filters: |
+            powershell: ./**/powershell/**
+
+  test:
+    needs: [detect-changes]
+    runs-on: ubuntu-24.04-arm
+    continue-on-error: true
+    strategy:
+      matrix:
+        features: ${{ fromJSON(needs.detect-changes.outputs.features) }}
+        baseImage:
+          [
+            "ubuntu:focal",
+            "ubuntu:jammy",
+            "debian:11",
+            "debian:12",
+            "mcr.microsoft.com/devcontainers/base:ubuntu",
+            "mcr.microsoft.com/devcontainers/base:debian",
+            "mcr.microsoft.com/devcontainers/base:noble"
+          ]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: "Install latest devcontainer CLI"
+        run: npm install -g @devcontainers/cli
+
+      - name: "Generating tests for '${{ matrix.features }}' against '${{ matrix.baseImage }}'"
+        run: devcontainer features test  --skip-scenarios -f ${{ matrix.features }} -i ${{ matrix.baseImage }} .
+
+  test-scenarios:
+    needs: [detect-changes]
+    runs-on: ubuntu-24.04-arm
+    continue-on-error: true
+    strategy:
+      matrix:
+        features: ${{ fromJSON(needs.detect-changes.outputs.features) }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: "Install latest devcontainer CLI"
+        run: npm install -g @devcontainers/cli
+
+      - name: "Testing '${{ matrix.features }}' scenarios"
+        run: devcontainer features test -f ${{ matrix.features }} --skip-autogenerated  .
diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json
index 2f511b212..3b500608d 100644
--- a/src/powershell/devcontainer-feature.json
+++ b/src/powershell/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "powershell",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "name": "PowerShell",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
     "description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/powershell/install.sh b/src/powershell/install.sh
index c12b72b75..40308c32e 100755
--- a/src/powershell/install.sh
+++ b/src/powershell/install.sh
@@ -367,7 +367,7 @@ install_using_github() {
     # Fall back on direct download if no apt package exists in microsoft pool
     if command -v apt-get > /dev/null 2>&1; then
         # Debian/Ubuntu dependencies
-        check_packages curl ca-certificates gnupg2 dirmngr libc6 libgcc1 libgssapi-krb5-2 libstdc++6 libunwind8 libuuid1 zlib1g libicu[0-9][0-9]
+        check_packages curl ca-certificates gnupg2 dirmngr libc6 libgcc1 libgssapi-krb5-2 libstdc++6 libunwind8 libuuid1 zlib1g libicu[0-9][0-9] wget
     elif command -v dnf > /dev/null 2>&1; then
         # AlmaLinux/RHEL dependencies
         check_packages curl ca-certificates gnupg2 glibc libgcc krb5-libs libstdc++ libuuid zlib libicu wget tar
@@ -394,10 +394,10 @@ install_using_github() {
         install_prev_pwsh $pwsh_url
     fi
     
-    # downlaod the latest version of powershell and extracting the file to powershell directory
+    # download the latest version of powershell and extracting the file to powershell directory
     wget https://github.com/PowerShell/PowerShell/releases/download/v${POWERSHELL_VERSION}/${powershell_filename}
     mkdir ~/powershell
-    tar -xvf powershell-${POWERSHELL_VERSION}-linux-x64.tar.gz -C ~/powershell
+    tar -xvf ${powershell_filename} -C ~/powershell
 
     powershell_archive_sha256="$(cat release.html | tr '\n' ' ' | sed 's|<[^>]*>||g' | grep -oP "${powershell_filename}\s+\K[0-9a-fA-F]{64}" || echo '')"
     if [ -z "${powershell_archive_sha256}" ]; then

From 4ed1c6d723ae3818e30d7abfbfc06b471ad9f53c Mon Sep 17 00:00:00 2001
From: Abdurrahmaan Iqbal <abdurriq@github.com>
Date: Thu, 19 Feb 2026 16:24:42 +0000
Subject: [PATCH 416/478] Fix conda installation failure due to SHA1 signature
 rejection (#1576)

Fix conda installation failure due to SHA1 signature rejection (#1565)

* Initial plan

* Fix conda installation by switching from apt repository to direct Miniconda installer



* Add error handling for Miniconda download and installation



* Use APT::Key::GPGVCommand=1 option to bypass SHA1 signature check



* Fix version to 1.2.1 for semantic versioning

* Revert to Miniconda installer approach - APT option caused gpgv errors



* Use mktemp for secure temporary file creation



* Replace Miniconda installer with direct .deb package download and apt install



* Fix apt-get install syntax and improve error handling



* Fix package filename - use architecture-specific deb and extract Filename from Packages



* Update version to 1.2.3



* Fix apt-get install path - remove ./ prefix for absolute paths



* Fix version matching for specific conda versions - handle version suffixes



---------

Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Kaniska <kaniska244@github.com>
---
 src/conda/devcontainer-feature.json | 80 ++++++++++++++---------------
 src/conda/install.sh                | 76 +++++++++++++++++++++++----
 2 files changed, 107 insertions(+), 49 deletions(-)

diff --git a/src/conda/devcontainer-feature.json b/src/conda/devcontainer-feature.json
index 163696a20..cd590f9b7 100644
--- a/src/conda/devcontainer-feature.json
+++ b/src/conda/devcontainer-feature.json
@@ -1,43 +1,43 @@
 {
-    "id": "conda",
-    "version": "1.0.10",
-    "name": "Conda",
-    "description": "A cross-platform, language-agnostic binary package manager",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "4.11.0",
-                "4.12.0"
-            ],
-            "default": "latest",
-            "description": "Select or enter a conda version."
-        },
-        "addCondaForge": {
-            "type": "boolean",
-            "default": false,
-            "description": "Add conda-forge channel to the config?"
-        }
+  "id": "conda",
+  "version": "1.2.5",
+  "name": "Conda",
+  "description": "A cross-platform, language-agnostic binary package manager",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "4.11.0",
+        "4.12.0"
+      ],
+      "default": "latest",
+      "description": "Select or enter a conda version."
     },
-    "containerEnv": {
-        "CONDA_DIR": "/opt/conda",
-        "CONDA_SCRIPT":"/opt/conda/etc/profile.d/conda.sh",
-        "PATH": "/opt/conda/bin:${PATH}"
-    },
-    "customizations": {
-        "vscode": {
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
-                    }
-                ]
-            }
-        }
-    },
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ]
+    "addCondaForge": {
+      "type": "boolean",
+      "default": false,
+      "description": "Add conda-forge channel to the config?"
+    }
+  },
+  "containerEnv": {
+    "CONDA_DIR": "/opt/conda",
+    "CONDA_SCRIPT": "/opt/conda/etc/profile.d/conda.sh",
+    "PATH": "/opt/conda/bin:${PATH}"
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
+          }
+        ]
+      }
+    }
+  },
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
 }
diff --git a/src/conda/install.sh b/src/conda/install.sh
index 43ab82f54..73925dd5d 100644
--- a/src/conda/install.sh
+++ b/src/conda/install.sh
@@ -83,20 +83,78 @@ if ! conda --version &> /dev/null ; then
     usermod -a -G conda "${USERNAME}"
 
     # Install dependencies
-    check_packages curl ca-certificates gnupg2
+    check_packages curl ca-certificates
 
     echo "Installing Conda..."
 
-    curl -sS https://repo.anaconda.com/pkgs/misc/gpgkeys/anaconda.asc | gpg --dearmor > /usr/share/keyrings/conda-archive-keyring.gpg
-    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/conda-archive-keyring.gpg] https://repo.anaconda.com/pkgs/misc/debrepo/conda stable main" > /etc/apt/sources.list.d/conda.list
-    apt-get update -y
-
-    CONDA_PKG="conda=${VERSION}-0"
+    # Download .deb package directly from repository (bypassing SHA1 signature issue)
+    TEMP_DEB="$(mktemp -t conda_XXXXXX.deb)"
+    CONDA_REPO_BASE="https://repo.anaconda.com/pkgs/misc/debrepo/conda"
+    
+    # Determine package filename based on requested version
+    ARCH="$(dpkg --print-architecture 2>/dev/null || echo "amd64")"
+    PACKAGES_URL="https://repo.anaconda.com/pkgs/misc/debrepo/conda/dists/stable/main/binary-${ARCH}/Packages"
+    
     if [ "${VERSION}" = "latest" ]; then
-        CONDA_PKG="conda"
+        # For latest, we need to query the repository to find the current version
+        echo "Fetching package list to determine latest version..."
+        CONDA_PKG_INFO=$(curl -fsSL "${PACKAGES_URL}" | grep -A 30 "^Package: conda$" | head -n 31)
+        CONDA_VERSION=$(echo "${CONDA_PKG_INFO}" | grep "^Version:" | head -n 1 | awk '{print $2}')
+        CONDA_FILENAME=$(echo "${CONDA_PKG_INFO}" | grep "^Filename:" | head -n 1 | awk '{print $2}')
+        
+        if [ -z "${CONDA_VERSION}" ] || [ -z "${CONDA_FILENAME}" ]; then
+            echo "ERROR: Could not determine latest conda version or filename from ${PACKAGES_URL}"
+            echo "This may indicate an unsupported architecture or repository unavailability."
+            rm -f "${TEMP_DEB}"
+            exit 1
+        fi
+        
+        CONDA_PKG_NAME="${CONDA_FILENAME}"
+    else
+        # For specific versions, query the Packages file to find the exact filename
+        echo "Fetching package list to find version ${VERSION}..."
+        # Search for version pattern - user may specify 4.12.0 but package has 4.12.0-0
+        CONDA_PKG_INFO=$(curl -fsSL "${PACKAGES_URL}" | grep -A 30 "^Package: conda$" | grep -B 5 -A 25 "^Version: ${VERSION}")
+        CONDA_FILENAME=$(echo "${CONDA_PKG_INFO}" | grep "^Filename:" | head -n 1 | awk '{print $2}')
+        
+        if [ -z "${CONDA_FILENAME}" ]; then
+            echo "ERROR: Could not find conda version ${VERSION} in ${PACKAGES_URL}"
+            echo "Please verify the version specified is valid."
+            rm -f "${TEMP_DEB}"
+            exit 1
+        fi
+        
+        CONDA_PKG_NAME="${CONDA_FILENAME}"
     fi
-
-    check_packages $CONDA_PKG
+    
+    # Download the .deb package
+    CONDA_DEB_URL="${CONDA_REPO_BASE}/${CONDA_PKG_NAME}"
+    echo "Downloading conda package from ${CONDA_DEB_URL}..."
+    
+    if ! curl -fsSL "${CONDA_DEB_URL}" -o "${TEMP_DEB}"; then
+        echo "ERROR: Failed to download conda .deb package from ${CONDA_DEB_URL}"
+        echo "Please verify the version specified is valid."
+        rm -f "${TEMP_DEB}"
+        exit 1
+    fi
+    
+    # Verify the package was downloaded successfully
+    if [ ! -f "${TEMP_DEB}" ] || [ ! -s "${TEMP_DEB}" ]; then
+        echo "ERROR: Conda .deb package file is missing or empty"
+        rm -f "${TEMP_DEB}"
+        exit 1
+    fi
+    
+    # Install the package using apt (which handles dependencies automatically)
+    echo "Installing conda package..."
+    if ! apt-get install -y "${TEMP_DEB}"; then
+        echo "ERROR: Failed to install conda package"
+        rm -f "${TEMP_DEB}"
+        exit 1
+    fi
+    
+    # Clean up downloaded package
+    rm -f "${TEMP_DEB}"
 
     CONDA_SCRIPT="/opt/conda/etc/profile.d/conda.sh"
     . $CONDA_SCRIPT

From c4d1db0f51d9506c5380be15f3c7d7d00e8af230 Mon Sep 17 00:00:00 2001
From: Abdurrahmaan Iqbal <abdurriq@github.com>
Date: Mon, 23 Feb 2026 14:15:35 +0000
Subject: [PATCH 417/478] Fix SDKMAN GLIBC 2.30 incompatibility on RHEL 8
 family systems (#1575)

Fix SDKMAN GLIBC 2.30 incompatibility on RHEL 8 family systems (#1568)

* Initial plan

* Fix SDKMAN GLIBC compatibility for RHEL 8 systems



* Fix SDKMAN native binary removal for RHEL 8 systems



* Disable for RHEL 8

* Update Java latest version test to check for v25 (#1574)

* Initial plan

* Update Java version test to check for version 25



---------




---------

Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
---
 src/java/devcontainer-feature.json  |  4 ++--
 src/java/install.sh                 | 21 +++++++++++++++++++++
 test/java/install_latest_version.sh |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index 4198af326..9591c3592 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.6.3",
+  "version": "1.7.2",
   "name": "Java (via SDKMAN!)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
@@ -122,4 +122,4 @@
   "installsAfter": [
     "ghcr.io/devcontainers/features/common-utils"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/java/install.sh b/src/java/install.sh
index 62fd39462..cd93eacf6 100644
--- a/src/java/install.sh
+++ b/src/java/install.sh
@@ -307,7 +307,28 @@ if [ ! -d "${SDKMAN_DIR}" ]; then
     usermod -a -G sdkman ${USERNAME}
     umask 0002
     # Install SDKMAN
+    # For RHEL 8 systems (glibc 2.28), disable native version to avoid glibc compatibility issues
+    # SDKMAN native binaries require glibc 2.30+ which is not available in RHEL 8 / AlmaLinux 8 / Rocky 8
+    if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${MAJOR_VERSION_ID}" = "8" ]; then
+        export SDKMAN_NATIVE_VERSION="false"
+    fi
     curl -sSL "https://get.sdkman.io?rcupdate=false" | bash
+    # For RHEL 8 systems, also disable native CLI in config file and remove native binaries
+    if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${MAJOR_VERSION_ID}" = "8" ]; then
+        # Disable native CLI in config to prevent future usage
+        # The SDKMAN config key is sdkman_native_enable (checked in sdkman-main.sh)
+        if [ -f "${SDKMAN_DIR}/etc/config" ]; then
+            if grep -q "sdkman_native_enable" "${SDKMAN_DIR}/etc/config"; then
+                sed -i 's/sdkman_native_enable=.*/sdkman_native_enable=false/' "${SDKMAN_DIR}/etc/config"
+            else
+                echo "sdkman_native_enable=false" >> "${SDKMAN_DIR}/etc/config"
+            fi
+        fi
+        # Remove native binaries if they were installed
+        if [ -d "${SDKMAN_DIR}/libexec" ]; then
+            rm -rf "${SDKMAN_DIR}/libexec"
+        fi
+    fi
     chown -R "${USERNAME}:sdkman" ${SDKMAN_DIR}
     find ${SDKMAN_DIR} -type d -print0 | xargs -d '\n' -0 chmod g+s
     # Add sourcing of sdkman into bashrc/zshrc files (unless disabled)
diff --git a/test/java/install_latest_version.sh b/test/java/install_latest_version.sh
index 007699b59..03175e767 100644
--- a/test/java/install_latest_version.sh
+++ b/test/java/install_latest_version.sh
@@ -9,7 +9,7 @@ echo 'public class HelloWorld { public static void main(String[] args) { System.
 javac HelloWorld.java
 
 check "hello world" /bin/bash -c "java HelloWorld | grep "Hello, World!""
-check "java version latest installed" grep "24" <(java --version)
+check "java version latest installed" grep "25" <(java --version)
 
 # Report result
 reportResults

From b35b810c7e9508e144bf363b2016e3bd6283c98a Mon Sep 17 00:00:00 2001
From: Abdurrahmaan Iqbal <abdurriq@github.com>
Date: Mon, 23 Feb 2026 14:16:20 +0000
Subject: [PATCH 418/478] Fix certificate verification for Ubuntu 24.04/Debian
 Trixie in docker features (#1577)

Fix certificate verification for Ubuntu 24.04/Debian Trixie in docker features (#1569)

* Initial plan

* Add update-ca-certificates call after installing ca-certificates package



* Bump feature versions: docker-outside-of-docker to 1.8.0, docker-in-docker to 2.16.0



* Add error handling and documentation for update-ca-certificates calls



* Remove invalid test for docker-compose when v2 isn't installed

---------

Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
---
 .../devcontainer-feature.json                 | 178 +++++++++---------
 src/docker-in-docker/install.sh               |   7 +
 .../devcontainer-feature.json                 | 152 +++++++--------
 src/docker-outside-of-docker/install.sh       |   5 +
 .../docker_dash_compose_v1.sh                 |   1 -
 5 files changed, 177 insertions(+), 166 deletions(-)

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 56520a200..48d807552 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,94 +1,94 @@
 {
-    "id": "docker-in-docker",
-    "version": "2.14.0",
-    "name": "Docker (Docker-in-Docker)",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
-    "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none",
-                "20.10"
-            ],
-            "default": "latest",
-            "description": "Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.)"
-        },
-        "moby": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install OSS Moby build instead of Docker CE"
-        },
-        "mobyBuildxVersion": {
-            "type": "string",
-            "default": "latest",
-            "description": "Install a specific version of moby-buildx when using Moby"
-        },
-        "dockerDashComposeVersion": {
-            "type": "string",
-            "enum": [
-                "none",
-                "v1",
-                "v2"
-            ],
-            "default": "v2",
-            "description": "Default version of Docker Compose (v1, v2 or none)"
-        },
-        "azureDnsAutoDetection": {
-            "type": "boolean",
-            "default": true,
-            "description": "Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure"
-        },
-        "dockerDefaultAddressPool": {
-            "type": "string",
-            "default": "",
-            "proposals": [],
-            "description": "Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24"
-        },
-        "installDockerBuildx": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install Docker Buildx"
-        },
-        "installDockerComposeSwitch": {
-            "type": "boolean",
-            "default": false,
-            "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
-        },
-        "disableIp6tables": {
-            "type": "boolean",
-            "default": false,
-            "description": "Disable ip6tables (this option is only applicable for Docker versions 27 and greater)"
-        }
+  "id": "docker-in-docker",
+  "version": "2.16.0",
+  "name": "Docker (Docker-in-Docker)",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
+  "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "none",
+        "20.10"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.)"
     },
-    "entrypoint": "/usr/local/share/docker-init.sh",
-    "privileged": true,
-    "containerEnv": {
-        "DOCKER_BUILDKIT": "1"
+    "moby": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install OSS Moby build instead of Docker CE"
     },
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "ms-azuretools.vscode-containers"
-            ],
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using a dedicated Docker daemon running inside the dev container."
-                    }
-                ]
-            }
-        }
+    "mobyBuildxVersion": {
+      "type": "string",
+      "default": "latest",
+      "description": "Install a specific version of moby-buildx when using Moby"
     },
-    "mounts": [
-        {
-            "source": "dind-var-lib-docker-${devcontainerId}",
-            "target": "/var/lib/docker",
-            "type": "volume"
-        }
-    ],
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ]
+    "dockerDashComposeVersion": {
+      "type": "string",
+      "enum": [
+        "none",
+        "v1",
+        "v2"
+      ],
+      "default": "v2",
+      "description": "Default version of Docker Compose (v1, v2 or none)"
+    },
+    "azureDnsAutoDetection": {
+      "type": "boolean",
+      "default": true,
+      "description": "Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure"
+    },
+    "dockerDefaultAddressPool": {
+      "type": "string",
+      "default": "",
+      "proposals": [],
+      "description": "Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24"
+    },
+    "installDockerBuildx": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install Docker Buildx"
+    },
+    "installDockerComposeSwitch": {
+      "type": "boolean",
+      "default": false,
+      "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
+    },
+    "disableIp6tables": {
+      "type": "boolean",
+      "default": false,
+      "description": "Disable ip6tables (this option is only applicable for Docker versions 27 and greater)"
+    }
+  },
+  "entrypoint": "/usr/local/share/docker-init.sh",
+  "privileged": true,
+  "containerEnv": {
+    "DOCKER_BUILDKIT": "1"
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-azuretools.vscode-containers"
+      ],
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using a dedicated Docker daemon running inside the dev container."
+          }
+        ]
+      }
+    }
+  },
+  "mounts": [
+    {
+      "source": "dind-var-lib-docker-${devcontainerId}",
+      "target": "/var/lib/docker",
+      "type": "volume"
+    }
+  ],
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
 }
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 3f30158e5..50576ae23 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -303,6 +303,13 @@ if ! command -v git >/dev/null 2>&1; then
     check_packages git
 fi
 
+# Update CA certificates to ensure HTTPS connections work properly
+# This is especially important for Ubuntu 24.04 (Noble) and Debian Trixie
+# Only run for Debian-based systems (RHEL uses update-ca-trust instead)
+if [ "${ADJUSTED_ID}" = "debian" ] && command -v update-ca-certificates > /dev/null 2>&1; then
+    update-ca-certificates
+fi
+
 # Swap to legacy iptables for compatibility (Debian only)
 if [ "${ADJUSTED_ID}" = "debian" ] && type iptables-legacy > /dev/null 2>&1; then
     update-alternatives --set iptables /usr/sbin/iptables-legacy
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 7314fa83d..d0039a843 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,80 +1,80 @@
 {
-    "id": "docker-outside-of-docker",
-    "version": "1.6.5",
-    "name": "Docker (docker-outside-of-docker)",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
-    "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none",
-                "20.10"
-            ],
-            "default": "latest",
-            "description": "Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.)"
-        },
-        "moby": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install OSS Moby build instead of Docker CE"
-        },
-        "mobyBuildxVersion": {
-            "type": "string",
-            "default": "latest",
-            "description": "Install a specific version of moby-buildx when using Moby"
-        },
-        "dockerDashComposeVersion": {
-            "type": "string",
-            "enum": [
-                "none",
-                "v1",
-                "v2"
-            ],
-            "default": "v2",
-            "description": "Compose version to use for docker-compose (v1 or v2 or none)"
-        },
-        "installDockerBuildx": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install Docker Buildx"
-        },
-        "installDockerComposeSwitch": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
-        }
+  "id": "docker-outside-of-docker",
+  "version": "1.8.0",
+  "name": "Docker (docker-outside-of-docker)",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
+  "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "none",
+        "20.10"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.)"
     },
-    "entrypoint": "/usr/local/share/docker-init.sh",
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "ms-azuretools.vscode-containers"
-            ],
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using the Docker daemon on the host machine."
-                    }
-                ]
-            }
-        }
+    "moby": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install OSS Moby build instead of Docker CE"
     },
-    "mounts": [
-        {
-            "source": "/var/run/docker.sock",
-            "target": "/var/run/docker-host.sock",
-            "type": "bind"
-        }
-    ],
-    "securityOpt": [
-        "label=disable"
-    ],
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ],
-    "legacyIds": [
-        "docker-from-docker"
-    ]
+    "mobyBuildxVersion": {
+      "type": "string",
+      "default": "latest",
+      "description": "Install a specific version of moby-buildx when using Moby"
+    },
+    "dockerDashComposeVersion": {
+      "type": "string",
+      "enum": [
+        "none",
+        "v1",
+        "v2"
+      ],
+      "default": "v2",
+      "description": "Compose version to use for docker-compose (v1 or v2 or none)"
+    },
+    "installDockerBuildx": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install Docker Buildx"
+    },
+    "installDockerComposeSwitch": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
+    }
+  },
+  "entrypoint": "/usr/local/share/docker-init.sh",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-azuretools.vscode-containers"
+      ],
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using the Docker daemon on the host machine."
+          }
+        ]
+      }
+    }
+  },
+  "mounts": [
+    {
+      "source": "/var/run/docker.sock",
+      "target": "/var/run/docker-host.sock",
+      "type": "bind"
+    }
+  ],
+  "securityOpt": [
+    "label=disable"
+  ],
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ],
+  "legacyIds": [
+    "docker-from-docker"
+  ]
 }
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 74fd63530..242636084 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -192,6 +192,11 @@ export DEBIAN_FRONTEND=noninteractive
 
 # Install dependencies
 check_packages apt-transport-https curl ca-certificates gnupg2 dirmngr wget
+# Update CA certificates to ensure HTTPS connections work properly
+# This is especially important for Ubuntu 24.04 (Noble) and Debian Trixie
+if command -v update-ca-certificates > /dev/null 2>&1; then
+    update-ca-certificates
+fi
 if ! type git > /dev/null 2>&1; then
     check_packages git
 fi
diff --git a/test/docker-outside-of-docker/docker_dash_compose_v1.sh b/test/docker-outside-of-docker/docker_dash_compose_v1.sh
index d95f3cf73..4ae7a9e02 100755
--- a/test/docker-outside-of-docker/docker_dash_compose_v1.sh
+++ b/test/docker-outside-of-docker/docker_dash_compose_v1.sh
@@ -6,7 +6,6 @@ set -e
 source dev-container-features-test-lib
 
 # Definition specific tests
-check "docker compose" bash -c "docker compose version | grep -E '2.[0-9]+.[0-9]+'"
 check "docker-compose" bash -c "docker-compose --version | grep -E '1.[0-9]+.[0-9]+'"
 
 # Report result

From 129c91dbe82fe1f6f7b4ee36b9f7b9e4d4cc1c95 Mon Sep 17 00:00:00 2001
From: Vatsal Gupta <40350810+gvatsal60@users.noreply.github.com>
Date: Tue, 24 Feb 2026 21:33:44 +0530
Subject: [PATCH 419/478] [#1196] Support Dependabot: Update Actions (#1197)

* [#1196] Support Dependabot: Update Actions

* Update .github/dependabot.yaml

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Kaniska <kaniska244@github.com>
---
 .github/dependabot.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .github/dependabot.yaml

diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
new file mode 100644
index 000000000..144149689
--- /dev/null
+++ b/.github/dependabot.yaml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "devcontainers"
+    directory: "/.devcontainer"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

From 06d3f56b24d3fb8a79e86f429bd30f438b10a149 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Wed, 25 Feb 2026 18:55:34 +0530
Subject: [PATCH 420/478] [nvidia-cuda] - Fix installation issue on debian
 trixie(13) (#1591)

* [nvidia-cuda] - Fix installation issue on debian trixie(13)

* Update test in line with the latest defailt cuda version 12.5

* Remove uwanted submodule

* Adding symlinks for duplicate test files
---
 src/nvidia-cuda/devcontainer-feature.json     |  4 +--
 src/nvidia-cuda/install.sh                    | 27 ++++++++++++++-----
 test/nvidia-cuda/install_all_options.sh       | 15 ++++++-----
 .../install_all_options_debian_12.sh          |  1 +
 .../install_all_options_ubuntu_noble.sh       |  1 +
 test/nvidia-cuda/scenarios.json               | 22 +++++++++++++++
 test/nvidia-cuda/test.sh                      | 14 +++++-----
 7 files changed, 61 insertions(+), 23 deletions(-)
 create mode 120000 test/nvidia-cuda/install_all_options_debian_12.sh
 create mode 120000 test/nvidia-cuda/install_all_options_ubuntu_noble.sh

diff --git a/src/nvidia-cuda/devcontainer-feature.json b/src/nvidia-cuda/devcontainer-feature.json
index 7dd46f7c0..477faf17a 100644
--- a/src/nvidia-cuda/devcontainer-feature.json
+++ b/src/nvidia-cuda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "nvidia-cuda",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "name": "NVIDIA CUDA",
   "description": "Installs shared libraries for NVIDIA CUDA.",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/nvidia-cuda",
@@ -42,7 +42,7 @@
         "11.3",
         "11.2"
       ],
-      "default": "11.8",
+      "default": "12.5",
       "description": "Version of CUDA to install"
     },
     "cudnnVersion": {
diff --git a/src/nvidia-cuda/install.sh b/src/nvidia-cuda/install.sh
index 6de935540..66e4a6834 100644
--- a/src/nvidia-cuda/install.sh
+++ b/src/nvidia-cuda/install.sh
@@ -62,13 +62,26 @@ esac
 # Add NVIDIA's package repository to apt so that we can download packages
 # Updating the repo to ubuntu2204 as ubuntu 20.04 is going out of support. 
 NVIDIA_REPO_URL="https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/$NVIDIA_ARCH"
-KEYRING_PACKAGE="cuda-keyring_1.0-1_all.deb"
-KEYRING_PACKAGE_URL="$NVIDIA_REPO_URL/$KEYRING_PACKAGE"
-KEYRING_PACKAGE_PATH="$(mktemp -d)"
-KEYRING_PACKAGE_FILE="$KEYRING_PACKAGE_PATH/$KEYRING_PACKAGE"
-wget -O "$KEYRING_PACKAGE_FILE" "$KEYRING_PACKAGE_URL"
-apt-get install -yq "$KEYRING_PACKAGE_FILE"
-apt-get update -yq
+
+
+if [ "${ID}" = "debian" ] && [ "${VERSION_CODENAME}" = "trixie" ]; then
+    echo "(!) Temporary workaround on debian:trixie: bypassing NVIDIA repo signature checks"
+    cat > /etc/apt/sources.list.d/cuda.list <<EOF
+deb [trusted=yes] ${NVIDIA_REPO_URL}/ /
+EOF
+
+    apt-get -o Acquire::AllowInsecureRepositories=true \
+            -o Acquire::AllowDowngradeToInsecureRepositories=true \
+            update -yq
+else
+    KEYRING_PACKAGE="cuda-keyring_1.0-1_all.deb"
+    KEYRING_PACKAGE_URL="$NVIDIA_REPO_URL/$KEYRING_PACKAGE"
+    KEYRING_PACKAGE_PATH="$(mktemp -d)"
+    KEYRING_PACKAGE_FILE="$KEYRING_PACKAGE_PATH/$KEYRING_PACKAGE"
+    wget -O "$KEYRING_PACKAGE_FILE" "$KEYRING_PACKAGE_URL"
+    apt-get install -yq "$KEYRING_PACKAGE_FILE"
+    apt-get update -yq
+fi
 
 # Ensure that the requested version of CUDA is available
 cuda_pkg="cuda-libraries-${CUDA_VERSION/./-}"
diff --git a/test/nvidia-cuda/install_all_options.sh b/test/nvidia-cuda/install_all_options.sh
index 7d9e03107..2f02e45e6 100644
--- a/test/nvidia-cuda/install_all_options.sh
+++ b/test/nvidia-cuda/install_all_options.sh
@@ -5,17 +5,18 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-# Check installation of libcudnn8
-check "libcudnn.so.8" test 1 -eq "$(find /usr -name 'libcudnn.so.8' | wc -l)"
+# Check installation of libcudnn9
+check "libcudnn.so.9" test 1 -eq "$(find /usr -name 'libcudnn.so.9' | wc -l)"
 
-# Check installation of libcudnn8-dev
+# Check installation of libcudnn9-dev
 check "cudnn.h" test 1 -eq "$(find /usr -name 'cudnn.h' | wc -l)"
 
-# Check installation of cuda-nvtx-11-<version>
-check "cuda-11+nvtx" test -e '/usr/local/cuda-11/targets/x86_64-linux/include/nvtx3'
+# Check installation of cuda-nvtx-12-<version>
+check "cuda-12+nvtx" test -e '/usr/local/cuda-12.5/targets/x86_64-linux/include/nvtx3'
 
-# Check installation of cuda-nvcc-11-<version>
-check "cuda-11+nvcc" test -e '/usr/local/cuda-11/bin/nvcc'
+# Check installation of cuda-nvcc-12-<version>
+check "cuda-12+nvcc" test -e '/usr/local/cuda-12.5/bin/nvcc'
 
 # Report result
 reportResults
+
diff --git a/test/nvidia-cuda/install_all_options_debian_12.sh b/test/nvidia-cuda/install_all_options_debian_12.sh
new file mode 120000
index 000000000..52a199770
--- /dev/null
+++ b/test/nvidia-cuda/install_all_options_debian_12.sh
@@ -0,0 +1 @@
+install_all_options.sh
\ No newline at end of file
diff --git a/test/nvidia-cuda/install_all_options_ubuntu_noble.sh b/test/nvidia-cuda/install_all_options_ubuntu_noble.sh
new file mode 120000
index 000000000..52a199770
--- /dev/null
+++ b/test/nvidia-cuda/install_all_options_ubuntu_noble.sh
@@ -0,0 +1 @@
+install_all_options.sh
\ No newline at end of file
diff --git a/test/nvidia-cuda/scenarios.json b/test/nvidia-cuda/scenarios.json
index 82c84f119..e8c0c6c22 100644
--- a/test/nvidia-cuda/scenarios.json
+++ b/test/nvidia-cuda/scenarios.json
@@ -10,6 +10,28 @@
             }
         }
     },
+    "install_all_options_debian_12": {
+        "image": "debian:12",
+        "features": {
+            "nvidia-cuda": {
+                "installCudnn": true,
+                "installCudnnDev": true,
+                "installNvtx": true,
+                "installToolkit": true
+            }
+        }
+    },
+    "install_all_options_ubuntu_noble": {
+        "image": "ubuntu:noble",
+        "features": {
+            "nvidia-cuda": {
+                "installCudnn": true,
+                "installCudnnDev": true,
+                "installNvtx": true,
+                "installToolkit": true
+            }
+        }
+    },
     "install_cudnn_nvxt_version": {
         "image": "debian",
         "features": {
diff --git a/test/nvidia-cuda/test.sh b/test/nvidia-cuda/test.sh
index 5c56b178d..1415340ca 100644
--- a/test/nvidia-cuda/test.sh
+++ b/test/nvidia-cuda/test.sh
@@ -5,16 +5,16 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-check "cuda version" test -d /usr/local/cuda-11.8
+check "cuda version" test -d /usr/local/cuda-12.5
 
-# Check installation of cuda-libraries-11-<version>
-check "libcudart.so.11.0" test 1 -eq "$(find /usr -name 'libcudart.so.11.0' | wc -l)"
-check "libcublas.so.11" test 1 -eq "$(find /usr -name 'libcublas.so.11' | wc -l)"
-check "libcublasLt.so.11" test 1 -eq "$(find /usr -name 'libcublasLt.so.11' | wc -l)"
-check "libcufft.so.10" test 1 -eq "$(find /usr -name 'libcufft.so.10' | wc -l)"
+# Check installation of cuda-libraries-12-<version>
+check "libcudart.so.12" test 1 -eq "$(find /usr -name 'libcudart.so.12' | wc -l)"
+check "libcublas.so.12" test 1 -eq "$(find /usr -name 'libcublas.so.12' | wc -l)"
+check "libcublasLt.so.12" test 1 -eq "$(find /usr -name 'libcublasLt.so.12' | wc -l)"
+check "libcufft.so.11" test 1 -eq "$(find /usr -name 'libcufft.so.11' | wc -l)"
 check "libcurand.so.10" test 1 -eq "$(find /usr -name 'libcurand.so.10' | wc -l)"
 check "libcusolver.so.11" test 1 -eq "$(find /usr -name 'libcusolver.so.11' | wc -l)"
-check "libcusparse.so.11" test 1 -eq "$(find /usr -name 'libcusparse.so.11' | wc -l)"
+check "libcusparse.so.12" test 1 -eq "$(find /usr -name 'libcusparse.so.12' | wc -l)"
 
 # Report result
 reportResults

From d79c223de2849c671c806c1a86ca9302993bac8c Mon Sep 17 00:00:00 2001
From: Abdurrahmaan Iqbal <abdurriq@github.com>
Date: Thu, 26 Feb 2026 11:55:02 +0000
Subject: [PATCH 421/478] Fix kubectl-helm-minikube installation failures on
 debian:11 and ubuntu:focal (#1578)

* Fix kubectl-helm-minikube installation failures on debian:11 and ubuntu:focal (#1567)

* Initial plan

* Fix kubectl SHA256 download URL and bump version to 1.3.1

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Add timeout and fallback for kubectl version fetching

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Improve error messages and diagnostics for kubectl version fetching

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Address code review feedback: clean up error handling

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Improve error message to reference VERSION option

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Use hardcoded fallback version instead of git tags fallback

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Add version validation and comment for fallback version

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Extract fallback version to constant at top of file

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Update fallback version of kubectl to v1.35.1

* Add alternative URL fallback before using hardcoded version

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>
Co-authored-by: Abdurrahmaan Iqbal <abdurriq@github.com>

* Fix kubectl SHA256 URL in install script

* Use configurable fallback kubectl version instead of just hardcoded one

---------

Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
---
 .../devcontainer-feature.json                 | 119 +++++++++---------
 src/kubectl-helm-minikube/install.sh          |  13 +-
 2 files changed, 74 insertions(+), 58 deletions(-)

diff --git a/src/kubectl-helm-minikube/devcontainer-feature.json b/src/kubectl-helm-minikube/devcontainer-feature.json
index 410a909e4..a88aebde6 100644
--- a/src/kubectl-helm-minikube/devcontainer-feature.json
+++ b/src/kubectl-helm-minikube/devcontainer-feature.json
@@ -1,61 +1,66 @@
 {
-    "id": "kubectl-helm-minikube",
-    "version": "1.2.2",
-    "name": "Kubectl, Helm, and Minikube",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
-    "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none",
-                "1.23",
-                "1.22",
-                "1.21",
-                "none"
-            ],
-            "default": "latest",
-            "description": "Select or enter a Kubernetes version to install"
-        },
-        "helm": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none"
-            ],
-            "default": "latest",
-            "description": "Select or enter a Helm version to install"
-        },
-        "minikube": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none"
-            ],
-            "default": "latest",
-            "description": "Select or enter a Minikube version to install"
-        }
+  "id": "kubectl-helm-minikube",
+  "version": "1.3.1",
+  "name": "Kubectl, Helm, and Minikube",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
+  "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "none",
+        "1.23",
+        "1.22",
+        "1.21",
+        "none"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Kubernetes version to install"
     },
-    "mounts": [
-        {
-            "source": "minikube-config",
-            "target": "/home/vscode/.minikube",
-            "type": "volume"
-        }
-    ],
-    "customizations": {
-        "vscode": {
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes kubectl, Helm, optionally minikube, and needed dependencies pre-installed and available on the `PATH`. When configuring Ingress for your Kubernetes cluster, note that by default Kubernetes will bind to a specific interface's IP rather than localhost or all interfaces. This is why you need to use the Kubernetes Node's IP when connecting - even if there's only one Node as in the case of Minikube."
-                    }
-                ]
-            }
-        }
+    "helm": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "none"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Helm version to install"
     },
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ]
+    "minikube": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "none"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Minikube version to install"
+    },
+    "kubectlFallbackVersion": {
+      "type": "string",
+      "default": "v1.35.1",
+      "description": "Fallback kubectl version to use when the latest stable version cannot be fetched"
+    }
+  },
+  "mounts": [
+    {
+      "source": "minikube-config",
+      "target": "/home/vscode/.minikube",
+      "type": "volume"
+    }
+  ],
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes kubectl, Helm, optionally minikube, and needed dependencies pre-installed and available on the `PATH`. When configuring Ingress for your Kubernetes cluster, note that by default Kubernetes will bind to a specific interface's IP rather than localhost or all interfaces. This is why you need to use the Kubernetes Node's IP when connecting - even if there's only one Node as in the case of Minikube."
+          }
+        ]
+      }
+    }
+  },
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
 }
diff --git a/src/kubectl-helm-minikube/install.sh b/src/kubectl-helm-minikube/install.sh
index f0cf1c946..40901d3cb 100755
--- a/src/kubectl-helm-minikube/install.sh
+++ b/src/kubectl-helm-minikube/install.sh
@@ -12,6 +12,9 @@ set -e
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
+# Fallback version when stable.txt cannot be fetched
+KUBECTL_FALLBACK_VERSION="${KUBECTLFALLBACKVERSION:-"v1.35.1"}"
+
 KUBECTL_VERSION="${VERSION:-"latest"}"
 HELM_VERSION="${HELM:-"latest"}"
 MINIKUBE_VERSION="${MINIKUBE:-"latest"}" # latest is also valid
@@ -164,7 +167,15 @@ if [ ${KUBECTL_VERSION} != "none" ]; then
     # Install the kubectl, verify checksum
     echo "Downloading kubectl..."
     if [ "${KUBECTL_VERSION}" = "latest" ] || [ "${KUBECTL_VERSION}" = "lts" ] || [ "${KUBECTL_VERSION}" = "current" ] || [ "${KUBECTL_VERSION}" = "stable" ]; then
-        KUBECTL_VERSION="$(curl -sSL https://dl.k8s.io/release/stable.txt)"
+        KUBECTL_VERSION="$(curl -fsSL --connect-timeout 10 --max-time 30 https://dl.k8s.io/release/stable.txt 2>/dev/null | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+' || echo "")"
+        if [ -z "${KUBECTL_VERSION}" ]; then
+            echo "(!) Failed to fetch kubectl stable version from dl.k8s.io, trying alternative URL..."
+            KUBECTL_VERSION="$(curl -fsSL --connect-timeout 10 --max-time 30 https://storage.googleapis.com/kubernetes-release/release/stable.txt 2>/dev/null | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+' || echo "")"
+        fi
+        if [ -z "${KUBECTL_VERSION}" ]; then
+            echo "(!) Failed to fetch kubectl stable version from both URLs. Using fallback version ${KUBECTL_FALLBACK_VERSION}"
+            KUBECTL_VERSION="${KUBECTL_FALLBACK_VERSION}"
+        fi
     else
         find_version_from_git_tags KUBECTL_VERSION https://github.com/kubernetes/kubernetes
     fi

From 03ea24c7d4311c9ef342985c3bd2531c105cbbf5 Mon Sep 17 00:00:00 2001
From: Vatsal Gupta <40350810+gvatsal60@users.noreply.github.com>
Date: Wed, 4 Mar 2026 23:01:40 +0530
Subject: [PATCH 422/478] #1587 - Fix: Remove temporary Go tools directory
 (#1588)

* Fix: Remove temporary Go tools directory

* Bump go version & Fixed variable expansion

---------

Co-authored-by: Kaniska <kaniska244@github.com>
---
 src/go/devcontainer-feature.json |  2 +-
 src/go/install.sh                | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/go/devcontainer-feature.json b/src/go/devcontainer-feature.json
index f98e65a7f..8872d6374 100644
--- a/src/go/devcontainer-feature.json
+++ b/src/go/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "go",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "name": "Go",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/go",
     "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/go/install.sh b/src/go/install.sh
index 85fea5dc4..4286c08a8 100755
--- a/src/go/install.sh
+++ b/src/go/install.sh
@@ -301,10 +301,11 @@ GO_TOOLS="\
 if [ "${INSTALL_GO_TOOLS}" = "true" ]; then
     echo "Installing common Go tools..."
     export PATH=${TARGET_GOROOT}/bin:${PATH}
-    mkdir -p /tmp/gotools /usr/local/etc/vscode-dev-containers ${TARGET_GOPATH}/bin
-    cd /tmp/gotools
     export GOPATH=/tmp/gotools
-    export GOCACHE=/tmp/gotools/cache
+    export GOCACHE="${GOPATH}/cache"
+
+    mkdir -p "${GOPATH}" /usr/local/etc/vscode-dev-containers "${TARGET_GOPATH}/bin"
+    cd "${GOPATH}"
 
     # Use go get for versions of go under 1.16
     go_install_command=install
@@ -316,10 +317,9 @@ if [ "${INSTALL_GO_TOOLS}" = "true" ]; then
 
     (echo "${GO_TOOLS}" | xargs -n 1 go ${go_install_command} -v )2>&1 | tee -a /usr/local/etc/vscode-dev-containers/go.log
 
-    # Move Go tools into path and clean up
-    if [ -d /tmp/gotools/bin ]; then
-        mv /tmp/gotools/bin/* ${TARGET_GOPATH}/bin/
-        rm -rf /tmp/gotools
+    # Move Go tools into path
+    if [ -d "${GOPATH}/bin" ]; then
+        mv "${GOPATH}/bin"/* "${TARGET_GOPATH}/bin/"
     fi
 
     # Install golangci-lint from precompiled binares
@@ -332,6 +332,9 @@ if [ "${INSTALL_GO_TOOLS}" = "true" ]; then
         curl -fsSL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | \
             sh -s -- -b "${TARGET_GOPATH}/bin" "v${GOLANGCILINT_VERSION}"
     fi
+
+    # Remove Go tools temp directory
+    rm -rf "${GOPATH}"
 fi
 
 

From 065b4d466f4623ab1c5aeb3e3b323d88cf69d190 Mon Sep 17 00:00:00 2001
From: Karsten Becker <567973+KarstenB@users.noreply.github.com>
Date: Wed, 4 Mar 2026 19:52:53 +0100
Subject: [PATCH 423/478] =?UTF-8?q?fix(docker-in-docker):=20create=20/usr/?=
 =?UTF-8?q?local/share=20directory=20if=20it=20doesn't=20exist=20before=20?=
 =?UTF-8?q?writing=20=E2=80=A6=20(#1594)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Create /usr/local/share directory if it doesn't exist before writing docker-init.sh
---
 src/docker-in-docker/devcontainer-feature.json | 2 +-
 src/docker-in-docker/install.sh                | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 48d807552..4c792e8f4 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "docker-in-docker",
-  "version": "2.16.0",
+  "version": "2.16.1",
   "name": "Docker (Docker-in-Docker)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
   "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 50576ae23..5af320b0b 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -861,6 +861,10 @@ if [ "$DISABLE_IP6_TABLES" == true ]; then
     fi
 fi
 
+if [ ! -d /usr/local/share ]; then
+    mkdir -p /usr/local/share
+fi
+
 tee /usr/local/share/docker-init.sh > /dev/null \
 << EOF
 #!/bin/sh

From 0c2cd3f94456726bae0027cee4c8a0f583667b98 Mon Sep 17 00:00:00 2001
From: 7006 <22399553+7006@users.noreply.github.com>
Date: Thu, 5 Mar 2026 13:55:54 +0200
Subject: [PATCH 424/478] Remove duplicated CentOS 7 mirrorlist update logic
 (#1586)

* Bump version from 2.5.6 to 2.5.7

* Remove duplicated CentOS 7 mirrorlist update logic

Remove duplicated CentOS 7 mirrorlist handling introduced in this commit https://github.com/devcontainers/features/commit/52c79b4963879dd941c67b583199ec7966e41ab4
---
 src/common-utils/devcontainer-feature.json | 2 +-
 src/common-utils/main.sh                   | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 14056e3a9..4ebbd3074 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.5.6",
+    "version": "2.5.7",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index b0fd2f3b0..3f6b13477 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -378,14 +378,6 @@ if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${VERSION_CODENAME-}" = "centos7" ]; then
     sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
 fi
 
-if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${VERSION_CODENAME-}" = "centos7" ]; then
-    # As of 1 July 2024, mirrorlist.centos.org no longer exists.
-    # Update the repo files to reference vault.centos.org.
-    sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
-    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
-    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
-fi
-
 # Install packages for appropriate OS
 case "${ADJUSTED_ID}" in
     "debian")

From e04e9cee60122521c0e717a1d4d4d5737bd5f6a3 Mon Sep 17 00:00:00 2001
From: Steven <steven.liekens@gmail.com>
Date: Wed, 11 Mar 2026 14:26:32 +0100
Subject: [PATCH 425/478] Fix dotnet latest resolution (#1598)

* Fix dotnet latest resolution

* Restore latest version check in test

* Avoid silently ignoring CDN errors

* Clarify dotnet latest target selection

* test(dotnet): source staged feature helper script
---
 src/dotnet/NOTES.md                           |  2 +-
 src/dotnet/README.md                          | 10 +--
 src/dotnet/install.sh                         |  2 +-
 src/dotnet/scripts/dotnet-helpers.sh          | 67 +++++++++++--------
 test/dotnet/dotnet_helpers.sh                 | 36 +---------
 test/dotnet/install_dotnet_lts.sh             |  2 +-
 .../dotnet/install_dotnet_specific_release.sh |  2 +-
 test/dotnet/install_dotnet_workloads.sh       |  3 -
 test/dotnet/scenarios.json                    |  2 +-
 9 files changed, 50 insertions(+), 76 deletions(-)

diff --git a/src/dotnet/NOTES.md b/src/dotnet/NOTES.md
index ff52835b0..953372381 100644
--- a/src/dotnet/NOTES.md
+++ b/src/dotnet/NOTES.md
@@ -67,7 +67,7 @@ Installing .NET workloads. Multiple workloads can be specified as comma-separate
 ``` json
 "features": {
     "ghcr.io/devcontainers/features/dotnet:2": {
-      "workloads": "aspire, wasm-tools"
+      "workloads": "wasm-tools"
     }
 }
 ```
diff --git a/src/dotnet/README.md b/src/dotnet/README.md
index fecaeb3f3..8244b151d 100644
--- a/src/dotnet/README.md
+++ b/src/dotnet/README.md
@@ -15,10 +15,10 @@ This Feature installs the latest .NET SDK, which includes the .NET CLI and the s
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| version | Select or enter a .NET SDK version. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version. | string | latest |
-| additionalVersions | Enter additional .NET SDK versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version. | string | - |
-| dotnetRuntimeVersions | Enter additional .NET runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version. | string | - |
-| aspNetCoreRuntimeVersions | Enter additional ASP.NET Core runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version. | string | - |
+| version | Select or enter a .NET SDK version. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version, 'X.Y-preview' or 'X.Y-daily' for prereleases. | string | latest |
+| additionalVersions | Enter additional .NET SDK versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version, 'X.Y-preview' or 'X.Y-daily' for prereleases. | string | - |
+| dotnetRuntimeVersions | Enter additional .NET runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version, 'X.Y-preview' or 'X.Y-daily' for prereleases. | string | - |
+| aspNetCoreRuntimeVersions | Enter additional ASP.NET Core runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version, 'X.Y-preview' or 'X.Y-daily' for prereleases. | string | - |
 | workloads | Enter additional .NET SDK workloads, separated by commas. Use 'dotnet workload search' to learn what workloads are available to install. | string | - |
 
 ## Customizations
@@ -95,7 +95,7 @@ Installing .NET workloads. Multiple workloads can be specified as comma-separate
 ``` json
 "features": {
     "ghcr.io/devcontainers/features/dotnet:2": {
-      "workloads": "aspire, wasm-tools"
+      "workloads": "wasm-tools"
     }
 }
 ```
diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh
index a6bde1ebd..d2b06cd0e 100644
--- a/src/dotnet/install.sh
+++ b/src/dotnet/install.sh
@@ -105,7 +105,7 @@ done
 
 # Install .NET versions and dependencies
 # icu-devtools includes dependencies for .NET
-check_packages wget ca-certificates icu-devtools
+check_packages wget ca-certificates icu-devtools jq
 
 for version in "${versions[@]}"; do
     read -r clean_version quality < <(parse_version_and_quality "$version")
diff --git a/src/dotnet/scripts/dotnet-helpers.sh b/src/dotnet/scripts/dotnet-helpers.sh
index 2ef8796eb..d2dbc4534 100644
--- a/src/dotnet/scripts/dotnet-helpers.sh
+++ b/src/dotnet/scripts/dotnet-helpers.sh
@@ -8,40 +8,49 @@
 # Maintainer: The Dev Container spec maintainers
 DOTNET_SCRIPTS=$(dirname "${BASH_SOURCE[0]}")
 DOTNET_INSTALL_SCRIPT="$DOTNET_SCRIPTS/vendor/dotnet-install.sh"
+DOTNET_RELEASES_INDEX_URL="https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json"
 
-# Prints the latest dotnet version in the specified channel
-# Usage: fetch_latest_version_in_channel <channel> [<runtime>]
-# Example: fetch_latest_version_in_channel "LTS"
-# Example: fetch_latest_version_in_channel "6.0" "dotnet"
-# Example: fetch_latest_version_in_channel "6.0" "aspnetcore"
-fetch_latest_version_in_channel() {
-    local channel="$1"
-    local runtime="$2"
-    if [ "$runtime" = "dotnet" ]; then
-        wget -qO- "https://builds.dotnet.microsoft.com/dotnet/Runtime/$channel/latest.version"
-    elif [ "$runtime" = "aspnetcore" ]; then
-        wget -qO- "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$channel/latest.version"
-    else
-        wget -qO- "https://builds.dotnet.microsoft.com/dotnet/Sdk/$channel/latest.version"
-    fi
-}
-
-# Prints the latest dotnet version
-# Usage: fetch_latest_version [<runtime>]
+# Prints the latest active dotnet version from the releases index.
+# Usage: fetch_latest_version [<target>]
+# With no target, resolves the latest SDK version.
+# With "sdk", resolves the latest SDK version explicitly.
+# With "dotnet" or "aspnetcore", resolves the latest runtime version.
+# Note: the upstream releases index only distinguishes SDK vs runtime for
+# latest resolution, so "dotnet" and "aspnetcore" currently resolve to the
+# same version.
 # Example: fetch_latest_version
+# Example: fetch_latest_version "sdk"
 # Example: fetch_latest_version "dotnet"
 # Example: fetch_latest_version "aspnetcore"
 fetch_latest_version() {
-    local runtime="$1"
-    local sts_version
-    local lts_version
-    sts_version=$(fetch_latest_version_in_channel "STS" "$runtime")
-    lts_version=$(fetch_latest_version_in_channel "LTS" "$runtime")
-    if [[ "$sts_version" > "$lts_version" ]]; then
-        echo "$sts_version"
-    else
-        echo "$lts_version"
-    fi
+    local target="$1"
+    local version_field=""
+    local releases_index=""
+
+    case "$target" in
+        ""|sdk)
+            version_field="latest-sdk"
+            ;;
+        dotnet|aspnetcore)
+            version_field="latest-runtime"
+            ;;
+        *)
+            echo "Unsupported target '$target'. Expected 'sdk', 'dotnet', or 'aspnetcore'." >&2
+            return 1
+            ;;
+    esac
+
+    releases_index="$(wget -qO- "$DOTNET_RELEASES_INDEX_URL")" || return $?
+
+    printf '%s\n' "$releases_index" \
+        | jq -er --arg version_field "$version_field" '
+            .["releases-index"]
+            | map(
+                select(."support-phase" == "active")
+                | .[$version_field]
+            )
+            | .[0]
+        '
 }
 
 # Installs a version of the .NET SDK
diff --git a/test/dotnet/dotnet_helpers.sh b/test/dotnet/dotnet_helpers.sh
index 01e554f66..20671f84b 100644
--- a/test/dotnet/dotnet_helpers.sh
+++ b/test/dotnet/dotnet_helpers.sh
@@ -1,39 +1,7 @@
 #!/bin/bash
 
-# Prints the latest dotnet version in the specified channel
-# Usage: fetch_latest_version_in_channel <channel> [<runtime>]
-# Example: fetch_latest_version_in_channel "LTS"
-# Example: fetch_latest_version_in_channel "6.0" "dotnet"
-# Example: fetch_latest_version_in_channel "6.0" "aspnetcore"
-fetch_latest_version_in_channel() {
-    local channel="$1"
-    local runtime="$2"
-    if [ "$runtime" = "dotnet" ]; then
-        wget -qO- "https://builds.dotnet.microsoft.com/dotnet/Runtime/$channel/latest.version"
-    elif [ "$runtime" = "aspnetcore" ]; then
-        wget -qO- "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$channel/latest.version"
-    else
-        wget -qO- "https://builds.dotnet.microsoft.com/dotnet/Sdk/$channel/latest.version"
-    fi
-}
-
-# Prints the latest dotnet version
-# Usage: fetch_latest_version [<runtime>]
-# Example: fetch_latest_version
-# Example: fetch_latest_version "dotnet"
-# Example: fetch_latest_version "aspnetcore"
-fetch_latest_version() {
-    local runtime="$1"
-    local sts_version
-    local lts_version
-    sts_version=$(fetch_latest_version_in_channel "STS" "$runtime")
-    lts_version=$(fetch_latest_version_in_channel "LTS" "$runtime")
-    if [[ "$sts_version" > "$lts_version" ]]; then
-        echo "$sts_version"
-    else
-        echo "$lts_version"
-    fi
-}
+# Include the same helper functions used by the install script
+source ".devcontainer/dotnet/scripts/dotnet-helpers.sh"
 
 # Asserts that the specified .NET SDK version is installed
 # Returns a non-zero exit code if the check fails
diff --git a/test/dotnet/install_dotnet_lts.sh b/test/dotnet/install_dotnet_lts.sh
index da9175c15..a62c5937b 100644
--- a/test/dotnet/install_dotnet_lts.sh
+++ b/test/dotnet/install_dotnet_lts.sh
@@ -13,7 +13,7 @@ source dev-container-features-test-lib
 source dotnet_env.sh
 source dotnet_helpers.sh
 
-expected=$(fetch_latest_version_in_channel "LTS")
+expected=$(wget -qO- "https://builds.dotnet.microsoft.com/dotnet/Sdk/LTS/latest.version")
 
 check "Latest LTS version installed" \
 is_dotnet_sdk_version_installed "$expected"
diff --git a/test/dotnet/install_dotnet_specific_release.sh b/test/dotnet/install_dotnet_specific_release.sh
index 1ef587945..961cb47ab 100644
--- a/test/dotnet/install_dotnet_specific_release.sh
+++ b/test/dotnet/install_dotnet_specific_release.sh
@@ -13,7 +13,7 @@ source dev-container-features-test-lib
 source dotnet_env.sh
 source dotnet_helpers.sh
 
-expected=$(fetch_latest_version_in_channel "10.0")
+expected=$(wget -qO- "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0/latest.version")
 
 check ".NET Core SDK 10.0 installed" \
 is_dotnet_sdk_version_installed "$expected"
diff --git a/test/dotnet/install_dotnet_workloads.sh b/test/dotnet/install_dotnet_workloads.sh
index 37c86a2d4..c4885664a 100644
--- a/test/dotnet/install_dotnet_workloads.sh
+++ b/test/dotnet/install_dotnet_workloads.sh
@@ -13,9 +13,6 @@ source dev-container-features-test-lib
 source dotnet_env.sh
 source dotnet_helpers.sh
 
-check "Aspire is installed" \
-is_dotnet_workload_installed "aspire"
-
 check "WASM tools are installed" \
 is_dotnet_workload_installed "wasm-tools"
 
diff --git a/test/dotnet/scenarios.json b/test/dotnet/scenarios.json
index 62e2f1a46..52c35b2b0 100644
--- a/test/dotnet/scenarios.json
+++ b/test/dotnet/scenarios.json
@@ -89,7 +89,7 @@
         "features": {
             "dotnet": {
                 "version": "latest",
-                "workloads": "aspire, wasm-tools"
+                "workloads": "wasm-tools"
             }
         }
     }

From 372e2d21c8080aa6bea117180b6d42094523b1d7 Mon Sep 17 00:00:00 2001
From: Steven <steven.liekens@gmail.com>
Date: Wed, 11 Mar 2026 15:35:43 +0100
Subject: [PATCH 426/478] dotnet: set up tab completions for SDK 10+ (#1596)

* dotnet: set up tab completions for SDK 10+

Generate bash, zsh, and fish completion scripts using 'dotnet completions
script' and place them in the standard system-wide completion directories:
- /usr/share/bash-completion/completions/dotnet
- /usr/share/zsh/site-functions/_dotnet
- /usr/share/fish/vendor_completions.d/dotnet.fish

Gated behind SDK 10+ via version check since the 'dotnet completions script'
command is only available starting with .NET 10. Skipped for runtime-only
installs.

Reference: https://learn.microsoft.com/en-us/dotnet/core/tools/enable-tab-autocomplete

* Add tab completion assertions

* Sync dotnet docs options with feature metadata
---
 src/dotnet/NOTES.md                  | 22 +++++++++++++--
 src/dotnet/README.md                 |  3 +-
 src/dotnet/devcontainer-feature.json |  9 ++++--
 src/dotnet/install.sh                |  5 ++++
 src/dotnet/scripts/dotnet-helpers.sh | 42 ++++++++++++++++++++++++++++
 test/dotnet/test.sh                  | 11 +++++++-
 6 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/src/dotnet/NOTES.md b/src/dotnet/NOTES.md
index 953372381..c5d6f6071 100644
--- a/src/dotnet/NOTES.md
+++ b/src/dotnet/NOTES.md
@@ -57,7 +57,7 @@ Installing only the .NET Runtime or the ASP.NET Core Runtime. (The SDK includes
     "ghcr.io/devcontainers/features/dotnet:2": {
         "version": "none",
         "dotnetRuntimeVersions": "latest, lts",
-        "aspnetCoreRuntimeVersions": "latest, lts",
+        "aspNetCoreRuntimeVersions": "latest, lts",
     }
 }
 ```
@@ -80,7 +80,7 @@ Installing prerelease builds. Supports `preview` and `daily` suffixes.
         "version": "10.0-preview",
         "additionalVersions": "10.0.1xx-daily",
         "dotnetRuntimeVersions": "10.0-daily",
-        "aspnetCoreRuntimeVersions": "10.0-daily"
+        "aspNetCoreRuntimeVersions": "10.0-daily"
     }
 }
 ```
@@ -90,3 +90,21 @@ Installing prerelease builds. Supports `preview` and `daily` suffixes.
 This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
 
 `bash` is required to execute the `install.sh` script.
+
+## Tab completions
+
+When using .NET SDK 10 or newer, tab completions for the `dotnet` CLI are automatically installed for bash, zsh, and fish. The completion scripts are placed in the standard system-wide directories so they work for all users:
+
+- **Bash**: `/usr/share/bash-completion/completions/dotnet`
+- **Zsh**: `/usr/share/zsh/site-functions/_dotnet`
+- **Fish**: `/usr/share/fish/vendor_completions.d/dotnet.fish`
+
+To disable this, set `tabCompletions` to `false`:
+
+``` json
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+        "tabCompletions": false
+    }
+}
+```
diff --git a/src/dotnet/README.md b/src/dotnet/README.md
index 8244b151d..ceb9c544f 100644
--- a/src/dotnet/README.md
+++ b/src/dotnet/README.md
@@ -20,6 +20,7 @@ This Feature installs the latest .NET SDK, which includes the .NET CLI and the s
 | dotnetRuntimeVersions | Enter additional .NET runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version, 'X.Y-preview' or 'X.Y-daily' for prereleases. | string | - |
 | aspNetCoreRuntimeVersions | Enter additional ASP.NET Core runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version, 'X.Y-preview' or 'X.Y-daily' for prereleases. | string | - |
 | workloads | Enter additional .NET SDK workloads, separated by commas. Use 'dotnet workload search' to learn what workloads are available to install. | string | - |
+| tabCompletions | Install shell tab completions for the dotnet CLI. Requires SDK 10 or newer. | boolean | true |
 
 ## Customizations
 
@@ -85,7 +86,7 @@ Installing only the .NET Runtime or the ASP.NET Core Runtime. (The SDK includes
     "ghcr.io/devcontainers/features/dotnet:2": {
         "version": "none",
         "dotnetRuntimeVersions": "latest, lts",
-        "aspnetCoreRuntimeVersions": "latest, lts",
+        "aspNetCoreRuntimeVersions": "latest, lts",
     }
 }
 ```
diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index 7389b8398..4bd3168c7 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.4.2",
+    "version": "2.5.0",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
@@ -39,6 +39,11 @@
             "type": "string",
             "default": "",
             "description": "Enter additional .NET SDK workloads, separated by commas. Use 'dotnet workload search' to learn what workloads are available to install."
+        },
+        "tabCompletions": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install shell tab completions for the dotnet CLI. Requires SDK 10 or newer."
         }
     },
     "containerEnv": {
@@ -64,4 +69,4 @@
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
-}
+}
\ No newline at end of file
diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh
index d2b06cd0e..a8e8436e5 100644
--- a/src/dotnet/install.sh
+++ b/src/dotnet/install.sh
@@ -11,6 +11,7 @@ ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 DOTNET_RUNTIME_VERSIONS="${DOTNETRUNTIMEVERSIONS:-""}"
 ASPNETCORE_RUNTIME_VERSIONS="${ASPNETCORERUNTIMEVERSIONS:-""}"
 WORKLOADS="${WORKLOADS:-""}"
+TAB_COMPLETIONS="${TABCOMPLETIONS:-"true"}"
 
 # Prevent "Welcome to .NET" message from dotnet
 export DOTNET_NOLOGO=true
@@ -146,6 +147,10 @@ if [ ! -e /usr/bin/dotnet ]; then
     ln --symbolic "$DOTNET_ROOT/dotnet" /usr/bin/dotnet
 fi
 
+if [ "$TAB_COMPLETIONS" = "true" ]; then
+    install_completions
+fi
+
 # Add .NET Core SDK tools to PATH for bash and zsh users
 # This is where 'dotnet tool install --global <tool>' installs tools to
 # Use single-quoted EOF to defer $PATH expansion until sourcing the file
diff --git a/src/dotnet/scripts/dotnet-helpers.sh b/src/dotnet/scripts/dotnet-helpers.sh
index d2dbc4534..e4c90819a 100644
--- a/src/dotnet/scripts/dotnet-helpers.sh
+++ b/src/dotnet/scripts/dotnet-helpers.sh
@@ -193,4 +193,46 @@ parse_version_and_quality() {
         quality=""
     fi
     echo "$clean_version" "$quality"
+}
+
+# Checks if the installed .NET SDK is at least the given major version.
+# Returns 0 (true) if the SDK major version >= the specified version, 1 otherwise.
+# Also returns 1 if no SDK is installed (e.g. runtime-only installs).
+# Usage: is_at_least_sdk_version <major_version>
+# Example: is_at_least_sdk_version 10
+is_at_least_sdk_version() {
+    local required_major="$1"
+    local dotnet_version
+    dotnet_version=$("$DOTNET_ROOT/dotnet" --version 2>/dev/null || true)
+    local major_version="${dotnet_version%%.*}"
+    [[ "$major_version" =~ ^[0-9]+$ ]] && [ "$major_version" -ge "$required_major" ]
+}
+
+# Sets up dotnet tab completions for bash, zsh, and fish.
+# The 'dotnet completions script' command is only available in .NET SDK 10+.
+# Older SDKs and runtime-only installs will naturally skip this since the
+# command won't be available.
+# Reference: https://learn.microsoft.com/en-us/dotnet/core/tools/enable-tab-autocomplete
+# Completion scripts are generated at install time and placed in the standard
+# system-wide completion directories, which are auto-discovered by
+# bash-completion, zsh, and fish without modifying any rc files.
+install_completions() {
+    if ! is_at_least_sdk_version 10; then
+        echo "Skipping dotnet tab completions (requires SDK 10+)."
+        return
+    fi
+
+    echo "Setting up dotnet tab completions..."
+
+    # Bash: drop into the standard bash-completion directory
+    mkdir -p /usr/share/bash-completion/completions
+    "$DOTNET_ROOT/dotnet" completions script bash > /usr/share/bash-completion/completions/dotnet
+
+    # Zsh: drop into the standard site-functions directory
+    mkdir -p /usr/share/zsh/site-functions
+    "$DOTNET_ROOT/dotnet" completions script zsh > /usr/share/zsh/site-functions/_dotnet
+
+    # Fish: drop into the standard vendor completions directory
+    mkdir -p /usr/share/fish/vendor_completions.d
+    "$DOTNET_ROOT/dotnet" completions script fish > /usr/share/fish/vendor_completions.d/dotnet.fish
 }
\ No newline at end of file
diff --git a/test/dotnet/test.sh b/test/dotnet/test.sh
index 11cc73126..7c5591773 100644
--- a/test/dotnet/test.sh
+++ b/test/dotnet/test.sh
@@ -21,9 +21,18 @@ test -L /usr/bin/dotnet -a "$(readlink -f /usr/bin/dotnet)" = "$DOTNET_ROOT/dotn
 
 expected=$(fetch_latest_version)
 
-check "Latest .NET SDK version installed" \
+check "Latest .NET SDK version $expected installed" \
 is_dotnet_sdk_version_installed "$expected"
 
+check "Bash completion script installed" \
+test -s /usr/share/bash-completion/completions/dotnet
+
+check "Zsh completion script installed" \
+test -s /usr/share/zsh/site-functions/_dotnet
+
+check "Fish completion script installed" \
+test -s /usr/share/fish/vendor_completions.d/dotnet.fish
+
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
 reportResults
\ No newline at end of file

From 0292aeecfcee6a82ddc6875d2b217affc327bb7b Mon Sep 17 00:00:00 2001
From: sireeshajonnalagadda <sireeshajonnalagadda@github.com>
Date: Thu, 12 Mar 2026 17:23:56 +0530
Subject: [PATCH 427/478]  update docker-compose version to latest and add new
 test scenarios (#1571)

* update docker-compose version to latest and add new test scenarios

* Fix JSON formatting in devcontainer-feature.json

* Update default docker-compose version to 'latest'

* Update default docker-compose version to 'latest'

* Version bump

* symlink

---------

Co-authored-by: Kaniska <kaniska244@github.com>
---
 src/docker-outside-of-docker/README.md        |  2 +-
 .../devcontainer-feature.json                 |  8 +++++---
 src/docker-outside-of-docker/install.sh       |  2 +-
 .../docker_dash_compose_latest_moby.sh        |  1 +
 .../docker_dash_compose_latest_no_moby.sh     | 14 +++++++++++++
 test/docker-outside-of-docker/scenarios.json  | 20 +++++++++++++++++++
 6 files changed, 42 insertions(+), 5 deletions(-)
 create mode 120000 test/docker-outside-of-docker/docker_dash_compose_latest_moby.sh
 create mode 100644 test/docker-outside-of-docker/docker_dash_compose_latest_no_moby.sh

diff --git a/src/docker-outside-of-docker/README.md b/src/docker-outside-of-docker/README.md
index 1794d42e8..e4fe0c446 100644
--- a/src/docker-outside-of-docker/README.md
+++ b/src/docker-outside-of-docker/README.md
@@ -20,7 +20,7 @@ Re-use the host docker socket, adding the Docker CLI to a container. Feature inv
 | version | Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.) | string | latest |
 | moby | Install OSS Moby build instead of Docker CE | boolean | true |
 | mobyBuildxVersion | Install a specific version of moby-buildx when using Moby | string | latest |
-| dockerDashComposeVersion | Compose version to use for docker-compose (v1 or v2 or none) | string | v2 |
+| dockerDashComposeVersion | Compose version to use for docker-compose (v1 or v2 or none or latest) | string | latest |
 | installDockerBuildx | Install Docker Buildx | boolean | true |
 | installDockerComposeSwitch | Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter. | boolean | true |
 
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index d0039a843..f2e57bd43 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,7 @@
 {
+
   "id": "docker-outside-of-docker",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "name": "Docker (docker-outside-of-docker)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
   "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
@@ -29,11 +30,12 @@
       "type": "string",
       "enum": [
         "none",
+        "latest",
         "v1",
         "v2"
       ],
-      "default": "v2",
-      "description": "Compose version to use for docker-compose (v1 or v2 or none)"
+      "default": "latest",
+      "description": "Compose version to use for docker-compose (v1 or v2 or none or latest)"
     },
     "installDockerBuildx": {
       "type": "boolean",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 242636084..6e26b13ac 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -10,7 +10,7 @@
 DOCKER_VERSION="${VERSION:-"latest"}"
 USE_MOBY="${MOBY:-"true"}"
 MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"latest"}"
-DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v2"}" # v1 or v2 or none
+DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"latest"}" # v1 or v2 or none or latest
 
 ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"
 SOURCE_SOCKET="${SOURCE_SOCKET:-"/var/run/docker-host.sock"}"
diff --git a/test/docker-outside-of-docker/docker_dash_compose_latest_moby.sh b/test/docker-outside-of-docker/docker_dash_compose_latest_moby.sh
new file mode 120000
index 000000000..d7e6cc99e
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_dash_compose_latest_moby.sh
@@ -0,0 +1 @@
+docker_dash_compose_latest_no_moby.sh
\ No newline at end of file
diff --git a/test/docker-outside-of-docker/docker_dash_compose_latest_no_moby.sh b/test/docker-outside-of-docker/docker_dash_compose_latest_no_moby.sh
new file mode 100644
index 000000000..d032da9e4
--- /dev/null
+++ b/test/docker-outside-of-docker/docker_dash_compose_latest_no_moby.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker compose" bash -c "docker compose version | grep -E '5.[0-9]+.[0-9]+'"
+check "docker-compose" bash -c "docker-compose --version | grep -E '5.[0-9]+.[0-9]+'"
+check "installs compose-switch as docker-compose" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
+
+# Report result
+reportResults
diff --git a/test/docker-outside-of-docker/scenarios.json b/test/docker-outside-of-docker/scenarios.json
index 2163e7076..3a49d594e 100644
--- a/test/docker-outside-of-docker/scenarios.json
+++ b/test/docker-outside-of-docker/scenarios.json
@@ -180,5 +180,25 @@
                 "moby": false
             }
         }
+    },
+     "docker_dash_compose_latest_moby": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
+        "features": {
+            "docker-outside-of-docker": {
+                "moby": true,
+                "dockerDashComposeVersion": "latest"
+            }
+        },
+        "containerUser": "vscode"
+    },
+    "docker_dash_compose_latest_no_moby": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
+        "features": {
+            "docker-outside-of-docker": {
+                "moby": false,
+                "dockerDashComposeVersion": "latest"
+            }
+        },
+        "containerUser": "vscode"
     }
 }

From 20aa81fff7953399bdb89f6874b034aa7e01274f Mon Sep 17 00:00:00 2001
From: Jason D'Amour <jasondamour98@gmail.com>
Date: Thu, 12 Mar 2026 06:34:40 -0700
Subject: [PATCH 428/478] aws-cli: add option to surpress unzip output (#1210)

* aws-cli: add option to surpress unzip output

* Update AWS CLI version to 1.1.3

---------

Co-authored-by: Kaniska <kaniska244@github.com>
---
 src/aws-cli/devcontainer-feature.json | 7 ++++++-
 src/aws-cli/install.sh                | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/aws-cli/devcontainer-feature.json b/src/aws-cli/devcontainer-feature.json
index 54cc4b29b..ed2e20284 100644
--- a/src/aws-cli/devcontainer-feature.json
+++ b/src/aws-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "aws-cli",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "name": "AWS CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/aws-cli",
     "description": "Installs the AWS CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -12,6 +12,11 @@
             ],
             "default": "latest",
             "description": "Select or enter an AWS CLI version."
+        },
+        "verbose": {
+            "type": "boolean",
+            "default": true,
+            "description": "Suppress verbose output."
         }
     },
     "customizations": {
diff --git a/src/aws-cli/install.sh b/src/aws-cli/install.sh
index 4ff9bfde6..ba6861074 100755
--- a/src/aws-cli/install.sh
+++ b/src/aws-cli/install.sh
@@ -13,6 +13,7 @@ set -e
 rm -rf /var/lib/apt/lists/*
 
 VERSION=${VERSION:-"latest"}
+VERBOSE=${VERBOSE:-"true"}
 
 AWSCLI_GPG_KEY=FB5DB77FD5C118B80511ADA8A6310ACC4672475C
 AWSCLI_GPG_KEY_MATERIAL="-----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -110,7 +111,12 @@ install() {
         exit 1
     fi
 
-    unzip "${scriptZipFile}"
+    if [ "${VERBOSE}" = "false" ]; then
+        unzip -q "${scriptZipFile}"
+    else
+        unzip "${scriptZipFile}"
+    fi
+    
     ./aws/install
 
     # kubectl bash completion

From b5b41d87b0baa6f0fda692db8ade35413f1e3e3e Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Mon, 23 Mar 2026 17:35:31 +0530
Subject: [PATCH 429/478] [oryx] - Upgrade DEBIAN_FLAVOR to `bookworm` (#1603)

* [oryx] - Upgrade DEBIAN_FLAVOR to `bookworm`

* Update documentation

* Modified test scripts as per review comments
---
 src/oryx/README.md                         |  2 +-
 src/oryx/devcontainer-feature.json         |  4 +--
 src/oryx/install.sh                        |  2 +-
 test/oryx/install_dotnet_and_oryx.sh       | 32 +++++++++-------------
 test/oryx/install_older_dotnet_and_oryx.sh | 32 +++++++++-------------
 test/oryx/install_prev_dotnet_and_oryx.sh  | 32 +++++++++-------------
 test/oryx/scenarios.json                   | 10 +++----
 test/oryx/test.sh                          | 15 ++++------
 8 files changed, 54 insertions(+), 75 deletions(-)

diff --git a/src/oryx/README.md b/src/oryx/README.md
index 7f9e62269..c115e570e 100644
--- a/src/oryx/README.md
+++ b/src/oryx/README.md
@@ -7,7 +7,7 @@ Installs the oryx CLI
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/oryx:1": {}
+    "ghcr.io/devcontainers/features/oryx:2": {}
 }
 ```
 
diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index 860a39003..9468222e8 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "oryx",
-    "version": "1.4.1",
+    "version": "2.0.0",
     "name": "Oryx",
     "description": "Installs the oryx CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
@@ -10,7 +10,7 @@
         "DYNAMIC_INSTALL_ROOT_DIR": "/opt",
         "ORYX_PREFER_USER_INSTALLED_SDKS": "true",
         "ORYX_DIR": "/usr/local/oryx",
-        "DEBIAN_FLAVOR": "focal-scm",
+        "DEBIAN_FLAVOR": "bookworm",
         "PATH": "/usr/local/oryx:${PATH}"
     },
     "customizations": {
diff --git a/src/oryx/install.sh b/src/oryx/install.sh
index cf67db6b1..eeacbec39 100755
--- a/src/oryx/install.sh
+++ b/src/oryx/install.sh
@@ -206,7 +206,7 @@ mkdir -p "${ORYX_INSTALL_DIR}"
 PIP_CACHE_DIR="/usr/local/share/pip-cache/lib"
 mkdir -p ${PIP_CACHE_DIR}
 
-updaterc "export ORYX_SDK_STORAGE_BASE_URL=https://oryx-cdn.microsoft.io && export ENABLE_DYNAMIC_INSTALL=true && DYNAMIC_INSTALL_ROOT_DIR=$ORYX_INSTALL_DIR && ORYX_PREFER_USER_INSTALLED_SDKS=true && export DEBIAN_FLAVOR=focal-scm"
+updaterc "export ORYX_SDK_STORAGE_BASE_URL=https://oryx-cdn.microsoft.io && export ENABLE_DYNAMIC_INSTALL=true && DYNAMIC_INSTALL_ROOT_DIR=$ORYX_INSTALL_DIR && ORYX_PREFER_USER_INSTALLED_SDKS=true && export DEBIAN_FLAVOR=bookworm"
 
 chown -R "${USERNAME}:oryx" "${ORYX_INSTALL_DIR}" "${BUILD_SCRIPT_GENERATOR}" "${ORYX}" "${PIP_CACHE_DIR}"
 chmod -R g+r+w "${ORYX_INSTALL_DIR}" "${BUILD_SCRIPT_GENERATOR}" "${ORYX}" "${PIP_CACHE_DIR}"
diff --git a/test/oryx/install_dotnet_and_oryx.sh b/test/oryx/install_dotnet_and_oryx.sh
index 670d7565a..e17c4e929 100644
--- a/test/oryx/install_dotnet_and_oryx.sh
+++ b/test/oryx/install_dotnet_and_oryx.sh
@@ -12,21 +12,18 @@ check "Oryx version" oryx --version
 check "Dotnet is not removed if it is not installed by the Oryx Feature" dotnet --version
 
 # Install platforms with oryx build tool
-check "oryx-install-dotnet-2.1" oryx prep --skip-detection --platforms-and-versions dotnet=2.1.30
-check "dotnet-2-installed-by-oryx" ls /opt/dotnet/ | grep 2.1
+check "oryx-install-dotnet-10.0" oryx prep --skip-detection --platforms-and-versions dotnet=10.0.4
+check "dotnet-10-installed-by-oryx" ls /opt/dotnet/ | grep 10.0
 
-check "oryx-install-nodejs-12.22.11" oryx prep --skip-detection --platforms-and-versions nodejs=12.22.11
-check "nodejs-12.22.11-installed-by-oryx" ls /opt/nodejs/ | grep 12.22.11
+check "oryx-install-nodejs-24.13.0" oryx prep --skip-detection --platforms-and-versions nodejs=24.13.0
+check "nodejs-24.13.0-installed-by-oryx" ls /opt/nodejs/ | grep 24.13.0
 
-check "oryx-install-php-7.3.25" oryx prep --skip-detection --platforms-and-versions php=7.3.25
-check "php-7.3.25-installed-by-oryx" ls /opt/php/ | grep 7.3.25
-
-check "oryx-install-java-12.0.2" oryx prep --skip-detection --platforms-and-versions java=12.0.2
-check "java-12.0.2-installed-by-oryx" ls /opt/java/ | grep 12.0.2
+check "oryx-install-php-8.5.1" oryx prep --skip-detection --platforms-and-versions php=8.5.1
+check "php-8.5.1-installed-by-oryx" ls /opt/php/ | grep 8.5.1
 
 # Replicates Oryx's behavior for universal image
 mkdir -p /opt/oryx
-echo "vso-focal" >> /opt/oryx/.imagetype
+echo "vso-bookworm" >> /opt/oryx/.imagetype
 
 mkdir -p /opt/dotnet/lts
 cp -R /usr/share/dotnet/dotnet /opt/dotnet/lts
@@ -34,17 +31,14 @@ cp -R /usr/share/dotnet/LICENSE.txt /opt/dotnet/lts
 cp -R /usr/share/dotnet/ThirdPartyNotices.txt /opt/dotnet/lts
 
 # Install platforms with oryx build tool
-check "oryx-install-dotnet-2.1-universal" oryx prep --skip-detection --platforms-and-versions dotnet=2.1.30
-check "dotnet-2-installed-by-oryx-universal" ls /opt/dotnet/ | grep 2.1
-
-check "oryx-install-nodejs-12.22.11-universal" oryx prep --skip-detection --platforms-and-versions nodejs=12.22.11
-check "nodejs-12.22.11-installed-by-oryx-universal" ls /opt/nodejs/ | grep 12.22.11
+check "oryx-install-dotnet-10.0" oryx prep --skip-detection --platforms-and-versions dotnet=10.0.4
+check "dotnet-10-installed-by-oryx" ls /opt/dotnet/ | grep 10.0
 
-check "oryx-install-php-7.3.25-universal" oryx prep --skip-detection --platforms-and-versions php=7.3.25
-check "php-7.3.25-installed-by-oryx-universal" ls /opt/php/ | grep 7.3.25
+check "oryx-install-nodejs-24.13.0" oryx prep --skip-detection --platforms-and-versions nodejs=24.13.0
+check "nodejs-24.13.0-installed-by-oryx" ls /opt/nodejs/ | grep 24.13.0
 
-check "oryx-install-java-12.0.2-universal" oryx prep --skip-detection --platforms-and-versions java=12.0.2
-check "java-12.0.2-installed-by-oryx-universal" ls /opt/java/ | grep 12.0.2
+check "oryx-install-php-8.5.1" oryx prep --skip-detection --platforms-and-versions php=8.5.1
+check "php-8.5.1-installed-by-oryx" ls /opt/php/ | grep 8.5.1
 
 # Report result
 reportResults
diff --git a/test/oryx/install_older_dotnet_and_oryx.sh b/test/oryx/install_older_dotnet_and_oryx.sh
index da0a9162d..2846d9519 100644
--- a/test/oryx/install_older_dotnet_and_oryx.sh
+++ b/test/oryx/install_older_dotnet_and_oryx.sh
@@ -9,21 +9,18 @@ check "Oryx version" oryx --version
 check "Dotnet is not removed if it is not installed by the Oryx Feature" dotnet --version
 
 # Install platforms with oryx build tool
-check "oryx-install-dotnet-2.1" oryx prep --skip-detection --platforms-and-versions dotnet=2.1.30
-check "dotnet-2-installed-by-oryx" ls /opt/dotnet/ | grep 2.1
+check "oryx-install-dotnet-6.0" oryx prep --skip-detection --platforms-and-versions dotnet=6.0.23
+check "dotnet-6-installed-by-oryx" ls /opt/dotnet/ | grep 6.0
 
-check "oryx-install-nodejs-12.22.11" oryx prep --skip-detection --platforms-and-versions nodejs=12.22.11
-check "nodejs-12.22.11-installed-by-oryx" ls /opt/nodejs/ | grep 12.22.11
+check "oryx-install-nodejs-20.11.0" oryx prep --skip-detection --platforms-and-versions nodejs=20.11.0
+check "nodejs-20.11.0-installed-by-oryx" ls /opt/nodejs/ | grep 20.11.0
 
-check "oryx-install-php-7.3.25" oryx prep --skip-detection --platforms-and-versions php=7.3.25
-check "php-7.3.25-installed-by-oryx" ls /opt/php/ | grep 7.3.25
-
-check "oryx-install-java-12.0.2" oryx prep --skip-detection --platforms-and-versions java=12.0.2
-check "java-12.0.2-installed-by-oryx" ls /opt/java/ | grep 12.0.2
+check "oryx-install-php-8.1.22" oryx prep --skip-detection --platforms-and-versions php=8.1.22
+check "php-8.1.22-installed-by-oryx" ls /opt/php/ | grep 8.1.22
 
 # Replicates Oryx's behavior for universal image
 mkdir -p /opt/oryx
-echo "vso-focal" >> /opt/oryx/.imagetype
+echo "vso-bookworm" >> /opt/oryx/.imagetype
 
 mkdir -p /opt/dotnet/lts
 cp -R /usr/share/dotnet/dotnet /opt/dotnet/lts
@@ -31,17 +28,14 @@ cp -R /usr/share/dotnet/LICENSE.txt /opt/dotnet/lts
 cp -R /usr/share/dotnet/ThirdPartyNotices.txt /opt/dotnet/lts
 
 # Install platforms with oryx build tool
-check "oryx-install-dotnet-2.1-universal" oryx prep --skip-detection --platforms-and-versions dotnet=2.1.30
-check "dotnet-2-installed-by-oryx-universal" ls /opt/dotnet/ | grep 2.1
-
-check "oryx-install-nodejs-12.22.11-universal" oryx prep --skip-detection --platforms-and-versions nodejs=12.22.11
-check "nodejs-12.22.11-installed-by-oryx-universal" ls /opt/nodejs/ | grep 12.22.11
+check "oryx-install-dotnet-6.0" oryx prep --skip-detection --platforms-and-versions dotnet=6.0.23
+check "dotnet-6-installed-by-oryx" ls /opt/dotnet/ | grep 6.0
 
-check "oryx-install-php-7.3.25-universal" oryx prep --skip-detection --platforms-and-versions php=7.3.25
-check "php-7.3.25-installed-by-oryx-universal" ls /opt/php/ | grep 7.3.25
+check "oryx-install-nodejs-20.11.0" oryx prep --skip-detection --platforms-and-versions nodejs=20.11.0
+check "nodejs-20.11.0-installed-by-oryx" ls /opt/nodejs/ | grep 20.11.0
 
-check "oryx-install-java-12.0.2-universal" oryx prep --skip-detection --platforms-and-versions java=12.0.2
-check "java-12.0.2-installed-by-oryx-universal" ls /opt/java/ | grep 12.0.2
+check "oryx-install-php-8.1.22" oryx prep --skip-detection --platforms-and-versions php=8.1.22
+check "php-8.1.22-installed-by-oryx" ls /opt/php/ | grep 8.1.22
 
 # Report result
 reportResults
diff --git a/test/oryx/install_prev_dotnet_and_oryx.sh b/test/oryx/install_prev_dotnet_and_oryx.sh
index da0a9162d..48cd98504 100644
--- a/test/oryx/install_prev_dotnet_and_oryx.sh
+++ b/test/oryx/install_prev_dotnet_and_oryx.sh
@@ -9,21 +9,18 @@ check "Oryx version" oryx --version
 check "Dotnet is not removed if it is not installed by the Oryx Feature" dotnet --version
 
 # Install platforms with oryx build tool
-check "oryx-install-dotnet-2.1" oryx prep --skip-detection --platforms-and-versions dotnet=2.1.30
-check "dotnet-2-installed-by-oryx" ls /opt/dotnet/ | grep 2.1
+check "oryx-install-dotnet-9.0" oryx prep --skip-detection --platforms-and-versions dotnet=9.0.1
+check "dotnet-9-installed-by-oryx" ls /opt/dotnet/ | grep 9.0
 
-check "oryx-install-nodejs-12.22.11" oryx prep --skip-detection --platforms-and-versions nodejs=12.22.11
-check "nodejs-12.22.11-installed-by-oryx" ls /opt/nodejs/ | grep 12.22.11
+check "oryx-install-nodejs-22.9.0" oryx prep --skip-detection --platforms-and-versions nodejs=22.9.0
+check "nodejs-22.9.0-installed-by-oryx" ls /opt/nodejs/ | grep 22.9.0
 
-check "oryx-install-php-7.3.25" oryx prep --skip-detection --platforms-and-versions php=7.3.25
-check "php-7.3.25-installed-by-oryx" ls /opt/php/ | grep 7.3.25
-
-check "oryx-install-java-12.0.2" oryx prep --skip-detection --platforms-and-versions java=12.0.2
-check "java-12.0.2-installed-by-oryx" ls /opt/java/ | grep 12.0.2
+check "oryx-install-php-8.3.20" oryx prep --skip-detection --platforms-and-versions php=8.3.20
+check "php-8.3.20-installed-by-oryx" ls /opt/php/ | grep 8.3.20
 
 # Replicates Oryx's behavior for universal image
 mkdir -p /opt/oryx
-echo "vso-focal" >> /opt/oryx/.imagetype
+echo "vso-bookworm" >> /opt/oryx/.imagetype
 
 mkdir -p /opt/dotnet/lts
 cp -R /usr/share/dotnet/dotnet /opt/dotnet/lts
@@ -31,17 +28,14 @@ cp -R /usr/share/dotnet/LICENSE.txt /opt/dotnet/lts
 cp -R /usr/share/dotnet/ThirdPartyNotices.txt /opt/dotnet/lts
 
 # Install platforms with oryx build tool
-check "oryx-install-dotnet-2.1-universal" oryx prep --skip-detection --platforms-and-versions dotnet=2.1.30
-check "dotnet-2-installed-by-oryx-universal" ls /opt/dotnet/ | grep 2.1
-
-check "oryx-install-nodejs-12.22.11-universal" oryx prep --skip-detection --platforms-and-versions nodejs=12.22.11
-check "nodejs-12.22.11-installed-by-oryx-universal" ls /opt/nodejs/ | grep 12.22.11
+check "oryx-install-dotnet-9.0" oryx prep --skip-detection --platforms-and-versions dotnet=9.0.1
+check "dotnet-9-installed-by-oryx" ls /opt/dotnet/ | grep 9.0
 
-check "oryx-install-php-7.3.25-universal" oryx prep --skip-detection --platforms-and-versions php=7.3.25
-check "php-7.3.25-installed-by-oryx-universal" ls /opt/php/ | grep 7.3.25
+check "oryx-install-nodejs-22.9.0" oryx prep --skip-detection --platforms-and-versions nodejs=22.9.0
+check "nodejs-22.9.0-installed-by-oryx" ls /opt/nodejs/ | grep 22.9.0
 
-check "oryx-install-java-12.0.2-universal" oryx prep --skip-detection --platforms-and-versions java=12.0.2
-check "java-12.0.2-installed-by-oryx-universal" ls /opt/java/ | grep 12.0.2
+check "oryx-install-php-8.3.20" oryx prep --skip-detection --platforms-and-versions php=8.3.20
+check "php-8.3.20-installed-by-oryx" ls /opt/php/ | grep 8.3.20
 
 # Report result
 reportResults
diff --git a/test/oryx/scenarios.json b/test/oryx/scenarios.json
index 4b3643590..88ec5e2c2 100644
--- a/test/oryx/scenarios.json
+++ b/test/oryx/scenarios.json
@@ -1,11 +1,11 @@
 {
     "install_dotnet_and_oryx": {
-        "image": "ubuntu:noble",
+        "image": "mcr.microsoft.com/devcontainers/base:noble",
         "features": {
             "dotnet": {
-                "version": "8.0",
-                "dotnetRuntimeVersions": "7.0",
-                "aspNetCoreRuntimeVersions": "7.0"
+                "version": "10.0",
+                "dotnetRuntimeVersions": "9.0",
+                "aspNetCoreRuntimeVersions": "9.0"
             },
             "oryx": {}
         }
@@ -23,7 +23,7 @@
         "image": "ubuntu:noble",
         "features": {
             "dotnet": {
-                "version": "6.0"
+                "version": "8.0"
             },
             "oryx": {}
         }
diff --git a/test/oryx/test.sh b/test/oryx/test.sh
index c5d606783..1df438e16 100755
--- a/test/oryx/test.sh
+++ b/test/oryx/test.sh
@@ -10,17 +10,14 @@ check "ORYX_SDK_STORAGE_BASE_URL" echo $ORYX_SDK_STORAGE_BASE_URL
 check "ENABLE_DYNAMIC_INSTALL" echo $ENABLE_DYNAMIC_INSTALL
 
 # Install platforms with oryx build tool
-check "oryx-install-dotnet-2.1" oryx prep --skip-detection --platforms-and-versions dotnet=2.1.30
-check "dotnet-2-installed-by-oryx" ls /opt/dotnet/ | grep 2.1
+check "oryx-install-dotnet-8.0" oryx prep --skip-detection --platforms-and-versions dotnet=8.0.23
+check "dotnet-2-installed-by-oryx" ls /opt/dotnet/ | grep 8.0
 
-check "oryx-install-nodejs-12.22.11" oryx prep --skip-detection --platforms-and-versions nodejs=12.22.11
-check "nodejs-12.22.11-installed-by-oryx" ls /opt/nodejs/ | grep 12.22.11
+check "oryx-install-nodejs-20.11.0" oryx prep --skip-detection --platforms-and-versions nodejs=20.11.0
+check "nodejs-20.11.0-installed-by-oryx" ls /opt/nodejs/ | grep 20.11.0
 
-check "oryx-install-php-7.3.25" oryx prep --skip-detection --platforms-and-versions php=7.3.25
-check "php-7.3.25-installed-by-oryx" ls /opt/php/ | grep 7.3.25
-
-check "oryx-install-java-12.0.2" oryx prep --skip-detection --platforms-and-versions java=12.0.2
-check "java-12.0.2-installed-by-oryx" ls /opt/java/ | grep 12.0.2
+check "oryx-install-php-8.1.30" oryx prep --skip-detection --platforms-and-versions php=8.1.30
+check "php-8.1.30-installed-by-oryx" ls /opt/php/ | grep 8.1.30
 
 # Report result
 reportResults
\ No newline at end of file

From 5e587d1725f0d274bc09a2bd33490b4236f1619c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Mar 2026 10:29:34 +0000
Subject: [PATCH 430/478] Bump azohra/shell-linter from 0.6.0 to 0.8.0 (#1593)

Bumps [azohra/shell-linter](https://github.com/azohra/shell-linter) from 0.6.0 to 0.8.0.
- [Release notes](https://github.com/azohra/shell-linter/releases)
- [Commits](https://github.com/azohra/shell-linter/compare/v0.6.0...v0.8.0)

---
updated-dependencies:
- dependency-name: azohra/shell-linter
  dependency-version: 0.8.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/linter-automated.yaml | 2 +-
 .github/workflows/linter-manual.yaml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linter-automated.yaml b/.github/workflows/linter-automated.yaml
index 46cbd085a..55d6f40b8 100644
--- a/.github/workflows/linter-automated.yaml
+++ b/.github/workflows/linter-automated.yaml
@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Shell Linter
-      uses: azohra/shell-linter@v0.6.0
+      uses: azohra/shell-linter@v0.8.0
       with:
         path: "src/**/*.sh"
         severity: "error" # [style, info, warning, error]
diff --git a/.github/workflows/linter-manual.yaml b/.github/workflows/linter-manual.yaml
index 019724d35..dbc3794b7 100644
--- a/.github/workflows/linter-manual.yaml
+++ b/.github/workflows/linter-manual.yaml
@@ -18,7 +18,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Shell Linter
-      uses: azohra/shell-linter@v0.6.0
+      uses: azohra/shell-linter@v0.8.0
       with:
         path: ${{ github.event.inputs.path }}
         severity: ${{ github.event.inputs.severity }}

From 1e831fbf2713fa79517b994e9895f5b5be3a4a14 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Mar 2026 10:29:55 +0000
Subject: [PATCH 431/478] Bump actions/checkout from 4 to 6 (#1592)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Abdurrahmaan Iqbal <abdurriq@github.com>
---
 .github/workflows/docker-in-docker-stress-test.yaml    | 4 ++--
 .github/workflows/linter-automated.yaml                | 2 +-
 .github/workflows/linter-manual.yaml                   | 2 +-
 .github/workflows/release.yaml                         | 2 +-
 .github/workflows/test-all.yaml                        | 6 +++---
 .github/workflows/test-manual.yaml                     | 2 +-
 .github/workflows/test-pr-arm64.yaml                   | 4 ++--
 .github/workflows/test-pr.yaml                         | 4 ++--
 .github/workflows/update-aws-cli-completer-scripts.yml | 2 +-
 .github/workflows/update-documentation.yml             | 2 +-
 .github/workflows/update-dotnet-install-script.yml     | 2 +-
 .github/workflows/validate-metadata-files.yml          | 2 +-
 12 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/docker-in-docker-stress-test.yaml b/.github/workflows/docker-in-docker-stress-test.yaml
index 1c9410a88..99470e558 100644
--- a/.github/workflows/docker-in-docker-stress-test.yaml
+++ b/.github/workflows/docker-in-docker-stress-test.yaml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
diff --git a/.github/workflows/linter-automated.yaml b/.github/workflows/linter-automated.yaml
index 55d6f40b8..234f7e726 100644
--- a/.github/workflows/linter-automated.yaml
+++ b/.github/workflows/linter-automated.yaml
@@ -9,7 +9,7 @@ jobs:
   shellchecker:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
     - name: Shell Linter
       uses: azohra/shell-linter@v0.8.0
diff --git a/.github/workflows/linter-manual.yaml b/.github/workflows/linter-manual.yaml
index dbc3794b7..5d4081f5a 100644
--- a/.github/workflows/linter-manual.yaml
+++ b/.github/workflows/linter-manual.yaml
@@ -15,7 +15,7 @@ jobs:
   shellchecker:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
     - name: Shell Linter
       uses: azohra/shell-linter@v0.8.0
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 6890f5ae5..ab3c0a34b 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -13,7 +13,7 @@ jobs:
       packages: write
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: "Publish"
         uses: devcontainers/action@v1
diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml
index ea4fe8728..4b73845f7 100644
--- a/.github/workflows/test-all.yaml
+++ b/.github/workflows/test-all.yaml
@@ -52,7 +52,7 @@ jobs:
             "mcr.microsoft.com/devcontainers/base:noble"
           ]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
@@ -96,7 +96,7 @@ jobs:
             "nix",
         ]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
@@ -108,7 +108,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
diff --git a/.github/workflows/test-manual.yaml b/.github/workflows/test-manual.yaml
index 10d099b25..cfee816c2 100644
--- a/.github/workflows/test-manual.yaml
+++ b/.github/workflows/test-manual.yaml
@@ -19,7 +19,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
diff --git a/.github/workflows/test-pr-arm64.yaml b/.github/workflows/test-pr-arm64.yaml
index d82ec3409..b2adfc7ae 100644
--- a/.github/workflows/test-pr-arm64.yaml
+++ b/.github/workflows/test-pr-arm64.yaml
@@ -42,7 +42,7 @@ jobs:
             "mcr.microsoft.com/devcontainers/base:noble"
           ]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
@@ -58,7 +58,7 @@ jobs:
       matrix:
         features: ${{ fromJSON(needs.detect-changes.outputs.features) }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index 645d38109..09478e51d 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -68,7 +68,7 @@ jobs:
           - features: docker-outside-of-docker
             baseImage: mcr.microsoft.com/devcontainers/base:debian             
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
@@ -84,7 +84,7 @@ jobs:
       matrix:
         features: ${{ fromJSON(needs.detect-changes.outputs.features) }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
diff --git a/.github/workflows/update-aws-cli-completer-scripts.yml b/.github/workflows/update-aws-cli-completer-scripts.yml
index 41d67189f..d0c119d09 100644
--- a/.github/workflows/update-aws-cli-completer-scripts.yml
+++ b/.github/workflows/update-aws-cli-completer-scripts.yml
@@ -12,7 +12,7 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Run fetch-latest-completer-scripts.sh
         run: src/aws-cli/scripts/fetch-latest-completer-scripts.sh
diff --git a/.github/workflows/update-documentation.yml b/.github/workflows/update-documentation.yml
index d74d970d5..96c12176b 100644
--- 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@v4
+      - uses: actions/checkout@v6
 
       - name: Generate Documentation
         uses: devcontainers/action@v1
diff --git a/.github/workflows/update-dotnet-install-script.yml b/.github/workflows/update-dotnet-install-script.yml
index 604f6880b..19aab95e2 100644
--- a/.github/workflows/update-dotnet-install-script.yml
+++ b/.github/workflows/update-dotnet-install-script.yml
@@ -12,7 +12,7 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Run fetch-latest-dotnet-install.sh
         run: src/dotnet/scripts/fetch-latest-dotnet-install.sh
diff --git a/.github/workflows/validate-metadata-files.yml b/.github/workflows/validate-metadata-files.yml
index 863418e93..dfb5b25f0 100644
--- a/.github/workflows/validate-metadata-files.yml
+++ b/.github/workflows/validate-metadata-files.yml
@@ -7,7 +7,7 @@ jobs:
   validate:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: "Validate devcontainer-feature.json files"
         uses: devcontainers/action@v1

From a2fd449926079efa1c270c4c64473143499292af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Mar 2026 10:30:53 +0000
Subject: [PATCH 432/478] Bump dorny/paths-filter from 3 to 4 (#1604)

Bumps [dorny/paths-filter](https://github.com/dorny/paths-filter) from 3 to 4.
- [Release notes](https://github.com/dorny/paths-filter/releases)
- [Changelog](https://github.com/dorny/paths-filter/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dorny/paths-filter/compare/v3...v4)

---
updated-dependencies:
- dependency-name: dorny/paths-filter
  dependency-version: '4'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Abdurrahmaan Iqbal <abdurriq@github.com>
---
 .github/workflows/test-pr-arm64.yaml | 2 +-
 .github/workflows/test-pr.yaml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-pr-arm64.yaml b/.github/workflows/test-pr-arm64.yaml
index b2adfc7ae..ea745345d 100644
--- a/.github/workflows/test-pr-arm64.yaml
+++ b/.github/workflows/test-pr-arm64.yaml
@@ -15,7 +15,7 @@ jobs:
     outputs:
       features: ${{ steps.filter.outputs.changes }}
     steps:
-      - uses: dorny/paths-filter@v3
+      - uses: dorny/paths-filter@v4
         id: filter
         with:
           # NOTE: To extend this workflow to other features, add filter entries below
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index 09478e51d..2747ec582 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -8,7 +8,7 @@ jobs:
     outputs:
       features: ${{ steps.filter.outputs.changes }}
     steps:
-      - uses: dorny/paths-filter@v3
+      - uses: dorny/paths-filter@v4
         id: filter
         with:
           filters: |

From d3971c3960448afdf4f5f693eacf1cd36f804bda Mon Sep 17 00:00:00 2001
From: sireeshajonnalagadda <sireeshajonnalagadda@github.com>
Date: Thu, 26 Mar 2026 17:57:48 +0530
Subject: [PATCH 433/478] Add rootless Docker support and update documentation
 (#1549)

* Add rootless Docker support and update documentation

* Ensure parent directory exists before creating source socket

* fixing errors

* Resolving conflicts

* fix(docker-outside-of-docker): update default for installDockerComposeSwitch and remove obsolete ROOTLESS_DOCKER.md documentation

* Bump version to 1.9.0

* Delete test/docker-outside-of-docker/custom_rootless_socket_path.sh

similar scenario already exists

* Delete test/docker-outside-of-docker/xdg_runtime_dir_socket.sh

* streamline Docker CLI and Buildx installation process

* fixing syntax errors

* fixing syntax errors

* Enhance Docker installation script for backward compatibility and update root Docker socket detection

---------

Co-authored-by: Kaniska <kaniska244@github.com>
---
 src/docker-outside-of-docker/README.md        | 25 +++++
 .../devcontainer-feature.json                 | 99 ++++++++++---------
 src/docker-outside-of-docker/install.sh       | 23 +++--
 .../docker_dash_compose_v1.sh                 |  1 +
 .../root_docker_socket.sh                     | 11 +++
 .../rootless_docker_socket.sh                 | 27 +++++
 test/docker-outside-of-docker/scenarios.json  | 28 ++++++
 7 files changed, 161 insertions(+), 53 deletions(-)
 create mode 100644 test/docker-outside-of-docker/root_docker_socket.sh
 create mode 100644 test/docker-outside-of-docker/rootless_docker_socket.sh

diff --git a/src/docker-outside-of-docker/README.md b/src/docker-outside-of-docker/README.md
index e4fe0c446..3b37028e2 100644
--- a/src/docker-outside-of-docker/README.md
+++ b/src/docker-outside-of-docker/README.md
@@ -23,6 +23,7 @@ Re-use the host docker socket, adding the Docker CLI to a container. Feature inv
 | dockerDashComposeVersion | Compose version to use for docker-compose (v1 or v2 or none or latest) | string | latest |
 | installDockerBuildx | Install Docker Buildx | boolean | true |
 | installDockerComposeSwitch | Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter. | boolean | true |
+| socketPath | Path where the Docker socket is mounted inside the container. For rootless Docker, override the mount in devcontainer.json to map your host socket to this path. | string | /var/run/docker-host.sock |
 
 ## Customizations
 
@@ -36,6 +37,30 @@ Re-use the host docker socket, adding the Docker CLI to a container. Feature inv
 - The host and the container must be running on the same chip architecture. You will not be able to use it with an emulated x86 image with Docker Desktop on an Apple Silicon Mac, for example.
 - This approach does not currently enable bind mounting the workspace folder by default, and cannot support folders outside of the workspace folder. Consider whether the [Docker-in-Docker Feature](../docker-in-docker) would better meet your needs given it does not have this limitation.
 
+## Rootless Docker Support
+
+By default, this feature expects the Docker socket at `/var/run/docker.sock` on the host, which works for standard (root) Docker installations. For **rootless Docker** setups where the socket is located at `/run/user/$UID/docker.sock` or `$XDG_RUNTIME_DIR/docker.sock`, you need to override the mount in your `devcontainer.json`:
+
+```json
+{
+  "features": {
+    "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
+  },
+  "mounts": [
+    {
+      "source": "/run/user/1000/docker.sock",
+      "target": "/var/run/docker-host.sock",
+      "type": "bind"
+    }
+  ]
+}
+```
+
+**Notes:**
+- Replace `1000` with your actual user ID (run `id -u` to find it)
+- The feature will automatically detect the socket at `/var/run/docker-host.sock`
+- Your custom mount will override the feature's default mount
+
 ## Supporting bind mounts from the workspace folder
 
 A common question that comes up is how you can use `bind` mounts from the Docker CLI from within the a dev container using this Feature (e.g. via `-v`). If you cannot use the [Docker-in-Docker Feature](../docker-in-docker), the only way to work around this is to use the **host**'s folder paths instead of the container's paths. There are 2 ways to do this
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index f2e57bd43..d98b8021c 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,53 +1,58 @@
 {
 
-  "id": "docker-outside-of-docker",
-  "version": "1.9.0",
-  "name": "Docker (docker-outside-of-docker)",
-  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
-  "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
-  "options": {
-    "version": {
-      "type": "string",
-      "proposals": [
-        "latest",
-        "none",
-        "20.10"
-      ],
-      "default": "latest",
-      "description": "Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.)"
-    },
-    "moby": {
-      "type": "boolean",
-      "default": true,
-      "description": "Install OSS Moby build instead of Docker CE"
-    },
-    "mobyBuildxVersion": {
-      "type": "string",
-      "default": "latest",
-      "description": "Install a specific version of moby-buildx when using Moby"
-    },
-    "dockerDashComposeVersion": {
-      "type": "string",
-      "enum": [
-        "none",
-        "latest",
-        "v1",
-        "v2"
-      ],
-      "default": "latest",
-      "description": "Compose version to use for docker-compose (v1 or v2 or none or latest)"
-    },
-    "installDockerBuildx": {
-      "type": "boolean",
-      "default": true,
-      "description": "Install Docker Buildx"
+    "id": "docker-outside-of-docker",
+    "version": "1.9.1",
+    "name": "Docker (docker-outside-of-docker)",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
+    "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "none",
+                "20.10"
+            ],
+            "default": "latest",
+            "description": "Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.)"
+        },
+        "moby": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install OSS Moby build instead of Docker CE"
+        },
+        "mobyBuildxVersion": {
+            "type": "string",
+            "default": "latest",
+            "description": "Install a specific version of moby-buildx when using Moby"
+        },
+        "dockerDashComposeVersion": {
+            "type": "string",
+            "enum": [
+                "none",
+                "latest",
+                "v1",
+                "v2"
+            ],
+            "default": "latest",
+            "description": "Compose version to use for docker-compose (v1 or v2 or none or latest)"
+        },
+        "installDockerBuildx": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install Docker Buildx"
+        },
+        "installDockerComposeSwitch": {
+            "type": "boolean",
+            "default": false,
+            "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
+        },
+        "socketPath": {
+            "type": "string",
+            "default": "/var/run/docker-host.sock",
+            "description": "Path where the Docker socket is mounted inside the container. For rootless Docker, override the mount in devcontainer.json to map your host socket to this path."
+        }
     },
-    "installDockerComposeSwitch": {
-      "type": "boolean",
-      "default": true,
-      "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
-    }
-  },
   "entrypoint": "/usr/local/share/docker-init.sh",
   "customizations": {
     "vscode": {
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 6e26b13ac..4799a4d59 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -13,7 +13,8 @@ MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"latest"}"
 DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"latest"}" # v1 or v2 or none or latest
 
 ENABLE_NONROOT_DOCKER="${ENABLE_NONROOT_DOCKER:-"true"}"
-SOURCE_SOCKET="${SOURCE_SOCKET:-"/var/run/docker-host.sock"}"
+SOCKET_PATH="${SOCKETPATH:-"/var/run/docker-host.sock"}" # From feature option
+SOURCE_SOCKET="${SOURCE_SOCKET:-"${SOCKET_PATH}"}"
 TARGET_SOCKET="${TARGET_SOCKET:-"/var/run/docker.sock"}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
@@ -318,23 +319,31 @@ else
             buildx=(moby-buildx${buildx_version_suffix})
         fi
         apt-get -y install --no-install-recommends ${cli_package_name}${cli_version_suffix} "${buildx[@]}" || { err "It seems packages for moby not available in OS ${ID} ${VERSION_CODENAME} (${architecture}). To resolve, either: (1) set feature option '\"moby\": false' , or (2) choose a compatible OS version (eg: 'ubuntu-24.04')." ; exit 1 ; }
-        apt-get -y install --no-install-recommends moby-compose || echo "(*) Package moby-compose (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
+        if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "v1" ]; then
+            apt-get -y install --no-install-recommends moby-compose || echo "(*) Package moby-compose (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
+        fi
     else
         buildx=()
         if [ "${INSTALL_DOCKER_BUILDX}" = "true" ]; then
             buildx=(docker-buildx-plugin)
         fi
-        apt-get -y install --no-install-recommends ${cli_package_name}${cli_version_suffix} "${buildx[@]}" docker-compose-plugin
+        #install cli + buildx first
+        apt-get -y install --no-install-recommends ${cli_package_name}${cli_version_suffix} "${buildx[@]}"
+        
+        # Backward compatibility: Older Docker CE versions bundled buildx with CLI
+        # Modern versions have separate packages, but this ensures consistent behavior
         buildx_path="/usr/libexec/docker/cli-plugins/docker-buildx"
-        # Older versions of Docker CE installs buildx as part of the CLI package
         if [ "${INSTALL_DOCKER_BUILDX}" = "false" ] && [ -f "${buildx_path}" ]; then
-            echo "(*) Removing docker-buildx installed from docker-ce-cli since installDockerBuildx is disabled..."
+            echo "(*) Removing docker-buildx (bundled in older Docker CE) since installDockerBuildx is disabled..."
             rm -f "${buildx_path}"
         fi
+        
+        if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "v1" ]; then
+            apt-get -y install --no-install-recommends docker-compose-plugin
+        fi
     fi
     unset buildx buildx_path
 fi
-
 # If 'docker-compose' command is to be included
 if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
     case "${architecture}" in
@@ -438,6 +447,8 @@ echo "docker-init doesn't exist, adding..."
 
 # By default, make the source and target sockets the same
 if [ "${SOURCE_SOCKET}" != "${TARGET_SOCKET}" ]; then
+    # Create parent directory if it doesn't exist
+    mkdir -p "$(dirname "${SOURCE_SOCKET}")"
     touch "${SOURCE_SOCKET}"
     ln -s "${SOURCE_SOCKET}" "${TARGET_SOCKET}"
 fi
diff --git a/test/docker-outside-of-docker/docker_dash_compose_v1.sh b/test/docker-outside-of-docker/docker_dash_compose_v1.sh
index 4ae7a9e02..33ae319f4 100755
--- a/test/docker-outside-of-docker/docker_dash_compose_v1.sh
+++ b/test/docker-outside-of-docker/docker_dash_compose_v1.sh
@@ -7,6 +7,7 @@ source dev-container-features-test-lib
 
 # Definition specific tests
 check "docker-compose" bash -c "docker-compose --version | grep -E '1.[0-9]+.[0-9]+'"
+check "no docker compose plugin" bash -c "if command -v docker >/dev/null 2>&1; then ! docker compose version >/dev/null 2>&1; else true; fi"
 
 # Report result
 reportResults
diff --git a/test/docker-outside-of-docker/root_docker_socket.sh b/test/docker-outside-of-docker/root_docker_socket.sh
new file mode 100644
index 000000000..c40d8a0ce
--- /dev/null
+++ b/test/docker-outside-of-docker/root_docker_socket.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+# Test script to assert root Docker socket usage
+
+if [ ! -S "/var/run/docker-host.sock" ]; then
+    echo "ERROR: Root Docker socket not found"
+    exit 1
+fi
+
+echo "Root Docker detected"
+export DOCKER_HOST="unix:///var/run/docker-host.sock"
+docker --version
\ No newline at end of file
diff --git a/test/docker-outside-of-docker/rootless_docker_socket.sh b/test/docker-outside-of-docker/rootless_docker_socket.sh
new file mode 100644
index 000000000..004554e9a
--- /dev/null
+++ b/test/docker-outside-of-docker/rootless_docker_socket.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+set -e
+
+source dev-container-features-test-lib
+
+echo "=== Rootless Docker Socket Configuration Test ==="
+
+# Test the custom rootless socket path
+EXPECTED_SOCKET="/var/run/docker-rootless.sock"
+
+# Check if the configured rootless socket exists and is accessible
+check "rootless-socket-exists" test -S "$EXPECTED_SOCKET"
+check "rootless-socket-readable" test -r "$EXPECTED_SOCKET"
+
+# Verify Docker functionality using the rootless socket
+export DOCKER_HOST="unix://$EXPECTED_SOCKET"
+check "docker-functional-rootless" docker ps >/dev/null
+
+# Test basic Docker operations with rootless configuration
+check "docker-version-rootless" docker version --format '{{.Client.Version}}' | grep -E '^[0-9]+\.[0-9]+\.[0-9]+' >/dev/null
+check "docker-info-rootless" docker info >/dev/null
+
+# Demonstrate that customers can configure custom socket paths
+echo "Configured rootless socket path: $EXPECTED_SOCKET"
+echo "Docker host: $DOCKER_HOST"
+
+reportResults
\ No newline at end of file
diff --git a/test/docker-outside-of-docker/scenarios.json b/test/docker-outside-of-docker/scenarios.json
index 3a49d594e..61b94f3d6 100644
--- a/test/docker-outside-of-docker/scenarios.json
+++ b/test/docker-outside-of-docker/scenarios.json
@@ -180,6 +180,32 @@
                 "moby": false
             }
         }
+    },
+    "rootless_docker_socket": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
+        "features": {
+            "docker-outside-of-docker": {
+                "moby": false,
+                "socketPath": "/var/run/docker-rootless.sock"
+            }
+        },
+        "mounts": [
+            {
+                "source": "/var/run/docker.sock",
+                "target": "/var/run/docker-rootless.sock",
+                "type": "bind"
+            }
+        ],
+        "containerUser": "vscode"
+    },
+    "root_docker_socket": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
+        "features": {
+            "docker-outside-of-docker": {
+                "moby": false
+              }
+        },
+        "containerUser": "vscode"
     },
      "docker_dash_compose_latest_moby": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
@@ -202,3 +228,5 @@
         "containerUser": "vscode"
     }
 }
+
+  
\ No newline at end of file

From 07f4101951e61c61fd1c8cfd00250af3716a6c2a Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Fri, 27 Mar 2026 21:56:11 +0530
Subject: [PATCH 434/478] Fix Java feature: fallback to LTS when latest feature
 release is unavailable (#1614)

---
 src/java/devcontainer-feature.json |  2 +-
 src/java/install.sh                | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index 9591c3592..c82718a49 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.7.2",
+  "version": "1.8.0",
   "name": "Java (via SDKMAN!)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
diff --git a/src/java/install.sh b/src/java/install.sh
index cd93eacf6..988460307 100644
--- a/src/java/install.sh
+++ b/src/java/install.sh
@@ -265,8 +265,19 @@ sdk_install() {
             set -e
         fi
         if [ -z "${requested_version}" ] || ! echo "${version_list}" | grep "^${requested_version//./\\.}$" > /dev/null 2>&1; then
-            echo -e "Version $2 not found. Available versions:\n${version_list}" >&2
-            exit 1
+            # Fallback to LTS if "latest" was requested and not found (java only)
+            if [ "$2" = "latest" ] && [ "${install_type}" = "java" ]; then
+                echo "Latest version not found in SDKMAN. Falling back to LTS..."
+                find_version_list "$prefix" "$suffix" "$install_type" "true" version_list "lts"
+                requested_version="$(echo "${version_list}" | head -n 1)"
+                if [ -z "${requested_version}" ] || ! echo "${version_list}" | grep "^${requested_version//./\\.}$" > /dev/null 2>&1; then
+                    echo -e "Version $2 (and LTS fallback) not found. Available versions:\n${version_list}" >&2
+                    exit 1
+                fi
+            else
+                echo -e "Version $2 not found. Available versions:\n${version_list}" >&2
+                exit 1
+            fi
         fi
     fi
     if [ "${set_as_default}" = "true" ]; then

From ceee60f6d5ff1c7834a48d417e9aca055f6aa29f Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Wed, 1 Apr 2026 12:52:07 +0100
Subject: [PATCH 435/478] Fix failing nix version test scenario by updating
 pinned version to 2.18 (#1610)

fix: update nix version from 2.10 to 2.18 in test scenario


Agent-Logs-Url: https://github.com/devcontainers/features/sessions/b026e9e9-065b-47f1-aa99-ff8fe8a4ceb0

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
Co-authored-by: Kaniska <kaniska244@github.com>
---
 test/nix/scenarios.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/nix/scenarios.json b/test/nix/scenarios.json
index dac5624f1..38eed0268 100644
--- a/test/nix/scenarios.json
+++ b/test/nix/scenarios.json
@@ -14,7 +14,7 @@
         "features": {
             "nix": {
                 "multiUser": false,
-                "version": "2.10"
+                "version": "2.18"
             }
         }
     },

From 3df3aed1e7bfcdd91e97fa2d5d7cbefff1dde4cf Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Wed, 1 Apr 2026 12:52:36 +0100
Subject: [PATCH 436/478] fix: update azure-cli test scenario base image from
 dev-10.0-preview-trixie to base:trixie (#1611)

* fix: update azure-cli test scenario base image from dev-10.0-preview-trixie to 10.0

Agent-Logs-Url: https://github.com/devcontainers/features/sessions/78a9b225-cd77-4447-9ee4-4de4b2546665

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>

* fix: use base:trixie image for trixie-specific test scenario

Agent-Logs-Url: https://github.com/devcontainers/features/sessions/5e6ed3a3-e87e-449f-ac46-ccc170990a0b

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
Co-authored-by: Kaniska <kaniska244@github.com>
---
 test/azure-cli/scenarios.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/azure-cli/scenarios.json b/test/azure-cli/scenarios.json
index 4c12034b5..1ba173de9 100644
--- a/test/azure-cli/scenarios.json
+++ b/test/azure-cli/scenarios.json
@@ -89,7 +89,7 @@
     }
   },
   "install_azcli_dotnet_dockerindocker_trixie": {
-    "image": "mcr.microsoft.com/devcontainers/dotnet:dev-10.0-preview-trixie",
+    "image": "mcr.microsoft.com/devcontainers/base:trixie",
     "user": "vscode",
     "features": {
       "azure-cli": {

From a1a09985015999d98717b82971b51c40665b04db Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Thu, 9 Apr 2026 13:37:52 +0100
Subject: [PATCH 437/478] Handle PowerShell RC versions in preview install path
 (#1608)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix powershell preview/RC version installation failure

- Add -rc. version checks alongside preview checks in routing conditions
  so RC versions go directly to GitHub install instead of apt/dnf
- Update find_preview_version_from_git_tags() to match -rc.X git tags
- Fix typo googlegit_cmd_name -> git_cmd_name
- Update preview test scripts to match both preview and rc.X patterns

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
Agent-Logs-Url: https://github.com/devcontainers/features/sessions/03fd0565-a230-4bd9-80f7-92b8ce74a1bb

* Version bump: powershell feature 2.0.1 → 2.0.2

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
Agent-Logs-Url: https://github.com/devcontainers/features/sessions/98f1f7bd-4d93-4641-85d8-287b218c1eb8

* Remove ubuntu:focal and debian:11 from arm64 test matrix

PowerShell 7.6.0 requires GLIBC_2.33+ which is unavailable on these
older platforms. ubuntu:focal is already obsolete and debian:11 reaches
EOL in Aug 2026.

Agent-Logs-Url: https://github.com/devcontainers/features/sessions/6a803744-ae1d-4c84-8e04-5bb2c0df1523

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>

* Add comment explaining ubuntu:focal and debian:11 removal from arm64 matrix

Agent-Logs-Url: https://github.com/devcontainers/features/sessions/071d8550-7b74-4436-91de-5933b6711bc3

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
Co-authored-by: Kaniska <kaniska244@github.com>
---
 .github/workflows/test-pr-arm64.yaml          |  5 ++--
 src/powershell/devcontainer-feature.json      |  2 +-
 src/powershell/install.sh                     | 23 +++++++++++--------
 test/powershell/powershell_preview_version.sh |  2 +-
 .../powershell_preview_version_almalinux.sh   |  2 +-
 .../powershell_preview_version_debian.sh      |  2 +-
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/test-pr-arm64.yaml b/.github/workflows/test-pr-arm64.yaml
index ea745345d..113ce39b5 100644
--- a/.github/workflows/test-pr-arm64.yaml
+++ b/.github/workflows/test-pr-arm64.yaml
@@ -31,11 +31,12 @@ jobs:
     strategy:
       matrix:
         features: ${{ fromJSON(needs.detect-changes.outputs.features) }}
+        # NOTE: ubuntu:focal and debian:11 are excluded because they ship
+        # GLIBC 2.31, but PowerShell >= 7.6.0 requires GLIBC 2.33+ on arm64.
+        # ubuntu:focal reached EOL Apr 2025; debian:11 reaches EOL Aug 2026.
         baseImage:
           [
-            "ubuntu:focal",
             "ubuntu:jammy",
-            "debian:11",
             "debian:12",
             "mcr.microsoft.com/devcontainers/base:ubuntu",
             "mcr.microsoft.com/devcontainers/base:debian",
diff --git a/src/powershell/devcontainer-feature.json b/src/powershell/devcontainer-feature.json
index 3b500608d..009f4c238 100644
--- a/src/powershell/devcontainer-feature.json
+++ b/src/powershell/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "powershell",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "name": "PowerShell",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/powershell",
     "description": "Installs PowerShell along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/powershell/install.sh b/src/powershell/install.sh
index 40308c32e..cabd2cbb4 100755
--- a/src/powershell/install.sh
+++ b/src/powershell/install.sh
@@ -126,7 +126,7 @@ find_preview_version_from_git_tags() {
     local requested_version=${!variable_name}
     local repository_url=$2
 
-    if [ -z "${googlegit_cmd_name}" ]; then
+    if [ -z "${git_cmd_name}" ]; then
         if type git > /dev/null 2>&1; then
             git_cmd_name="git"
         else
@@ -135,22 +135,22 @@ find_preview_version_from_git_tags() {
         fi
     fi
 
-    # Fetch tags from remote repository
+    # Fetch tags from remote repository (match both -preview.X and -rc.X tags)
     local tags
-    tags=$(git ls-remote --tags "${repository_url}" 2>/dev/null | grep -oP 'refs/tags/v\K[0-9]+\.[0-9]+\.[0-9]+-preview\.[0-9]+' | sort -V)
+    tags=$(git ls-remote --tags "${repository_url}" 2>/dev/null | grep -oP 'refs/tags/v\K[0-9]+\.[0-9]+\.[0-9]+-(preview|rc)\.[0-9]+' | sort -V)
 
     if [ -z "${tags}" ]; then
-        echo "No preview tags found in repository."
+        echo "No preview/rc tags found in repository."
         return 1
     fi
 
     local version=""
 
     if [ "${requested_version}" = "preview" ] || [ "${requested_version}" = "latest" ]; then
-        # Get the latest preview version
+        # Get the latest preview/rc version
         version=$(echo "${tags}" | tail -n 1)
     elif [[ "${requested_version}" =~ ^[0-9]+\.[0-9]+$ ]]; then
-        # Partial version provided (e.g., "7.6"), find latest preview matching that major.minor
+        # Partial version provided (e.g., "7.6"), find latest preview/rc matching that major.minor
         version=$(echo "${tags}" | grep "^${requested_version}\." | tail -n 1)
     elif [[ "${requested_version}" =~ ^[0-9]+\.[0-9]+\.[0-9]+-preview$ ]]; then
         # Version like "7.6.0-preview" provided, find latest preview for that version
@@ -161,6 +161,11 @@ find_preview_version_from_git_tags() {
         if echo "${tags}" | grep -q "^${requested_version}$"; then
             version="${requested_version}"
         fi
+    elif [[ "${requested_version}" =~ ^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$ ]]; then
+        # Exact RC version provided, verify it exists
+        if echo "${tags}" | grep -q "^${requested_version}$"; then
+            version="${requested_version}"
+        fi
     fi
 
     if [ -z "${version}" ]; then
@@ -382,7 +387,7 @@ install_using_github() {
     fi
     pwsh_url="https://github.com/PowerShell/PowerShell"
     # Check if we need to find a preview version or stable version
-    if [[ "${POWERSHELL_VERSION}" == *"preview"* ]] || [ "${POWERSHELL_VERSION}" = "preview" ]; then
+    if [[ "${POWERSHELL_VERSION}" == *"preview"* ]] || [ "${POWERSHELL_VERSION}" = "preview" ] || [[ "${POWERSHELL_VERSION}" == *"-rc."* ]]; then
         echo "Finding preview version..."
         find_preview_version_from_git_tags POWERSHELL_VERSION "${pwsh_url}"
     else
@@ -446,9 +451,9 @@ if ! type pwsh >/dev/null 2>&1; then
         POWERSHELL_ARCHIVE_ARCHITECTURES="${POWERSHELL_ARCHIVE_ARCHITECTURES_ALMALINUX}"
     fi
 
-    if [[ "${POWERSHELL_ARCHIVE_ARCHITECTURES}" = *"${POWERSHELL_ARCHIVE_ARCHITECTURES_UBUNTU}"* ]] && [[  "${POWERSHELL_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]] && [[ "${POWERSHELL_VERSION}" != *"preview"* ]]; then
+    if [[ "${POWERSHELL_ARCHIVE_ARCHITECTURES}" = *"${POWERSHELL_ARCHIVE_ARCHITECTURES_UBUNTU}"* ]] && [[  "${POWERSHELL_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]] && [[ "${POWERSHELL_VERSION}" != *"preview"* ]] && [[ "${POWERSHELL_VERSION}" != *"-rc."* ]]; then
         install_using_apt || use_github="true"
-    elif [[ "${POWERSHELL_ARCHIVE_ARCHITECTURES}" = *"${POWERSHELL_ARCHIVE_ARCHITECTURES_ALMALINUX}"* ]] && [[ "${POWERSHELL_VERSION}" != *"preview"* ]]; then 
+    elif [[ "${POWERSHELL_ARCHIVE_ARCHITECTURES}" = *"${POWERSHELL_ARCHIVE_ARCHITECTURES_ALMALINUX}"* ]] && [[ "${POWERSHELL_VERSION}" != *"preview"* ]] && [[ "${POWERSHELL_VERSION}" != *"-rc."* ]]; then 
         install_using_dnf && install_powershell_dnf || use_github="true"
     else 
        use_github="true"
diff --git a/test/powershell/powershell_preview_version.sh b/test/powershell/powershell_preview_version.sh
index 7e49ded9e..91238e794 100755
--- a/test/powershell/powershell_preview_version.sh
+++ b/test/powershell/powershell_preview_version.sh
@@ -7,7 +7,7 @@ source dev-container-features-test-lib
 
 # Test preview version installation
 check "pwsh is installed" bash -c "command -v pwsh"
-check "pwsh version is preview" bash -c "pwsh --version | grep -i 'preview'"
+check "pwsh version is preview" bash -c "pwsh --version | grep -iE 'preview|rc\.[0-9]+'"
 check "pwsh can execute basic command" bash -c "pwsh -Command 'Write-Output Hello'"
 
 # Report result
diff --git a/test/powershell/powershell_preview_version_almalinux.sh b/test/powershell/powershell_preview_version_almalinux.sh
index 3a8128209..806dbf324 100755
--- a/test/powershell/powershell_preview_version_almalinux.sh
+++ b/test/powershell/powershell_preview_version_almalinux.sh
@@ -7,7 +7,7 @@ source dev-container-features-test-lib
 
 # Test preview version installation on AlmaLinux
 check "pwsh is installed" bash -c "command -v pwsh"
-check "pwsh version is preview" bash -c "pwsh --version | grep -i 'preview'"
+check "pwsh version is preview" bash -c "pwsh --version | grep -iE 'preview|rc\.[0-9]+'"
 check "pwsh can execute basic command" bash -c "pwsh -Command 'Write-Output Hello'"
 
 # Report result
diff --git a/test/powershell/powershell_preview_version_debian.sh b/test/powershell/powershell_preview_version_debian.sh
index 316017cf7..1d8ba4e36 100755
--- a/test/powershell/powershell_preview_version_debian.sh
+++ b/test/powershell/powershell_preview_version_debian.sh
@@ -7,7 +7,7 @@ source dev-container-features-test-lib
 
 # Test preview version installation on Debian
 check "pwsh is installed" bash -c "command -v pwsh"
-check "pwsh version is preview" bash -c "pwsh --version | grep -i 'preview'"
+check "pwsh version is preview" bash -c "pwsh --version | grep -iE 'preview|rc\.[0-9]+'"
 check "pwsh can execute basic command" bash -c "pwsh -Command 'Write-Output Hello'"
 
 # Report result

From 9f086c01b93e85024dcafae432aa0a3044d02652 Mon Sep 17 00:00:00 2001
From: Mathiyarasy <157102811+Mathiyarasy@users.noreply.github.com>
Date: Tue, 14 Apr 2026 17:03:06 +0530
Subject: [PATCH 438/478] [Desktop-lite]  desktop-init.sh drops entrypoint args
 due to heredoc variable expansion (#1621)

* update script

* update minor version
---
 src/desktop-lite/devcontainer-feature.json       |  2 +-
 src/desktop-lite/install.sh                      |  4 ++--
 test/desktop-lite/scenarios.json                 | 11 ++++++++---
 .../test_desktop_init_exec_passthrough.sh        | 16 ++++++++++++++++
 4 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 test/desktop-lite/test_desktop_init_exec_passthrough.sh

diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json
index ae10c9977..b87e2bc02 100644
--- a/src/desktop-lite/devcontainer-feature.json
+++ b/src/desktop-lite/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "desktop-lite",
-    "version": "1.2.8",
+    "version": "1.2.9",
     "name": "Light-weight Desktop",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
     "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh
index 4575cc4f9..822818723 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -409,9 +409,9 @@ else
 fi
 
 # Run whatever was passed in
-if [ -n "$1" ]; then
+if [ -n "\$1" ]; then
     log "Executing \"\$@\"."
-    exec "$@"
+    exec "\$@"
 else
     log "No command provided to execute."
 fi
diff --git a/test/desktop-lite/scenarios.json b/test/desktop-lite/scenarios.json
index 4ee429dd5..f8719acc6 100644
--- a/test/desktop-lite/scenarios.json
+++ b/test/desktop-lite/scenarios.json
@@ -12,13 +12,12 @@
                 "noVncVersion": "1.2.0"
             }
         }
-    },    
+    },
     "test_vnc_resolution_as_container_env_var": {
         "image": "ubuntu:noble",
         "features": {
             "desktop-lite": {}
-        }
-        ,
+        },
         "containerEnv": {
             "VNC_RESOLUTION": "1920x1080x32"
         },
@@ -45,5 +44,11 @@
         "features": {
             "desktop-lite": {}
         }
+    },
+    "test_desktop_init_exec_passthrough": {
+        "image": "ubuntu:noble",
+        "features": {
+            "desktop-lite": {}
+        }
     }
 }
\ No newline at end of file
diff --git a/test/desktop-lite/test_desktop_init_exec_passthrough.sh b/test/desktop-lite/test_desktop_init_exec_passthrough.sh
new file mode 100644
index 000000000..27d224ca3
--- /dev/null
+++ b/test/desktop-lite/test_desktop_init_exec_passthrough.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Verify that desktop-init.sh correctly passes through commands.
+# Previously, the heredoc in install.sh did not escape $1 and $@, causing them to expand
+# to empty strings at install time, so any command passed to desktop-init.sh was silently ignored.
+
+check "command is passed through and executed" \
+    bash -c "result=\$(/usr/local/share/desktop-init.sh echo 'passthrough-test-token' 2>/dev/null) && echo \"\$result\" | grep -q 'passthrough-test-token'"
+
+# Report result
+reportResults

From dc8cf55a16c1880c364bb27bf39abcc7e478ff82 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Tue, 14 Apr 2026 17:32:12 +0530
Subject: [PATCH 439/478] [conda] - Upgrade incompatible pluggy library to
 prevent conda installation failure. (#1617)

---
 src/conda/devcontainer-feature.json            |  2 +-
 src/conda/install.sh                           |  3 +++
 test/conda/conda_channel_creation.sh           | 14 ++++++++++++++
 .../install_conda_package_after_upgrade.sh     | 18 ++++++++++++++++++
 test/conda/scenarios.json                      | 12 ++++++++++++
 5 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 test/conda/conda_channel_creation.sh
 create mode 100644 test/conda/install_conda_package_after_upgrade.sh

diff --git a/src/conda/devcontainer-feature.json b/src/conda/devcontainer-feature.json
index cd590f9b7..d78e6c92b 100644
--- a/src/conda/devcontainer-feature.json
+++ b/src/conda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "conda",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "name": "Conda",
   "description": "A cross-platform, language-agnostic binary package manager",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
diff --git a/src/conda/install.sh b/src/conda/install.sh
index 73925dd5d..2e312ac58 100644
--- a/src/conda/install.sh
+++ b/src/conda/install.sh
@@ -179,6 +179,9 @@ if ! conda --version &> /dev/null ; then
     install_user_package cryptography
     # Due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-40897
     install_user_package setuptools
+
+    install_user_package pluggy
+
 fi
 
 # Display a notice on conda when not running in GitHub Codespaces
diff --git a/test/conda/conda_channel_creation.sh b/test/conda/conda_channel_creation.sh
new file mode 100644
index 000000000..d6409a38f
--- /dev/null
+++ b/test/conda/conda_channel_creation.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+## Test Conda
+check "conda-update-conda" bash -c "conda update -c defaults -y conda"
+check "conda-install-tensorflow" bash -c "conda create --name test-env -c conda-forge --yes tensorflow"
+check "conda-install-pytorch" bash -c "conda create --name test-env -c conda-forge --yes pytorch"
+
+# Report result
+reportResults
diff --git a/test/conda/install_conda_package_after_upgrade.sh b/test/conda/install_conda_package_after_upgrade.sh
new file mode 100644
index 000000000..cb61c6b65
--- /dev/null
+++ b/test/conda/install_conda_package_after_upgrade.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Test that conda can install packages without pluggy incompatibility errors
+# This validates the fix for the pluggy/conda version mismatch issue where
+# conda self-upgrades but the older pluggy lacks the 'wrapper' attribute
+check "conda version" conda --version
+check "install pyopenssl" conda install -y -c defaults pyopenssl
+check "install cryptography" conda install -y -c defaults cryptography
+check "conda-forge" conda config --show channels | grep conda-forge
+check "if conda-notice.txt exists" cat /usr/local/etc/vscode-dev-containers/conda-notice.txt
+
+# Report result
+reportResults
diff --git a/test/conda/scenarios.json b/test/conda/scenarios.json
index ef930a17c..531f32938 100644
--- a/test/conda/scenarios.json
+++ b/test/conda/scenarios.json
@@ -7,5 +7,17 @@
                 "addCondaForge": "true"
             }
         }
+    },
+    "install_conda_package_after_upgrade": {
+        "image": "ubuntu:noble",
+        "features": {
+            "conda": {}
+        }
+    },
+    "conda_channel_creation": {
+        "image": "ubuntu:noble",
+        "features": {
+            "conda": {}
+        }
     }
 }

From ac2413713e37f570c32d82f43c4eca24be16e5f0 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Tue, 14 Apr 2026 19:13:03 +0530
Subject: [PATCH 440/478] Move conda installation from deprecated DEBs to
 Miniconda installer (#1619)

* Move conda installation from deprecated DEBs to Miniconda installer

* Fix missing newline at end of conda_channel_creation.sh

* Fix missing newline at end of install_conda_package_after_upgrade.sh

---------

Co-authored-by: Abdurrahmaan Iqbal <abdurriq@github.com>
---
 src/conda/NOTES.md                            |   2 +-
 src/conda/README.md                           |   2 +-
 src/conda/devcontainer-feature.json           |   6 +-
 src/conda/install.sh                          | 115 +++++++-----------
 test/conda/conda_channel_creation.sh          |   4 +-
 test/conda/install_conda.sh                   |   4 +-
 .../install_conda_package_after_upgrade.sh    |   3 +
 test/conda/scenarios.json                     |   2 +-
 8 files changed, 58 insertions(+), 80 deletions(-)

diff --git a/src/conda/NOTES.md b/src/conda/NOTES.md
index ef8657ab4..98189ccc4 100644
--- a/src/conda/NOTES.md
+++ b/src/conda/NOTES.md
@@ -15,6 +15,6 @@ conda install python=3.7
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed. Both `x86_64` and `aarch64` architectures are supported.
 
 `bash` is required to execute the `install.sh` script.
diff --git a/src/conda/README.md b/src/conda/README.md
index 2e123f2c7..eaee45b2d 100644
--- a/src/conda/README.md
+++ b/src/conda/README.md
@@ -7,7 +7,7 @@ A cross-platform, language-agnostic binary package manager
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/conda:1": {}
+    "ghcr.io/devcontainers/features/conda:2": {}
 }
 ```
 
diff --git a/src/conda/devcontainer-feature.json b/src/conda/devcontainer-feature.json
index d78e6c92b..26d20d6a6 100644
--- a/src/conda/devcontainer-feature.json
+++ b/src/conda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "conda",
-  "version": "1.2.6",
+  "version": "2.0.0",
   "name": "Conda",
   "description": "A cross-platform, language-agnostic binary package manager",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
@@ -9,8 +9,8 @@
       "type": "string",
       "proposals": [
         "latest",
-        "4.11.0",
-        "4.12.0"
+        "24.11.3",
+        "24.7.1"
       ],
       "default": "latest",
       "description": "Select or enter a conda version."
diff --git a/src/conda/install.sh b/src/conda/install.sh
index 2e312ac58..4ff0c6fa1 100644
--- a/src/conda/install.sh
+++ b/src/conda/install.sh
@@ -45,10 +45,14 @@ elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
 fi
 
 architecture="$(uname -m)"
-if [ "${architecture}" != "x86_64" ]; then
-    echo "(!) Architecture $architecture unsupported"
-    exit 1
-fi
+case "${architecture}" in
+    x86_64) MINICONDA_ARCH="x86_64" ;;
+    aarch64|arm64) MINICONDA_ARCH="aarch64" ;;
+    *)
+        echo "(!) Architecture $architecture unsupported"
+        exit 1
+    ;;
+esac
 
 # Checks if packages are installed and installs them if not
 check_packages() {
@@ -75,6 +79,17 @@ install_user_package() {
     sudo_if "${CONDA_DIR}/bin/python3" -m pip install --user --upgrade "$PACKAGE"
 }
 
+accept_anaconda_tos_if_needed() {
+    if ! "${CONDA_DIR}/bin/conda" tos --help > /dev/null 2>&1; then
+        return 0
+    fi
+
+    for channel in "https://repo.anaconda.com/pkgs/main" "https://repo.anaconda.com/pkgs/r"; do
+        echo "Accepting Conda Terms of Service for ${channel}..."
+        "${CONDA_DIR}/bin/conda" tos accept --override-channels --channel "${channel}"
+    done
+}
+
 # Install Conda if it's missing
 if ! conda --version &> /dev/null ; then
     if ! cat /etc/group | grep -e "^conda:" > /dev/null 2>&1; then
@@ -85,78 +100,36 @@ if ! conda --version &> /dev/null ; then
     # Install dependencies
     check_packages curl ca-certificates
 
-    echo "Installing Conda..."
+    echo "Installing Conda via Miniconda installer..."
 
-    # Download .deb package directly from repository (bypassing SHA1 signature issue)
-    TEMP_DEB="$(mktemp -t conda_XXXXXX.deb)"
-    CONDA_REPO_BASE="https://repo.anaconda.com/pkgs/misc/debrepo/conda"
-    
-    # Determine package filename based on requested version
-    ARCH="$(dpkg --print-architecture 2>/dev/null || echo "amd64")"
-    PACKAGES_URL="https://repo.anaconda.com/pkgs/misc/debrepo/conda/dists/stable/main/binary-${ARCH}/Packages"
-    
-    if [ "${VERSION}" = "latest" ]; then
-        # For latest, we need to query the repository to find the current version
-        echo "Fetching package list to determine latest version..."
-        CONDA_PKG_INFO=$(curl -fsSL "${PACKAGES_URL}" | grep -A 30 "^Package: conda$" | head -n 31)
-        CONDA_VERSION=$(echo "${CONDA_PKG_INFO}" | grep "^Version:" | head -n 1 | awk '{print $2}')
-        CONDA_FILENAME=$(echo "${CONDA_PKG_INFO}" | grep "^Filename:" | head -n 1 | awk '{print $2}')
-        
-        if [ -z "${CONDA_VERSION}" ] || [ -z "${CONDA_FILENAME}" ]; then
-            echo "ERROR: Could not determine latest conda version or filename from ${PACKAGES_URL}"
-            echo "This may indicate an unsupported architecture or repository unavailability."
-            rm -f "${TEMP_DEB}"
-            exit 1
-        fi
-        
-        CONDA_PKG_NAME="${CONDA_FILENAME}"
-    else
-        # For specific versions, query the Packages file to find the exact filename
-        echo "Fetching package list to find version ${VERSION}..."
-        # Search for version pattern - user may specify 4.12.0 but package has 4.12.0-0
-        CONDA_PKG_INFO=$(curl -fsSL "${PACKAGES_URL}" | grep -A 30 "^Package: conda$" | grep -B 5 -A 25 "^Version: ${VERSION}")
-        CONDA_FILENAME=$(echo "${CONDA_PKG_INFO}" | grep "^Filename:" | head -n 1 | awk '{print $2}')
-        
-        if [ -z "${CONDA_FILENAME}" ]; then
-            echo "ERROR: Could not find conda version ${VERSION} in ${PACKAGES_URL}"
-            echo "Please verify the version specified is valid."
-            rm -f "${TEMP_DEB}"
-            exit 1
-        fi
-        
-        CONDA_PKG_NAME="${CONDA_FILENAME}"
-    fi
-    
-    # Download the .deb package
-    CONDA_DEB_URL="${CONDA_REPO_BASE}/${CONDA_PKG_NAME}"
-    echo "Downloading conda package from ${CONDA_DEB_URL}..."
-    
-    if ! curl -fsSL "${CONDA_DEB_URL}" -o "${TEMP_DEB}"; then
-        echo "ERROR: Failed to download conda .deb package from ${CONDA_DEB_URL}"
-        echo "Please verify the version specified is valid."
-        rm -f "${TEMP_DEB}"
-        exit 1
-    fi
-    
-    # Verify the package was downloaded successfully
-    if [ ! -f "${TEMP_DEB}" ] || [ ! -s "${TEMP_DEB}" ]; then
-        echo "ERROR: Conda .deb package file is missing or empty"
-        rm -f "${TEMP_DEB}"
+    # Download and run the official Miniconda installer
+    MINICONDA_INSTALLER="$(mktemp -t miniconda_XXXXXX.sh)"
+    MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-${MINICONDA_ARCH}.sh"
+
+    echo "Downloading Miniconda installer from ${MINICONDA_URL}..."
+    if ! curl -fsSL --connect-timeout 10 --max-time 120 "${MINICONDA_URL}" -o "${MINICONDA_INSTALLER}"; then
+        echo "ERROR: Failed to download Miniconda installer from ${MINICONDA_URL}"
+        rm -f "${MINICONDA_INSTALLER}"
         exit 1
     fi
-    
-    # Install the package using apt (which handles dependencies automatically)
-    echo "Installing conda package..."
-    if ! apt-get install -y "${TEMP_DEB}"; then
-        echo "ERROR: Failed to install conda package"
-        rm -f "${TEMP_DEB}"
-        exit 1
+
+    # Run installer in batch mode (no prompts) and install to CONDA_DIR
+    bash "${MINICONDA_INSTALLER}" -b -p "${CONDA_DIR}"
+    rm -f "${MINICONDA_INSTALLER}"
+
+    # Conda defaults channels now require a non-interactive ToS acknowledgement.
+    accept_anaconda_tos_if_needed
+
+    # Install specific conda version if requested (latest Miniconda already bundles a recent conda)
+    if [ "${VERSION}" != "latest" ]; then
+        echo "Installing conda version ${VERSION}..."
+        if ! "${CONDA_DIR}/bin/conda" install -y "conda=${VERSION}"; then
+            echo "ERROR: Failed to install conda version ${VERSION}. Please verify the version is valid and available."
+            exit 1
+        fi
     fi
-    
-    # Clean up downloaded package
-    rm -f "${TEMP_DEB}"
 
-    CONDA_SCRIPT="/opt/conda/etc/profile.d/conda.sh"
+    CONDA_SCRIPT="${CONDA_DIR}/etc/profile.d/conda.sh"
     . $CONDA_SCRIPT
 
     if [ "${ADD_CONDA_FORGE}" = "true" ]; then
diff --git a/test/conda/conda_channel_creation.sh b/test/conda/conda_channel_creation.sh
index d6409a38f..d1af05d5d 100644
--- a/test/conda/conda_channel_creation.sh
+++ b/test/conda/conda_channel_creation.sh
@@ -7,8 +7,8 @@ source dev-container-features-test-lib
 
 ## Test Conda
 check "conda-update-conda" bash -c "conda update -c defaults -y conda"
-check "conda-install-tensorflow" bash -c "conda create --name test-env -c conda-forge --yes tensorflow"
-check "conda-install-pytorch" bash -c "conda create --name test-env -c conda-forge --yes pytorch"
+check "conda-install-tensorflow" bash -c "conda create --name tensorflow-test-env -c conda-forge --yes tensorflow"
+check "conda-install-pytorch" bash -c "conda create --name pytorch-test-env -c conda-forge --yes pytorch"
 
 # Report result
 reportResults
diff --git a/test/conda/install_conda.sh b/test/conda/install_conda.sh
index efe7f5e89..c7c67dc51 100644
--- a/test/conda/install_conda.sh
+++ b/test/conda/install_conda.sh
@@ -5,7 +5,9 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-check "conda" conda --version | grep 4.12.0
+check "conda" conda --version
+check "conda update" conda update -n base -c defaults -y conda
+check "conda updated version" conda --version
 check "conda-forge" conda config --show channels | grep conda-forge
 check "if conda-notice.txt exists" cat /usr/local/etc/vscode-dev-containers/conda-notice.txt
 
diff --git a/test/conda/install_conda_package_after_upgrade.sh b/test/conda/install_conda_package_after_upgrade.sh
index cb61c6b65..70715a959 100644
--- a/test/conda/install_conda_package_after_upgrade.sh
+++ b/test/conda/install_conda_package_after_upgrade.sh
@@ -9,8 +9,11 @@ source dev-container-features-test-lib
 # This validates the fix for the pluggy/conda version mismatch issue where
 # conda self-upgrades but the older pluggy lacks the 'wrapper' attribute
 check "conda version" conda --version
+check "conda update" conda update -n base -c defaults -y conda
+check "conda updated version" conda --version
 check "install pyopenssl" conda install -y -c defaults pyopenssl
 check "install cryptography" conda install -y -c defaults cryptography
+check "install scipy with bioconda" conda install -y -c bioconda scipy
 check "conda-forge" conda config --show channels | grep conda-forge
 check "if conda-notice.txt exists" cat /usr/local/etc/vscode-dev-containers/conda-notice.txt
 
diff --git a/test/conda/scenarios.json b/test/conda/scenarios.json
index 531f32938..36eacb10a 100644
--- a/test/conda/scenarios.json
+++ b/test/conda/scenarios.json
@@ -3,7 +3,7 @@
         "image": "ubuntu:noble",
         "features": {
             "conda": {
-                "version": "4.12.0",
+                "version": "latest",
                 "addCondaForge": "true"
             }
         }

From 8054e63d4047154fc89141461b683561e496daa4 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Thu, 16 Apr 2026 20:02:34 +0530
Subject: [PATCH 441/478] [conda] - Accept the terms of service for root and
 target user and conda cleanup (#1622)

* [conda] - Accept the terms of service for root and target user and conda cleanup

* Removing the version bump.

* Removing commented lines.

* Retrigger test

* Revert the notes change
---
 src/conda/install.sh                          | 24 +++++++++++--------
 .../conda/conda_channel_creation_with_root.sh |  1 +
 ...l_conda_package_after_upgrade_with_root.sh |  1 +
 test/conda/scenarios.json                     | 16 +++++++++++--
 4 files changed, 30 insertions(+), 12 deletions(-)
 create mode 120000 test/conda/conda_channel_creation_with_root.sh
 create mode 120000 test/conda/install_conda_package_after_upgrade_with_root.sh

diff --git a/src/conda/install.sh b/src/conda/install.sh
index 4ff0c6fa1..fdc050c7a 100644
--- a/src/conda/install.sh
+++ b/src/conda/install.sh
@@ -86,10 +86,23 @@ accept_anaconda_tos_if_needed() {
 
     for channel in "https://repo.anaconda.com/pkgs/main" "https://repo.anaconda.com/pkgs/r"; do
         echo "Accepting Conda Terms of Service for ${channel}..."
+        # Accept as root (for install-time commands)
         "${CONDA_DIR}/bin/conda" tos accept --override-channels --channel "${channel}"
+        # Accept as the target user (for runtime usage)
+        sudo_if "${CONDA_DIR}/bin/conda" tos accept --override-channels --channel "${channel}"
     done
 }
 
+clean_conda_cache() {
+    "${CONDA_DIR}/bin/conda" clean --all --yes
+    find "${CONDA_DIR}" -type f -name '*.pyc' -delete
+    find "${CONDA_DIR}" -type d -name '__pycache__' -exec rm -rf {} +
+    rm -rf "${CONDA_DIR}/pkgs/cache" /root/.cache/pip
+    if [ "${USERNAME}" != "root" ]; then
+        rm -rf "/home/${USERNAME}/.cache/pip"
+    fi
+}
+
 # Install Conda if it's missing
 if ! conda --version &> /dev/null ; then
     if ! cat /etc/group | grep -e "^conda:" > /dev/null 2>&1; then
@@ -145,16 +158,7 @@ if ! conda --version &> /dev/null ; then
     
     find "${CONDA_DIR}" -type d -print0 | xargs -n 1 -0 chmod g+s
 
-    # Temporary fixes
-    # Due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-23491
-    install_user_package certifi
-    # Due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-0286 and https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-23931
-    install_user_package cryptography
-    # Due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-40897
-    install_user_package setuptools
-
-    install_user_package pluggy
-
+    clean_conda_cache
 fi
 
 # Display a notice on conda when not running in GitHub Codespaces
diff --git a/test/conda/conda_channel_creation_with_root.sh b/test/conda/conda_channel_creation_with_root.sh
new file mode 120000
index 000000000..906864b93
--- /dev/null
+++ b/test/conda/conda_channel_creation_with_root.sh
@@ -0,0 +1 @@
+conda_channel_creation.sh
\ No newline at end of file
diff --git a/test/conda/install_conda_package_after_upgrade_with_root.sh b/test/conda/install_conda_package_after_upgrade_with_root.sh
new file mode 120000
index 000000000..c3d5608a0
--- /dev/null
+++ b/test/conda/install_conda_package_after_upgrade_with_root.sh
@@ -0,0 +1 @@
+install_conda_package_after_upgrade.sh
\ No newline at end of file
diff --git a/test/conda/scenarios.json b/test/conda/scenarios.json
index 36eacb10a..f7c2692cb 100644
--- a/test/conda/scenarios.json
+++ b/test/conda/scenarios.json
@@ -1,6 +1,6 @@
 {
     "install_conda": {
-        "image": "ubuntu:noble",
+        "image": "mcr.microsoft.com/devcontainers/base:noble",
         "features": {
             "conda": {
                 "version": "latest",
@@ -9,12 +9,24 @@
         }
     },
     "install_conda_package_after_upgrade": {
-        "image": "ubuntu:noble",
+        "image": "mcr.microsoft.com/devcontainers/base:noble",
         "features": {
             "conda": {}
         }
     },
     "conda_channel_creation": {
+        "image": "mcr.microsoft.com/devcontainers/base:noble",
+        "features": {
+            "conda": {}
+        }
+    },
+    "install_conda_package_after_upgrade_with_root": {
+        "image": "ubuntu:noble",
+        "features": {
+            "conda": {}
+        }
+    },
+    "conda_channel_creation_with_root": {
         "image": "ubuntu:noble",
         "features": {
             "conda": {}

From 87bc90767461e2b964fb9622e592ed83bea4548d Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Thu, 16 Apr 2026 23:07:55 +0530
Subject: [PATCH 442/478] [conda] - Version bump (#1623)

* [conda] - Version bump

* Remove ubuntu:focal from the tests as it's deprecated for over an year

* Update baseImage in test-all.yaml

Removed comment about ubuntu:focal EOL.

* Update test-pr.yaml to remove EOL comment

Removed comment about Ubuntu focal EOL in workflow.

---------

Co-authored-by: Abdurrahmaan Iqbal <abdurriq@github.com>
---
 .github/workflows/test-all.yaml     | 1 -
 .github/workflows/test-manual.yaml  | 2 +-
 .github/workflows/test-pr.yaml      | 1 -
 src/conda/devcontainer-feature.json | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml
index 4b73845f7..2c1405d9d 100644
--- a/.github/workflows/test-all.yaml
+++ b/.github/workflows/test-all.yaml
@@ -43,7 +43,6 @@ jobs:
         ]
         baseImage:
           [
-            "ubuntu:focal",
             "ubuntu:jammy",
             "debian:11",
             "debian:12",
diff --git a/.github/workflows/test-manual.yaml b/.github/workflows/test-manual.yaml
index cfee816c2..1373f5215 100644
--- a/.github/workflows/test-manual.yaml
+++ b/.github/workflows/test-manual.yaml
@@ -9,7 +9,7 @@ on:
       baseImage:
         description: "Base image"
         required: true
-        default: "ubuntu:focal"
+        default: "ubuntu:noble"
       logLevel:
         description: "Log Level (info/debug/trace)"
         required: true
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index 2747ec582..a10e94d3c 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -50,7 +50,6 @@ jobs:
         features: ${{ fromJSON(needs.detect-changes.outputs.features) }}
         baseImage:
           [
-            "ubuntu:focal",
             "ubuntu:jammy",
             "debian:11",
             "debian:12",
diff --git a/src/conda/devcontainer-feature.json b/src/conda/devcontainer-feature.json
index 26d20d6a6..8c66d4ef1 100644
--- a/src/conda/devcontainer-feature.json
+++ b/src/conda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "conda",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "name": "Conda",
   "description": "A cross-platform, language-agnostic binary package manager",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",

From 732822d359772cb9c7c93af0f357fe9575758dbf Mon Sep 17 00:00:00 2001
From: Caleb Brose <5447118+cmbrose@users.noreply.github.com>
Date: Thu, 23 Apr 2026 07:03:43 -0500
Subject: [PATCH 443/478] Add default `copilot update` to `postStartCommand`
 (#1624)

* Add postStartCommand to devcontainer feature

* Bump version of copilot-cli to 1.1.0

* feat: conditionally run copilot update based on use-latest flag file

Agent-Logs-Url: https://github.com/cmbrose/devcontainer-features/sessions/3627c9ec-26ad-486e-a1ae-a4159d1ec2c5

Co-authored-by: cmbrose <5447118+cmbrose@users.noreply.github.com>

* Bump version of copilot-cli to 1.1.1

* Update devcontainer-feature.json

* Modify flag file creation for CLI version checks

Updated the condition to create a flag file for both 'latest' and 'prerelease' versions.

* Update postStartCommand for Copilot CLI

* Fix conditional check for CLI version

* Bump version of copilot-cli to 1.1.2

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
---
 src/copilot-cli/devcontainer-feature.json | 3 ++-
 src/copilot-cli/install.sh                | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/copilot-cli/devcontainer-feature.json b/src/copilot-cli/devcontainer-feature.json
index ab433e2ae..bfd97286c 100644
--- a/src/copilot-cli/devcontainer-feature.json
+++ b/src/copilot-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "copilot-cli",
-    "version": "1.0.0",
+    "version": "1.1.2",
     "name": "GitHub Copilot CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/copilot-cli",
     "description": "Installs the GitHub Copilot CLI.",
@@ -15,6 +15,7 @@
             "description": "Select version of the GitHub Copilot CLI, if not latest."
         }
     },
+    "postStartCommand": "[ -f /etc/devcontainer-copilot-cli/auto-update ] && copilot update || true",
     "customizations": {
         "vscode": {
             "settings": {
diff --git a/src/copilot-cli/install.sh b/src/copilot-cli/install.sh
index 7250fa642..47c2e3aca 100755
--- a/src/copilot-cli/install.sh
+++ b/src/copilot-cli/install.sh
@@ -80,3 +80,9 @@ echo "Downloading GitHub Copilot CLI..."
 
 install_using_github
 
+# Create a flag file if using "latest" or "prerelease" so the postStartCommand knows to auto-update
+if [ "${CLI_VERSION}" = "latest" ] || [ "${CLI_VERSION}" = "prerelease" ]; then
+    mkdir -p /etc/devcontainer-copilot-cli
+    touch /etc/devcontainer-copilot-cli/auto-update
+fi
+

From eea29bc78d2ab97a5465d84e6429fa057f5161dd Mon Sep 17 00:00:00 2001
From: sireeshajonnalagadda <sireeshajonnalagadda@github.com>
Date: Tue, 28 Apr 2026 17:24:07 +0530
Subject: [PATCH 444/478] Add support for configuring npm version in Node
 devcontainers (#1616)

* feat(node): add npm version selection and installation options

* add 'lts' and 'latest' options for npm version selection

* feat(node): enhance npm installation with compatibility checks and fallback for incompatible Node.js versions

* Update src/node/devcontainer-feature.json

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/node/devcontainer-feature.json

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* feat(tests): enhance npm version checks for compatibility and fallback scenarios

* Version bump

* Version bump

* fix(install): update npm version check logic and improve compatibility messaging

* fix(install): update npm version check logic and improve compatibility messaging

* fix(install): update npm installation loop syntax for clarity

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 src/node/devcontainer-feature.json           | 17 +++-
 src/node/install.sh                          | 96 ++++++++++++++++++++
 test/node/install_npm_latest.sh              | 31 +++++++
 test/node/install_npm_latest_incompatible.sh | 30 ++++++
 test/node/install_npm_none.sh                | 29 ++++++
 test/node/install_specific_npm_version.sh    | 12 +++
 test/node/scenarios.json                     | 47 +++++++++-
 7 files changed, 256 insertions(+), 6 deletions(-)
 create mode 100644 test/node/install_npm_latest.sh
 create mode 100644 test/node/install_npm_latest_incompatible.sh
 create mode 100644 test/node/install_npm_none.sh
 create mode 100644 test/node/install_specific_npm_version.sh

diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index c8ceb966f..2e86262ae 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.7.1",
+    "version": "2.0.0",
     "name": "Node.js (via nvm), yarn and pnpm.",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
@@ -27,6 +27,21 @@
             "default": "/usr/local/share/nvm",
             "description": "The path where NVM will be installed."
         },
+        "npmVersion": {
+            "type": "string",
+            "proposals": [
+                "lts",
+                "latest",
+                "10.9.0",
+                "10.8.0",
+                "10.7.0",
+                "9.9.3",
+                "8.19.4",
+                "none"
+            ],
+            "default": "none",
+            "description": "Select or enter a specific NPM version to install globally. Use 'latest' for the latest version, 'none' to skip npm version update, or specify a version like '10.9.0'."
+        },
         "pnpmVersion": {
             "type": "string",
             "proposals": [
diff --git a/src/node/install.sh b/src/node/install.sh
index 1d89abd0a..20ea85463 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -8,6 +8,7 @@
 # Maintainer: The Dev Container spec maintainers
 
 export NODE_VERSION="${VERSION:-"lts"}"
+export NPM_VERSION="${NPMVERSION:-"lts"}"
 export PNPM_VERSION="${PNPMVERSION:-"latest"}"
 export NVM_VERSION="${NVMVERSION:-"latest"}"
 export NVM_DIR="${NVMINSTALLPATH:-"/usr/local/share/nvm"}"
@@ -381,6 +382,101 @@ if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
     IFS=$OLDIFS
 fi
 
+# Install or update npm to specific version
+if [ -z "${NPM_VERSION}" ] || [ "${NPM_VERSION}" = "none" ]; then
+    echo "Ignoring NPM version update"
+elif bash -c ". '${NVM_DIR}/nvm.sh' && type npm >/dev/null 2>&1"; then
+        (
+            . "${NVM_DIR}/nvm.sh"
+            [ ! -z "$http_proxy" ] && npm set proxy="$http_proxy"
+            [ ! -z "$https_proxy" ] && npm set https-proxy="$https_proxy"
+            [ ! -z "$no_proxy" ] && npm set noproxy="$no_proxy"
+            echo "Installing npm version ${NPM_VERSION}..."
+
+            CURRENT_NPM_VERSION=$(npm --version 2>/dev/null || echo 'unknown')
+            echo "Current npm version: $CURRENT_NPM_VERSION"
+            
+            # Clear npm cache and extract version numbers
+            npm cache clean --force 2>/dev/null || true
+            CURRENT_MAJOR=$(echo "$CURRENT_NPM_VERSION" | cut -d. -f1 || echo "0")
+            NODE_MAJOR=$(node --version 2>/dev/null | cut -d. -f1 | tr -d 'v' || echo "0")
+            
+            # Dynamically check npm's Node.js requirements and auto-fallback if incompatible
+            ORIGINAL_NPM_VERSION="$NPM_VERSION"
+            if [ "$NPM_VERSION" != "none" ]; then
+                echo "Checking npm compatibility requirements..."
+                NPM_NODE_REQUIREMENT=$(npm view npm@${NPM_VERSION} engines.node 2>/dev/null || echo "")
+                
+                if [ -n "$NPM_NODE_REQUIREMENT" ]; then
+                    echo "npm $NPM_VERSION requires Node.js: $NPM_NODE_REQUIREMENT"
+                    
+                    # Extract minimum required Node version from requirement string
+                    MIN_NODE=$(echo "$NPM_NODE_REQUIREMENT" | grep -oE '[0-9]+' | head -1 || echo "0")
+                    
+                    if [ "$MIN_NODE" -gt "0" ] && [ "$NODE_MAJOR" -lt "$MIN_NODE" ]; then
+                        echo "⚠️  WARNING: npm $NPM_VERSION requires Node.js $MIN_NODE+, you have $NODE_MAJOR.x"
+                        
+                        # Find compatible npm version dynamically using same logic
+                        echo "🔍 Finding compatible npm version for Node.js $NODE_MAJOR.x..."
+                        
+                        # Try npm major versions in descending order to find highest compatible version
+                        for npm_major in 10 9 8 7 6; do
+                            echo "Checking npm $npm_major compatibility..."
+                            FALLBACK_NODE_REQUIREMENT=$(npm view "npm@${npm_major}" engines.node 2>/dev/null || echo "")
+                            
+                            if [ -n "$FALLBACK_NODE_REQUIREMENT" ]; then
+                                MIN_NODE=$(echo "$FALLBACK_NODE_REQUIREMENT" | grep -oE '[0-9]+' | head -1 || echo "0")
+                                
+                                if [ "$MIN_NODE" -le "$NODE_MAJOR" ]; then
+                                    # Get latest patch version for this compatible major version
+                                    NPM_VERSION=$(npm view "npm@${npm_major}" version 2>/dev/null || echo "")
+                                    if [ -n "$NPM_VERSION" ]; then
+                                        echo "✓ Found compatible npm $NPM_VERSION (requires Node.js $MIN_NODE+)"
+                                        echo "🔄 Auto-fallback: Installing compatible npm $NPM_VERSION instead"
+                                        break
+                                    fi
+                                fi
+                            fi
+                        done
+                        
+                        # If no compatible version found, skip npm installation
+                        if [ "$NPM_VERSION" = "$ORIGINAL_NPM_VERSION" ]; then
+                            echo "❌ Could not find compatible npm version, keeping current npm"
+                            NPM_VERSION="none"
+                        fi
+                    elif [ "$MIN_NODE" -gt "0" ]; then
+                        echo "✓ Node.js $NODE_MAJOR.x meets npm $NPM_VERSION requirement"
+                    fi
+                else
+                    echo "Could not determine Node.js requirements for npm $NPM_VERSION, proceeding anyway..."
+                fi
+            fi
+            
+            # Check if npm installation was cancelled due to compatibility issues
+            if [ "$NPM_VERSION" = "none" ]; then
+                echo "Skipping npm installation due to compatibility issues."
+            else
+                # Try npm installation with retries
+                for i in 1 2 3; do
+                    echo "Attempt $i: Running npm install -g npm@$NPM_VERSION"
+                    if npm install -g npm@$NPM_VERSION --force --no-audit --no-fund 2>&1; then
+                        NEW_VERSION=$(npm --version 2>/dev/null || echo 'unknown')
+                        echo "Successfully installed npm@${NPM_VERSION}, new version: $NEW_VERSION"
+                        break
+                    else
+                        echo "Attempt $i failed, retrying..."
+                        sleep 2
+                        if [ $i -eq 3 ]; then
+                            echo "Failed to install npm@${NPM_VERSION} after 3 attempts. Keeping current npm version $(npm --version 2>/dev/null || echo 'unknown')."
+                        fi
+                    fi
+                done
+            fi
+        )
+    else
+        echo "Skip installing/updating npm because npm is not available"
+    fi
+
 # Install pnpm
 if [ ! -z "${PNPM_VERSION}" ] && [ "${PNPM_VERSION}" = "none" ]; then
     echo "Ignoring installation of PNPM"
diff --git a/test/node/install_npm_latest.sh b/test/node/install_npm_latest.sh
new file mode 100644
index 000000000..e3fa94f67
--- /dev/null
+++ b/test/node/install_npm_latest.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# When npmVersion="latest", npm should be upgraded from Node.js bundled version if possible
+# Node.js 22 comes with npm 10.x, latest should be 11+ if upgrade succeeds
+# If upgrade fails, npm should still work (may remain at bundled version)
+check "npm_version_upgraded_or_functional" bash -c "
+    npm --version >/dev/null
+    NPM_MAJOR=\$(npm --version | cut -d. -f1)
+    
+    if [ \$NPM_MAJOR -ge 11 ]; then
+        echo 'npm successfully upgraded to version 11+ (\$NPM_MAJOR.x)'
+        exit 0
+    elif [ \$NPM_MAJOR -eq 10 ]; then
+        echo 'npm upgrade may have failed, but npm 10.x is still functional'
+        exit 0
+    else
+        echo 'npm version \$NPM_MAJOR.x - unexpected version'
+        exit 1
+    fi
+"
+
+# Also verify pnpm works as configured
+check "pnpm_version" bash -c "pnpm -v | grep 8.8.0"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/node/install_npm_latest_incompatible.sh b/test/node/install_npm_latest_incompatible.sh
new file mode 100644
index 000000000..5db9ad903
--- /dev/null
+++ b/test/node/install_npm_latest_incompatible.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Test: npm "latest" with Node.js 16.x (incompatible scenario)
+# Should show compatibility warning and auto-fallback to compatible version (npm 9.x)
+
+# Verify we have Node.js 16.x as expected
+check "node_version_16" bash -c "node -v | grep '^v16\.'"
+
+# Check npm is functional after installation attempt
+check "npm_works" bash -c "npm --version"
+
+# Verify npm version fell back to compatible version for Node 16.x (should be npm 8.x)
+check "npm_fallback_version" bash -c "
+    NPM_MAJOR=\$(npm --version | cut -d. -f1)
+    if [ \$NPM_MAJOR -eq 8 ]; then
+        echo 'npm auto-fell back to version 8.x (compatible with Node 16.x)'
+        exit 0
+    else
+        echo 'npm version \$NPM_MAJOR.x - fallback may not have worked correctly'
+        exit 1
+    fi
+"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/node/install_npm_none.sh b/test/node/install_npm_none.sh
new file mode 100644
index 000000000..5bd07157b
--- /dev/null
+++ b/test/node/install_npm_none.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# When npmVersion is "none", npm should not be updated from node's bundled version
+check "npm_not_updated" bash -c '
+    npm --version >/dev/null
+
+    NODE_MAJOR=$(node -p "process.versions.node.split(\".\")[0]")
+    NPM_MAJOR=$(npm --version | cut -d. -f1)
+
+    case "$NODE_MAJOR" in
+        16) EXPECTED_NPM_MAJOR=8 ;;
+        18|20|22) EXPECTED_NPM_MAJOR=10 ;;
+        24) EXPECTED_NPM_MAJOR=11 ;;
+        *)
+            echo "Unsupported Node major for bundled npm assertion: $NODE_MAJOR"
+            exit 1
+            ;;
+    esac
+
+    [ "$NPM_MAJOR" = "$EXPECTED_NPM_MAJOR" ]
+'
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/node/install_specific_npm_version.sh b/test/node/install_specific_npm_version.sh
new file mode 100644
index 000000000..8c541fd07
--- /dev/null
+++ b/test/node/install_specific_npm_version.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Verify npm is installed with specific version 10.8.0
+check "npm_specific_version" bash -c "npm -v | grep '^10.8.0'"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/node/scenarios.json b/test/node/scenarios.json
index e3b4297a1..9459d0e4a 100644
--- a/test/node/scenarios.json
+++ b/test/node/scenarios.json
@@ -6,7 +6,7 @@
                 "version": "lts"
             }
         }
-    },    
+    },
     "install_node_debian_bookworm": {
         "image": "debian:12",
         "features": {
@@ -14,7 +14,7 @@
                 "version": "lts"
             }
         }
-    },    
+    },
     "nvm_test_fallback": {
         "image": "debian:11",
         "features": {
@@ -22,7 +22,7 @@
                 "version": "lts"
             }
         }
-    },    
+    },
     "install_additional_node": {
         "image": "debian:11",
         "features": {
@@ -98,7 +98,7 @@
         "features": {
             "node": {
                 "version": "22",
-                "pnpmVersion":"8.8.0"
+                "pnpmVersion": "8.8.0"
             }
         }
     },
@@ -207,5 +207,42 @@
                 "version": "lts"
             }
         }
+    },
+    "install_specific_npm_version": {
+        "image": "debian:12",
+        "features": {
+            "node": {
+                "version": "lts",
+                "npmVersion": "10.8.0"
+            }
+        }
+    },
+    "install_npm_none": {
+        "image": "mcr.microsoft.com/devcontainers/base",
+        "features": {
+            "node": {
+                "version": "24",
+                "npmVersion": "none"
+            }
+        }
+    },
+    "install_npm_latest": {
+        "image": "debian:12",
+        "features": {
+            "node": {
+                "version": "22",
+                "npmVersion": "latest",
+                "pnpmVersion": "8.8.0"
+            }
+        }
+    },
+    "install_npm_latest_incompatible": {
+        "image": "debian:12",
+        "features": {
+            "node": {
+                "version": "16",
+                "npmVersion": "latest"
+            }
+        }
     }
-}
+}
\ No newline at end of file

From 71c999dff6218c6905de7b7a55167fba7eb5709a Mon Sep 17 00:00:00 2001
From: Daeghan Elkin <daeghan.elkin@tylertech.com>
Date: Tue, 28 Apr 2026 07:59:30 -0400
Subject: [PATCH 445/478] Fix `aws-cli` completion for ZSH (#1627)

fix(aws-cli): fix ZSH completion installation

The ZSH completer script provided by the aws/aws-cli repo is not set up
to be used as a completer function, and thus cannot be dropped into a
directory like ~/.oh-my-zsh/completions and be expected to work.

This change also moves the completer to a more standard location for system-wide
ZSH completions, and adds the necessary header to make it work as a completer.
---
 src/aws-cli/devcontainer-feature.json |  2 +-
 src/aws-cli/install.sh                | 12 +++++-------
 test/aws-cli/scenarios.json           |  9 +++++++++
 test/aws-cli/zsh_completion.sh        | 17 +++++++++++++++++
 4 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 test/aws-cli/zsh_completion.sh

diff --git a/src/aws-cli/devcontainer-feature.json b/src/aws-cli/devcontainer-feature.json
index ed2e20284..75d24ca88 100644
--- a/src/aws-cli/devcontainer-feature.json
+++ b/src/aws-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "aws-cli",
-    "version": "1.1.3",
+    "version": "1.1.4",
     "name": "AWS CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/aws-cli",
     "description": "Installs the AWS CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/aws-cli/install.sh b/src/aws-cli/install.sh
index ba6861074..1f6af54bd 100755
--- a/src/aws-cli/install.sh
+++ b/src/aws-cli/install.sh
@@ -119,16 +119,14 @@ install() {
     
     ./aws/install
 
-    # kubectl bash completion
+    # AWS bash completion
     mkdir -p /etc/bash_completion.d
     cp ./scripts/vendor/aws_bash_completer /etc/bash_completion.d/aws
 
-    # kubectl zsh completion
-    if [ -e "${USERHOME}/.oh-my-zsh" ]; then
-        mkdir -p "${USERHOME}/.oh-my-zsh/completions"
-        cp ./scripts/vendor/aws_zsh_completer.sh "${USERHOME}/.oh-my-zsh/completions/_aws"
-        chown -R "${USERNAME}" "${USERHOME}/.oh-my-zsh"
-    fi
+    # AWS zsh completion
+    mkdir -p /usr/local/share/zsh/site-functions/
+    cp ./scripts/vendor/aws_zsh_completer.sh /usr/local/share/zsh/site-functions/_aws
+    sed -i '1s/^/#compdef aws\n/' /usr/local/share/zsh/site-functions/_aws
 
     rm -rf ./aws
 }
diff --git a/test/aws-cli/scenarios.json b/test/aws-cli/scenarios.json
index 9dd703c27..f2577c0ff 100644
--- a/test/aws-cli/scenarios.json
+++ b/test/aws-cli/scenarios.json
@@ -4,5 +4,14 @@
         "features": {
             "aws-cli": {}
         }
+    },
+    "zsh_completion": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "features": {
+            "common-utils": {
+                "installZsh": true
+            },
+            "aws-cli": {}
+        }
     }
 }
\ No newline at end of file
diff --git a/test/aws-cli/zsh_completion.sh b/test/aws-cli/zsh_completion.sh
new file mode 100644
index 000000000..ca08e077d
--- /dev/null
+++ b/test/aws-cli/zsh_completion.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check that the zsh completion file exists in the correct location
+check "zsh completion file installed" test -f /usr/local/share/zsh/site-functions/_aws
+
+# Check that the completion file has the proper zsh completion header
+check "zsh completion file has compdef header" grep -q "^#compdef aws" /usr/local/share/zsh/site-functions/_aws
+
+# Actual ZSH completion testing is a pain, so just ignoring it for now.
+
+# Report result
+reportResults

From 50fd97945b00ccdae3064e26100e768d6081b54e Mon Sep 17 00:00:00 2001
From: Gennadij Ivanov <86804723+ivanov-gv@users.noreply.github.com>
Date: Tue, 5 May 2026 18:48:27 +0200
Subject: [PATCH 446/478] #1635 - Fix: changed the golangci-lint script url
 (#1636)

Fix: changed the golangci-lint script url
---
 src/go/devcontainer-feature.json | 2 +-
 src/go/install.sh                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/go/devcontainer-feature.json b/src/go/devcontainer-feature.json
index 8872d6374..b61e93605 100644
--- a/src/go/devcontainer-feature.json
+++ b/src/go/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "go",
-    "version": "1.3.3",
+    "version": "1.3.4",
     "name": "Go",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/go",
     "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/go/install.sh b/src/go/install.sh
index 4286c08a8..db0ac7977 100755
--- a/src/go/install.sh
+++ b/src/go/install.sh
@@ -325,11 +325,11 @@ if [ "${INSTALL_GO_TOOLS}" = "true" ]; then
     # Install golangci-lint from precompiled binares
     if [ "$GOLANGCILINT_VERSION" = "latest" ] || [ "$GOLANGCILINT_VERSION" = "" ]; then
         echo "Installing golangci-lint latest..."
-        curl -fsSL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | \
+        curl -fsSL https://golangci-lint.run/install.sh | \
             sh -s -- -b "${TARGET_GOPATH}/bin"
     else
         echo "Installing golangci-lint ${GOLANGCILINT_VERSION}..."
-        curl -fsSL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | \
+        curl -fsSL https://golangci-lint.run/install.sh | \
             sh -s -- -b "${TARGET_GOPATH}/bin" "v${GOLANGCILINT_VERSION}"
     fi
 

From 704147d27ebb0de85ec537f303fa87cc9397bbfb Mon Sep 17 00:00:00 2001
From: sireeshajonnalagadda <sireeshajonnalagadda@github.com>
Date: Wed, 6 May 2026 18:52:55 +0530
Subject: [PATCH 447/478] [Node]-Update Readme (#1641)

* feat(node): add npm version selection and installation options

* add 'lts' and 'latest' options for npm version selection

* feat(node): enhance npm installation with compatibility checks and fallback for incompatible Node.js versions

* Update src/node/devcontainer-feature.json

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/node/devcontainer-feature.json

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* feat(tests): enhance npm version checks for compatibility and fallback scenarios

* Version bump

* Version bump

* fix(install): update npm version check logic and improve compatibility messaging

* fix(install): update npm version check logic and improve compatibility messaging

* fix(install): update npm installation loop syntax for clarity

* feat(README): update Node.js feature version and add npm version option

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 src/node/README.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/node/README.md b/src/node/README.md
index 2c6f8cba6..028b47401 100644
--- a/src/node/README.md
+++ b/src/node/README.md
@@ -7,7 +7,16 @@ Installs Node.js, nvm, yarn, pnpm, and needed dependencies.
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/node:1": {}
+    "ghcr.io/devcontainers/features/node:2": {}
+}
+```
+
+```json
+"features": {
+    "ghcr.io/devcontainers/features/node:2": {
+        "version": "20",
+        "npmVersion": "10.8.0"
+    }
 }
 ```
 
@@ -18,6 +27,7 @@ Installs Node.js, nvm, yarn, pnpm, and needed dependencies.
 | version | Select or enter a Node.js version to install | string | lts |
 | nodeGypDependencies | Install dependencies to compile native node modules (node-gyp)? | boolean | true |
 | nvmInstallPath | The path where NVM will be installed. | string | /usr/local/share/nvm |
+| npmVersion | Select or enter a specific NPM version to install globally. Use 'latest' for the latest version, 'none' to skip npm version update, or specify a version like '10.9.0'. | string | none |
 | pnpmVersion | Select or enter the PNPM version to install | string | latest |
 | nvmVersion | Version of NVM to install. | string | latest |
 | installYarnUsingApt | On Debian and Ubuntu systems, you have the option to install Yarn globally via APT. If you choose not to use this option, Yarn will be set up using Corepack instead. This choice is specific to Debian and Ubuntu; for other Linux distributions, Yarn is always installed using Corepack, with a fallback to installation via NPM if an error occurs. | boolean | false |

From 58f4a1f28b18a2d46883000725f55c2fa698e425 Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Wed, 13 May 2026 14:40:17 +0530
Subject: [PATCH 448/478] =?UTF-8?q?fix:=20docker-in-docker=20on=20Ubuntu?=
 =?UTF-8?q?=2026.04=20=E2=80=94=20verify=20iptables-legacy=20works=20befor?=
 =?UTF-8?q?e=20switching=20(#1637)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Initial plan

* fix: support Ubuntu 26.04 (plucky) by checking iptables-legacy works before switching, falling back to iptables-nft

Agent-Logs-Url: https://github.com/devcontainers/features/sessions/af4f00a5-8bfc-472b-97e3-735ddf7a07c1

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>

* fix: also verify iptables-nft works before switching to it

Agent-Logs-Url: https://github.com/devcontainers/features/sessions/af4f00a5-8bfc-472b-97e3-735ddf7a07c1

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>

* fix: use correct Ubuntu 26.04 codename 'resolute' instead of 'plucky'

Agent-Logs-Url: https://github.com/devcontainers/features/sessions/60277e16-b948-4f67-8140-1d3f1cda6941

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>

* chore: bump docker-in-docker feature version to 2.17.0

Agent-Logs-Url: https://github.com/devcontainers/features/sessions/f340a34b-66fa-45bd-85f2-94b32c943241

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>

* test: set moby: false for resolute test scenario

Agent-Logs-Url: https://github.com/devcontainers/features/sessions/ce62c78c-ff28-4766-bd7f-2b5a57a349ec

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>

* docs: note Ubuntu Resolute exceptional behavior in NOTES.md

Agent-Logs-Url: https://github.com/devcontainers/features/sessions/8983ff12-365e-49de-bd65-47614caf8539

Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>

* Correction on the iptables switching logic

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Kaniska244 <186041440+Kaniska244@users.noreply.github.com>
Co-authored-by: Kaniska <kaniska244@github.com>
---
 src/docker-in-docker/NOTES.md                 |  2 ++
 .../devcontainer-feature.json                 |  2 +-
 src/docker-in-docker/install.sh               | 31 ++++++++++++++-----
 .../docker_build_ubuntu_resolute.sh           | 14 +++++++++
 test/docker-in-docker/scenarios.json          |  8 +++++
 5 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 test/docker-in-docker/docker_build_ubuntu_resolute.sh

diff --git a/src/docker-in-docker/NOTES.md b/src/docker-in-docker/NOTES.md
index c7fb26137..797bbcc81 100644
--- a/src/docker-in-docker/NOTES.md
+++ b/src/docker-in-docker/NOTES.md
@@ -15,4 +15,6 @@ This Feature should work on recent versions of Debian/Ubuntu-based distributions
 
 Debian Trixie (13) does not include moby-cli and related system packages, so the feature cannot install with "moby": "true". To use this feature on Trixie, please set "moby": "false" or choose a different base image (for example, Ubuntu 24.04).
 
+Ubuntu 26.04 (Resolute) does not currently have moby packages available, so the feature cannot install with "moby": "true". To use this feature on Resolute, please set "moby": "false". Additionally, the kernel on Ubuntu 26.04 no longer supports legacy iptables NAT tables, so the feature automatically falls back to `iptables-nft` when `iptables-legacy` is not functional.
+
 `bash` is required to execute the `install.sh` script.
diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 4c792e8f4..bdb4cb291 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "docker-in-docker",
-  "version": "2.16.1",
+  "version": "2.17.0",
   "name": "Docker (Docker-in-Docker)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
   "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 5af320b0b..dd9d09fa3 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -20,7 +20,7 @@ INSTALL_DOCKER_COMPOSE_SWITCH="${INSTALLDOCKERCOMPOSESWITCH:-"false"}"
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 MICROSOFT_GPG_KEYS_ROLLING_URI="https://packages.microsoft.com/keys/microsoft-rolling.asc"
 DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="trixie bookworm buster bullseye bionic focal jammy noble"
-DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="trixie bookworm buster bullseye bionic focal hirsute impish jammy noble"
+DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="trixie bookworm buster bullseye bionic focal hirsute impish jammy noble resolute"
 DISABLE_IP6_TABLES="${DISABLEIP6TABLES:-false}"
 
 # Default: Exit on any failure.
@@ -249,10 +249,10 @@ if [ "${ID}" = "azurelinux" ]; then
     VERSION_CODENAME="azurelinux${VERSION_ID}"
 fi
 
-# Prevent attempting to install Moby on Debian trixie (packages removed)
-if [ "${USE_MOBY}" = "true" ] && [ "${ID}" = "debian" ] && [ "${VERSION_CODENAME}" = "trixie" ]; then
-    err "The 'moby' option is not supported on Debian 'trixie' because 'moby-cli' and related system packages have been removed from that distribution."
-    err "To continue, either set the feature option '\"moby\": false' or use a different base image (for example: 'debian:bookworm' or 'ubuntu-24.04')."
+# Prevent attempting to install Moby on Debian trixie/resolute (packages removed)
+if [ "${USE_MOBY}" = "true" ] && [ "${ADJUSTED_ID}" = "debian" ] && ([ "${VERSION_CODENAME}" = "trixie" ] || [ "${VERSION_CODENAME}" = "resolute" ]); then
+    err "The 'moby' option is not supported on ${ID} '${VERSION_CODENAME}' because 'moby-cli' and related system packages are not available in that distribution."
+    err "To continue, either set the feature option '\"moby\": false' or use a different base image."
     exit 1
 fi
 
@@ -311,9 +311,24 @@ if [ "${ADJUSTED_ID}" = "debian" ] && command -v update-ca-certificates > /dev/n
 fi
 
 # Swap to legacy iptables for compatibility (Debian only)
-if [ "${ADJUSTED_ID}" = "debian" ] && type iptables-legacy > /dev/null 2>&1; then
-    update-alternatives --set iptables /usr/sbin/iptables-legacy
-    update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
+if [ "${ADJUSTED_ID}" = "debian" ]; then
+    # On distros where legacy iptables is no longer kernel-supported (e.g. Ubuntu 26.04 / resolute),
+    # prefer iptables-nft. Otherwise prefer legacy for backward compatibility.
+    use_nft=false
+    case "${VERSION_CODENAME}" in
+        resolute) use_nft=true ;;
+    esac
+
+    if [ "${use_nft}" = "true" ] && type iptables-nft > /dev/null 2>&1; then
+        update-alternatives --set iptables /usr/sbin/iptables-nft || true
+        update-alternatives --set ip6tables /usr/sbin/ip6tables-nft || true
+    elif type iptables-legacy > /dev/null 2>&1; then
+        update-alternatives --set iptables /usr/sbin/iptables-legacy || true
+        update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy || true
+    elif type iptables-nft > /dev/null 2>&1; then
+        update-alternatives --set iptables /usr/sbin/iptables-nft || true
+        update-alternatives --set ip6tables /usr/sbin/ip6tables-nft || true
+    fi
 fi
 
 # Set up the necessary repositories
diff --git a/test/docker-in-docker/docker_build_ubuntu_resolute.sh b/test/docker-in-docker/docker_build_ubuntu_resolute.sh
new file mode 100644
index 000000000..c9fd7affc
--- /dev/null
+++ b/test/docker-in-docker/docker_build_ubuntu_resolute.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker-buildx" docker buildx version
+check "docker-build" docker build ./
+check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
+
+# Report result
+reportResults
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index baeaa6769..ad8c2ce48 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -154,6 +154,14 @@
             }
         }
     },
+    "docker_build_ubuntu_resolute": {
+        "image": "ubuntu:resolute",
+        "features": {
+            "docker-in-docker": {
+                "moby": false
+            }
+        }
+    },
     "docker_specific_moby_buildx": {
         "image": "ubuntu:noble",
         "features": {

From 8c471574f1b39e260e88ddcb858ab1681dafbdac Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Wed, 13 May 2026 15:02:45 +0100
Subject: [PATCH 449/478] Install only missing packages across all common-utils
 package sets (#1644)

* Initial plan

* Fix bubblewrap/socat installation in common-utils (install regardless of PACKAGES_ALREADY_INSTALLED)

* Install bubblewrap/socat only when missing in common-utils

* Refine missing-package checks in common-utils

* Check all common-utils packages and install only missing ones

* Address PR review: fix dpkg-query format, remove dead variable, add docs and tests

- Add \n to dpkg-query format string so glob patterns like libicu[0-9][0-9]
  that match multiple packages get each status on its own line
- Remove dead PACKAGES_ALREADY_INSTALLED variable from all three install
  functions and the marker file (per-package checks make it redundant)
- Document bubblewrap and socat in NOTES.md
- Add bubblewrap/socat checks to alpine, alma-9, fedora, and rocky-9 tests#

* Add bubblewrap/socat checks to Ubuntu test scenarios (jammy, noble)

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Abdurrahmaan Iqbal <abdurriq@github.com>
---
 src/common-utils/NOTES.md                  |   7 +
 src/common-utils/devcontainer-feature.json |   2 +-
 src/common-utils/main.sh                   | 410 +++++++++++----------
 test/common-utils/alma-9.sh                |   2 +
 test/common-utils/alpine.sh                |   2 +
 test/common-utils/fedora.sh                |   2 +
 test/common-utils/jammy.sh                 |   2 +
 test/common-utils/noble.sh                 |   2 +
 test/common-utils/rocky-9.sh               |   2 +
 test/common-utils/test.sh                  |   2 +
 10 files changed, 240 insertions(+), 193 deletions(-)

diff --git a/src/common-utils/NOTES.md b/src/common-utils/NOTES.md
index f2c7aa72e..9faa2eedd 100644
--- a/src/common-utils/NOTES.md
+++ b/src/common-utils/NOTES.md
@@ -2,6 +2,13 @@
 
 This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, RockyLinux, and Alpine Linux.
 
+## Included utilities
+
+In addition to the common CLI tools (curl, wget, git, jq, nano, vim, etc.), this Feature installs:
+
+- **bubblewrap** (`bwrap`) — a lightweight sandboxing tool used as a dependency by some desktop and container tooling.
+- **socat** — a multipurpose relay for bidirectional data transfer between two independent data channels (e.g., sockets, files, pipes).
+
 ## Using with dev container images
 
 This Feature is used in many of the [dev container images](https://github.com/search?q=repo%3Adevcontainers%2Fimages+%22ghcr.io%2Fdevcontainers%2Ffeatures%2Fcommon-utils%22&type=code), as a result
diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 4ebbd3074..92d47fc3c 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.5.7",
+    "version": "2.5.8",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 3f6b13477..eab75ced3 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -30,80 +30,80 @@ install_debian_packages() {
     export DEBIAN_FRONTEND=noninteractive
 
     local package_list=""
-    if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
-        package_list="${package_list} \
-        apt-utils \
-        bash-completion \
-        openssh-client \
-        gnupg2 \
-        dirmngr \
-        iproute2 \
-        procps \
-        lsof \
-        htop \
-        net-tools \
-        psmisc \
-        curl \
-        tree \
-        wget \
-        rsync \
-        ca-certificates \
-        unzip \
-        bzip2 \
-        xz-utils \
-        zip \
-        nano \
-        vim-tiny \
-        less \
-        jq \
-        lsb-release \
-        apt-transport-https \
-        dialog \
-        libc6 \
-        libgcc1 \
-        libkrb5-3 \
-        libgssapi-krb5-2 \
-        libicu[0-9][0-9] \
-        liblttng-ust[0-9] \
-        libstdc++6 \
-        zlib1g \
-        locales \
-        sudo \
-        ncdu \
-        man-db \
-        strace \
-        manpages \
-        manpages-dev \
-        init-system-helpers"
-
-        if [ "${INSTALL_SSL}" = "true" ]; then
-            # Include libssl1.1 if available
-            if [[ ! -z $(apt-cache --names-only search ^libssl1.1$) ]]; then
-                package_list="${package_list} libssl1.1"
-            fi
+    package_list="${package_list} \
+    apt-utils \
+    bash-completion \
+    openssh-client \
+    gnupg2 \
+    dirmngr \
+    iproute2 \
+    procps \
+    lsof \
+    htop \
+    net-tools \
+    psmisc \
+    curl \
+    tree \
+    wget \
+    rsync \
+    ca-certificates \
+    unzip \
+    bzip2 \
+    xz-utils \
+    zip \
+    nano \
+    vim-tiny \
+    less \
+    jq \
+    lsb-release \
+    apt-transport-https \
+    dialog \
+    libc6 \
+    libgcc1 \
+    libkrb5-3 \
+    libgssapi-krb5-2 \
+    libicu[0-9][0-9] \
+    liblttng-ust[0-9] \
+    libstdc++6 \
+    zlib1g \
+    locales \
+    sudo \
+    ncdu \
+    man-db \
+    strace \
+    manpages \
+    manpages-dev \
+    init-system-helpers \
+    bubblewrap \
+    socat"
+
+    if [ "${INSTALL_SSL}" = "true" ]; then
+        # Include libssl1.1 if available
+        if [[ ! -z $(apt-cache --names-only search ^libssl1.1$) ]]; then
+            package_list="${package_list} libssl1.1"
+        fi
 
-            # Include libssl3 if available
-            if [[ ! -z $(apt-cache --names-only search ^libssl3$) ]]; then
-                package_list="${package_list} libssl3"
-            fi
+        # Include libssl3 if available
+        if [[ ! -z $(apt-cache --names-only search ^libssl3$) ]]; then
+            package_list="${package_list} libssl3"
+        fi
 
-            # Include appropriate version of libssl1.0.x if available
-            local libssl_package=$(dpkg-query -f '${db:Status-Abbrev}\t${binary:Package}\n' -W 'libssl1\.0\.?' 2>&1 || echo '')
-            if [ "$(echo "$libssl_package" | grep -o 'libssl1\.0\.[0-9]:' | uniq | sort | wc -l)" -eq 0 ]; then
-                if [[ ! -z $(apt-cache --names-only search ^libssl1.0.2$) ]]; then
-                    # Debian 9
-                    package_list="${package_list} libssl1.0.2"
-                elif [[ ! -z $(apt-cache --names-only search ^libssl1.0.0$) ]]; then
-                    # Ubuntu 18.04
-                    package_list="${package_list} libssl1.0.0"
-                fi
+        # Include appropriate version of libssl1.0.x if available
+        local libssl_package=$(dpkg-query -f '${db:Status-Abbrev}\t${binary:Package}\n' -W 'libssl1\.0\.?' 2>&1 || echo '')
+        if [ "$(echo "$libssl_package" | grep -o 'libssl1\.0\.[0-9]:' | uniq | sort | wc -l)" -eq 0 ]; then
+            if [[ ! -z $(apt-cache --names-only search ^libssl1.0.2$) ]]; then
+                # Debian 9
+                package_list="${package_list} libssl1.0.2"
+            elif [[ ! -z $(apt-cache --names-only search ^libssl1.0.0$) ]]; then
+                # Ubuntu 18.04
+                package_list="${package_list} libssl1.0.0"
             fi
         fi
+    fi
 
-        # Include git if not already installed (may be more recent than distro version)
-        if ! type git > /dev/null 2>&1; then
-            package_list="${package_list} git"
-        fi
+    # Include git if not already installed (may be more recent than distro version)
+    if ! type git > /dev/null 2>&1; then
+        package_list="${package_list} git"
     fi
 
     # Needed for adding manpages-posix and manpages-posix-dev which are non-free packages in Debian
@@ -128,11 +128,22 @@ install_debian_packages() {
         package_list="${package_list} manpages-posix manpages-posix-dev"
     fi
 
-    # Install the list of packages
-    echo "Packages to verify are installed: ${package_list}"
-    rm -rf /var/lib/apt/lists/*
-    apt-get update -y
-    apt-get -y install --no-install-recommends ${package_list} 2> >( grep -v 'debconf: delaying package configuration, since apt-utils is not installed' >&2 )
+    local missing_package_list=""
+    local packages=()
+    read -r -a packages <<< "${package_list}"
+    for package in "${packages[@]}"; do
+        if ! dpkg-query -W -f='${db:Status-Abbrev}\n' "${package}" 2>/dev/null | grep -q '^ii'; then
+            missing_package_list="${missing_package_list} ${package}"
+        fi
+    done
+
+    # Install the list of missing packages
+    if [ -n "${missing_package_list}" ]; then
+        echo "Packages to verify are installed: ${missing_package_list}"
+        rm -rf /var/lib/apt/lists/*
+        apt-get update -y
+        apt-get -y install --no-install-recommends ${missing_package_list} 2> >( grep -v 'debconf: delaying package configuration, since apt-utils is not installed' >&2 )
+    fi
 
     # Install zsh (and recommended packages) if needed
     if [ "${INSTALL_ZSH}" = "true" ] && ! type zsh > /dev/null 2>&1; then
@@ -152,8 +163,6 @@ install_debian_packages() {
         LOCALE_ALREADY_SET="true"
     fi
 
-    PACKAGES_ALREADY_INSTALLED="true"
-
     # Clean up
     apt-get -y clean
     rm -rf /var/lib/apt/lists/*
@@ -177,64 +186,64 @@ install_redhat_packages() {
        exit 1
     fi
 
-    if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
-        package_list="${package_list} \
-            gawk \
-            bash-completion \
-            openssh-clients \
-            gnupg2 \
-            iproute \
-            procps \
-            lsof \
-            net-tools \
-            psmisc \
-            wget \
-            ca-certificates \
-            rsync \
-            unzip \
-            xz \
-            zip \
-            nano \
-            vim-minimal \
-            less \
-            jq \
-            openssl-libs \
-            krb5-libs \
-            libicu \
-            zlib \
-            sudo \
-            sed \
-            grep \
-            which \
-            man-db \
-            strace"
-
-        # rockylinux:9 installs 'curl-minimal' which clashes with 'curl'
-        # Install 'curl' for every OS except this rockylinux:9
-        if [[ "${ID}" = "rocky" ]] && [[ "${VERSION}" != *"9."* ]]; then
-            package_list="${package_list} curl"
-        fi
+    package_list="${package_list} \
+        gawk \
+        bash-completion \
+        openssh-clients \
+        gnupg2 \
+        iproute \
+        procps \
+        lsof \
+        net-tools \
+        psmisc \
+        wget \
+        ca-certificates \
+        rsync \
+        unzip \
+        xz \
+        zip \
+        nano \
+        vim-minimal \
+        less \
+        jq \
+        openssl-libs \
+        krb5-libs \
+        libicu \
+        zlib \
+        sudo \
+        sed \
+        grep \
+        which \
+        man-db \
+        strace \
+        bubblewrap \
+        socat"
 
-        # Install OpenSSL 1.0 compat if needed
-        if ${install_cmd} -q list compat-openssl10 >/dev/null 2>&1; then
-            package_list="${package_list} compat-openssl10"
-        fi
+    # rockylinux:9 installs 'curl-minimal' which clashes with 'curl'
+    # Install 'curl' for every OS except this rockylinux:9
+    if [[ "${ID}" = "rocky" ]] && [[ "${VERSION}" != *"9."* ]]; then
+        package_list="${package_list} curl"
+    fi
 
-        # Install lsb_release if available
-        if ${install_cmd} -q list redhat-lsb-core >/dev/null 2>&1; then
-            package_list="${package_list} redhat-lsb-core"
-        fi
+    # Install OpenSSL 1.0 compat if needed
+    if ${install_cmd} -q list compat-openssl10 >/dev/null 2>&1; then
+        package_list="${package_list} compat-openssl10"
+    fi
 
-        # Install git if not already installed (may be more recent than distro version)
-        if ! type git > /dev/null 2>&1; then
-            package_list="${package_list} git"
-        fi
+    # Install lsb_release if available
+    if ${install_cmd} -q list redhat-lsb-core >/dev/null 2>&1; then
+        package_list="${package_list} redhat-lsb-core"
+    fi
 
-        # Install EPEL repository if needed (required to install 'jq' for CentOS)
-        if [[ "${ID}" = "centos" ]] && ! rpm -q jq >/dev/null 2>&1; then
-            ${install_cmd} -y install epel-release
-            remove_epel="true"
-        fi
+    # Install git if not already installed (may be more recent than distro version)
+    if ! type git > /dev/null 2>&1; then
+        package_list="${package_list} git"
+    fi
+
+    # Install EPEL repository if needed (required to install 'jq' for CentOS)
+    if [[ "${ID}" = "centos" ]] && ! rpm -q jq >/dev/null 2>&1; then
+        ${install_cmd} -y install epel-release
+        remove_epel="true"
     fi
 
     # Install zsh if needed
@@ -242,13 +251,22 @@ install_redhat_packages() {
         package_list="${package_list} zsh"
     fi
 
-    if [ -n "${package_list}" ]; then
-        echo "Packages to verify are installed: ${package_list}"
+    local missing_package_list=""
+    local packages=()
+    read -r -a packages <<< "${package_list}"
+    for package in "${packages[@]}"; do
+        if ! rpm -q "${package}" >/dev/null 2>&1; then
+            missing_package_list="${missing_package_list} ${package}"
+        fi
+    done
+
+    if [ -n "${missing_package_list}" ]; then
+        echo "Packages to verify are installed: ${missing_package_list}"
         echo "Running ${install_cmd} install..."
         if [ "${install_cmd}" = "dnf" ]; then
-            ${install_cmd} -y install --allowerasing ${package_list}
+            ${install_cmd} -y install --allowerasing ${missing_package_list}
         else
-            ${install_cmd} -y install ${package_list}
+            ${install_cmd} -y install ${missing_package_list}
         fi
     fi
 
@@ -261,77 +279,86 @@ install_redhat_packages() {
     if [[ "${remove_epel}" = "true" ]]; then
         ${install_cmd} -y remove epel-release
     fi
-
-    PACKAGES_ALREADY_INSTALLED="true"
 }
 
 # Alpine Linux packages
 install_alpine_packages() {
     apk update
+    local package_list=""
 
-    if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
-        apk add --no-cache \
-            openssh-client \
-            bash-completion \
-            gnupg \
-            procps \
-            lsof \
-            htop \
-            net-tools \
-            psmisc \
-            curl \
-            wget \
-            rsync \
-            ca-certificates \
-            unzip \
-            xz \
-            zip \
-            nano \
-            vim \
-            less \
-            jq \
-            libgcc \
-            libstdc++ \
-            krb5-libs \
-            libintl \
-            lttng-ust \
-            tzdata \
-            userspace-rcu \
-            zlib \
-            sudo \
-            coreutils \
-            sed \
-            grep \
-            which \
-            ncdu \
-            shadow \
-            strace
-
-        # # Include libssl1.1 if available (not available for 3.19 and newer)
-        LIBSSL1_PKG=libssl1.1
-        if [[ $(apk search --no-cache -a $LIBSSL1_PKG | grep $LIBSSL1_PKG) ]]; then
-            apk add --no-cache $LIBSSL1_PKG
-        fi
+    package_list="${package_list} \
+        openssh-client \
+        bash-completion \
+        gnupg \
+        procps \
+        lsof \
+        htop \
+        net-tools \
+        psmisc \
+        curl \
+        wget \
+        rsync \
+        ca-certificates \
+        unzip \
+        xz \
+        zip \
+        nano \
+        vim \
+        less \
+        jq \
+        libgcc \
+        libstdc++ \
+        krb5-libs \
+        libintl \
+        lttng-ust \
+        tzdata \
+        userspace-rcu \
+        zlib \
+        sudo \
+        coreutils \
+        sed \
+        grep \
+        which \
+        ncdu \
+        shadow \
+        strace \
+        bubblewrap \
+        socat"
 
-        # Install man pages - package name varies between 3.12 and earlier versions
-        if apk info man > /dev/null 2>&1; then
-            apk add --no-cache man man-pages
-        else
-            apk add --no-cache mandoc man-pages
-        fi
+    # # Include libssl1.1 if available (not available for 3.19 and newer)
+    LIBSSL1_PKG=libssl1.1
+    if [[ $(apk search --no-cache -a $LIBSSL1_PKG | grep $LIBSSL1_PKG) ]]; then
+        package_list="${package_list} $LIBSSL1_PKG"
+    fi
 
-        # Install git if not already installed (may be more recent than distro version)
-        if ! type git > /dev/null 2>&1; then
-            apk add --no-cache git
-        fi
+    # Install man pages - package name varies between 3.12 and earlier versions
+    if apk info man > /dev/null 2>&1; then
+        package_list="${package_list} man man-pages"
+    else
+        package_list="${package_list} mandoc man-pages"
+    fi
+
+    # Install git if not already installed (may be more recent than distro version)
+    if ! type git > /dev/null 2>&1; then
+        package_list="${package_list} git"
     fi
 
     # Install zsh if needed
     if [ "${INSTALL_ZSH}" = "true" ] && ! type zsh > /dev/null 2>&1; then
-        apk add --no-cache zsh
+        package_list="${package_list} zsh"
     fi
 
-    PACKAGES_ALREADY_INSTALLED="true"
+    local missing_package_list=""
+    local packages=()
+    read -r -a packages <<< "${package_list}"
+    for package in "${packages[@]}"; do
+        if ! apk info -e "${package}" >/dev/null 2>&1; then
+            missing_package_list="${missing_package_list} ${package}"
+        fi
+    done
+    if [ -n "${missing_package_list}" ]; then
+        apk add --no-cache ${missing_package_list}
+    fi
 }
 
 # ******************
@@ -609,7 +636,6 @@ if [ ! -d "/usr/local/etc/vscode-dev-containers" ]; then
     mkdir -p "$(dirname "${MARKER_FILE}")"
 fi
 echo -e "\
-    PACKAGES_ALREADY_INSTALLED=${PACKAGES_ALREADY_INSTALLED}\n\
     LOCALE_ALREADY_SET=${LOCALE_ALREADY_SET}\n\
     EXISTING_NON_ROOT_USER=${EXISTING_NON_ROOT_USER}\n\
     RC_SNIPPET_ALREADY_ADDED=${RC_SNIPPET_ALREADY_ADDED}\n\
diff --git a/test/common-utils/alma-9.sh b/test/common-utils/alma-9.sh
index cb2b339e1..c0771df14 100755
--- a/test/common-utils/alma-9.sh
+++ b/test/common-utils/alma-9.sh
@@ -11,6 +11,8 @@ check "non-root user" test "$(whoami)" = "devcontainer"
 check "distro" test "${PLATFORM_ID}" = "platform:el9"
 check "curl" curl --version
 check "jq" jq  --version
+check "bubblewrap" bwrap --version
+check "socat" socat -V
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/common-utils/alpine.sh b/test/common-utils/alpine.sh
index c5ff86613..f60732527 100755
--- a/test/common-utils/alpine.sh
+++ b/test/common-utils/alpine.sh
@@ -9,6 +9,8 @@ source dev-container-features-test-lib
 . /etc/os-release
 check "non-root user" test "$(whoami)" = "devcontainer"
 check "distro" test "${ID}" = "alpine"
+check "bubblewrap" bwrap --version
+check "socat" socat -V
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/common-utils/fedora.sh b/test/common-utils/fedora.sh
index 67706d49a..e52f99bff 100755
--- a/test/common-utils/fedora.sh
+++ b/test/common-utils/fedora.sh
@@ -10,6 +10,8 @@ source dev-container-features-test-lib
 check "non-root user" test "$(whoami)" = "devcontainer"
 check "distro" test "${ID}" = "fedora"
 check "jq" jq  --version
+check "bubblewrap" bwrap --version
+check "socat" socat -V
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/common-utils/jammy.sh b/test/common-utils/jammy.sh
index f11cac69e..e09765168 100755
--- a/test/common-utils/jammy.sh
+++ b/test/common-utils/jammy.sh
@@ -9,6 +9,8 @@ source dev-container-features-test-lib
 . /etc/os-release
 check "non-root user" test "$(whoami)" = "devcontainer"
 check "distro" test "${VERSION_CODENAME}" = "jammy"
+check "bubblewrap" bwrap --version
+check "socat" socat -V
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/common-utils/noble.sh b/test/common-utils/noble.sh
index 78ad146e3..e1d578271 100644
--- a/test/common-utils/noble.sh
+++ b/test/common-utils/noble.sh
@@ -9,6 +9,8 @@ source dev-container-features-test-lib
 . /etc/os-release
 check "non-root user" test "$(whoami)" = "devcontainer"
 check "distro" test "${VERSION_CODENAME}" = "noble"
+check "bubblewrap" bwrap --version
+check "socat" socat -V
 
 # Report result
 reportResults
diff --git a/test/common-utils/rocky-9.sh b/test/common-utils/rocky-9.sh
index cb2b339e1..c0771df14 100755
--- a/test/common-utils/rocky-9.sh
+++ b/test/common-utils/rocky-9.sh
@@ -11,6 +11,8 @@ check "non-root user" test "$(whoami)" = "devcontainer"
 check "distro" test "${PLATFORM_ID}" = "platform:el9"
 check "curl" curl --version
 check "jq" jq  --version
+check "bubblewrap" bwrap --version
+check "socat" socat -V
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/common-utils/test.sh b/test/common-utils/test.sh
index 5e16a33c7..46cb119be 100755
--- a/test/common-utils/test.sh
+++ b/test/common-utils/test.sh
@@ -10,6 +10,8 @@ check "jq" jq  --version
 check "curl" curl  --version
 check "git" git  --version
 check "zsh" zsh --version
+check "bubblewrap" bwrap --version
+check "socat" socat -V
 check "ps" ps --version
 check "Oh My Zsh! theme" test -e $HOME/.oh-my-zsh/custom/themes/devcontainers.zsh-theme
 check "zsh theme symlink" test -e $HOME/.oh-my-zsh/custom/themes/codespaces.zsh-theme

From a646de42368ffd0df9110a0b07d5bcde4ad2f8c4 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Mon, 18 May 2026 17:58:24 +0530
Subject: [PATCH 450/478] fix(docker-in-docker): disable containerd erofs
 snapshotter to fix dockerd startup (#1645)

* Test case

* Modify the script

* Trigger the test

* Change installation script to install erofs-utils upfront

* Install docker-compose v1 with python venv

* Force load erofs to replicate the same setup as reported in the issue

* Disable erofs filesystem

* Start own containerd process

* Major version bump

* Add docker probe in some cases.

* Support arm64 for azurelinux
---
 .github/workflows/test-pr-arm64.yaml          |   9 ++
 src/docker-in-docker/NOTES.md                 |   2 +-
 src/docker-in-docker/README.md                |   2 +-
 .../devcontainer-feature.json                 |   2 +-
 src/docker-in-docker/install.sh               | 133 ++++++++++++++++--
 .../dockerIp6tablesDisabledTest.sh            |   2 +-
 test/docker-in-docker/docker_build_older.sh   |   2 +-
 .../pin_docker-ce_version_moby_false.sh       |   1 +
 8 files changed, 136 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/test-pr-arm64.yaml b/.github/workflows/test-pr-arm64.yaml
index 113ce39b5..f05048e1b 100644
--- a/.github/workflows/test-pr-arm64.yaml
+++ b/.github/workflows/test-pr-arm64.yaml
@@ -8,6 +8,8 @@ on:
     paths:
       - "src/powershell/**"
       - "test/powershell/**"
+      - "src/docker-in-docker/**"
+      - "test/docker-in-docker/**"      
 
 jobs:
   detect-changes:
@@ -23,6 +25,7 @@ jobs:
           #   <feature-name>: ./**/<feature-name>/**
           filters: |
             powershell: ./**/powershell/**
+            docker-in-docker: ./**/docker-in-docker/**
 
   test:
     needs: [detect-changes]
@@ -42,9 +45,15 @@ jobs:
             "mcr.microsoft.com/devcontainers/base:debian",
             "mcr.microsoft.com/devcontainers/base:noble"
           ]
+        exclude:
+          - features: docker-in-docker
+            baseImage: mcr.microsoft.com/devcontainers/base:debian           
     steps:
       - uses: actions/checkout@v6
 
+      - name: "Load erofs module and verify"
+        run: sudo modprobe erofs && grep erofs /proc/filesystems
+
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
 
diff --git a/src/docker-in-docker/NOTES.md b/src/docker-in-docker/NOTES.md
index 797bbcc81..67f736f59 100644
--- a/src/docker-in-docker/NOTES.md
+++ b/src/docker-in-docker/NOTES.md
@@ -4,7 +4,7 @@ This docker-in-docker Dev Container Feature is roughly based on the [official do
 * As the name implies, the Feature is expected to work when the host is running Docker (or the OSS Moby container engine it is built on). It may be possible to get running in other container engines, but it has not been tested with them.
 * The host and the container must be running on the same chip architecture. You will not be able to use it with an emulated x86 image with Docker Desktop on an Apple Silicon Mac, like in this example:
   ```
-  FROM --platform=linux/amd64 mcr.microsoft.com/devcontainers/typescript-node:16
+  FROM --platform=linux/amd64 mcr.microsoft.com/devcontainers/typescript-node:24
   ```
   See [Issue #219](https://github.com/devcontainers/features/issues/219) for more details.
 
diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index 9c5370c4e..c58283317 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -7,7 +7,7 @@ Create child containers *inside* a container, independent from the host's docker
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/docker-in-docker:2": {}
+    "ghcr.io/devcontainers/features/docker-in-docker:3": {}
 }
 ```
 
diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index bdb4cb291..406627f7e 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "docker-in-docker",
-  "version": "2.17.0",
+  "version": "3.0.0",
   "name": "Docker (Docker-in-Docker)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
   "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index dd9d09fa3..e9740efc5 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -287,10 +287,13 @@ else
 fi
 
 # Install base dependencies
+# Note: erofs-utils provides mkfs.erofs, required by containerd >= 2.3.x snapshotter
+# to avoid "failed to check mkfs.erofs availability" errors at dockerd startup
+# (see https://github.com/devcontainers/features/issues/1642).
 base_packages="curl ca-certificates pigz iptables gnupg2 wget jq"
 case ${ADJUSTED_ID} in
     debian)
-        check_packages apt-transport-https $base_packages dirmngr
+        check_packages apt-transport-https $base_packages dirmngr erofs-utils
         ;;
     rhel)
         check_packages $base_packages tar gawk shadow-utils policycoreutils  procps-ng systemd-libs systemd-devel
@@ -621,9 +624,19 @@ else
                         
                         # Download packages manually using curl since tdnf doesn't support download
                         echo "(*) Downloading Docker CE packages manually..."
-                        
+
+                        # Derive repo arch from the current platform. The Docker CE centos
+                        # repo uses 'x86_64' and 'aarch64' as the per-arch directory names,
+                        # which matches the values produced by `rpm --eval '%{_arch}'` /
+                        # `uname -m` for those platforms.
+                        case "${architecture}" in
+                            amd64|x86_64) repo_arch="x86_64" ;;
+                            arm64|aarch64) repo_arch="aarch64" ;;
+                            *) repo_arch="${architecture}" ;;
+                        esac
+
                         # Get the repository baseurl
-                        repo_baseurl="https://download.docker.com/linux/centos/9/x86_64/stable"
+                        repo_baseurl="https://download.docker.com/linux/centos/9/${repo_arch}/stable"
                         
                         # Download packages directly
                         cd /tmp/docker-ce-install
@@ -640,12 +653,12 @@ else
                         echo "(*) Attempting to download Docker CE packages from repository..."
                         
                         # Try to download latest packages if specific version fails
-                        if ! curl -fsSL "${repo_baseurl}/Packages/docker-ce-${docker_ce_version}.el9.x86_64.rpm" -o docker-ce.rpm 2>/dev/null; then
+                        if ! curl -fsSL "${repo_baseurl}/Packages/docker-ce-${docker_ce_version}.el9.${repo_arch}.rpm" -o docker-ce.rpm 2>/dev/null; then
                             # Fallback: try to get latest available version
                             echo "(*) Specific version not found, trying latest..."
-                            latest_docker=$(curl -s "${repo_baseurl}/Packages/" | grep -o 'docker-ce-[0-9][^"]*\.el9\.x86_64\.rpm' | head -1)
-                            latest_cli=$(curl -s "${repo_baseurl}/Packages/" | grep -o 'docker-ce-cli-[0-9][^"]*\.el9\.x86_64\.rpm' | head -1)
-                            latest_containerd=$(curl -s "${repo_baseurl}/Packages/" | grep -o 'containerd\.io-[0-9][^"]*\.el9\.x86_64\.rpm' | head -1)
+                            latest_docker=$(curl -s "${repo_baseurl}/Packages/" | grep -o "docker-ce-[0-9][^\"]*\.el9\.${repo_arch}\.rpm" | head -1)
+                            latest_cli=$(curl -s "${repo_baseurl}/Packages/" | grep -o "docker-ce-cli-[0-9][^\"]*\.el9\.${repo_arch}\.rpm" | head -1)
+                            latest_containerd=$(curl -s "${repo_baseurl}/Packages/" | grep -o "containerd\.io-[0-9][^\"]*\.el9\.${repo_arch}\.rpm" | head -1)
                             
                             if [ -n "${latest_docker}" ]; then
                                 curl -fsSL "${repo_baseurl}/Packages/${latest_docker}" -o docker-ce.rpm
@@ -731,11 +744,21 @@ if [ "${DOCKER_DASH_COMPOSE_VERSION}" != "none" ]; then
             err "Docker compose v1 is unavailable for 'bookworm' on Arm64. Kindly switch to use v2"
             exit 1
         else
-            # Use pip to get a version that runs on this architecture
+            # Use pip (inside an isolated venv) to get a version that runs on this architecture.
+            # A dedicated venv avoids PEP 668 "externally-managed-environment" errors on newer
+            # distros (Debian trixie, Ubuntu noble, etc.) and guarantees we do not modify or
+            # shadow the distro-managed system Python site-packages.
             check_packages python3-minimal python3-pip libffi-dev python3-venv
-            echo "(*) Installing docker compose v1 via pip..."
-            export PYTHONUSERBASE=/usr/local
-            pip3 install --disable-pip-version-check --no-cache-dir --user "Cython<3.0" pyyaml wheel docker-compose --no-build-isolation
+            echo "(*) Installing docker compose v1 via pip into an isolated virtualenv..."
+
+            compose_v1_venv="/usr/local/share/docker-compose-v1-venv"
+            python3 -m venv "${compose_v1_venv}"
+            "${compose_v1_venv}/bin/pip" install --disable-pip-version-check --no-cache-dir --upgrade pip setuptools wheel
+            "${compose_v1_venv}/bin/pip" install --disable-pip-version-check --no-cache-dir "Cython<3.0" pyyaml docker-compose --no-build-isolation
+
+            # Expose the venv's docker-compose entrypoint on PATH at the expected location.
+            ln -sf "${compose_v1_venv}/bin/docker-compose" "${docker_compose_path}"
+            chmod +x "${docker_compose_path}"
         fi
     else
         compose_version=${DOCKER_DASH_COMPOSE_VERSION#v}
@@ -876,6 +899,58 @@ if [ "$DISABLE_IP6_TABLES" == true ]; then
     fi
 fi
 
+# Workaround for https://github.com/devcontainers/features/issues/1642
+# containerd >= 2.3 ships an erofs snapshotter that requires mkfs.erofs >= 1.7.
+# Older distros (Debian 12, Ubuntu 22.04) ship erofs-utils 1.4/1.5, so when the
+# host kernel exposes the 'erofs' filesystem the snapshotter fails to
+# initialize and dockerd times out waiting for containerd. Disable the plugin
+# via the top-level `disabled_plugins` list so containerd always uses
+# overlayfs, regardless of distro / mkfs.erofs version.
+mkdir -p /etc/containerd
+if [ ! -s /etc/containerd/config.toml ]; then
+    if command -v containerd >/dev/null 2>&1; then
+        containerd config default > /etc/containerd/config.toml 2>/dev/null || : > /etc/containerd/config.toml
+    elif [ -x /usr/sbin/containerd ]; then
+        /usr/sbin/containerd config default > /etc/containerd/config.toml 2>/dev/null || : > /etc/containerd/config.toml
+    elif [ -x /usr/bin/containerd ]; then
+        /usr/bin/containerd config default > /etc/containerd/config.toml 2>/dev/null || : > /etc/containerd/config.toml
+    else
+        : > /etc/containerd/config.toml
+    fi
+fi
+
+EROFS_PLUGIN_URI='io.containerd.snapshotter.v1.erofs'
+EROFS_MARKER='# devcontainers-features:disable-erofs'
+
+if ! grep -qF "${EROFS_MARKER}" /etc/containerd/config.toml; then
+    if grep -qE '^[[:space:]]*disabled_plugins[[:space:]]*=' /etc/containerd/config.toml; then
+        # Add erofs URI to the existing top-level disabled_plugins list.
+        # Branches are mutually exclusive and guarded so we never produce
+        # duplicate entries on re-runs.
+        if grep -qE '^[[:space:]]*disabled_plugins[[:space:]]*=[[:space:]]*\[[[:space:]]*\]' /etc/containerd/config.toml; then
+            # disabled_plugins = []  ->  insert URI as the only entry.
+            sed -i -E \
+              "s|^([[:space:]]*disabled_plugins[[:space:]]*=[[:space:]]*\[)[[:space:]]*\]|\1\"${EROFS_PLUGIN_URI}\"]|" \
+              /etc/containerd/config.toml
+        elif ! grep -qF "\"${EROFS_PLUGIN_URI}\"" /etc/containerd/config.toml; then
+            # disabled_plugins = ["existing", ...]  ->  append URI.
+            sed -i -E \
+              "s|^([[:space:]]*disabled_plugins[[:space:]]*=[[:space:]]*\[)([^]]*[^],[:space:]])[[:space:]]*\]|\1\2, \"${EROFS_PLUGIN_URI}\"]|" \
+              /etc/containerd/config.toml
+        fi
+    else
+        # No disabled_plugins key in the config: prepend one.
+        tmp_cfg="$(mktemp)"
+        {
+            printf 'disabled_plugins = ["%s"]\n\n' "${EROFS_PLUGIN_URI}"
+            cat /etc/containerd/config.toml
+        } > "${tmp_cfg}"
+        mv "${tmp_cfg}" /etc/containerd/config.toml
+    fi
+    # Idempotency marker
+    printf '\n%s\n' "${EROFS_MARKER}" >> /etc/containerd/config.toml
+fi
+
 if [ ! -d /usr/local/share ]; then
     mkdir -p /usr/local/share
 fi
@@ -974,8 +1049,42 @@ dockerd_start="AZURE_DNS_AUTO_DETECTION=${AZURE_DNS_AUTO_DETECTION} DOCKER_DEFAU
         DEFAULT_ADDRESS_POOL="--default-address-pool $DOCKER_DEFAULT_ADDRESS_POOL"
     fi
 
+
+    # Start our own containerd so it picks up /etc/containerd/config.toml
+    # (notably the disabled_plugins entry for the erofs snapshotter, see
+    # https://github.com/devcontainers/features/issues/1642). dockerd's
+    # built-in containerd child uses an auto-generated config that ignores
+    # /etc/containerd/config.toml, so we must run containerd ourselves and
+    # point dockerd at it via --containerd.
+    CONTAINERD_SOCK="/run/containerd/containerd.sock"
+    CONTAINERD_BIN=""
+    for candidate in /usr/local/bin/containerd /usr/bin/containerd /usr/sbin/containerd; do
+        if [ -x "$candidate" ]; then
+            CONTAINERD_BIN="$candidate"
+            break
+        fi
+    done
+    DOCKERD_CONTAINERD_ARG=""
+    if [ -n "$CONTAINERD_BIN" ] && [ -f /etc/containerd/config.toml ]; then
+        mkdir -p /run/containerd
+        if ! pgrep -x containerd > /dev/null 2>&1; then
+            ( "$CONTAINERD_BIN" --config /etc/containerd/config.toml > /tmp/containerd.log 2>&1 ) &
+        fi
+        # Wait up to ~5s for the socket to appear
+        i=0
+        while [ $i -lt 50 ] && [ ! -S "$CONTAINERD_SOCK" ]; do
+            sleep 0.1
+            i=$((i + 1))
+        done
+        if [ -S "$CONTAINERD_SOCK" ]; then
+            DOCKERD_CONTAINERD_ARG="--containerd $CONTAINERD_SOCK"
+        else
+            echo "(*) containerd socket not ready; letting dockerd spawn its own containerd."
+        fi
+    fi
+
     # Start docker/moby engine
-    ( dockerd $CUSTOMDNS $DEFAULT_ADDRESS_POOL $DOCKER_DEFAULT_IP6_TABLES > /tmp/dockerd.log 2>&1 ) &
+    ( dockerd $DOCKERD_CONTAINERD_ARG $CUSTOMDNS $DEFAULT_ADDRESS_POOL $DOCKER_DEFAULT_IP6_TABLES > /tmp/dockerd.log 2>&1 ) &
 INNEREOF
 )"
 
diff --git a/test/docker-in-docker/dockerIp6tablesDisabledTest.sh b/test/docker-in-docker/dockerIp6tablesDisabledTest.sh
index 977054ffc..5fe8c2a3b 100644
--- a/test/docker-in-docker/dockerIp6tablesDisabledTest.sh
+++ b/test/docker-in-docker/dockerIp6tablesDisabledTest.sh
@@ -16,7 +16,7 @@ ip6tablesCheck() {
         echo "❕ip6tables command not found. ❕"
     fi
 }
-
+check "docker ps" bash -c "docker ps"
 check "ip6tables" ip6tablesCheck
 check "ip6tables check" bash -c "docker network inspect bridge"
 check "docker-build" docker build ./
diff --git a/test/docker-in-docker/docker_build_older.sh b/test/docker-in-docker/docker_build_older.sh
index d60cd937a..ed9932a84 100644
--- a/test/docker-in-docker/docker_build_older.sh
+++ b/test/docker-in-docker/docker_build_older.sh
@@ -10,6 +10,6 @@ check "docker-buildx" docker buildx version
 check "docker-build" docker build ./
 check "docker-buildx" bash -c "docker buildx version"
 check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"
-
+check "docker ps" bash -c "docker ps"
 # Report result
 reportResults
diff --git a/test/docker-in-docker/pin_docker-ce_version_moby_false.sh b/test/docker-in-docker/pin_docker-ce_version_moby_false.sh
index ec33d1504..4f1eedb84 100644
--- a/test/docker-in-docker/pin_docker-ce_version_moby_false.sh
+++ b/test/docker-in-docker/pin_docker-ce_version_moby_false.sh
@@ -5,6 +5,7 @@ source dev-container-features-test-lib
 
 check "docker-ce" bash -c "docker --version"
 check "docker-ce-cli" bash -c "docker version"
+check "docker ps" bash -c "docker ps"
 
 #report result
 reportResults
\ No newline at end of file

From 6a28f2da32040c8c2dde2c83826b242a31567325 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Wed, 20 May 2026 16:24:33 +0530
Subject: [PATCH 451/478] [docker-in-docker] - Fixing issue with containerd
 (#1653)

* [docker-in-docker] - Fixing issue with containerd

* Change the base image used for stress test as its not compatible with ubuntu resolute

* Change test base image
---
 .../docker-in-docker-stress-test.yaml         |  4 +-
 .github/workflows/test-pr-arm64.yaml          |  4 +-
 .github/workflows/test-pr.yaml                |  4 +-
 src/docker-in-docker/NOTES.md                 | 11 +++++
 .../devcontainer-feature.json                 |  7 +++-
 test/docker-in-docker/Dockerfile              |  2 +-
 .../overlayfs_containerd_root.sh              | 42 +++++++++++++++++++
 test/docker-in-docker/scenarios.json          | 11 ++++-
 8 files changed, 78 insertions(+), 7 deletions(-)
 create mode 100644 test/docker-in-docker/overlayfs_containerd_root.sh

diff --git a/.github/workflows/docker-in-docker-stress-test.yaml b/.github/workflows/docker-in-docker-stress-test.yaml
index 99470e558..a63225a13 100644
--- a/.github/workflows/docker-in-docker-stress-test.yaml
+++ b/.github/workflows/docker-in-docker-stress-test.yaml
@@ -19,7 +19,7 @@ jobs:
         run: npm install -g @devcontainers/cli
 
       - name: "Generating tests for 'docker-in-docker' which validates if docker daemon is running"
-        run: devcontainer features test --skip-scenarios -f docker-in-docker -i mcr.microsoft.com/devcontainers/base:ubuntu .
+        run: devcontainer features test --skip-scenarios -f docker-in-docker -i mcr.microsoft.com/devcontainers/base:noble .
 
   test-onCreate:
     strategy:
@@ -34,4 +34,4 @@ jobs:
         run: npm install -g @devcontainers/cli
 
       - name: "Generating tests for 'docker-in-docker' which validates if docker daemon is available within 'onCreateCommand'"
-        run: devcontainer features test -f docker-in-docker --skip-autogenerated --filter "docker_with_on_create_command"
\ No newline at end of file
+        run: devcontainer features test -f docker-in-docker --skip-autogenerated --filter "docker_with_on_create_command" -i mcr.microsoft.com/devcontainers/base:noble
\ No newline at end of file
diff --git a/.github/workflows/test-pr-arm64.yaml b/.github/workflows/test-pr-arm64.yaml
index f05048e1b..e5855ced2 100644
--- a/.github/workflows/test-pr-arm64.yaml
+++ b/.github/workflows/test-pr-arm64.yaml
@@ -47,7 +47,9 @@ jobs:
           ]
         exclude:
           - features: docker-in-docker
-            baseImage: mcr.microsoft.com/devcontainers/base:debian           
+            baseImage: mcr.microsoft.com/devcontainers/base:debian
+          - features: docker-in-docker
+            baseImage: mcr.microsoft.com/devcontainers/base:ubuntu       
     steps:
       - uses: actions/checkout@v6
 
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index a10e94d3c..83944a5c8 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -65,7 +65,9 @@ jobs:
           - features: docker-in-docker
             baseImage: mcr.microsoft.com/devcontainers/base:debian         
           - features: docker-outside-of-docker
-            baseImage: mcr.microsoft.com/devcontainers/base:debian             
+            baseImage: mcr.microsoft.com/devcontainers/base:debian   
+          - features: docker-in-docker
+            baseImage: mcr.microsoft.com/devcontainers/base:ubuntu 
     steps:
       - uses: actions/checkout@v6
 
diff --git a/src/docker-in-docker/NOTES.md b/src/docker-in-docker/NOTES.md
index 67f736f59..693afd41f 100644
--- a/src/docker-in-docker/NOTES.md
+++ b/src/docker-in-docker/NOTES.md
@@ -18,3 +18,14 @@ Debian Trixie (13) does not include moby-cli and related system packages, so the
 Ubuntu 26.04 (Resolute) does not currently have moby packages available, so the feature cannot install with "moby": "true". To use this feature on Resolute, please set "moby": "false". Additionally, the kernel on Ubuntu 26.04 no longer supports legacy iptables NAT tables, so the feature automatically falls back to `iptables-nft` when `iptables-legacy` is not functional.
 
 `bash` is required to execute the `install.sh` script.
+
+## Persisted state
+
+This Feature mounts two named Docker volumes into the dev container so that the daemons have writable, non-overlay storage for their state:
+
+* `dind-var-lib-docker-${devcontainerId}` → `/var/lib/docker`
+* `dind-var-lib-containerd-${devcontainerId}` → `/var/lib/containerd`
+
+The `/var/lib/containerd` mount is required when the dev container's root filesystem is itself an overlayfs mount (the default in Kubernetes / containerd-backed hosts, GitHub Codespaces, and Docker with the containerd image store enabled). Without it, the standalone `containerd` started by this Feature would place its overlayfs snapshotter data on an overlay rootfs, causing overlay-on-overlay mounts to fail with `invalid argument`. See [issue #1639](https://github.com/devcontainers/features/issues/1639) for background.
+
+Because both volumes are scoped to `${devcontainerId}`, each dev container gets its own state and rebuilds preserve images and snapshots. Removing the dev container does not automatically remove these volumes; clean them up with `docker volume rm` if you want to reclaim space.
diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 406627f7e..0af78923e 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "docker-in-docker",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "name": "Docker (Docker-in-Docker)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
   "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
@@ -86,6 +86,11 @@
       "source": "dind-var-lib-docker-${devcontainerId}",
       "target": "/var/lib/docker",
       "type": "volume"
+    },
+    {
+      "source": "dind-var-lib-containerd-${devcontainerId}",
+      "target": "/var/lib/containerd",
+      "type": "volume"
     }
   ],
   "installsAfter": [
diff --git a/test/docker-in-docker/Dockerfile b/test/docker-in-docker/Dockerfile
index 9cc9f1a39..f2ca69d1d 100644
--- a/test/docker-in-docker/Dockerfile
+++ b/test/docker-in-docker/Dockerfile
@@ -1 +1 @@
-FROM ubuntu:focal
+FROM ubuntu:noble
diff --git a/test/docker-in-docker/overlayfs_containerd_root.sh b/test/docker-in-docker/overlayfs_containerd_root.sh
new file mode 100644
index 000000000..f1099c91e
--- /dev/null
+++ b/test/docker-in-docker/overlayfs_containerd_root.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+#
+# Regression test for devcontainers/features#1639 / PR #1645 follow-up:
+# verifies that when the dev container's root filesystem is overlayfs
+# (the default under Docker / containerd-backed hosts), the standalone
+# containerd started by the docker-in-docker Feature does NOT place its
+# overlayfs snapshotter data on an overlay rootfs (which would fail with
+# `invalid argument` when pulling images).
+#
+set -e
+
+source dev-container-features-test-lib
+
+# 1. Confirm we're really reproducing the affected condition:
+#    the dev container's / must be overlay.
+check "rootfs is overlay (precondition)" \
+    bash -c '[ "$(findmnt -no FSTYPE /)" = "overlay" ]'
+
+# 2. The Feature's volume mount must shadow /var/lib/containerd with a
+#    non-overlay filesystem. Without the mount, containerd's overlayfs
+#    snapshotter would be writing onto the overlay rootfs and fail at
+#    pull time.
+check "/var/lib/containerd is not overlay" \
+    bash -c '[ "$(findmnt -no FSTYPE /var/lib/containerd)" != "overlay" ]'
+
+check "/var/lib/docker is not overlay" \
+    bash -c '[ "$(findmnt -no FSTYPE /var/lib/docker)" != "overlay" ]'
+
+# 3. The actual symptom: pulling and running an image must succeed.
+#    Pre-PR-#1645 this fails with:
+#      failed to mount /tmp/containerd-mountXXXXX ... err: invalid argument
+check "docker run hello-world" \
+    docker run --rm hello-world
+
+# 4. Belt-and-braces: confirm dockerd is actually using the
+#    containerd-snapshotter path so we know this test exercises the
+#    affected code path, not the legacy overlay2 driver.
+check "containerd-snapshotter active" \
+    bash -c "docker info 2>/dev/null | grep -qiE 'driver-type: io.containerd.snapshotter.v1|Storage Driver: overlayfs'"
+
+reportResults
+
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index ad8c2ce48..2f9df3958 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -1,4 +1,13 @@
 {
+    "overlayfs_containerd_root": {
+        "image": "mcr.microsoft.com/devcontainers/base:noble",
+        "features": {
+            "docker-in-docker": {
+                "version": "latest",
+                "moby": true
+            }
+        }
+    },     
     "docker_build_fallback_compose": {
         "image": "ubuntu:noble",
         "features": {
@@ -108,7 +117,7 @@
         }
     },
     "docker_python_bookworm": {
-        "image": "mcr.microsoft.com/devcontainers/base:bookworm",
+        "image": "mcr.microsoft.com/devcontainers/base:2.1.8-bookworm",
         "features": {
             "docker-in-docker": {
                 "moby": true,

From f5bfe123db12af60b3b20299b60c123c56614e4a Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Wed, 20 May 2026 12:00:35 +0100
Subject: [PATCH 452/478] Fix Terraform Sentinel prerelease version resolution
 in scenario tests (#1648)

* Initial plan

* fix(terraform): preserve sentinel prerelease version names

* chore(terraform): bump feature minor version

* fix(terraform): correct feature patch version bump

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Kaniska <kaniska244@github.com>
---
 src/terraform/devcontainer-feature.json | 2 +-
 src/terraform/install.sh                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index a72f18993..f9ebcbee8 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.4.2",
+    "version": "1.4.3",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index 999815a38..8c4755ebe 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -249,7 +249,7 @@ find_sentinel_version_from_url() {
     if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
         local prefix='sentinel_'
         local regex="${prefix}\d.\d{2}.\d(?:-\w*)?"
-        local version_list="$(wget -q $2 -O - | grep -oP ${regex} | tr -d ${prefix} | sort -rV)"
+        local version_list="$(wget -q $2 -O - | grep -oP ${regex} | sed "s/^${prefix}//" | sort -rV)"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
             declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
         else

From ca1c1661e324b7b5d86b407b28a08687d2c3d759 Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Wed, 20 May 2026 18:04:59 +0100
Subject: [PATCH 453/478] fix: make bubblewrap conditionally installed for
 RedHat-based images (#1651)

* Initial plan

* fix: make bubblewrap conditionally installed on RedHat-based systems

bubblewrap is not available in UBI repositories, causing common-utils
installation to fail on UBI base images. This change checks package
availability before adding bubblewrap to the install list, following
the same pattern used for compat-openssl10 and redhat-lsb-core.

Also adds a test scenario for UBI 8 image.

* chore: bump common-utils version to 2.5.9

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
---
 src/common-utils/devcontainer-feature.json |  2 +-
 src/common-utils/main.sh                   |  6 +++++-
 test/common-utils/scenarios.json           |  7 +++++++
 test/common-utils/ubi-8.sh                 | 16 ++++++++++++++++
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 test/common-utils/ubi-8.sh

diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 92d47fc3c..5b56f6184 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.5.8",
+    "version": "2.5.9",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index eab75ced3..5e5487aa2 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -216,9 +216,13 @@ install_redhat_packages() {
         which \
         man-db \
         strace \
-        bubblewrap \
         socat"
 
+    # Install bubblewrap if available (not present in UBI repositories)
+    if ${install_cmd} -q list bubblewrap >/dev/null 2>&1; then
+        package_list="${package_list} bubblewrap"
+    fi
+
     # rockylinux:9 installs 'curl-minimal' which clashes with 'curl'
     # Install 'curl' for every OS except this rockylinux:9
     if [[ "${ID}" = "rocky" ]] && [[ "${VERSION}" != *"9."* ]]; then
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index ee138ca22..c70c574a7 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -284,5 +284,12 @@
         "features": {
             "common-utils": {}
         }
+    },
+    "ubi-8": {
+        "image": "registry.access.redhat.com/ubi8/ubi:8.10",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
     }
 }
\ No newline at end of file
diff --git a/test/common-utils/ubi-8.sh b/test/common-utils/ubi-8.sh
new file mode 100644
index 000000000..d97e614a7
--- /dev/null
+++ b/test/common-utils/ubi-8.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${PLATFORM_ID}" = "platform:el8"
+check "curl" curl --version
+check "jq" jq  --version
+
+# Report result
+reportResults

From 0c44debb78548dd9c15258b51efafede9bf53c78 Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Wed, 20 May 2026 18:24:11 +0100
Subject: [PATCH 454/478] Add Ubuntu 26.04 (resolute) support to
 docker-outside-of-docker (#1656)

* Initial plan

* Add Ubuntu 26.04 (resolute) support to docker-outside-of-docker

- Add "resolute" to DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES
- Block moby on resolute (packages not available), matching docker-in-docker behavior
- Add test scenario for Ubuntu resolute with moby=false

* Bump version to 1.10.0 and exclude base:ubuntu from test-pr workflow

- Bump docker-outside-of-docker version from 1.9.1 to 1.10.0
- Add exclusion for docker-outside-of-docker with base:ubuntu image in
  test-pr workflow since moby (default) is not available on resolute

* Remove trailing whitespace in test-pr.yaml

* Add note about Ubuntu 26.04 requiring moby: false in NOTES.md

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
---
 .github/workflows/test-pr.yaml                       |  6 ++++--
 src/docker-outside-of-docker/NOTES.md                | 10 ++++++++++
 .../devcontainer-feature.json                        |  2 +-
 src/docker-outside-of-docker/install.sh              |  8 ++++----
 .../install_on_ubuntu_resolute.sh                    | 12 ++++++++++++
 test/docker-outside-of-docker/scenarios.json         |  8 ++++++++
 6 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 test/docker-outside-of-docker/install_on_ubuntu_resolute.sh

diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index 83944a5c8..e00c50876 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -65,9 +65,11 @@ jobs:
           - features: docker-in-docker
             baseImage: mcr.microsoft.com/devcontainers/base:debian         
           - features: docker-outside-of-docker
-            baseImage: mcr.microsoft.com/devcontainers/base:debian   
+            baseImage: mcr.microsoft.com/devcontainers/base:debian
           - features: docker-in-docker
-            baseImage: mcr.microsoft.com/devcontainers/base:ubuntu 
+            baseImage: mcr.microsoft.com/devcontainers/base:ubuntu
+          - features: docker-outside-of-docker
+            baseImage: mcr.microsoft.com/devcontainers/base:ubuntu
     steps:
       - uses: actions/checkout@v6
 
diff --git a/src/docker-outside-of-docker/NOTES.md b/src/docker-outside-of-docker/NOTES.md
index ca6f43114..f9d7dbc06 100644
--- a/src/docker-outside-of-docker/NOTES.md
+++ b/src/docker-outside-of-docker/NOTES.md
@@ -60,4 +60,14 @@ This Feature should work on recent versions of Debian/Ubuntu-based distributions
 
 Debian Trixie (13) does not include moby-cli and related system packages, so the feature cannot install with "moby": "true". To use this feature on Trixie, please set "moby": "false" or choose a different base image (for example, Ubuntu 24.04).
 
+Ubuntu 26.04 LTS (Resolute) does not have moby-cli packages available, so the feature only supports installation with `"moby": false`. To use this feature on Ubuntu 26.04, set `"moby": false` in your feature configuration:
+
+```json
+"features": {
+    "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
+        "moby": false
+    }
+}
+```
+
 `bash` is required to execute the `install.sh` script.
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index d98b8021c..3cf3513c0 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
 
     "id": "docker-outside-of-docker",
-    "version": "1.9.1",
+    "version": "1.10.0",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 4799a4d59..ae4c7ae51 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -22,7 +22,7 @@ INSTALL_DOCKER_COMPOSE_SWITCH="${INSTALLDOCKERCOMPOSESWITCH:-"true"}"
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 MICROSOFT_GPG_KEYS_ROLLING_URI="https://packages.microsoft.com/keys/microsoft-rolling.asc"
 DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="trixie bookworm buster bullseye bionic focal jammy noble plucky"
-DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="trixie bookworm buster bullseye bionic focal hirsute impish jammy noble plucky"
+DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="trixie bookworm buster bullseye bionic focal hirsute impish jammy noble plucky resolute"
 
 set -e
 
@@ -207,9 +207,9 @@ fi
 # Fetch host/container arch.
 architecture="$(dpkg --print-architecture)"
 
-# Prevent attempting to install Moby on Debian trixie (packages removed)
-if [ "${USE_MOBY}" = "true" ] && [ "${ID}" = "debian" ] && [ "${VERSION_CODENAME}" = "trixie" ]; then
-    err "The 'moby' option is not supported on Debian 'trixie' because 'moby-cli' and related system packages have been removed from that distribution."
+# Prevent attempting to install Moby on Debian trixie or Ubuntu resolute (packages not available)
+if [ "${USE_MOBY}" = "true" ] && ([ "${VERSION_CODENAME}" = "trixie" ] || [ "${VERSION_CODENAME}" = "resolute" ]); then
+    err "The 'moby' option is not supported on ${ID} '${VERSION_CODENAME}' because 'moby-cli' and related system packages are not available in that distribution."
     err "To continue, either set the feature option '\"moby\": false' or use a different base image (for example: 'debian:bookworm' or 'ubuntu-24.04')."
     exit 1
 fi
diff --git a/test/docker-outside-of-docker/install_on_ubuntu_resolute.sh b/test/docker-outside-of-docker/install_on_ubuntu_resolute.sh
new file mode 100644
index 000000000..c6c679684
--- /dev/null
+++ b/test/docker-outside-of-docker/install_on_ubuntu_resolute.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker installed" bash -c "type docker"
+
+# Report results
+reportResults
diff --git a/test/docker-outside-of-docker/scenarios.json b/test/docker-outside-of-docker/scenarios.json
index 61b94f3d6..2df748169 100644
--- a/test/docker-outside-of-docker/scenarios.json
+++ b/test/docker-outside-of-docker/scenarios.json
@@ -181,6 +181,14 @@
             }
         }
     },
+    "install_on_ubuntu_resolute": {
+        "image": "ubuntu:resolute",
+        "features": {
+            "docker-outside-of-docker": {
+                "moby": false
+            }
+        }
+    },
     "rootless_docker_socket": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {

From 8bd6ad7cbd5095dea611ef4bb901bb05d494917e Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Fri, 22 May 2026 17:03:58 +0100
Subject: [PATCH 455/478] fix(copilot-cli): use semver sort for prerelease tag
 resolution (#1657)

* Initial plan

* fix(copilot-cli): use semver sort for prerelease tag resolution

* refactor(copilot-cli): extract resolve_prerelease_version function and add test

Extract the prerelease tag resolution logic into a standalone
resolve_prerelease_version() function that can read from stdin for
testing. Add a scenario test that validates version sorting with mock
git ls-remote data to prevent regressions.

* fix(copilot-cli): make repo_url mandatory in resolve_prerelease_version

Remove the stdin/cat fallback and use ${1:?} to error if no URL is
provided. Update the test to mock git via PATH instead of piping stdin.

* Add tests as per review comments without git ls and separate test for prerelease tag

* Further changes in the test and code cleanup

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Kaniska <kaniska244@github.com>
---
 src/copilot-cli/devcontainer-feature.json     |  2 +-
 src/copilot-cli/install.sh                    | 12 ++++++-
 test/copilot-cli/install_prerelease.sh        | 19 +++++++++++
 .../copilot-cli/resolve_prerelease_version.sh | 32 +++++++++++++++++++
 test/copilot-cli/scenarios.json               | 18 +++++++++++
 5 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 test/copilot-cli/install_prerelease.sh
 create mode 100644 test/copilot-cli/resolve_prerelease_version.sh
 create mode 100644 test/copilot-cli/scenarios.json

diff --git a/src/copilot-cli/devcontainer-feature.json b/src/copilot-cli/devcontainer-feature.json
index bfd97286c..f4db33ced 100644
--- a/src/copilot-cli/devcontainer-feature.json
+++ b/src/copilot-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "copilot-cli",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "name": "GitHub Copilot CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/copilot-cli",
     "description": "Installs the GitHub Copilot CLI.",
diff --git a/src/copilot-cli/install.sh b/src/copilot-cli/install.sh
index 47c2e3aca..ad4a19701 100755
--- a/src/copilot-cli/install.sh
+++ b/src/copilot-cli/install.sh
@@ -31,6 +31,14 @@ check_packages() {
     fi
 }
 
+resolve_prerelease_version() {
+    local repo_versions="${1:?resolve_prerelease_version requires the copilot-cli repo tags as input}"
+    printf '%s\n' "${repo_versions}" \
+      | awk '{print $2}' | sed 's|refs/tags/||' \
+      | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+(-[0-9]+)?$' \
+      | sort -V | tail -n1
+}
+
 download_from_github() {
     local release_url=$1
     echo "Downloading GitHub Copilot CLI from ${release_url}..."
@@ -63,8 +71,10 @@ install_using_github() {
     if [ "${CLI_VERSION}" = "latest" ]; then
         download_from_github "https://github.com/github/copilot-cli/releases/latest/download/${cli_filename}"
     elif [ "${CLI_VERSION}" = "prerelease" ]; then
-        prerelease_version="$(git ls-remote --tags https://github.com/github/copilot-cli | tail -1 | awk -F/ '{print $NF}')"
+
+        prerelease_version="$(resolve_prerelease_version "$(git ls-remote --tags https://github.com/github/copilot-cli)")"
         download_from_github "https://github.com/github/copilot-cli/releases/download/${prerelease_version}/${cli_filename}"
+        
     else
         # Install specific version
         # Add leading v to version if it doesn't start with v
diff --git a/test/copilot-cli/install_prerelease.sh b/test/copilot-cli/install_prerelease.sh
new file mode 100644
index 000000000..6ef707418
--- /dev/null
+++ b/test/copilot-cli/install_prerelease.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# End-to-end check that the "prerelease" channel actually resolves a tag and
+# installs the binary. Regression guard for the inline pipeline in
+# src/copilot-cli/install.sh.
+
+check "copilot binary is on PATH" which copilot
+check "copilot reports a version" bash -c "copilot -v"
+
+# Auto-update flag file must exist for prerelease channel.
+check "auto-update flag created for prerelease" test -f /etc/devcontainer-copilot-cli/auto-update
+
+# Report result
+reportResults
diff --git a/test/copilot-cli/resolve_prerelease_version.sh b/test/copilot-cli/resolve_prerelease_version.sh
new file mode 100644
index 000000000..aa4ff41fd
--- /dev/null
+++ b/test/copilot-cli/resolve_prerelease_version.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+resolve_prerelease_version() {
+    local repo_versions="${1:?resolve_prerelease_version requires the copilot-cli repo tags as input}"
+    printf '%s\n' "${repo_versions}" \
+      | awk '{print $2}' | sed 's|refs/tags/||' \
+      | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+(-[0-9]+)?$' \
+      | sort -V | tail -n1
+}
+
+# Tests the tag-resolution pipeline used by src/copilot-cli/install.sh for the
+# "prerelease" channel. 
+
+check "copilot binary is on PATH" which copilot
+check "copilot reports a version" bash -c "copilot -v"
+
+result1="$(resolve_prerelease_version $'abc1234\trefs/tags/v1.0.1\ndef5678\trefs/tags/v1.0.9\nghi9012\trefs/tags/v1.0.10\njkl3456\trefs/tags/v1.0.45\nmno7890\trefs/tags/v1.0.2\n')"
+check "picks highest version (v1.0.45)" bash -c "[ '${result1}' = 'v1.0.45' ]"
+
+result2="$(resolve_prerelease_version $'abc1234\trefs/tags/v1.0.44\ndef5678\trefs/tags/v1.0.45-1\nghi9012\trefs/tags/v1.0.45-10\njkl3456\trefs/tags/v1.0.45-2\nmno7890\trefs/tags/v1.0.45\n')"
+check "picks highest prerelease (v1.0.45-10)" bash -c "[ '${result2}' = 'v1.0.45-10' ]"
+
+result3="$(resolve_prerelease_version $'abc1234\trefs/tags/latest\ndef5678\trefs/tags/v1.0.3\nghi9012\trefs/tags/nightly\njkl3456\trefs/tags/v1.0.20\n')"
+check "picks highest version ignoring non-version tags (v1.0.20)" bash -c "[ '${result3}' = 'v1.0.20' ]"
+
+# Report result
+reportResults
diff --git a/test/copilot-cli/scenarios.json b/test/copilot-cli/scenarios.json
new file mode 100644
index 000000000..3d8336bec
--- /dev/null
+++ b/test/copilot-cli/scenarios.json
@@ -0,0 +1,18 @@
+{
+  "resolve_prerelease_version": {
+    "image": "ubuntu:noble",
+    "features": {
+      "copilot-cli": {
+        "version": "latest"
+      }
+    }
+  },
+  "install_prerelease": {
+    "image": "ubuntu:noble",
+    "features": {
+      "copilot-cli": {
+        "version": "prerelease"
+      }
+    }
+  }
+}

From 72df8a5f191f840a66dc2e2ced10a136e4d75173 Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Thu, 28 May 2026 17:06:22 +0100
Subject: [PATCH 456/478] fix: azure-cli falls back to pip on unknown Ubuntu
 codenames (#1668)

* Initial plan

* fix: azure-cli falls back to pip on unknown codenames, add resolute support

- Add 'resolute' (Ubuntu 26.04) to AZCLI_ARCHIVE_VERSION_CODENAMES
- Add else branch to fall back to pip when codename/arch not in allowlist
- Bump feature version to 1.3.0
- Add test scenario for Ubuntu resolute

* test: add scenario for pip fallback on Ubuntu plucky (25.04)

Ubuntu plucky's codename is not in the apt archive allowlist, so this
scenario exercises the else-branch pip fallback path.

* Correcting the fallback test

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Kaniska <kaniska244@github.com>
---
 src/azure-cli/devcontainer-feature.json         |  2 +-
 src/azure-cli/install.sh                        |  5 ++++-
 .../install_fallback_pip_ubuntu_plucky.sh       | 13 +++++++++++++
 test/azure-cli/install_in_ubuntu_resolute.sh    | 14 ++++++++++++++
 test/azure-cli/scenarios.json                   | 17 +++++++++++++++++
 5 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 test/azure-cli/install_fallback_pip_ubuntu_plucky.sh
 create mode 100644 test/azure-cli/install_in_ubuntu_resolute.sh

diff --git a/src/azure-cli/devcontainer-feature.json b/src/azure-cli/devcontainer-feature.json
index a634818b6..7280ad2ad 100644
--- a/src/azure-cli/devcontainer-feature.json
+++ b/src/azure-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "azure-cli",
-  "version": "1.2.9",
+  "version": "1.3.0",
   "name": "Azure CLI",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/azure-cli",
   "description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
diff --git a/src/azure-cli/install.sh b/src/azure-cli/install.sh
index bc5744ce2..425deafe9 100755
--- a/src/azure-cli/install.sh
+++ b/src/azure-cli/install.sh
@@ -19,7 +19,7 @@ AZ_BICEPVERSION=${BICEPVERSION:-latest}
 INSTALL_USING_PYTHON=${INSTALLUSINGPYTHON:-false}
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 AZCLI_ARCHIVE_ARCHITECTURES="amd64 arm64"
-AZCLI_ARCHIVE_VERSION_CODENAMES="stretch bookworm buster bullseye bionic focal jammy noble trixie"
+AZCLI_ARCHIVE_VERSION_CODENAMES="stretch bookworm buster bullseye bionic focal jammy noble trixie resolute"
 
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
@@ -200,6 +200,9 @@ CACHED_AZURE_VERSION="${AZ_VERSION}" # In case we need to fallback to pip and th
 if [ "${INSTALL_USING_PYTHON}" != "true" ]; then
     if [[ "${AZCLI_ARCHIVE_ARCHITECTURES}" = *"${architecture}"* ]] && [[  "${AZCLI_ARCHIVE_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
         install_using_apt || use_pip="true"
+    else
+        echo "(*) Codename '${VERSION_CODENAME}' or architecture '${architecture}' not in apt archive list, falling back to pip installation."
+        use_pip="true"
     fi
 else
     use_pip="true"
diff --git a/test/azure-cli/install_fallback_pip_ubuntu_plucky.sh b/test/azure-cli/install_fallback_pip_ubuntu_plucky.sh
new file mode 100644
index 000000000..f6fffd02b
--- /dev/null
+++ b/test/azure-cli/install_fallback_pip_ubuntu_plucky.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Ubuntu plucky (25.04) is NOT in the apt archive codename allowlist,
+# so this test validates the pip fallback path.
+check "version" az  --version
+
+# Report result
+reportResults
diff --git a/test/azure-cli/install_in_ubuntu_resolute.sh b/test/azure-cli/install_in_ubuntu_resolute.sh
new file mode 100644
index 000000000..eff30a25c
--- /dev/null
+++ b/test/azure-cli/install_in_ubuntu_resolute.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+check "version" az  --version
+
+# Report result
+reportResults
diff --git a/test/azure-cli/scenarios.json b/test/azure-cli/scenarios.json
index 1ba173de9..29fb4f935 100644
--- a/test/azure-cli/scenarios.json
+++ b/test/azure-cli/scenarios.json
@@ -1,4 +1,12 @@
 {
+  "install_fallback_pip_ubuntu_plucky": {
+    "image": "ubuntu:plucky",
+    "features": {
+      "azure-cli": {
+        "version": "latest"
+      }
+    }
+  },  
   "install_extensions_trixie": {
     "image": "mcr.microsoft.com/devcontainers/base:trixie",
     "user": "vscode",
@@ -102,5 +110,14 @@
         "moby": false
       }
     }
+  },
+  "install_in_ubuntu_resolute": {
+    "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+    "user": "vscode",
+    "features": {
+      "azure-cli": {
+        "version": "latest"
+      }
+    }
   }
 }
\ No newline at end of file

From 7ae907dc1a8f19b961a0f36c88d28fd025c025ba Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Wed, 10 Jun 2026 23:26:20 +0530
Subject: [PATCH 457/478] [php] - Install xdebug from source if installation
 fails with PECL (#1671)

---
 src/php/devcontainer-feature.json  |  6 ++---
 src/php/install.sh                 | 36 ++++++++++++++++++++++++++++--
 test/php/install_additional_php.sh |  5 ++---
 test/php/scenarios.json            |  5 +++--
 4 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/php/devcontainer-feature.json b/src/php/devcontainer-feature.json
index 4db478230..6abdc965b 100644
--- a/src/php/devcontainer-feature.json
+++ b/src/php/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "php",
-    "version": "1.1.4",
+    "version": "1.1.5",
     "name": "PHP",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/php",
     "options": {
@@ -9,8 +9,8 @@
             "proposals": [
                 "latest",
                 "8",
-                "8.2",
-                "8.2.0",
+                "8.5",
+                "8.5.0",
                 "none"
             ],
             "default": "latest",
diff --git a/src/php/install.sh b/src/php/install.sh
index 357395e88..531b16518 100755
--- a/src/php/install.sh
+++ b/src/php/install.sh
@@ -170,6 +170,31 @@ addcomposer() {
     "${PHP_SRC}" -r "unlink('composer-setup.php');"
 }
 
+# Build xdebug from its official source tarball. Used as a fallback when
+# pecl.php.net is broken or has no release advertising compatibility with
+# the current PHP version (common around new PHP releases).
+install_xdebug_from_source() {
+    XDEBUG_VERSION="latest"
+    find_version_from_git_tags XDEBUG_VERSION https://github.com/xdebug/xdebug "tags/"
+
+    local xdebug_src_dir="/tmp/xdebug-src"
+    rm -rf "${xdebug_src_dir}"
+    mkdir -p "${xdebug_src_dir}"
+
+    wget -O /tmp/xdebug.tgz "https://xdebug.org/files/xdebug-${XDEBUG_VERSION}.tgz"
+    tar -xzf /tmp/xdebug.tgz -C "${xdebug_src_dir}" --strip-components=1
+
+    (
+        cd "${xdebug_src_dir}"
+        "${PHP_INSTALL_DIR}/bin/phpize"
+        ./configure --enable-xdebug --with-php-config="${PHP_INSTALL_DIR}/bin/php-config"
+        make -j "$(nproc)"
+        make install
+    )
+
+    rm -rf "${xdebug_src_dir}" /tmp/xdebug.tgz
+}
+
 init_php_install() {
     PHP_INSTALL_DIR="${PHP_DIR}/${PHP_VERSION}"
     if [ -d "${PHP_INSTALL_DIR}" ]; then
@@ -219,8 +244,10 @@ install_php() {
 
     # PHP 7.4+, the pecl/pear installers are officially deprecated and are removed in PHP 8+
     # Thus, requiring an explicit "--with-pear"
+    OLDIFS=$IFS
     IFS="."
     read -a versions <<< "${PHP_VERSION}"
+    IFS=$OLDIFS
     PHP_MAJOR_VERSION=${versions[0]}
     PHP_MINOR_VERSION=${versions[1]}
 
@@ -240,8 +267,13 @@ install_php() {
     cp -v $PHP_SRC_DIR/php.ini-* "$PHP_INI_DIR/";
     cp "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 
-    # Install xdebug
-    "${PHP_INSTALL_DIR}/bin/pecl" install xdebug
+    # Install xdebug. Try PECL first (fast path), then fall back to building
+    # from source if PECL's channel cache is broken or no release advertises
+    # compatibility with the current PHP version.
+    "${PHP_INSTALL_DIR}/bin/pecl" channel-update pecl.php.net || true
+    if ! "${PHP_INSTALL_DIR}/bin/pecl" install xdebug; then
+        install_xdebug_from_source
+    fi
     XDEBUG_INI="${CONF_DIR}/xdebug.ini"
 
     echo "zend_extension=${PHP_EXT_DIR}/xdebug.so" > "${XDEBUG_INI}"
diff --git a/test/php/install_additional_php.sh b/test/php/install_additional_php.sh
index c1c085b5c..b5bdcace2 100644
--- a/test/php/install_additional_php.sh
+++ b/test/php/install_additional_php.sh
@@ -5,9 +5,8 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-check "php version 8.4.2 installed as default" php --version | grep 8.4.2
-check "php version 8.3.14 installed"   ls -l /usr/local/php | grep 8.3.14
-check "php version 8.2.27 installed"  ls -l /usr/local/php | grep 8.2.27
+check "php version 8.5.0 installed as default" php --version | grep 8.5.0
+check "php version 8.4.15 installed"   ls -l /usr/local/php | grep 8.4.15
 
 check "composer-version" composer --version
 
diff --git a/test/php/scenarios.json b/test/php/scenarios.json
index 8aa25cbff..57abdf16d 100644
--- a/test/php/scenarios.json
+++ b/test/php/scenarios.json
@@ -3,8 +3,9 @@
         "image": "ubuntu:noble",
         "features": {
             "php": {
-                "version": "8.4.2",
-                "additionalVersions": "8.3.14,8.2.27"
+                "version": "8.5.0",
+                "additionalVersions": "8.4.15",
+                "installComposer": "true"
             }
         }
     },

From a8f0b45732c6b170aa48d9276c01da13be9d6e71 Mon Sep 17 00:00:00 2001
From: Brian Helba <brian.helba@kitware.com>
Date: Mon, 15 Jun 2026 08:31:24 -0400
Subject: [PATCH 458/478] [node] - Install pnpm as non-root user to prevent
 root-owned npm cache (#1625)

* [node] - Install pnpm as non-root user to prevent root-owned npm cache

Currently, the pnpm installation block runs `npm install -g pnpm` in
a bare subshell as root, unlike every other npm/nvm operation in the
script which uses `su ${USERNAME}`. This causes the npm cache directory
to be created owned by `root:root`, leading to `EACCES` errors for the
non-root user on subsequent npm operations.

This is particularly reproducible on macOS with Rosetta 2 emulation,
where the cache directory may not already exist from prior steps.

Note, the explicit setting of proxy env vars (`http_proxy`, `https_proxy`,
`no_proxy`) is likely a workaround for https://github.com/npm/cli/issues/6835.
No other commands in this script use that workaround anymore, so this change
uses the same `su` syntax as all other commands.

* Bump Node.js version to 2.1.0

---------

Co-authored-by: Abdurrahmaan Iqbal <abdurriq@github.com>
---
 src/node/devcontainer-feature.json | 2 +-
 src/node/install.sh                | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index 2e86262ae..5e0970b2d 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "2.0.0",
+    "version": "2.1.0",
     "name": "Node.js (via nvm), yarn and pnpm.",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
diff --git a/src/node/install.sh b/src/node/install.sh
index 20ea85463..0e277812e 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -482,13 +482,7 @@ if [ ! -z "${PNPM_VERSION}" ] && [ "${PNPM_VERSION}" = "none" ]; then
     echo "Ignoring installation of PNPM"
 else
     if bash -c ". '${NVM_DIR}/nvm.sh' && type npm >/dev/null 2>&1"; then
-        (
-            . "${NVM_DIR}/nvm.sh"
-            [ ! -z "$http_proxy" ] && npm set proxy="$http_proxy"
-            [ ! -z "$https_proxy" ] && npm set https-proxy="$https_proxy"
-            [ ! -z "$no_proxy" ] && npm set noproxy="$no_proxy"
-            npm install -g pnpm@$PNPM_VERSION --force
-        )
+        su ${USERNAME} -c "umask 0002 && . '${NVM_DIR}/nvm.sh' && npm install -g pnpm@${PNPM_VERSION} --force"
     else
         echo "Skip installing pnpm because npm is missing"
     fi

From f851b4860e3e40842bfc4053c0fb45b5a7d91c9a Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Wed, 17 Jun 2026 22:22:11 +0530
Subject: [PATCH 459/478] [Docker-in-Docker] - Update docker-compose to the
 latest version (#1672)

* [Docker-in-Docker] - Update docker-compose to the latest version

* Implement review comment.
---
 src/docker-in-docker/README.md                |  2 +-
 .../devcontainer-feature.json                 |  7 ++++---
 src/docker-in-docker/install.sh               |  2 +-
 .../docker_compose_latest_moby.sh             | 16 +++++++++++++++
 .../docker_compose_latest_no_moby.sh          | 14 +++++++++++++
 test/docker-in-docker/scenarios.json          | 20 +++++++++++++++++++
 6 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100755 test/docker-in-docker/docker_compose_latest_moby.sh
 create mode 100644 test/docker-in-docker/docker_compose_latest_no_moby.sh

diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index c58283317..f94c9be51 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -18,7 +18,7 @@ Create child containers *inside* a container, independent from the host's docker
 | version | Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.) | string | latest |
 | moby | Install OSS Moby build instead of Docker CE | boolean | true |
 | mobyBuildxVersion | Install a specific version of moby-buildx when using Moby | string | latest |
-| dockerDashComposeVersion | Default version of Docker Compose (v1, v2 or none) | string | v2 |
+| dockerDashComposeVersion | Default version of Docker Compose (v1, v2, latest or none) | string | latest |
 | azureDnsAutoDetection | Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure | boolean | true |
 | dockerDefaultAddressPool | Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24 | string | - |
 | installDockerBuildx | Install Docker Buildx | boolean | true |
diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 0af78923e..6d7c0431a 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "docker-in-docker",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "name": "Docker (Docker-in-Docker)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
   "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
@@ -29,11 +29,12 @@
       "type": "string",
       "enum": [
         "none",
+        "latest",
         "v1",
         "v2"
       ],
-      "default": "v2",
-      "description": "Default version of Docker Compose (v1, v2 or none)"
+      "default": "latest",
+      "description": "Default version of Docker Compose (v1, v2, latest or none)"
     },
     "azureDnsAutoDetection": {
       "type": "boolean",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index e9740efc5..70a187e28 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -11,7 +11,7 @@
 DOCKER_VERSION="${VERSION:-"latest"}" # The Docker/Moby Engine + CLI should match in version
 USE_MOBY="${MOBY:-"true"}"
 MOBY_BUILDX_VERSION="${MOBYBUILDXVERSION:-"latest"}"
-DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"v2"}" #v1, v2 or none
+DOCKER_DASH_COMPOSE_VERSION="${DOCKERDASHCOMPOSEVERSION:-"latest"}" #v1, v2, latest or none
 AZURE_DNS_AUTO_DETECTION="${AZUREDNSAUTODETECTION:-"true"}"
 DOCKER_DEFAULT_ADDRESS_POOL="${DOCKERDEFAULTADDRESSPOOL:-""}"
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
diff --git a/test/docker-in-docker/docker_compose_latest_moby.sh b/test/docker-in-docker/docker_compose_latest_moby.sh
new file mode 100755
index 000000000..bd5a9d23f
--- /dev/null
+++ b/test/docker-in-docker/docker_compose_latest_moby.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker compose" bash -c "docker compose version | grep -E '[0-9]+\.[0-9]+\.[0-9]+'"
+check "docker-compose" bash -c "docker-compose --version | grep -E '[0-9]+\.[0-9]+\.[0-9]+'"
+check "installs compose as docker-compose" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
+check "moby-engine" bash -c "dpkg-query -W moby-engine"
+check "moby-cli" bash -c "dpkg-query -W moby-cli"
+
+# Report result
+reportResults
diff --git a/test/docker-in-docker/docker_compose_latest_no_moby.sh b/test/docker-in-docker/docker_compose_latest_no_moby.sh
new file mode 100644
index 000000000..5eeb34b45
--- /dev/null
+++ b/test/docker-in-docker/docker_compose_latest_no_moby.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "docker compose" bash -c "docker compose version | grep -E '[0-9]+\.[0-9]+\.[0-9]+'"
+check "docker-compose" bash -c "docker-compose --version | grep -E '[0-9]+\.[0-9]+\.[0-9]+'"
+check "installs compose as docker-compose" bash -c "[[ -f /usr/local/bin/docker-compose ]]"
+
+# Report result
+reportResults
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index 2f9df3958..a93495b51 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -146,6 +146,26 @@
             }
         }
     },
+    "docker_compose_latest_moby": {
+        "image": "mcr.microsoft.com/devcontainers/base:noble",
+        "features": {
+            "docker-in-docker": {
+                "moby": true,
+                "installDockerBuildx": true,
+                "dockerDashComposeVersion": "latest"
+            }
+        }
+    },
+    "docker_compose_latest_no_moby": {
+        "image": "mcr.microsoft.com/devcontainers/base:noble",
+        "features": {
+            "docker-in-docker": {
+                "moby": false,
+                "installDockerBuildx": true,
+                "dockerDashComposeVersion": "latest"
+            }
+        }
+    },
     "docker_build_fallback_buildx": {
         "image": "ubuntu:noble",
         "features": {

From 71d6d23dfb14f3bbae3de4080034002d57215adf Mon Sep 17 00:00:00 2001
From: Ryosuke Hiroe <ride.poke@gmail.com>
Date: Sat, 20 Jun 2026 02:24:36 +0900
Subject: [PATCH 460/478] feat(ruby)!: rewrite to use ruby-build with optional
 rbenv/rvm (v2.0.0) (#1654)

* feat(ruby)!: rewrite to use ruby-build with optional rbenv/rvm (v2.0.0)

Replace the rvm-only install with ruby-build under /usr/local/rubies,
exposed via the 'current' symlink on the PATH. Add a versionManager
option ("none" | "rbenv" | "rvm") that installs the chosen manager
and delegates 'install' to it.

Detect build deps across apt, dnf/yum, apk, zypper, and pacman.
Replace ruby_fallback_test with ruby_rbenv / ruby_rvm scenarios.

* test(ruby): symlink install_additional_ruby_trixie.sh to install_additional_ruby.sh

---------

Co-authored-by: Kaniska <kaniska244@github.com>
---
 src/ruby/NOTES.md                           |   9 +-
 src/ruby/README.md                          |   9 +-
 src/ruby/devcontainer-feature.json          |  24 +-
 src/ruby/install.sh                         | 584 ++++++++++----------
 test/ruby/install_additional_ruby.sh        |  10 +-
 test/ruby/install_additional_ruby_trixie.sh |  18 +-
 test/ruby/install_ruby_trixie_base.sh       |   8 +-
 test/ruby/ruby_fallback_test.sh             | 310 -----------
 test/ruby/ruby_rbenv.sh                     |  19 +
 test/ruby/ruby_rvm.sh                       |  19 +
 test/ruby/scenarios.json                    |  26 +-
 11 files changed, 390 insertions(+), 646 deletions(-)
 mode change 100644 => 120000 test/ruby/install_additional_ruby_trixie.sh
 delete mode 100644 test/ruby/ruby_fallback_test.sh
 create mode 100755 test/ruby/ruby_rbenv.sh
 create mode 100755 test/ruby/ruby_rvm.sh

diff --git a/src/ruby/NOTES.md b/src/ruby/NOTES.md
index 19fe92f31..53da243c1 100644
--- a/src/ruby/NOTES.md
+++ b/src/ruby/NOTES.md
@@ -2,6 +2,13 @@
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+This Feature supports Linux images that ship one of the following package managers: `apt`, `dnf`/`yum`, `apk`, `zypper`, or `pacman`. The script detects the available package manager and installs the build dependencies that ruby-build needs.
 
 `bash` is required to execute the `install.sh` script.
+
+## Layout
+
+- Ruby is installed under `/usr/local/rubies/<version>` by ruby-build.
+- The default Ruby is exposed via the `/usr/local/rubies/current` symlink, which is placed on the `PATH` through `containerEnv`.
+- `ruby-build` itself is cloned to `/usr/local/share/ruby-build` and symlinked into `/usr/local/bin/ruby-build` so additional versions can be installed later.
+- A shared `ruby` group owns `/usr/local/rubies`; the configured non-root user is added to it so `gem install` can write into the active Ruby tree without `sudo`.
diff --git a/src/ruby/README.md b/src/ruby/README.md
index 7df6965c7..351ffe906 100644
--- a/src/ruby/README.md
+++ b/src/ruby/README.md
@@ -1,13 +1,13 @@
 
-# Ruby (via rvm) (ruby)
+# Ruby (via ruby-build) (ruby)
 
-Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.
+Installs Ruby using ruby-build, with optional rbenv or rvm for version management.
 
 ## Example Usage
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/ruby:1": {}
+    "ghcr.io/devcontainers/features/ruby:2": {}
 }
 ```
 
@@ -16,6 +16,7 @@ Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
 | version | Select or enter a Ruby version to install | string | latest |
+| versionManager | Version manager to install alongside Ruby: 'rbenv', 'rvm', or 'none' (ruby-build only) | string | none |
 
 ## Customizations
 
@@ -27,7 +28,7 @@ Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu-based distributions with the `apt` package manager installed.
+This Feature supports Linux images that ship one of the following package managers: `apt`, `dnf`/`yum`, `apk`, `zypper`, or `pacman`. The script detects the available package manager and installs the build dependencies that ruby-build needs.
 
 `bash` is required to execute the `install.sh` script.
 
diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json
index 661c46bf0..841afbc3d 100644
--- a/src/ruby/devcontainer-feature.json
+++ b/src/ruby/devcontainer-feature.json
@@ -1,20 +1,26 @@
 {
     "id": "ruby",
-    "version": "1.3.2",
-    "name": "Ruby (via rvm)",
+    "version": "2.0.0",
+    "name": "Ruby (via ruby-build)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
-    "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
+    "description": "Installs Ruby using ruby-build, with optional rbenv or rvm for version management.",
     "options": {
         "version": {
             "type": "string",
             "proposals": [
                 "latest",
                 "none",
-                "3.4",
-                "3.2"
+                "4.0",
+                "3.4"
             ],
             "default": "latest",
             "description": "Select or enter a Ruby version to install"
+        },
+        "versionManager": {
+            "type": "string",
+            "enum": ["none", "rbenv", "rvm"],
+            "default": "none",
+            "description": "Version manager to install alongside Ruby: 'rbenv', 'rvm', or 'none' (ruby-build only)"
         }
     },
     "customizations": {
@@ -25,17 +31,15 @@
             "settings": {
                 "github.copilot.chat.codeGeneration.instructions": [
                     {
-                        "text": "This dev container includes Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies pre-installed and available on the `PATH`, along with the Ruby language extension for Ruby development."
+                        "text": "This dev container installs Ruby via ruby-build. rbenv or rvm may also be available depending on the versionManager option. The default Ruby is on the PATH via /usr/local/rubies/current/bin (or rbenv shims if rbenv is the version manager)."
                     }
                 ]
             }
         }
     },
     "containerEnv": {
-        "GEM_PATH": "/usr/local/rvm/gems/default:/usr/local/rvm/gems/default@global",
-        "GEM_HOME": "/usr/local/rvm/gems/default",
-        "MY_RUBY_HOME": "/usr/local/rvm/rubies/default",
-        "PATH": "/usr/local/rvm/gems/default/bin:/usr/local/rvm/gems/default@global/bin:/usr/local/rvm/rubies/default/bin:/usr/local/share/rbenv/bin:${PATH}"
+        "RBENV_ROOT": "/usr/local/share/rbenv",
+        "PATH": "/usr/local/share/rbenv/shims:/usr/local/share/rbenv/bin:/usr/local/rubies/current/bin:${PATH}"
     },
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
diff --git a/src/ruby/install.sh b/src/ruby/install.sh
index 39cb5be03..2b990cda8 100755
--- a/src/ruby/install.sh
+++ b/src/ruby/install.sh
@@ -10,24 +10,27 @@
 RUBY_VERSION="${VERSION:-"latest"}"
 
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
-UPDATE_RC="${UPDATE_RC:-"true"}"
 INSTALL_RUBY_TOOLS="${INSTALL_RUBY_TOOLS:-"true"}"
 
-# Comma-separated list of ruby versions to be installed (with rvm)
-# alongside RUBY_VERSION, but not set as default.
+# Comma-separated list of ruby versions to be installed alongside RUBY_VERSION,
+# but not set as default.
 ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 
-# Note: ruby-debug-ide will install the right version of debase if missing and
-# installing debase directly fails on Ruby 3.1.0 as of 1/7/2022, so omitting.
-# installing ruby-debug-ide on debian fails, so omitting.
+VERSION_MANAGER="${VERSIONMANAGER:-"none"}"
+
 DEFAULT_GEMS="rake"
 
+RUBY_BUILD_DIR="/usr/local/share/ruby-build"
+RUBIES_DIR="/usr/local/rubies"
+RUBY_GROUP="ruby"
+RBENV_ROOT="/usr/local/share/rbenv"
+RVM_PATH="/usr/local/rvm"
 RVM_GPG_KEYS="409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"
 
 set -e
 
-# Clean up
-rm -rf /var/lib/apt/lists/*
+# Force apt to refresh its lists below by clearing them up front (no-op on non-apt systems).
+rm -rf /var/lib/apt/lists/* 2>/dev/null || true
 
 if [ "$(id -u)" -ne 0 ]; then
     echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
@@ -39,7 +42,6 @@ rm -f /etc/profile.d/00-restore-env.sh
 echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
 chmod +x /etc/profile.d/00-restore-env.sh
 
-# Determine the appropriate non-root user
 if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
     USERNAME=""
     POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
@@ -56,19 +58,35 @@ elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
     USERNAME=root
 fi
 
-updaterc() {
-    if [ "${UPDATE_RC}" = "true" ]; then
-        echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
-        if [[ "$(cat /etc/bash.bashrc)" != *"$1"* ]]; then
-            echo -e "$1" >> /etc/bash.bashrc
-        fi
-        if [ -f "/etc/zsh/zshrc" ] && [[ "$(cat /etc/zsh/zshrc)" != *"$1"* ]]; then
-            echo -e "$1" >> /etc/zsh/zshrc
-        fi
+architecture="$(uname -m)"
+if [ "${architecture}" != "amd64" ] && [ "${architecture}" != "x86_64" ] && [ "${architecture}" != "arm64" ] && [ "${architecture}" != "aarch64" ]; then
+    echo "(!) Architecture $architecture unsupported"
+    exit 1
+fi
+
+clone_or_update_repo() {
+    local repo=$1 dest=$2
+    if [ ! -d "${dest}" ]; then
+        git clone --depth=1 \
+            -c core.eol=lf \
+            -c core.autocrlf=false \
+            -c fsck.zeroPaddedFilemode=ignore \
+            -c fetch.fsck.zeroPaddedFilemode=ignore \
+            -c receive.fsck.zeroPaddedFilemode=ignore \
+            "${repo}" "${dest}"
+    else
+        git -C "${dest}" fetch --depth=1 origin && \
+            git -C "${dest}" reset --hard origin/HEAD || true
     fi
 }
 
-# Get the list of GPG key servers that are reachable
+apply_group_perms() {
+    local dir=$1
+    chgrp -R "${RUBY_GROUP}" "${dir}" 2>/dev/null || true
+    chmod -R g+rw "${dir}" 2>/dev/null || true
+    find "${dir}" -type d -exec chmod g+s {} + 2>/dev/null || true
+}
+
 get_gpg_key_servers() {
     declare -A keyservers_curl_map=(
         ["hkp://keyserver.ubuntu.com"]="http://keyserver.ubuntu.com:11371"
@@ -78,15 +96,15 @@ get_gpg_key_servers() {
     )
 
     local curl_args=""
-    local keyserver_reachable=false  # Flag to indicate if any keyserver is reachable
+    local keyserver_reachable=false
 
-    if [ ! -z "${KEYSERVER_PROXY}" ]; then
+    if [ -n "${KEYSERVER_PROXY:-}" ]; then
         curl_args="--proxy ${KEYSERVER_PROXY}"
     fi
 
     for keyserver in "${!keyservers_curl_map[@]}"; do
         local keyserver_curl_url="${keyservers_curl_map[${keyserver}]}"
-        if curl -s ${curl_args} --max-time 5 ${keyserver_curl_url} > /dev/null; then
+        if curl -s ${curl_args} --max-time 5 "${keyserver_curl_url}" > /dev/null; then
             echo "keyserver ${keyserver}"
             keyserver_reachable=true
         else
@@ -100,31 +118,24 @@ get_gpg_key_servers() {
     fi
 }
 
-# Import the specified key in a variable name passed in as 
 receive_gpg_keys() {
     local keys=${!1}
     local keyring_args=""
-    if [ ! -z "$2" ]; then
+    if [ -n "${2:-}" ]; then
         keyring_args="--no-default-keyring --keyring \"$2\""
     fi
 
-    # Install curl
-    if ! type curl > /dev/null 2>&1; then
-        check_packages curl
-    fi
-
-    # Use a temporary location for gpg keys to avoid polluting image
     export GNUPGHOME="/tmp/tmp-gnupg"
-    mkdir -p ${GNUPGHOME}
-    chmod 700 ${GNUPGHOME}
-    echo -e "disable-ipv6\n$(get_gpg_key_servers)" > ${GNUPGHOME}/dirmngr.conf
-    # GPG key download sometimes fails for some reason and retrying fixes it.
+    mkdir -p "${GNUPGHOME}"
+    chmod 700 "${GNUPGHOME}"
+    echo -e "disable-ipv6\n$(get_gpg_key_servers)" > "${GNUPGHOME}/dirmngr.conf"
+
     local retry_count=0
     local gpg_ok="false"
     set +e
-    until [ "${gpg_ok}" = "true" ] || [ "${retry_count}" -eq "5" ]; 
-    do
+    until [ "${gpg_ok}" = "true" ] || [ "${retry_count}" -eq "5" ]; do
         echo "(*) Downloading GPG key..."
+        # shellcheck disable=SC2086
         ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys) 2>&1 && gpg_ok="true"
         if [ "${gpg_ok}" != "true" ]; then
             echo "(*) Failed getting key, retrying in 10s..."
@@ -139,306 +150,305 @@ receive_gpg_keys() {
     fi
 }
 
-# Figure out correct version of a three part version number is not passed
-find_version_from_git_tags() {
-    local variable_name=$1
-    local requested_version=${!variable_name}
-    if [ "${requested_version}" = "none" ]; then return; fi
-    local repository=$2
-    local prefix=${3:-"tags/v"}
-    local separator=${4:-"."}
-    local last_part_optional=${5:-"false"}    
-    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
-        local escaped_separator=${separator//./\\.}
-        local last_part
-        if [ "${last_part_optional}" = "true" ]; then
-            last_part="(${escaped_separator}[0-9]+)?"
-        else
-            last_part="${escaped_separator}[0-9]+"
-        fi
-        local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
-        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
-            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
-        else
-            set +e
-            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
-            set -e
-        fi
-    fi
-    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
-        echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
+default_ruby_version() {
+    [ -L "${RUBIES_DIR}/current" ] && basename "$(readlink "${RUBIES_DIR}/current")"
+}
+
+install_build_deps() {
+    if command -v apt-get > /dev/null 2>&1; then
+        export DEBIAN_FRONTEND=noninteractive
+        apt-get update -y
+        # libgdbm-dev pulls the appropriate libgdbm runtime, so no version-specific package is needed.
+        apt-get -y install --no-install-recommends \
+            curl ca-certificates git autoconf bison patch build-essential \
+            libssl-dev libyaml-dev libreadline-dev zlib1g-dev libgmp-dev \
+            libncurses-dev libffi-dev libgdbm-dev libdb-dev uuid-dev
+    elif command -v dnf > /dev/null 2>&1 || command -v yum > /dev/null 2>&1; then
+        local pm
+        pm="$(command -v dnf || command -v yum)"
+        "${pm}" install -y \
+            curl ca-certificates git gcc make patch autoconf bison \
+            openssl-devel libyaml-devel zlib-devel libffi-devel \
+            readline-devel ncurses-devel gdbm-devel
+    elif command -v apk > /dev/null 2>&1; then
+        apk add --no-cache \
+            bash curl ca-certificates git build-base linux-headers \
+            autoconf bison patch openssl-dev yaml-dev zlib-dev \
+            readline-dev ncurses-dev libffi-dev gdbm-dev
+    elif command -v zypper > /dev/null 2>&1; then
+        zypper --non-interactive install --no-recommends \
+            curl ca-certificates git gcc-c++ make patch \
+            autoconf automake libtool bison \
+            libopenssl-devel libyaml-devel zlib-devel libffi-devel \
+            readline-devel ncurses-devel gdbm-devel
+    elif command -v pacman > /dev/null 2>&1; then
+        pacman -Sy --noconfirm --needed \
+            curl ca-certificates git base-devel autoconf bison \
+            openssl libyaml zlib libffi readline ncurses gdbm
+    else
+        echo "(!) No supported package manager found. Install Ruby build dependencies manually."
         exit 1
     fi
-    echo "${variable_name}=${!variable_name}"
 }
 
-# Use semver logic to decrement a version number then look for the closest match
-find_prev_version_from_git_tags() {
-    local variable_name=$1
-    local current_version=${!variable_name}
-    local repository=$2
-    # Normally a "v" is used before the version number, but support alternate cases
-    local prefix=${3:-"tags/v"}
-    # Some repositories use "_" instead of "." for version number part separation, support that
-    local separator=${4:-"."}
-    # Some tools release versions that omit the last digit (e.g. go)
-    local last_part_optional=${5:-"false"}
-    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
-    local version_suffix_regex=$6
-    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
-    set +e
-        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
-        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
-        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
-
-        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
-            ((major=major-1))
-            declare -g ${variable_name}="${major}"
-            # Look for latest version from previous major release
-            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
-        # Handle situations like Go's odd version pattern where "0" releases omit the last part
-        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
-            ((minor=minor-1))
-            declare -g ${variable_name}="${major}.${minor}"
-            # Look for latest version from previous minor release
-            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
-        else
-            ((breakfix=breakfix-1))
-            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
-                declare -g ${variable_name}="${major}.${minor}"
-            else 
-                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
-            fi
-        fi
-    set -e
+install_ruby_build() {
+    clone_or_update_repo "https://github.com/rbenv/ruby-build.git" "${RUBY_BUILD_DIR}"
+    ln -sf "${RUBY_BUILD_DIR}/bin/ruby-build" /usr/local/bin/ruby-build
 }
 
-apt_get_update()
-{
-    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
-        echo "Running apt-get update..."
-        apt-get update -y
+resolve_ruby_version() {
+    local requested=$1
+    local definitions_dir="${RUBY_BUILD_DIR}/share/ruby-build"
+    local stable_versions
+    stable_versions="$(ls "${definitions_dir}" 2>/dev/null | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$' | sort -V)"
+
+    if [ -z "${stable_versions}" ]; then
+        echo "(!) ruby-build has no version definitions at ${definitions_dir}." >&2
+        exit 1
     fi
+
+    case "${requested}" in
+        latest|current|lts)
+            echo "${stable_versions}" | tail -n 1
+            ;;
+        *)
+            if echo "${stable_versions}" | grep -qx "${requested}"; then
+                echo "${requested}"
+                return
+            fi
+            # Resolve a partial X.Y to the highest matching X.Y.Z.
+            local match
+            match="$(echo "${stable_versions}" | grep -E "^${requested//./\\.}\\.[0-9]+$" | sort -V | tail -n 1)"
+            if [ -n "${match}" ]; then
+                echo "${match}"
+                return
+            fi
+            echo "(!) Ruby version '${requested}' is not known to ruby-build." >&2
+            exit 1
+            ;;
+    esac
 }
 
-# Checks if packages are installed and installs them if not
-check_packages() {
-    if ! dpkg -s "$@" > /dev/null 2>&1; then
-        apt_get_update
-        apt-get -y install --no-install-recommends "$@"
+install_ruby_version() {
+    local requested=$1
+    local set_default=$2
+    local resolved
+    resolved="$(resolve_ruby_version "${requested}")"
+    local prefix="${RUBIES_DIR}/${resolved}"
+
+    if [ -x "${prefix}/bin/ruby" ]; then
+        echo "(!) Ruby ${resolved} already installed at ${prefix}. Skipping..."
+    elif [ "${VERSION_MANAGER}" = "rbenv" ] && [ -x "${RBENV_ROOT}/bin/rbenv" ]; then
+        echo "Installing Ruby ${resolved} via rbenv..."
+        mkdir -p "${RUBIES_DIR}"
+        LANG="${LANG:-C.UTF-8}" RBENV_ROOT="${RBENV_ROOT}" \
+            "${RBENV_ROOT}/bin/rbenv" install --skip-existing "${resolved}"
+        # Mirror into RUBIES_DIR so the rest of the script uses a consistent path.
+        ln -sfn "${RBENV_ROOT}/versions/${resolved}" "${prefix}"
+    elif [ "${VERSION_MANAGER}" = "rvm" ] && [ -s "${RVM_PATH}/scripts/rvm" ]; then
+        echo "Installing Ruby ${resolved} via rvm..."
+        mkdir -p "${RUBIES_DIR}"
+        # shellcheck disable=SC1091
+        source "${RVM_PATH}/scripts/rvm"
+        LANG="${LANG:-C.UTF-8}" rvm install "${resolved}"
+        local rvm_ruby="${RVM_PATH}/rubies/ruby-${resolved}"
+        if [ -d "${rvm_ruby}" ]; then
+            ln -sfn "${rvm_ruby}" "${prefix}"
+        fi
+    else
+        mkdir -p "${RUBIES_DIR}"
+        echo "Installing Ruby ${resolved} via ruby-build..."
+        # Ensure a UTF-8 locale so that rdoc (and other tools bundled with Ruby)
+        # can process non-ASCII bytes during `make install`, even on minimal
+        # base images that ship with no LANG set (e.g. Debian 11 bullseye).
+        LANG="${LANG:-C.UTF-8}" ruby-build "${resolved}" "${prefix}"
+    fi
+
+    if [ "${set_default}" = "true" ]; then
+        ln -sfn "${prefix}" "${RUBIES_DIR}/current"
     fi
 }
 
-# Ensure apt is in non-interactive to avoid prompts
-export DEBIAN_FRONTEND=noninteractive
+# Called before ruby versions are installed so that install_ruby_version()
+# can delegate to 'rbenv install'.
+install_rbenv() {
+    echo "Installing rbenv..."
+    clone_or_update_repo "https://github.com/rbenv/rbenv.git" "${RBENV_ROOT}"
 
-architecture="$(uname -m)"
-if [ "${architecture}" != "amd64" ] && [ "${architecture}" != "x86_64" ] && [ "${architecture}" != "arm64" ] && [ "${architecture}" != "aarch64" ]; then
-    echo "(!) Architecture $architecture unsupported"
-    exit 1
-fi
+    ln -sf "${RBENV_ROOT}/bin/rbenv" /usr/local/bin/rbenv
 
-# Install dependencies
-# Removed software-properties-common package from here as it has been removed for debian trixie(13)
-check_packages curl ca-certificates build-essential gnupg2 libreadline-dev \
-    procps dirmngr gawk autoconf automake bison libffi-dev libgdbm-dev libncurses5-dev \
-    libsqlite3-dev libtool libyaml-dev pkg-config sqlite3 zlib1g-dev libgmp-dev libssl-dev
-if ! type git > /dev/null 2>&1; then
-    check_packages git
-fi
+    # Wire the already-installed ruby-build as an rbenv plugin so that
+    # 'rbenv install' works out of the box.
+    mkdir -p "${RBENV_ROOT}/plugins"
+    if [ ! -e "${RBENV_ROOT}/plugins/ruby-build" ]; then
+        ln -sfn "${RUBY_BUILD_DIR}" "${RBENV_ROOT}/plugins/ruby-build"
+    fi
+    mkdir -p "${RBENV_ROOT}/versions"
+    echo "rbenv ready at ${RBENV_ROOT}."
+}
 
-# Conditionally install software-properties-common (skip on Debian Trixie)
-if type apt-get >/dev/null 2>&1; then
-    if [ -f /etc/os-release ]; then
-        . /etc/os-release
-        if [ "${ID}" = "debian" ] && [ "${VERSION_CODENAME}" = "trixie" ]; then
-            echo "Skipping software-properties-common on Debian Trixie."
-        else
-            check_packages software-properties-common
+# Called after ruby versions are installed.
+finalize_rbenv() {
+    # When rubies were installed via ruby-build (not 'rbenv install'), symlink them
+    # into rbenv's versions directory so 'rbenv versions' shows them.
+    # Skip entries that already point into RBENV_ROOT to avoid circular symlinks.
+    for ruby_dir in "${RUBIES_DIR}"/[0-9]*/; do
+        [ -d "${ruby_dir}" ] || continue
+        local ver
+        ver="$(basename "${ruby_dir%/}")"
+        local real_target
+        real_target="$(readlink -f "${ruby_dir%/}" 2>/dev/null || true)"
+        if [ "${real_target}" = "${RBENV_ROOT}/versions/${ver}" ]; then
+            continue
         fi
-    else
-        # Fallback for apt-based systems without /etc/os-release
-        check_packages software-properties-common
+        ln -sfn "${ruby_dir%/}" "${RBENV_ROOT}/versions/${ver}"
+    done
+
+    # Set the rbenv global version to match the ruby-build default.
+    local default_ver
+    default_ver="$(default_ruby_version)"
+    if [ -n "${default_ver}" ]; then
+        echo "${default_ver}" > "${RBENV_ROOT}/version"
     fi
-fi
 
-# Function to fetch the version released prior to the latest version
-get_previous_version() {
-    local url=$1
-    local repo_url=$2
-    variable_name=$3
-    prev_version=${!variable_name}
-    
-    output=$(curl -s "$repo_url");
-
-    #install jq
-    check_packages jq
-
-    message=$(echo "$output" | jq -r '.message')
-
-    if [[ $message == "API rate limit exceeded"* ]]; then
-        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
-        echo -e "\nAttempting to find latest version using GitHub tags."
-        find_prev_version_from_git_tags prev_version "$url" "tags/v" "_"
-        declare -g ${variable_name}="${prev_version}"
-    else 
-        echo -e "\nAttempting to find latest version using GitHub Api."
-        version=$(echo "$output" | jq -r '.tag_name' | tr '_' '.')
-        declare -g ${variable_name}="${version#v}"
-    fi  
-    echo "${variable_name}=${!variable_name}"
-}
+    apply_group_perms "${RBENV_ROOT}"
 
-get_github_api_repo_url() {
-    local url=$1
-    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
+    # Profile script for login shells (non-login shells rely on containerEnv
+    # which already prepends RBENV_ROOT/shims and RBENV_ROOT/bin).
+    cat > /etc/profile.d/rbenv.sh << 'RBENV_PROFILE'
+export RBENV_ROOT=/usr/local/share/rbenv
+export PATH="${RBENV_ROOT}/bin:${RBENV_ROOT}/shims:${PATH}"
+eval "$(rbenv init - --no-rehash)" 2>/dev/null || true
+RBENV_PROFILE
+    chmod +x /etc/profile.d/rbenv.sh
+
+    RBENV_ROOT="${RBENV_ROOT}" "${RBENV_ROOT}/bin/rbenv" rehash 2>/dev/null || true
+    echo "rbenv configured."
 }
 
+# Called before ruby versions are installed so that install_ruby_version()
+# can delegate to 'rvm install'.
+install_rvm() {
+    echo "Installing rvm..."
 
-# Figure out correct version of a three part version number is not passed
-RUBY_URL="https://github.com/ruby/ruby"
-ORIGINAL_RUBY_VERSION=$RUBY_VERSION
-find_version_from_git_tags RUBY_VERSION $RUBY_URL "tags/v" "_"
+    receive_gpg_keys RVM_GPG_KEYS
 
-set_rvm_install_args() {
-    RUBY_VERSION=$1
-    if [ "${RUBY_VERSION}" = "none" ]; then
-        RVM_INSTALL_ARGS=""
-    elif [[ "$(ruby -v)" = *"${RUBY_VERSION}"* ]]; then
-        echo "(!) Ruby is already installed with version ${RUBY_VERSION}. Skipping..."
-        RVM_INSTALL_ARGS=""
-    else
-        if [ "${RUBY_VERSION}" = "latest" ] || [ "${RUBY_VERSION}" = "current" ] || [ "${RUBY_VERSION}" = "lts" ]; then
-            RVM_INSTALL_ARGS="--ruby"
-            RUBY_VERSION=""
-        else
-            RVM_INSTALL_ARGS="--ruby=${RUBY_VERSION}"
-        fi
-        if [ "${INSTALL_RUBY_TOOLS}" = "true" ]; then
-            SKIP_GEM_INSTALL="true"
-        else 
-            DEFAULT_GEMS=""
-        fi
+    curl -sSL https://get.rvm.io | bash -s stable --path "${RVM_PATH}"
+
+    # rvm is a shell function, so we must source it before calling 'rvm' below.
+    # shellcheck disable=SC1091
+    if [ -s "${RVM_PATH}/scripts/rvm" ]; then
+        source "${RVM_PATH}/scripts/rvm"
     fi
+    echo "rvm ready at ${RVM_PATH}."
 }
 
-install_previous_version() {
-    if [[ $ORIGINAL_RUBY_VERSION == "latest" ]]; then
-        repo_url=$(get_github_api_repo_url "$RUBY_URL")
-        get_previous_version "${RUBY_URL}" "${repo_url}" RUBY_VERSION
-        set_rvm_install_args $RUBY_VERSION
-        curl -sSL https://get.rvm.io | bash -s stable --ignore-dotfiles ${RVM_INSTALL_ARGS} --with-default-gems="${DEFAULT_GEMS}" 2>&1
-    else 
-        echo "Failed to install Ruby version $ORIGINAL_RUBY_VERSION. Exiting..."
+finalize_rvm() {
+    # shellcheck disable=SC1091
+    [ -s "${RVM_PATH}/scripts/rvm" ] && source "${RVM_PATH}/scripts/rvm" || true
+
+    # When rubies were installed via ruby-build (not 'rvm install'), mount them
+    # into rvm so 'rvm list' shows them.  Skip entries that already live under
+    # RVM_PATH to avoid double-mounting.
+    if [ -d "${RUBIES_DIR}" ]; then
+        for ruby_dir in "${RUBIES_DIR}"/[0-9]*/; do
+            [ -d "${ruby_dir}" ] || continue
+            local ver
+            ver="$(basename "${ruby_dir%/}")"
+            local real_target
+            real_target="$(readlink -f "${ruby_dir%/}" 2>/dev/null || true)"
+            if [[ "${real_target}" == "${RVM_PATH}/rubies/"* ]]; then
+                continue
+            fi
+            rvm mount "${ruby_dir%/}" -n "${ver}" 2>/dev/null || true
+        done
     fi
-}
 
-# Just install Ruby if RVM already installed
-if rvm --version > /dev/null; then
-    echo "Ruby Version Manager already exists."
-    if [[ "$(ruby -v)" = *"${RUBY_VERSION}"* ]]; then
-        echo "(!) Ruby is already installed with version ${RUBY_VERSION}. Skipping..."
-    elif [ "${RUBY_VERSION}" != "none" ]; then
-        echo "Installing specified Ruby version."
-        su ${USERNAME} -c "rvm install ruby ${RUBY_VERSION}"
+    # Set the rvm default to match the ruby-build default.
+    local default_ver
+    default_ver="$(default_ruby_version)"
+    if [ -n "${default_ver}" ]; then
+        local real_current
+        real_current="$(readlink -f "${RUBIES_DIR}/current" 2>/dev/null || true)"
+        if [[ "${real_current}" == "${RVM_PATH}/rubies/"* ]]; then
+            # Installed via 'rvm install': use the version name directly.
+            rvm use "${default_ver}" --default 2>/dev/null || true
+        else
+            # Installed via ruby-build and mounted: use the 'ext-' prefix.
+            rvm use "ext-${default_ver}" --default 2>/dev/null || true
+        fi
     fi
-    SKIP_GEM_INSTALL="false"
-    SKIP_RBENV_RBUILD="true"
-else
-    # Install RVM
-    receive_gpg_keys RVM_GPG_KEYS
-    # Determine appropriate settings for rvm installer
-    set_rvm_install_args $RUBY_VERSION
-    # Create rvm group as a system group to reduce the odds of conflict with local user UIDs
-    if ! cat /etc/group | grep -e "^rvm:" > /dev/null 2>&1; then
-        groupadd -r rvm
+
+    echo "source ${RVM_PATH}/scripts/rvm" > /etc/profile.d/rvm.sh
+    chmod +x /etc/profile.d/rvm.sh
+
+    if [ "${USERNAME}" != "root" ] && id -u "${USERNAME}" > /dev/null 2>&1; then
+        usermod -aG rvm "${USERNAME}" 2>/dev/null || true
     fi
-    # Install rvm
-    curl -sSL https://get.rvm.io | bash -s stable --ignore-dotfiles ${RVM_INSTALL_ARGS} --with-default-gems="${DEFAULT_GEMS}" 2>&1 || install_previous_version
-    usermod -aG rvm ${USERNAME}
-    source /usr/local/rvm/scripts/rvm
-    rvm fix-permissions system
-    rm -rf ${GNUPGHOME}
-fi
+    echo "rvm configured."
+}
+
+install_build_deps
+install_ruby_build
 
-if [ "${INSTALL_RUBY_TOOLS}" = "true" ]; then   
-    # Non-root user may not have "gem" in path when script is run and no ruby version
-    # is installed by rvm, so handle this by using root's default gem in this case
-    ROOT_GEM="$(which gem || echo "")"
-    ${ROOT_GEM} install ${DEFAULT_GEMS}
+# Create a shared "ruby" group so the configured user can write under the rubies tree.
+if ! getent group "${RUBY_GROUP}" > /dev/null 2>&1; then
+    groupadd -r "${RUBY_GROUP}" 2>/dev/null || addgroup -S "${RUBY_GROUP}" 2>/dev/null || true
+fi
+mkdir -p "${RUBIES_DIR}"
+chgrp "${RUBY_GROUP}" "${RUBIES_DIR}" 2>/dev/null || true
+chmod 2775 "${RUBIES_DIR}" 2>/dev/null || true
+
+# Set up the version manager BEFORE installing Ruby versions so that
+# install_ruby_version() can delegate to it when requested.
+if [ "${VERSION_MANAGER}" = "rbenv" ]; then
+    install_rbenv
+elif [ "${VERSION_MANAGER}" = "rvm" ]; then
+    install_rvm
 fi
 
-# VS Code server usually first in the path, so silence annoying rvm warning (that does not apply) and then source it
-updaterc "if ! grep rvm_silence_path_mismatch_check_flag \$HOME/.rvmrc > /dev/null 2>&1; then echo 'rvm_silence_path_mismatch_check_flag=1' >> \$HOME/.rvmrc; fi\nsource /usr/local/rvm/scripts/rvm > /dev/null 2>&1"
+if [ "${RUBY_VERSION}" != "none" ]; then
+    install_ruby_version "${RUBY_VERSION}" "true"
+fi
 
-# Additional ruby versions to be installed but not be set as default.
 if [ ! -z "${ADDITIONAL_VERSIONS}" ]; then
     OLDIFS=$IFS
     IFS=","
         read -a additional_versions <<< "$ADDITIONAL_VERSIONS"
         for version in "${additional_versions[@]}"; do
-            # Figure out correct version of a three part version number is not passed
-            find_version_from_git_tags version $RUBY_URL "tags/v" "_"
-            source /usr/local/rvm/scripts/rvm
-            rvm install ruby ${version}
+            install_ruby_version "${version}" "false"
         done
     IFS=$OLDIFS
 fi
 
-# Install rbenv/ruby-build for good measure
-if [ "${SKIP_RBENV_RBUILD}" != "true" ]; then
+# Expose the default Ruby on the PATH for all login shells.
+echo 'export PATH="/usr/local/rubies/current/bin:${PATH}"' > /etc/profile.d/ruby.sh
+chmod +x /etc/profile.d/ruby.sh
 
-    if [[ ! -d "/usr/local/share/rbenv" ]]; then
-        git clone --depth=1 \
-            -c core.eol=lf \
-            -c core.autocrlf=false \
-            -c fsck.zeroPaddedFilemode=ignore \
-            -c fetch.fsck.zeroPaddedFilemode=ignore \
-            -c receive.fsck.zeroPaddedFilemode=ignore \
-            https://github.com/rbenv/rbenv.git /usr/local/share/rbenv
-    fi
-
-    if [[ ! -d "/usr/local/share/ruby-build" ]]; then
-        git clone --depth=1 \
-            -c core.eol=lf \
-            -c core.autocrlf=false \
-            -c fsck.zeroPaddedFilemode=ignore \
-            -c fetch.fsck.zeroPaddedFilemode=ignore \
-            -c receive.fsck.zeroPaddedFilemode=ignore \
-            https://github.com/rbenv/ruby-build.git /usr/local/share/ruby-build
-        mkdir -p /root/.rbenv/plugins
-
-        ln -s /usr/local/share/ruby-build /root/.rbenv/plugins/ruby-build
-    fi
-
-    if [ "${USERNAME}" != "root" ]; then
-        mkdir -p /home/${USERNAME}/.rbenv/plugins
-
-        if [[ ! -d "/home/${USERNAME}/.rbenv/plugins/ruby-build" ]]; then
-            ln -s /usr/local/share/ruby-build /home/${USERNAME}/.rbenv/plugins/ruby-build
-        fi
-
-        # Oryx expects ruby to be installed in this specific path, else it breaks the oryx magic for ruby projects.
-        if [ ! -f /usr/local/rvm/gems/default/bin/ruby ]; then
-            ln -s /usr/local/rvm/rubies/default/bin/ruby /usr/local/rvm/gems/default/bin
-        fi
+if [ "${RUBY_VERSION}" != "none" ] && [ "${INSTALL_RUBY_TOOLS}" = "true" ]; then
+    "${RUBIES_DIR}/current/bin/gem" install --no-document ${DEFAULT_GEMS}
+fi
 
-        chown -R "${USERNAME}:rvm" "/home/${USERNAME}/.rbenv/"
-        chmod -R g+r+w "/home/${USERNAME}/.rbenv"
-        find "/home/${USERNAME}/.rbenv" -type d | xargs -n 1 chmod g+s
+# Make sure the configured user can install gems against the shared rubies tree.
+if [ "${USERNAME}" != "root" ] && id -u "${USERNAME}" > /dev/null 2>&1; then
+    if command -v usermod > /dev/null 2>&1; then
+        usermod -aG "${RUBY_GROUP}" "${USERNAME}" || true
+    elif command -v addgroup > /dev/null 2>&1; then
+        addgroup "${USERNAME}" "${RUBY_GROUP}" || true
     fi
 fi
 
-chown -R "${USERNAME}:rvm" "/usr/local/rvm/"
-chmod -R g+r+w "/usr/local/rvm/"
-find "/usr/local/rvm/" -type d | xargs -n 1 chmod g+s
+apply_group_perms "${RUBIES_DIR}"
 
-# Clean up
-rvm cleanup all
-${ROOT_GEM} cleanup
+if command -v apt-get > /dev/null 2>&1; then
+    rm -rf /var/lib/apt/lists/*
+fi
 
-# Clean up
-rm -rf /var/lib/apt/lists/*
+# Finalize the version manager now that all ruby versions are installed.
+if [ "${VERSION_MANAGER}" = "rbenv" ]; then
+    finalize_rbenv
+elif [ "${VERSION_MANAGER}" = "rvm" ]; then
+    finalize_rvm
+fi
 
 echo "Done!"
diff --git a/test/ruby/install_additional_ruby.sh b/test/ruby/install_additional_ruby.sh
index 12b77def3..90c34f724 100644
--- a/test/ruby/install_additional_ruby.sh
+++ b/test/ruby/install_additional_ruby.sh
@@ -5,11 +5,11 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-check "ruby version 3.4.2 installed as default" ruby -v | grep 3.4.2
-check "ruby version 3.2.8 installed"  rvm list | grep 3.2.8
-check "ruby version 3.3.2 installed"  rvm list | grep 3.3.2
-
-check "rbenv" bash -c 'eval "$(rbenv init -)" && rbenv --version'
+check "ruby-build available" ruby-build --version
+check "ruby version 3.4.2 installed as default" bash -c "ruby -v | grep 3.4.2"
+check "ruby version 3.4.2 prefix present" test -x /usr/local/rubies/3.4.2/bin/ruby
+check "ruby version 3.3.2 prefix present" test -x /usr/local/rubies/3.3.2/bin/ruby
+check "ruby version 3.2 series installed" bash -c "ls /usr/local/rubies | grep -E '^3\\.2\\.'"
 check "rake" bash -c "gem list | grep rake"
 
 # Report result
diff --git a/test/ruby/install_additional_ruby_trixie.sh b/test/ruby/install_additional_ruby_trixie.sh
deleted file mode 100644
index 76f7c9028..000000000
--- a/test/ruby/install_additional_ruby_trixie.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "ruby version 3.4.2 installed as default" ruby -v | grep 3.4.2
-check "ruby version 3.2.8 installed"  rvm list | grep 3.2.8
-check "ruby version 3.3.2 installed"  rvm list | grep 3.3.2
-
-check "rbenv" bash -c 'eval "$(rbenv init -)" && rbenv --version'
-check "rake" bash -c "gem list | grep rake"
-
-# Report result
-reportResults
-
diff --git a/test/ruby/install_additional_ruby_trixie.sh b/test/ruby/install_additional_ruby_trixie.sh
new file mode 120000
index 000000000..bddda2d3a
--- /dev/null
+++ b/test/ruby/install_additional_ruby_trixie.sh
@@ -0,0 +1 @@
+install_additional_ruby.sh
\ No newline at end of file
diff --git a/test/ruby/install_ruby_trixie_base.sh b/test/ruby/install_ruby_trixie_base.sh
index f90c76cc4..609187ccb 100644
--- a/test/ruby/install_ruby_trixie_base.sh
+++ b/test/ruby/install_ruby_trixie_base.sh
@@ -5,11 +5,11 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-# Definition specific tests
-check "ruby version" ruby  --version
-check "rvm" rvm --version
+# The feature was invoked with version=none on a base image that already ships
+# Ruby. ruby-build should still be installed so additional versions can be added.
+check "ruby version" ruby --version
 check "gem version" gem --version
+check "ruby-build available" ruby-build --version
 
 # Report result
 reportResults
-
diff --git a/test/ruby/ruby_fallback_test.sh b/test/ruby/ruby_fallback_test.sh
deleted file mode 100644
index a4ec9a6b5..000000000
--- a/test/ruby/ruby_fallback_test.sh
+++ /dev/null
@@ -1,310 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-USERNAME="automatic"
-echo -e "\nRVM version installed previously by ruby feature ..."
-check "rvm" rvm --version
-check "ruby" ruby -v
-
-trap 'echo "Last executed command failed at line ${LINENO}"' ERR
-
-RVM_GPG_KEYS="409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"
-
-# Clean up
-rm -rf /var/lib/apt/lists/*
-
-# Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
-
-# Ensure apt is in non-interactive to avoid prompts
-export DEBIAN_FRONTEND=noninteractive
-
-architecture="$(uname -m)"
-if [ "${architecture}" != "amd64" ] && [ "${architecture}" != "x86_64" ] && [ "${architecture}" != "arm64" ] && [ "${architecture}" != "aarch64" ]; then
-    echo "(!) Architecture $architecture unsupported"
-    exit 1
-fi
-
-apt_get_update()
-{
-    if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then
-        echo "Running apt-get update..."
-        apt-get update -y
-    fi
-}
-
-# Checks if packages are installed and installs them if not
-check_packages() {
-    if ! dpkg -s "$@" > /dev/null 2>&1; then
-        apt_get_update
-        apt-get -y install --no-install-recommends "$@"
-    fi
-}
-
-# Get the list of GPG key servers that are reachable
-get_gpg_key_servers() {
-    declare -A keyservers_curl_map=(
-        ["hkp://keyserver.ubuntu.com"]="http://keyserver.ubuntu.com:11371"
-        ["hkp://keyserver.ubuntu.com:80"]="http://keyserver.ubuntu.com"
-        ["hkps://keys.openpgp.org"]="https://keys.openpgp.org"
-        ["hkp://keyserver.pgp.com"]="http://keyserver.pgp.com:11371"
-    )
-
-    local curl_args=""
-    local keyserver_reachable=false  # Flag to indicate if any keyserver is reachable
-
-    if [ ! -z "${KEYSERVER_PROXY}" ]; then
-        curl_args="--proxy ${KEYSERVER_PROXY}"
-    fi
-
-    for keyserver in "${!keyservers_curl_map[@]}"; do
-        local keyserver_curl_url="${keyservers_curl_map[${keyserver}]}"
-        if curl -s ${curl_args} --max-time 5 ${keyserver_curl_url} > /dev/null; then
-            echo "keyserver ${keyserver}"
-            keyserver_reachable=true
-        else
-            echo "(*) Keyserver ${keyserver} is not reachable." >&2
-        fi
-    done
-
-    if ! $keyserver_reachable; then
-        echo "(!) No keyserver is reachable." >&2
-        exit 1
-    fi
-}
-
-# Import the specified key in a variable name passed in as 
-receive_gpg_keys() {
-    local keys=${!1}
-    local keyring_args=""
-    if [ ! -z "$2" ]; then
-        keyring_args="--no-default-keyring --keyring \"$2\""
-    fi
-
-    # Install curl
-    if ! type curl > /dev/null 2>&1; then
-        check_packages curl
-    fi
-
-    # Use a temporary location for gpg keys to avoid polluting image
-    export GNUPGHOME="/tmp/tmp-gnupg"
-    mkdir -p ${GNUPGHOME}
-    chmod 700 ${GNUPGHOME}
-    echo -e "disable-ipv6\n$(get_gpg_key_servers)" | tee ${GNUPGHOME}/dirmngr.conf > /dev/null
-    # GPG key download sometimes fails for some reason and retrying fixes it.
-    local retry_count=0
-    local gpg_ok="false"
-    set +e
-    until [ "${gpg_ok}" = "true" ] || [ "${retry_count}" -eq "5" ]; 
-    do
-        echo "(*) Downloading GPG key..."
-        ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys) 2>&1 && gpg_ok="true"
-        if [ "${gpg_ok}" != "true" ]; then
-            echo "(*) Failed getting key, retrying in 10s..."
-            (( retry_count++ ))
-            sleep 10s
-        fi
-    done
-    set -e
-    if [ "${gpg_ok}" = "false" ]; then
-        echo "(!) Failed to get gpg key."
-        exit 1
-    fi
-}
-
-# Figure out correct version of a three part version number is not passed
-find_version_from_git_tags() {
-    local variable_name=$1
-    local requested_version=${!variable_name}
-    if [ "${requested_version}" = "none" ]; then return; fi
-    local repository=$2
-    local prefix=${3:-"tags/v"}
-    local separator=${4:-"."}
-    local last_part_optional=${5:-"false"}    
-    if [ "$(echo "${requested_version}" | grep -o "." | wc -l)" != "2" ]; then
-        local escaped_separator=${separator//./\\.}
-        local last_part
-        if [ "${last_part_optional}" = "true" ]; then
-            last_part="(${escaped_separator}[0-9]+)?"
-        else
-            last_part="${escaped_separator}[0-9]+"
-        fi
-        local regex="${prefix}\\K[0-9]+${escaped_separator}[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
-        if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
-            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
-        else
-            set +e
-            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
-            set -e
-        fi
-    fi
-    if [ -z "${!variable_name}" ] || ! echo "${version_list}" | grep "^${!variable_name//./\\.}$" > /dev/null 2>&1; then
-        echo -e "Invalid ${variable_name} value: ${requested_version}\nValid values:\n${version_list}" >&2
-        exit 1
-    fi
-    echo "${variable_name}=${!variable_name}"
-}
-
-# Use semver logic to decrement a version number then look for the closest match
-find_prev_version_from_git_tags() {
-    local variable_name=$1
-    local current_version=${!variable_name}
-    local repository=$2
-    # Normally a "v" is used before the version number, but support alternate cases
-    local prefix=${3:-"tags/v"}
-    # Some repositories use "_" instead of "." for version number part separation, support that
-    local separator=${4:-"."}
-    # Some tools release versions that omit the last digit (e.g. go)
-    local last_part_optional=${5:-"false"}
-    # Some repositories may have tags that include a suffix (e.g. actions/node-versions)
-    local version_suffix_regex=$6
-    # Try one break fix version number less if we get a failure. Use "set +e" since "set -e" can cause failures in valid scenarios.
-    set +e
-        major="$(echo "${current_version}" | grep -oE '^[0-9]+' || echo '')"
-        minor="$(echo "${current_version}" | grep -oP '^[0-9]+\.\K[0-9]+' || echo '')"
-        breakfix="$(echo "${current_version}" | grep -oP '^[0-9]+\.[0-9]+\.\K[0-9]+' 2>/dev/null || echo '')"
-
-        if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
-            ((major=major-1))
-            declare -g ${variable_name}="${major}"
-            # Look for latest version from previous major release
-            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
-        # Handle situations like Go's odd version pattern where "0" releases omit the last part
-        elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
-            ((minor=minor-1))
-            declare -g ${variable_name}="${major}.${minor}"
-            # Look for latest version from previous minor release
-            find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${last_part_optional}"
-        else
-            ((breakfix=breakfix-1))
-            if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
-                declare -g ${variable_name}="${major}.${minor}"
-            else 
-                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
-            fi
-        fi
-    set -e
-}
-
-# Function to fetch the version released prior to the latest version
-get_previous_version() {
-    local url=$1
-    local repo_url=$2
-    local variable_name=$3
-    local mode=$4
-    prev_version=${!variable_name}
-    
-    output=$(curl -s "$repo_url");
-
-    #install jq
-    check_packages jq
-
-    message=$(echo "$output" | jq -r '.message')
-
-    if [[ $mode == "mode1" ]]; then
-        message="API rate limit exceeded"
-    else 
-        message=""
-    fi
-    
-    if [[ $message == "API rate limit exceeded"* ]]; then
-        echo -e "\nAn attempt to find latest version using GitHub Api Failed... \nReason: ${message}"
-        echo -e "\nAttempting to find latest version using GitHub tags."
-        find_prev_version_from_git_tags prev_version "$url" "tags/v" "_"
-        declare -g ${variable_name}="${prev_version}"
-    else 
-        echo -e "\nAttempting to find latest version using GitHub Api."
-        version=$(echo "$output" | jq -r '.tag_name' | tr '_' '.')
-        declare -g ${variable_name}="${version#v}"
-    fi  
-    echo "${variable_name}=${!variable_name}"
-}
-
-get_github_api_repo_url() {
-    local url=$1
-    echo "${url/https:\/\/github.com/https:\/\/api.github.com\/repos}/releases/latest"
-}
-
-
-# Figure out correct version of a three part version number is not passed
-ruby_url="https://github.com/ruby/ruby"
-
-RUBY_VERSION="3.4.xyz"
-
-set_rvm_install_args() {
-    RUBY_VERSION=$1
-    if [ "${RUBY_VERSION}" = "none" ]; then
-        RVM_INSTALL_ARGS=""
-    elif [[ "$(ruby -v)" = *"${RUBY_VERSION}"* ]]; then
-        echo "(!) Ruby is already installed with version ${RUBY_VERSION}. Skipping..."
-        RVM_INSTALL_ARGS=""
-    else
-        if [ "${RUBY_VERSION}" = "latest" ] || [ "${RUBY_VERSION}" = "current" ] || [ "${RUBY_VERSION}" = "lts" ]; then
-            RVM_INSTALL_ARGS="--ruby"
-            RUBY_VERSION=""
-        else
-            RVM_INSTALL_ARGS="--ruby=${RUBY_VERSION}"
-        fi
-        if [ "${INSTALL_RUBY_TOOLS}" = "true" ]; then
-            SKIP_GEM_INSTALL="true"
-        else 
-            DEFAULT_GEMS=""
-        fi
-    fi
-}
-
-install_previous_version() {
-    mode=$1
-    repo_url=$(get_github_api_repo_url "$ruby_url")
-    get_previous_version "${ruby_url}" "${repo_url}" RUBY_VERSION $mode
-    set_rvm_install_args $RUBY_VERSION
-    curl -sSL https://get.rvm.io | bash -s stable --ignore-dotfiles ${RVM_INSTALL_ARGS} --with-default-gems="${DEFAULT_GEMS}" 2>&1
-}
-
-install_rvm() {
-    mode=$1
-    # Install RVM
-    receive_gpg_keys RVM_GPG_KEYS
-    # Determine appropriate settings for rvm installer
-    set_rvm_install_args $RUBY_VERSION
-    # Create rvm group as a system group to reduce the odds of conflict with local user UIDs
-    if ! cat /etc/group | grep -e "^rvm:" > /dev/null 2>&1; then
-        groupadd -r rvm
-    fi
-    # Install rvm
-    curl -sSL https://get.rvm.io | bash -s stable --ignore-dotfiles ${RVM_INSTALL_ARGS} --with-default-gems="${DEFAULT_GEMS}" 2>&1 || install_previous_version "$mode"
-    sudo usermod -aG rvm ${USERNAME}
-    source /usr/local/rvm/scripts/rvm
-    rvm fix-permissions system
-    rm -rf ${GNUPGHOME}
-}
-
-install_rvm "mode1"
-echo -e "\n👉🏻👉🏻RVM version installed by test file ... (mode: 1 - install using find_prev_version_from_git_tags):"
-check "rvm" rvm --version
-
-install_rvm "mode2"
-echo -e "\n👉🏻👉🏻RVM version installed by test file ... (mode: 1 - install using GitHub Api):"
-check "rvm" rvm --version
-
-# Report result
-reportResults
\ No newline at end of file
diff --git a/test/ruby/ruby_rbenv.sh b/test/ruby/ruby_rbenv.sh
new file mode 100755
index 000000000..685dc6828
--- /dev/null
+++ b/test/ruby/ruby_rbenv.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# rbenv (and its shims/bin dirs) is placed on PATH via containerEnv,
+# so these commands should work in non-login shells too.
+check "ruby version 3.4.2 active" bash -c "ruby -v | grep 3.4.2"
+check "rbenv available" rbenv --version
+check "rbenv lists ruby 3.4.2" bash -c "rbenv versions | grep 3.4.2"
+check "rbenv global is 3.4.2" bash -c "rbenv global | grep 3.4.2"
+check "rbenv shim for ruby" test -x /usr/local/share/rbenv/shims/ruby
+check "ruby-build wired as rbenv plugin" test -d /usr/local/share/rbenv/plugins/ruby-build
+check "rake gem installed" bash -c "gem list | grep rake"
+
+# Report result
+reportResults
diff --git a/test/ruby/ruby_rvm.sh b/test/ruby/ruby_rvm.sh
new file mode 100755
index 000000000..6cea7901a
--- /dev/null
+++ b/test/ruby/ruby_rvm.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Ruby installed via rvm lives under /usr/local/rvm/rubies and is also
+# exposed via the /usr/local/rubies/current PATH entry from containerEnv.
+check "ruby version 3.4.2 active" bash -c "ruby -v | grep 3.4.2"
+check "rvm binary available" /usr/local/rvm/bin/rvm --version
+check "rvm ruby 3.4.2 directory exists" test -d /usr/local/rvm/rubies/ruby-3.4.2
+# rvm is implemented as a shell function, so source it before calling.
+check "rvm default points to 3.4.2" bash -c "source /usr/local/rvm/scripts/rvm && rvm current | grep 3.4.2"
+check "rvm profile.d hook installed" test -x /etc/profile.d/rvm.sh
+check "rake gem installed" bash -c "gem list | grep rake"
+
+# Report result
+reportResults
diff --git a/test/ruby/scenarios.json b/test/ruby/scenarios.json
index 7aa7c5f8e..4c3b2600c 100644
--- a/test/ruby/scenarios.json
+++ b/test/ruby/scenarios.json
@@ -1,8 +1,8 @@
-{   
+{
     "install_ruby_trixie_base": {
         "build": {
             "dockerfile": "Dockerfile"
-        },        
+        },
         "features": {
             "ghcr.io/devcontainers/features/common-utils:2": {
                 "installZsh": "true",
@@ -28,7 +28,7 @@
                 "additionalVersions": "3.2,3.3.2"
             }
         }
-    },       
+    },
     "install_additional_ruby": {
         "image": "ubuntu:noble",
         "features": {
@@ -39,17 +39,27 @@
         }
     },
     "ruby_debian": {
-        "image": "mcr.microsoft.com/devcontainers/base:bullseye",
+        "image": "mcr.microsoft.com/devcontainers/base:bookworm",
         "features": {
             "ruby": {}
         }
     },
-    "ruby_fallback_test": {
-        "image": "mcr.microsoft.com/devcontainers/base:bullseye",
+    "ruby_rbenv": {
+        "image": "mcr.microsoft.com/devcontainers/base:noble",
         "features": {
             "ruby": {
-                "version": "latest"
+                "version": "3.4.2",
+                "versionManager": "rbenv"
+            }
+        }
+    },
+    "ruby_rvm": {
+        "image": "mcr.microsoft.com/devcontainers/base:bookworm",
+        "features": {
+            "ruby": {
+                "version": "3.4.2",
+                "versionManager": "rvm"
             }
         }
     }
-}
\ No newline at end of file
+}

From e21f5c8de89f9b0c191e39084a90d7dbb25ca8d0 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Thu, 25 Jun 2026 12:59:47 +0530
Subject: [PATCH 461/478] [docker-in-docker] - Move the iptables switching
 logic in the docker-init script and isolated tests for specific cases (#1666)

* Check the tests

* check the log

* Adding debug statements

* Another change

* Check in docker-init.sh

* Change test order

* Check the presence of the kernel module

* change the test execution order

* Changes in workflows

* Change the test

* Further isolation

* Adding a flag to switch the logic for better management.

* Modify stress tests

* Add docker-compose latest version

* Changing to minor version upgrade as a switch flag is present

* Revert "Add docker-compose latest version"

This reverts commit 7360873729d711c85bc3932b8a854ffd0f6a9e91.

* Reapply "Add docker-compose latest version"

This reverts commit dfa45209737192e4f4a5ca8e58222c8ce47c823b.

* Removing docker-compose latest version change from this PR.

* Implementing review comments.

* Implementing review comments

* Implementing review comments further

* Setting iptablesSwitchAtRuntime:true and major version bump.
---
 ...r-in-docker-daemon-startup-bulk-test.yaml} |  6 +-
 .github/workflows/test-pr-arm64.yaml          |  9 +++
 .github/workflows/test-pr.yaml                | 37 ++++++++++++
 src/docker-in-docker/README.md                |  3 +-
 .../devcontainer-feature.json                 |  7 ++-
 src/docker-in-docker/install.sh               | 35 ++++++++++-
 .../docker_iptables_switch_at_install.sh      | 22 +++++++
 .../docker_iptables_switch_at_runtime.sh      | 24 ++++++++
 .../docker_with_default_iptables.sh           | 33 +++++++++++
 .../docker_with_default_iptables_ubuntu.sh    |  1 +
 .../docker_with_legacy_iptables.sh            | 20 +++++++
 .../docker_with_legacy_iptables_ubuntu.sh     |  1 +
 test/docker-in-docker/scenarios.json          | 59 ++++++++++++++++++-
 13 files changed, 248 insertions(+), 9 deletions(-)
 rename .github/workflows/{docker-in-docker-stress-test.yaml => docker-in-docker-daemon-startup-bulk-test.yaml} (82%)
 create mode 100644 test/docker-in-docker/docker_iptables_switch_at_install.sh
 create mode 100644 test/docker-in-docker/docker_iptables_switch_at_runtime.sh
 create mode 100644 test/docker-in-docker/docker_with_default_iptables.sh
 create mode 120000 test/docker-in-docker/docker_with_default_iptables_ubuntu.sh
 create mode 100644 test/docker-in-docker/docker_with_legacy_iptables.sh
 create mode 120000 test/docker-in-docker/docker_with_legacy_iptables_ubuntu.sh

diff --git a/.github/workflows/docker-in-docker-stress-test.yaml b/.github/workflows/docker-in-docker-daemon-startup-bulk-test.yaml
similarity index 82%
rename from .github/workflows/docker-in-docker-stress-test.yaml
rename to .github/workflows/docker-in-docker-daemon-startup-bulk-test.yaml
index a63225a13..b7ec4339e 100644
--- a/.github/workflows/docker-in-docker-stress-test.yaml
+++ b/.github/workflows/docker-in-docker-daemon-startup-bulk-test.yaml
@@ -1,4 +1,4 @@
-name: "Stress test - Docker in Docker"
+name: "Test Docker daemon startup in bulk - Docker in Docker"
 on:
   pull_request:
     paths:
@@ -18,8 +18,8 @@ jobs:
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
 
-      - name: "Generating tests for 'docker-in-docker' which validates if docker daemon is running"
-        run: devcontainer features test --skip-scenarios -f docker-in-docker -i mcr.microsoft.com/devcontainers/base:noble .
+      - name: "Generating tests for 'docker-in-docker' which validates if docker daemon is running (with iptablesSwitchAtRuntime=true)"
+        run: devcontainer features test -f docker-in-docker --skip-autogenerated --filter "docker_iptables_switch_at_runtime" .
 
   test-onCreate:
     strategy:
diff --git a/.github/workflows/test-pr-arm64.yaml b/.github/workflows/test-pr-arm64.yaml
index e5855ced2..ddc761000 100644
--- a/.github/workflows/test-pr-arm64.yaml
+++ b/.github/workflows/test-pr-arm64.yaml
@@ -75,5 +75,14 @@ jobs:
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
 
+      - name: "Exclude iptables-isolation scenarios from docker-in-docker"
+        if: matrix.features == 'docker-in-docker'
+        run: |
+          sudo apt-get update && sudo apt-get install -y jq
+          sed 's://.*$::' test/docker-in-docker/scenarios.json \
+            | jq 'del(.docker_with_default_iptables, .docker_with_default_iptables_ubuntu)' \
+            > test/docker-in-docker/scenarios.json.tmp
+          mv test/docker-in-docker/scenarios.json.tmp test/docker-in-docker/scenarios.json
+
       - name: "Testing '${{ matrix.features }}' scenarios"
         run: devcontainer features test -f ${{ matrix.features }} --skip-autogenerated  .
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index e00c50876..8b2520752 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -92,5 +92,42 @@ jobs:
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
 
+      - name: "Exclude iptables-isolation scenarios from docker-in-docker (run in separate 'iptables-isolation' job)"
+        if: matrix.features == 'docker-in-docker'
+        run: |
+          sudo apt-get update && sudo apt-get install -y jq
+          sed 's://.*$::' test/docker-in-docker/scenarios.json \
+            | jq 'del(.docker_with_default_iptables, .docker_with_default_iptables_ubuntu)' \
+            > test/docker-in-docker/scenarios.json.tmp
+          mv test/docker-in-docker/scenarios.json.tmp test/docker-in-docker/scenarios.json
+
       - name: "Testing '${{ matrix.features }}' scenarios"
         run: devcontainer features test -f ${{ matrix.features }} --skip-autogenerated  .
+
+  iptables-isolation:
+    needs: [detect-changes]
+    if: contains(fromJSON(needs.detect-changes.outputs.features), 'docker-in-docker')
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    strategy:
+      fail-fast: false
+      matrix:
+        scenario:
+          - docker_with_default_iptables
+          - docker_with_default_iptables_ubuntu
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: "Install latest devcontainer CLI"
+        run: npm install -g @devcontainers/cli
+
+      - name: "Isolate scenario '${{ matrix.scenario }}'"
+        run: |
+          sudo apt-get update && sudo apt-get install -y jq
+          sed 's://.*$::' test/docker-in-docker/scenarios.json \
+            | jq '{ "${{ matrix.scenario }}": .["${{ matrix.scenario }}"] }' \
+            > test/docker-in-docker/scenarios.json.tmp
+          mv test/docker-in-docker/scenarios.json.tmp test/docker-in-docker/scenarios.json
+
+      - name: "Testing docker-in-docker scenario '${{ matrix.scenario }}'"
+        run: devcontainer features test --features docker-in-docker --filter ${{ matrix.scenario }} --skip-autogenerated  .
diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index f94c9be51..6bba801a8 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -7,7 +7,7 @@ Create child containers *inside* a container, independent from the host's docker
 
 ```json
 "features": {
-    "ghcr.io/devcontainers/features/docker-in-docker:3": {}
+    "ghcr.io/devcontainers/features/docker-in-docker:4": {}
 }
 ```
 
@@ -24,6 +24,7 @@ Create child containers *inside* a container, independent from the host's docker
 | installDockerBuildx | Install Docker Buildx | boolean | true |
 | installDockerComposeSwitch | Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter. | boolean | false |
 | disableIp6tables | Disable ip6tables (this option is only applicable for Docker versions 27 and greater) | boolean | false |
+| iptablesSwitchAtRuntime | If true, the iptables alternative is selected at container start (inside docker-init.sh) instead of at image build time. Useful when the desired iptables backend depends on the host kernel at runtime rather than at build time. | boolean | true |
 
 ## Customizations
 
diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 6d7c0431a..2710a2e32 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "docker-in-docker",
-  "version": "3.1.0",
+  "version": "4.0.0",
   "name": "Docker (Docker-in-Docker)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
   "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
@@ -61,6 +61,11 @@
       "type": "boolean",
       "default": false,
       "description": "Disable ip6tables (this option is only applicable for Docker versions 27 and greater)"
+    },
+    "iptablesSwitchAtRuntime": {
+      "type": "boolean",
+      "default": true,
+      "description": "If true, the iptables alternative is selected at container start (inside docker-init.sh) instead of at image build time. Useful when the desired iptables backend depends on the host kernel at runtime rather than at build time."
     }
   },
   "entrypoint": "/usr/local/share/docker-init.sh",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 70a187e28..dbef9ae32 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -22,6 +22,7 @@ MICROSOFT_GPG_KEYS_ROLLING_URI="https://packages.microsoft.com/keys/microsoft-ro
 DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="trixie bookworm buster bullseye bionic focal jammy noble"
 DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="trixie bookworm buster bullseye bionic focal hirsute impish jammy noble resolute"
 DISABLE_IP6_TABLES="${DISABLEIP6TABLES:-false}"
+IPTABLES_SWITCH_AT_RUNTIME="${IPTABLESSWITCHATRUNTIME:-true}"
 
 # Default: Exit on any failure.
 set -e
@@ -313,8 +314,10 @@ if [ "${ADJUSTED_ID}" = "debian" ] && command -v update-ca-certificates > /dev/n
     update-ca-certificates
 fi
 
-# Swap to legacy iptables for compatibility (Debian only)
-if [ "${ADJUSTED_ID}" = "debian" ]; then
+# Swap to legacy iptables for compatibility (Debian only) - install-time path.
+# When IPTABLES_SWITCH_AT_RUNTIME=true the same logic is emitted into
+# docker-init.sh and runs at container start instead.
+if [ "${IPTABLES_SWITCH_AT_RUNTIME}" != "true" ] && [ "${ADJUSTED_ID}" = "debian" ]; then
     # On distros where legacy iptables is no longer kernel-supported (e.g. Ubuntu 26.04 / resolute),
     # prefer iptables-nft. Otherwise prefer legacy for backward compatibility.
     use_nft=false
@@ -323,12 +326,15 @@ if [ "${ADJUSTED_ID}" = "debian" ]; then
     esac
 
     if [ "${use_nft}" = "true" ] && type iptables-nft > /dev/null 2>&1; then
+        echo "(*) Setting iptables alternatives to nft for better compatibility with newer kernels"
         update-alternatives --set iptables /usr/sbin/iptables-nft || true
         update-alternatives --set ip6tables /usr/sbin/ip6tables-nft || true
-    elif type iptables-legacy > /dev/null 2>&1; then
+    elif type iptables-legacy > /dev/null 2>&1 && iptables-legacy -L > /dev/null 2>&1; then
+        echo "(*) Setting iptables alternatives to legacy for better compatibility with Docker and older kernels"
         update-alternatives --set iptables /usr/sbin/iptables-legacy || true
         update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy || true
     elif type iptables-nft > /dev/null 2>&1; then
+        echo "(*) Setting iptables alternatives to nft for better compatibility with newer kernels for non resolute"
         update-alternatives --set iptables /usr/sbin/iptables-nft || true
         update-alternatives --set ip6tables /usr/sbin/ip6tables-nft || true
     fi
@@ -970,6 +976,29 @@ DOCKER_DEFAULT_ADDRESS_POOL=${DOCKER_DEFAULT_ADDRESS_POOL}
 DOCKER_DEFAULT_IP6_TABLES=${DOCKER_DEFAULT_IP6_TABLES}
 EOF
 
+# On Debian-based images, re-assert the iptables alternative at container start
+# (only when the user opted into runtime switching via iptablesSwitchAtRuntime=true).
+if [ "${IPTABLES_SWITCH_AT_RUNTIME}" = "true" ] && [ "${ADJUSTED_ID}" = "debian" ]; then
+    tee -a /usr/local/share/docker-init.sh > /dev/null \
+<< 'EOF'
+# Prefer legacy only when the ip_tables kernel module is actually present.
+# (Do NOT call `iptables-legacy -L/-nL` to test this — it auto-modprobes ip_tables
+# and would defeat hosts/scenarios where the module is intentionally absent 
+# such as the newer kernels which leaves out ip_tables legacy.)
+if type iptables-legacy > /dev/null 2>&1 \
+   && { grep -qE '^(ip_tables)\b' /proc/modules \
+        || [ -d /sys/module/ip_tables ]; } \
+   && update-alternatives --list iptables 2>/dev/null | grep -q '/usr/sbin/iptables-legacy'; then
+    update-alternatives --set iptables  /usr/sbin/iptables-legacy || true
+    update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy || true
+elif type iptables-nft > /dev/null 2>&1 \
+     && update-alternatives --list iptables 2>/dev/null | grep -q '/usr/sbin/iptables-nft'; then
+    update-alternatives --set iptables  /usr/sbin/iptables-nft  || true
+    update-alternatives --set ip6tables /usr/sbin/ip6tables-nft || true
+fi
+EOF
+fi
+
 tee -a /usr/local/share/docker-init.sh > /dev/null \
 << 'EOF'
 dockerd_start="AZURE_DNS_AUTO_DETECTION=${AZURE_DNS_AUTO_DETECTION} DOCKER_DEFAULT_ADDRESS_POOL=${DOCKER_DEFAULT_ADDRESS_POOL} DOCKER_DEFAULT_IP6_TABLES=${DOCKER_DEFAULT_IP6_TABLES} $(cat << 'INNEREOF'
diff --git a/test/docker-in-docker/docker_iptables_switch_at_install.sh b/test/docker-in-docker/docker_iptables_switch_at_install.sh
new file mode 100644
index 000000000..c87650a4c
--- /dev/null
+++ b/test/docker-in-docker/docker_iptables_switch_at_install.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Default behavior (iptablesSwitchAtRuntime omitted -> false): switching happens
+# at image build time, so docker-init.sh should NOT contain the runtime block.
+check "init-script-exists" bash -c "test -f /usr/local/share/docker-init.sh"
+check "no-runtime-iptables-block" bash -c "! grep -q 'update-alternatives --set iptables' /usr/local/share/docker-init.sh"
+
+# The build-time switch should have set /etc/alternatives/iptables to one of the
+# known backends. With the ip_tables module loaded on the host, legacy is preferred.
+check "iptables-alternative-set" bash -c "readlink /etc/alternatives/iptables | grep -E 'iptables-(legacy|nft)$'"
+check "iptables works" sudo iptables -L
+
+check "version" docker --version
+check "docker-ps" bash -c "docker ps"
+
+# Report result
+reportResults
diff --git a/test/docker-in-docker/docker_iptables_switch_at_runtime.sh b/test/docker-in-docker/docker_iptables_switch_at_runtime.sh
new file mode 100644
index 000000000..152a4ec98
--- /dev/null
+++ b/test/docker-in-docker/docker_iptables_switch_at_runtime.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# iptablesSwitchAtRuntime=true: switching is deferred to container start, so the
+# runtime block MUST have been written into docker-init.sh by install.sh.
+check "init-script-exists" bash -c "test -f /usr/local/share/docker-init.sh"
+check "runtime-iptables-block-present" bash -c "grep -q 'update-alternatives --set iptables' /usr/local/share/docker-init.sh"
+check "runtime-iptables-block-has-legacy-branch" bash -c "grep -q '/usr/sbin/iptables-legacy' /usr/local/share/docker-init.sh"
+check "runtime-iptables-block-has-nft-branch" bash -c "grep -q '/usr/sbin/iptables-nft' /usr/local/share/docker-init.sh"
+
+# The runtime block runs as part of docker-init.sh (the feature's entrypoint),
+# so by the time these tests execute the alternative must already be set.
+check "iptables-alternative-set" bash -c "readlink /etc/alternatives/iptables | grep -E 'iptables-(legacy|nft)$'"
+check "iptables works" sudo iptables -L
+
+check "version" docker --version
+check "docker-ps" bash -c "docker ps"
+
+# Report result
+reportResults
diff --git a/test/docker-in-docker/docker_with_default_iptables.sh b/test/docker-in-docker/docker_with_default_iptables.sh
new file mode 100644
index 000000000..8336cda4c
--- /dev/null
+++ b/test/docker-in-docker/docker_with_default_iptables.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Feature specific tests
+check "docker-ps" bash -c "docker ps"
+# Fail loudly if dockerd never finished initializing, printing the real error
+check "dockerd-started-successfully" bash -c '
+    if ! grep -q "Daemon has completed initialization" /tmp/dockerd.log; then
+        echo "❌ Docker daemon failed to start. Last errors from /tmp/dockerd.log:"
+        echo "----- dockerd.log (tail) -----"
+        tail -n 100 /tmp/dockerd.log
+        echo "----- error/fatal lines -----"
+        grep -iE "error|fatal|failed|panic" /tmp/dockerd.log || true
+        exit 1
+    fi
+'
+
+check "iptables works" sudo iptables -L
+check "iptables uses nf_tables" bash -c "iptables --version | grep nf_tables"
+
+check "version" docker  --version
+check "docker-ps" bash -c "docker ps"
+check "log-exists" bash -c "ls /tmp/dockerd.log"
+check "log-for-completion" bash -c "cat /tmp/dockerd.log | grep 'Daemon has completed initialization'"
+check "log-contents" bash -c "cat /tmp/dockerd.log | grep 'API listen on /var/run/docker.sock'"
+
+# Report result
+reportResults
+
diff --git a/test/docker-in-docker/docker_with_default_iptables_ubuntu.sh b/test/docker-in-docker/docker_with_default_iptables_ubuntu.sh
new file mode 120000
index 000000000..7eb9de2c6
--- /dev/null
+++ b/test/docker-in-docker/docker_with_default_iptables_ubuntu.sh
@@ -0,0 +1 @@
+docker_with_default_iptables.sh
\ No newline at end of file
diff --git a/test/docker-in-docker/docker_with_legacy_iptables.sh b/test/docker-in-docker/docker_with_legacy_iptables.sh
new file mode 100644
index 000000000..e29e10146
--- /dev/null
+++ b/test/docker-in-docker/docker_with_legacy_iptables.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Feature specific tests
+check "iptables works" sudo iptables -L
+check "iptables uses legacy" bash -c "iptables --version | grep legacy"
+
+check "version" docker  --version
+check "docker-ps" bash -c "docker ps"
+check "log-exists" bash -c "ls /tmp/dockerd.log"
+check "log-for-completion" bash -c "cat /tmp/dockerd.log | grep 'Daemon has completed initialization'"
+check "log-contents" bash -c "cat /tmp/dockerd.log | grep 'API listen on /var/run/docker.sock'"
+
+# Report result
+reportResults
+
diff --git a/test/docker-in-docker/docker_with_legacy_iptables_ubuntu.sh b/test/docker-in-docker/docker_with_legacy_iptables_ubuntu.sh
new file mode 120000
index 000000000..5b62242e3
--- /dev/null
+++ b/test/docker-in-docker/docker_with_legacy_iptables_ubuntu.sh
@@ -0,0 +1 @@
+docker_with_legacy_iptables.sh
\ No newline at end of file
diff --git a/test/docker-in-docker/scenarios.json b/test/docker-in-docker/scenarios.json
index a93495b51..a4ee2a3b0 100644
--- a/test/docker-in-docker/scenarios.json
+++ b/test/docker-in-docker/scenarios.json
@@ -1,4 +1,61 @@
 {
+    "docker_iptables_switch_at_install": {
+        "image": "mcr.microsoft.com/devcontainers/base:debian",
+        "features": {
+            "docker-in-docker": {
+                "moby": "false",
+                "iptablesSwitchAtRuntime": false
+            }
+        },
+        "initializeCommand": "sudo modprobe ip_tables"
+    },
+    // DO NOT REMOVE: This scenario is used by the docker-in-docker-daemon-startup-bulk-test workflow
+    "docker_iptables_switch_at_runtime": {
+        "image": "mcr.microsoft.com/devcontainers/base:debian",
+        "features": {
+            "docker-in-docker": {
+                "moby": "false",
+                "iptablesSwitchAtRuntime": true
+            }
+        },
+        "initializeCommand": "sudo modprobe ip_tables"
+    },
+    "docker_with_default_iptables": {
+        "image": "mcr.microsoft.com/devcontainers/base:debian",
+        "features": {
+            "docker-in-docker": {
+                "moby": "false"
+            }
+        },
+        "initializeCommand": "sudo modprobe --remove --remove-holders --wait 1000 ip_tables"
+    },
+    "docker_with_legacy_iptables": {
+        "image": "mcr.microsoft.com/devcontainers/base:debian",
+        "features": {
+            "docker-in-docker": {
+                "moby": "false"
+            }
+        },
+        "initializeCommand": "sudo modprobe ip_tables"
+    },
+    "docker_with_default_iptables_ubuntu": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "features": {
+            "docker-in-docker": {
+                "moby": "false"
+            }
+        },
+        "initializeCommand": "sudo modprobe --remove --remove-holders --wait 1000 ip_tables"
+    },
+    "docker_with_legacy_iptables_ubuntu": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "features": {
+            "docker-in-docker": {
+                "moby": "false"
+            }
+        },
+        "initializeCommand": "sudo modprobe ip_tables"
+    },        
     "overlayfs_containerd_root": {
         "image": "mcr.microsoft.com/devcontainers/base:noble",
         "features": {
@@ -215,7 +272,7 @@
             }
         }
     },
-    // DO NOT REMOVE: This scenario is used by the docker-in-docker-stress-test workflow
+    // DO NOT REMOVE: This scenario is used by the docker-in-docker-daemon-startup-bulk-test workflow
     "docker_with_on_create_command": {
         "image": "mcr.microsoft.com/devcontainers/base:debian",
         "features": {

From 0eb175018a2ffb84174a2cb08be617c20553aaaf Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Tue, 30 Jun 2026 16:21:40 +0530
Subject: [PATCH 462/478] [git] - Fixing installation from source with new
 version `2.55.0` (#1678)

---
 src/git/devcontainer-feature.json | 2 +-
 src/git/install.sh                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
index 5aa83a8b1..93ea7b061 100644
--- a/src/git/devcontainer-feature.json
+++ b/src/git/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
diff --git a/src/git/install.sh b/src/git/install.sh
index 7ee301b7e..ed20a8ce5 100755
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -318,6 +318,7 @@ cd /tmp/git-${GIT_VERSION}
 git_options=("prefix=/usr/local")
 git_options+=("sysconfdir=/etc")
 git_options+=("USE_LIBPCRE=YesPlease")
+git_options+=("NO_RUST=YesPlease")
 if [ "${ADJUSTED_ID}" = "alpine" ]; then
     # ref. <https://github.com/alpinelinux/aports/blob/32ac93ffb642031b88ba8639fbb3abb324169dea/main/git/APKBUILD#L126>
     git_options+=("NO_REGEX=YesPlease")

From 1863143f13d84971a56e850929ba0019e54e0ca5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Jun 2026 12:00:41 +0100
Subject: [PATCH 463/478] Bump actions/checkout from 6 to 7 (#1674)

Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../docker-in-docker-daemon-startup-bulk-test.yaml          | 4 ++--
 .github/workflows/linter-automated.yaml                     | 2 +-
 .github/workflows/linter-manual.yaml                        | 2 +-
 .github/workflows/release.yaml                              | 2 +-
 .github/workflows/test-all.yaml                             | 6 +++---
 .github/workflows/test-manual.yaml                          | 2 +-
 .github/workflows/test-pr-arm64.yaml                        | 4 ++--
 .github/workflows/test-pr.yaml                              | 6 +++---
 .github/workflows/update-aws-cli-completer-scripts.yml      | 2 +-
 .github/workflows/update-documentation.yml                  | 2 +-
 .github/workflows/update-dotnet-install-script.yml          | 2 +-
 .github/workflows/validate-metadata-files.yml               | 2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/docker-in-docker-daemon-startup-bulk-test.yaml b/.github/workflows/docker-in-docker-daemon-startup-bulk-test.yaml
index b7ec4339e..668879730 100644
--- a/.github/workflows/docker-in-docker-daemon-startup-bulk-test.yaml
+++ b/.github/workflows/docker-in-docker-daemon-startup-bulk-test.yaml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
diff --git a/.github/workflows/linter-automated.yaml b/.github/workflows/linter-automated.yaml
index 234f7e726..db57db29d 100644
--- a/.github/workflows/linter-automated.yaml
+++ b/.github/workflows/linter-automated.yaml
@@ -9,7 +9,7 @@ jobs:
   shellchecker:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
 
     - name: Shell Linter
       uses: azohra/shell-linter@v0.8.0
diff --git a/.github/workflows/linter-manual.yaml b/.github/workflows/linter-manual.yaml
index 5d4081f5a..ba72f8eaf 100644
--- a/.github/workflows/linter-manual.yaml
+++ b/.github/workflows/linter-manual.yaml
@@ -15,7 +15,7 @@ jobs:
   shellchecker:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
 
     - name: Shell Linter
       uses: azohra/shell-linter@v0.8.0
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index ab3c0a34b..96c95398b 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -13,7 +13,7 @@ jobs:
       packages: write
       contents: write
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: "Publish"
         uses: devcontainers/action@v1
diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml
index 2c1405d9d..dd1d216a0 100644
--- a/.github/workflows/test-all.yaml
+++ b/.github/workflows/test-all.yaml
@@ -51,7 +51,7 @@ jobs:
             "mcr.microsoft.com/devcontainers/base:noble"
           ]
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
@@ -95,7 +95,7 @@ jobs:
             "nix",
         ]
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
@@ -107,7 +107,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
diff --git a/.github/workflows/test-manual.yaml b/.github/workflows/test-manual.yaml
index 1373f5215..18dffd1b9 100644
--- a/.github/workflows/test-manual.yaml
+++ b/.github/workflows/test-manual.yaml
@@ -19,7 +19,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
diff --git a/.github/workflows/test-pr-arm64.yaml b/.github/workflows/test-pr-arm64.yaml
index ddc761000..0de1f066b 100644
--- a/.github/workflows/test-pr-arm64.yaml
+++ b/.github/workflows/test-pr-arm64.yaml
@@ -51,7 +51,7 @@ jobs:
           - features: docker-in-docker
             baseImage: mcr.microsoft.com/devcontainers/base:ubuntu       
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: "Load erofs module and verify"
         run: sudo modprobe erofs && grep erofs /proc/filesystems
@@ -70,7 +70,7 @@ jobs:
       matrix:
         features: ${{ fromJSON(needs.detect-changes.outputs.features) }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index 8b2520752..e18291f09 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -71,7 +71,7 @@ jobs:
           - features: docker-outside-of-docker
             baseImage: mcr.microsoft.com/devcontainers/base:ubuntu
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
@@ -87,7 +87,7 @@ jobs:
       matrix:
         features: ${{ fromJSON(needs.detect-changes.outputs.features) }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
@@ -116,7 +116,7 @@ jobs:
           - docker_with_default_iptables
           - docker_with_default_iptables_ubuntu
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
diff --git a/.github/workflows/update-aws-cli-completer-scripts.yml b/.github/workflows/update-aws-cli-completer-scripts.yml
index d0c119d09..fde3a29fc 100644
--- a/.github/workflows/update-aws-cli-completer-scripts.yml
+++ b/.github/workflows/update-aws-cli-completer-scripts.yml
@@ -12,7 +12,7 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Run fetch-latest-completer-scripts.sh
         run: src/aws-cli/scripts/fetch-latest-completer-scripts.sh
diff --git a/.github/workflows/update-documentation.yml b/.github/workflows/update-documentation.yml
index 96c12176b..50a643fd7 100644
--- 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@v6
+      - uses: actions/checkout@v7
 
       - name: Generate Documentation
         uses: devcontainers/action@v1
diff --git a/.github/workflows/update-dotnet-install-script.yml b/.github/workflows/update-dotnet-install-script.yml
index 19aab95e2..16f737ff2 100644
--- a/.github/workflows/update-dotnet-install-script.yml
+++ b/.github/workflows/update-dotnet-install-script.yml
@@ -12,7 +12,7 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Run fetch-latest-dotnet-install.sh
         run: src/dotnet/scripts/fetch-latest-dotnet-install.sh
diff --git a/.github/workflows/validate-metadata-files.yml b/.github/workflows/validate-metadata-files.yml
index dfb5b25f0..5b24dfbee 100644
--- a/.github/workflows/validate-metadata-files.yml
+++ b/.github/workflows/validate-metadata-files.yml
@@ -7,7 +7,7 @@ jobs:
   validate:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: "Validate devcontainer-feature.json files"
         uses: devcontainers/action@v1

From 5e6a85458a579e737897494b313322d7c2d2ddca Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Tue, 30 Jun 2026 22:01:17 +0530
Subject: [PATCH 464/478] [oryx] - Fixing build issue (#1680)

---
 src/oryx/devcontainer-feature.json | 2 +-
 src/oryx/install.sh                | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index 9468222e8..5e60e3218 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "oryx",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "name": "Oryx",
     "description": "Installs the oryx CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
diff --git a/src/oryx/install.sh b/src/oryx/install.sh
index eeacbec39..8a85fecd1 100755
--- a/src/oryx/install.sh
+++ b/src/oryx/install.sh
@@ -188,10 +188,10 @@ SOLUTION_FILE_NAME="Oryx.sln"
 echo "Building solution '$SOLUTION_FILE_NAME'..."
 
 cd $GIT_ORYX
-${DOTNET_BINARY} build "$SOLUTION_FILE_NAME" -c Debug
+${DOTNET_BINARY} build "$SOLUTION_FILE_NAME" -c Debug -p:NuGetAudit=false
 
-${DOTNET_BINARY} publish -property:ValidateExecutableReferencesMatchSelfContained=false -r linux-x64 -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildScriptGeneratorCli/BuildScriptGeneratorCli.csproj --self-contained true
-${DOTNET_BINARY} publish -r linux-x64 -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildServer/BuildServer.csproj --self-contained true
+${DOTNET_BINARY} publish -p:NuGetAudit=false -property:ValidateExecutableReferencesMatchSelfContained=false -r linux-x64 -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildScriptGeneratorCli/BuildScriptGeneratorCli.csproj --self-contained true
+${DOTNET_BINARY} publish -p:NuGetAudit=false -r linux-x64 -o ${BUILD_SCRIPT_GENERATOR} -c Release $GIT_ORYX/src/BuildServer/BuildServer.csproj --self-contained true
 
 chmod a+x ${BUILD_SCRIPT_GENERATOR}/GenerateBuildScript
 

From 8431b2dc0714188386f1ee126d8583bd617f30a3 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Tue, 30 Jun 2026 22:57:40 +0530
Subject: [PATCH 465/478] [git] - Fixing issue for alpine installation from
 source and updating tests (#1679)

* [git] - Fixing issue for alpine installation from source and updating tests

* Consolidating common logic
---
 src/git/devcontainer-feature.json         |  2 +-
 src/git/install.sh                        |  9 +++++++--
 test/git/install_git_from_src.sh          |  4 ++++
 test/git/install_git_from_src_alpine.sh   |  4 ++++
 test/git/install_git_from_src_bookworm.sh |  1 +
 test/git/install_git_from_src_centos-7.sh | 16 ----------------
 test/git/install_git_from_src_noble.sh    |  4 ++++
 test/git/install_git_from_src_trixie.sh   |  1 +
 test/git/scenarios.json                   | 15 ++++++++++++---
 test/git/utils.sh                         | 19 +++++++++++++++++++
 10 files changed, 53 insertions(+), 22 deletions(-)
 create mode 120000 test/git/install_git_from_src_bookworm.sh
 delete mode 100644 test/git/install_git_from_src_centos-7.sh
 create mode 120000 test/git/install_git_from_src_trixie.sh
 create mode 100644 test/git/utils.sh

diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
index 93ea7b061..46b49b27f 100644
--- a/src/git/devcontainer-feature.json
+++ b/src/git/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.3.6",
+    "version": "1.3.7",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
diff --git a/src/git/install.sh b/src/git/install.sh
index ed20a8ce5..d214e3e32 100755
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -263,10 +263,10 @@ elif [ "${ADJUSTED_ID}" = "alpine" ]; then
     ${INSTALL_CMD} add --no-cache --update curl grep make zlib-dev
 
     # ref. <https://github.com/alpinelinux/aports/blob/32ac93ffb642031b88ba8639fbb3abb324169dea/main/git/APKBUILD#L62>
-    check_packages asciidoc curl-dev expat-dev g++ gcc openssl-dev pcre2-dev perl-dev perl-error python3-dev tcl tk xmlto
+    check_packages asciidoc curl-dev expat-dev g++ gcc linux-headers openssl-dev pcre2-dev perl-dev perl-error python3-dev tcl tk xmlto
 
 elif [ "${ADJUSTED_ID}" = "rhel" ]; then
-    check_packages gcc libcurl-devel expat-devel gettext-devel openssl-devel perl-devel zlib-devel cmake pcre2-devel tar gzip ca-certificates
+    check_packages gcc make libcurl-devel expat-devel gettext-devel openssl-devel perl-devel zlib-devel cmake pcre2-devel tar gzip ca-certificates
     if ! type curl > /dev/null 2>&1; then
         check_packages curl
     fi
@@ -325,6 +325,11 @@ if [ "${ADJUSTED_ID}" = "alpine" ]; then
     git_options+=("NO_GETTEXT=YesPlease")
 fi
 make -s "${git_options[@]}" all && make -s "${git_options[@]}" install 2>&1
+build_result=$?
 rm -rf /tmp/git-${GIT_VERSION}
 clean_up
+if [ "${build_result}" -ne 0 ]; then
+    echo "(!) Failed to build and install git ${GIT_VERSION}." >&2
+    exit 1
+fi
 echo "Done!"
diff --git a/test/git/install_git_from_src.sh b/test/git/install_git_from_src.sh
index d0ebaa282..4888c25fb 100644
--- a/test/git/install_git_from_src.sh
+++ b/test/git/install_git_from_src.sh
@@ -5,8 +5,12 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Import shared helper functions
+source "$(dirname "$0")/utils.sh"
+
 # Definition specific tests
 check "version" git  --version
+check "version-is-latest" check_git_is_latest_version
 check "gettext" dpkg-query -l gettext
 
 cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
diff --git a/test/git/install_git_from_src_alpine.sh b/test/git/install_git_from_src_alpine.sh
index 2a26beec5..a9a9d7d9c 100644
--- a/test/git/install_git_from_src_alpine.sh
+++ b/test/git/install_git_from_src_alpine.sh
@@ -5,8 +5,12 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Import shared helper functions
+source "$(dirname "$0")/utils.sh"
+
 # Definition specific tests
 check "version" git --version
+check "version-is-latest" check_git_is_latest_version
 
 cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
 cd feature-starter
diff --git a/test/git/install_git_from_src_bookworm.sh b/test/git/install_git_from_src_bookworm.sh
new file mode 120000
index 000000000..aa0c8ade6
--- /dev/null
+++ b/test/git/install_git_from_src_bookworm.sh
@@ -0,0 +1 @@
+install_git_from_src.sh
\ No newline at end of file
diff --git a/test/git/install_git_from_src_centos-7.sh b/test/git/install_git_from_src_centos-7.sh
deleted file mode 100644
index 84800b543..000000000
--- a/test/git/install_git_from_src_centos-7.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-# Definition specific tests
-check "version" git  --version
-
-cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
-cd feature-starter
-check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
-
-# Report result
-reportResults
diff --git a/test/git/install_git_from_src_noble.sh b/test/git/install_git_from_src_noble.sh
index 337226fdc..dae12450b 100644
--- a/test/git/install_git_from_src_noble.sh
+++ b/test/git/install_git_from_src_noble.sh
@@ -5,8 +5,12 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
+# Import shared helper functions
+source "$(dirname "$0")/utils.sh"
+
 # Definition specific tests
 check "version" git  --version
+check "latest version" check_git_is_latest_version
 check "gettext" dpkg-query -l gettext
 
 cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
diff --git a/test/git/install_git_from_src_trixie.sh b/test/git/install_git_from_src_trixie.sh
new file mode 120000
index 000000000..aa0c8ade6
--- /dev/null
+++ b/test/git/install_git_from_src_trixie.sh
@@ -0,0 +1 @@
+install_git_from_src.sh
\ No newline at end of file
diff --git a/test/git/scenarios.json b/test/git/scenarios.json
index 7feff6564..ce110d3c5 100644
--- a/test/git/scenarios.json
+++ b/test/git/scenarios.json
@@ -1,6 +1,6 @@
 {
     "install_git_from_src": {
-        "image": "ubuntu:noble",
+        "image": "ubuntu:resolute",
         "features": {
             "git": {
                 "version": "latest",
@@ -53,8 +53,17 @@
             }
         }
     },
-    "install_git_from_src_centos-7": {
-        "image": "centos:centos7",
+    "install_git_from_src_bookworm": {
+        "image": "debian:bookworm",
+        "features": {
+            "git": {
+                "version": "latest",
+                "ppa": "false"
+            }
+        }
+    },
+    "install_git_from_src_trixie": {
+        "image": "debian:trixie",
         "features": {
             "git": {
                 "version": "latest",
diff --git a/test/git/utils.sh b/test/git/utils.sh
new file mode 100644
index 000000000..6b5b03f93
--- /dev/null
+++ b/test/git/utils.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Shared helper functions for git "install from source" test scenarios.
+
+# Resolves the latest stable git version from GitHub
+get_latest_git_version() {
+    curl -sSL -H "Accept: application/vnd.github.v3+json" "https://api.github.com/repos/git/git/tags" \
+        | grep -oP '"name":\s*"v\K[0-9]+\.[0-9]+\.[0-9]+(?=")' \
+        | sort -rV \
+        | head -n 1
+}
+
+# Verifies the installed git version matches the latest stable version on GitHub
+check_git_is_latest_version() {
+    local latest_version installed_version
+    latest_version="$(get_latest_git_version)"
+    installed_version="$(git --version | awk '{print $3}')"
+    [ -n "$latest_version" ] && [ "$installed_version" = "$latest_version" ]
+}

From f15b529848d77c462d1bf8004c0ff465e124fdd3 Mon Sep 17 00:00:00 2001
From: Daniel Meilak <32960789+daniel-meilak@users.noreply.github.com>
Date: Thu, 2 Jul 2026 16:49:12 +0200
Subject: [PATCH 466/478] Fix desktop-lite ALSA package selection (#1676)

* Fix desktop-lite ALSA package selection

Select the first installable ALSA package by apt candidate availability so Ubuntu releases before and after the t64 transition continue to work.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Order newer packages first

Co-authored-by: nicholas Krul <nicholas.krul@gmail.com>

* Use symlink for duplicate desktop-lite ALSA test

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: nicholas Krul <nicholas.krul@gmail.com>
Co-authored-by: Kaniska <kaniska244@github.com>
---
 src/desktop-lite/devcontainer-feature.json    |  2 +-
 src/desktop-lite/install.sh                   | 26 ++++++++++-----
 test/desktop-lite/check_asound_package.sh     | 33 +++++++++++++++++++
 test/desktop-lite/scenarios.json              | 12 +++++++
 test/desktop-lite/test.sh                     | 22 ++-----------
 .../test_asound_package_ubuntu_2204.sh        |  1 +
 .../test_asound_package_ubuntu_2604.sh        | 14 ++++++++
 7 files changed, 82 insertions(+), 28 deletions(-)
 create mode 100644 test/desktop-lite/check_asound_package.sh
 create mode 120000 test/desktop-lite/test_asound_package_ubuntu_2204.sh
 create mode 100755 test/desktop-lite/test_asound_package_ubuntu_2604.sh

diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json
index b87e2bc02..891ac6d73 100644
--- a/src/desktop-lite/devcontainer-feature.json
+++ b/src/desktop-lite/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "desktop-lite",
-    "version": "1.2.9",
+    "version": "1.2.10",
     "name": "Light-weight Desktop",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
     "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh
index 822818723..0d6d6e31d 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -168,6 +168,19 @@ check_packages() {
     fi
 }
 
+find_available_package() {
+    local candidate
+    local package_name
+    for package_name in "$@"; do
+        candidate="$(apt-cache policy "${package_name}" | awk '/Candidate:/ {print $2}')"
+        if [ -n "${candidate}" ] && [ "${candidate}" != "(none)" ]; then
+            echo "${package_name}"
+            return 0
+        fi
+    done
+    return 1
+}
+
 ##########################
 #  Install starts here   #
 ##########################
@@ -199,15 +212,12 @@ fi
 # Install X11, fluxbox and VS Code dependencies
 check_packages ${package_list}
 
-# if Ubuntu-24.04, noble(numbat) / Debian-13, trixie found, then will install libasound2-dev instead of libasound2.
-# this change is temporary, https://packages.ubuntu.com/noble/libasound2 will switch to libasound2 once it is available for Ubuntu-24.04, noble(numbat)
-. /etc/os-release
-if { [ "${ID}" = "ubuntu" ] && [ "${VERSION_CODENAME}" = "noble" ]; } || { [ "${ID}" = "debian" ] && [ "${VERSION_CODENAME}" = "trixie" ]; }; then
-    echo "Detected Noble (Ubuntu 24.04) or Trixie (Debian). Installing libasound2-dev package..."
-    check_packages "libasound2-dev"
-else
-    check_packages "libasound2"
+if ! alsa_package="$(find_available_package libasound2t64 libasound2 libasound2-dev)"; then
+    echo "(!) No supported ALSA package found. Tried: libasound2, libasound2t64, libasound2-dev." >&2
+    exit 1
 fi
+echo "Installing ${alsa_package} package..."
+check_packages "${alsa_package}"
 
 # On newer versions of Ubuntu (22.04), 
 # we need an additional package that isn't provided in earlier versions
diff --git a/test/desktop-lite/check_asound_package.sh b/test/desktop-lite/check_asound_package.sh
new file mode 100644
index 000000000..112dac197
--- /dev/null
+++ b/test/desktop-lite/check_asound_package.sh
@@ -0,0 +1,33 @@
+checkOSPackage() {
+    PACKAGE_NAME=$1
+    # Check if the package exists and retrieve its exact version
+    if [ "$(dpkg-query -W -f='${Status}' "$PACKAGE_NAME" 2>/dev/null | grep -c "ok installed")" -eq 1 ]; then
+        echo "✅  Package '$PACKAGE_NAME' is installed."
+        return 0
+    else
+        echo "❌ Package '$PACKAGE_NAME' is not installed."
+        return 1
+    fi
+}
+
+findAvailableOSPackage() {
+    local candidate
+    local package_name
+    for package_name in "$@"; do
+        candidate="$(apt-cache policy "${package_name}" | awk '/Candidate:/ {print $2}')"
+        if [ -n "${candidate}" ] && [ "${candidate}" != "(none)" ]; then
+            echo "${package_name}"
+            return 0
+        fi
+    done
+    return 1
+}
+
+checkAsoundPackage() {
+    local alsa_package
+    if ! alsa_package="$(findAvailableOSPackage libasound2 libasound2t64 libasound2-dev)"; then
+        echo "No supported ALSA package found in apt indexes." >&2
+        exit 1
+    fi
+    check "alsa-package-installed-${alsa_package}" checkOSPackage "${alsa_package}"
+}
diff --git a/test/desktop-lite/scenarios.json b/test/desktop-lite/scenarios.json
index f8719acc6..fcb804ff5 100644
--- a/test/desktop-lite/scenarios.json
+++ b/test/desktop-lite/scenarios.json
@@ -45,6 +45,18 @@
             "desktop-lite": {}
         }
     },
+    "test_asound_package_ubuntu_2204": {
+        "image": "ubuntu:22.04",
+        "features": {
+            "desktop-lite": {}
+        }
+    },
+    "test_asound_package_ubuntu_2604": {
+        "image": "ubuntu:26.04",
+        "features": {
+            "desktop-lite": {}
+        }
+    },
     "test_desktop_init_exec_passthrough": {
         "image": "ubuntu:noble",
         "features": {
diff --git a/test/desktop-lite/test.sh b/test/desktop-lite/test.sh
index 32eab53c4..a22c49532 100755
--- a/test/desktop-lite/test.sh
+++ b/test/desktop-lite/test.sh
@@ -10,30 +10,14 @@ echoStderr()
     echo "$@" 1>&2
 }
 
-checkOSPackage() {
-    LABEL=$1
-    PACKAGE_NAME=$2
-    echo -e "\n🧪 Testing $LABEL"
-    # Check if the package exists and retrieve its exact version
-    if [ "$(dpkg-query -W -f='${Status}' "$PACKAGE_NAME" 2>/dev/null | grep -c "ok installed")" -eq 1 ]; then
-        echo "✅  Package '$PACKAGE_NAME' is installed."
-        exit 0
-    else
-        echo "❌ Package '$PACKAGE_NAME' is not installed."
-        exit 1
-    fi
-}
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${script_dir}/check_asound_package.sh"
 
 check "desktop-init-exists" bash -c "ls /usr/local/share/desktop-init.sh"
 check "log-exists" bash -c "ls /tmp/container-init.log"
 check "fluxbox-exists" bash -c "ls -la ~/.fluxbox"
 
-. /etc/os-release
-if [ "${VERSION_CODENAME}" = "noble" ] || [ "${VERSION_CODENAME}" = "trixie" ]; then
-    checkOSPackage "if libasound2-dev exists !" "libasound2-dev"
-else 
-    checkOSPackage "if libasound2 exists !" "libasound2"
-fi
+checkAsoundPackage
 
 # Report result
 reportResults
\ No newline at end of file
diff --git a/test/desktop-lite/test_asound_package_ubuntu_2204.sh b/test/desktop-lite/test_asound_package_ubuntu_2204.sh
new file mode 120000
index 000000000..297c107db
--- /dev/null
+++ b/test/desktop-lite/test_asound_package_ubuntu_2204.sh
@@ -0,0 +1 @@
+test_asound_package_ubuntu_2604.sh
\ No newline at end of file
diff --git a/test/desktop-lite/test_asound_package_ubuntu_2604.sh b/test/desktop-lite/test_asound_package_ubuntu_2604.sh
new file mode 100755
index 000000000..150a806ed
--- /dev/null
+++ b/test/desktop-lite/test_asound_package_ubuntu_2604.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${script_dir}/check_asound_package.sh"
+
+checkAsoundPackage
+
+# Report result
+reportResults

From 6c375f1d65510836760bef052f4614a0df974946 Mon Sep 17 00:00:00 2001
From: Paul Taylor <178183+trxcllnt@users.noreply.github.com>
Date: Wed, 8 Jul 2026 04:40:37 -0700
Subject: [PATCH 467/478] Fix installing git-core PPA in Ubuntu 26.04 (#1675)

* dearmor git-core ppa key for Ubuntu Resolute

* add git-core ppa tests for ubuntu noble and resolute

* make new tests into symlinks

---------

Co-authored-by: Kaniska <kaniska244@github.com>
---
 src/git/devcontainer-feature.json         |  2 +-
 src/git/install.sh                        | 28 +++++++++++------------
 test/git/install_git_from_ppa_noble.sh    |  1 +
 test/git/install_git_from_ppa_resolute.sh |  1 +
 test/git/install_git_from_src_resolute.sh |  1 +
 test/git/scenarios.json                   | 27 ++++++++++++++++++++++
 6 files changed, 45 insertions(+), 15 deletions(-)
 create mode 120000 test/git/install_git_from_ppa_noble.sh
 create mode 120000 test/git/install_git_from_ppa_resolute.sh
 create mode 120000 test/git/install_git_from_src_resolute.sh

diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json
index 46b49b27f..1aa7e237b 100644
--- a/src/git/devcontainer-feature.json
+++ b/src/git/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.3.7",
+    "version": "1.3.8",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
diff --git a/src/git/install.sh b/src/git/install.sh
index d214e3e32..e289ce16b 100755
--- a/src/git/install.sh
+++ b/src/git/install.sh
@@ -110,12 +110,8 @@ get_gpg_key_servers() {
 
 # Import the specified key in a variable name passed in as
 receive_gpg_keys() {
-    local keys=${!1}
-    local keyring_args=""
-    if [ ! -z "$2" ]; then
-        mkdir -p "$(dirname \"$2\")"
-        keyring_args="--no-default-keyring --keyring $2"
-    fi
+    local -a keys="(${!1})"
+    mkdir -p "$(dirname "$2")"
 
     # Install curl
     if ! type curl > /dev/null 2>&1; then
@@ -133,13 +129,17 @@ receive_gpg_keys() {
     set +e
     until [ "${gpg_ok}" = "true" ] || [ "${retry_count}" -eq "5" ];
     do
-        echo "(*) Downloading GPG key..."
-        ( echo "${keys}" | xargs -n 1 gpg -q ${keyring_args} --recv-keys) 2>&1 && gpg_ok="true"
-        if [ "${gpg_ok}" != "true" ]; then
-            echo "(*) Failed getting key, retrying in 10s..."
-            (( retry_count++ ))
-            sleep 10s
-        fi
+        for key in "${keys[@]}"; do
+            echo "(*) Downloading GPG key '${key}'..."
+            gpg --recv-keys "${key}" \
+            && gpg --export "${key}" | gpg --dearmor --yes -o "$2" \
+            && gpg_ok="true"
+            if [ "${gpg_ok}" != "true" ]; then
+                echo "(*) Failed getting key, retrying in 10s..."
+                (( retry_count++ ))
+                sleep 10s
+            fi
+        done
     done
     set -e
     if [ "${gpg_ok}" = "false" ]; then
@@ -275,7 +275,7 @@ elif [ "${ADJUSTED_ID}" = "rhel" ]; then
     fi
     if ! type awk > /dev/null 2>&1; then
         check_packages gawk
-    fi        
+    fi
     if [ $ID = "mariner" ]; then
         check_packages glibc-devel kernel-headers binutils
     fi
diff --git a/test/git/install_git_from_ppa_noble.sh b/test/git/install_git_from_ppa_noble.sh
new file mode 120000
index 000000000..408beff37
--- /dev/null
+++ b/test/git/install_git_from_ppa_noble.sh
@@ -0,0 +1 @@
+install_git_from_ppa_jammy.sh
\ No newline at end of file
diff --git a/test/git/install_git_from_ppa_resolute.sh b/test/git/install_git_from_ppa_resolute.sh
new file mode 120000
index 000000000..408beff37
--- /dev/null
+++ b/test/git/install_git_from_ppa_resolute.sh
@@ -0,0 +1 @@
+install_git_from_ppa_jammy.sh
\ No newline at end of file
diff --git a/test/git/install_git_from_src_resolute.sh b/test/git/install_git_from_src_resolute.sh
new file mode 120000
index 000000000..1e44e792a
--- /dev/null
+++ b/test/git/install_git_from_src_resolute.sh
@@ -0,0 +1 @@
+install_git_from_src_noble.sh
\ No newline at end of file
diff --git a/test/git/scenarios.json b/test/git/scenarios.json
index ce110d3c5..d47f0bb6e 100644
--- a/test/git/scenarios.json
+++ b/test/git/scenarios.json
@@ -44,6 +44,33 @@
             }
         }
     },
+    "install_git_from_ppa_noble": {
+        "image": "ubuntu:noble",
+        "features": {
+            "git": {
+                "version": "latest",
+                "ppa": "true"
+            }
+        }
+    },
+    "install_git_from_src_resolute": {
+        "image": "ubuntu:resolute",
+        "features": {
+            "git": {
+                "version": "latest",
+                "ppa": "false"
+            }
+        }
+    },
+    "install_git_from_ppa_resolute": {
+        "image": "ubuntu:resolute",
+        "features": {
+            "git": {
+                "version": "latest",
+                "ppa": "true"
+            }
+        }
+    },
     "install_git_from_src_bullseye": {
         "image": "debian:bullseye",
         "features": {

From 0f547996943a66f51c28cae151fec87907b27ee9 Mon Sep 17 00:00:00 2001
From: Bobby Reynolds <37971212+reynoldsbd@users.noreply.github.com>
Date: Tue, 14 Jul 2026 06:51:42 -0700
Subject: [PATCH 468/478] fix(rust): support Azure Linux base images (#1685)

---
 src/rust/NOTES.md                  |  4 ++--
 src/rust/README.md                 |  4 ++--
 src/rust/devcontainer-feature.json |  2 +-
 src/rust/install.sh                |  7 ++++---
 test/rust/rust_with_azurelinux.sh  | 31 ++++++++++++++++++++++++++++++
 test/rust/scenarios.json           | 10 ++++++++++
 6 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 test/rust/rust_with_azurelinux.sh

diff --git a/src/rust/NOTES.md b/src/rust/NOTES.md
index 1f01e6e52..68d170302 100644
--- a/src/rust/NOTES.md
+++ b/src/rust/NOTES.md
@@ -2,8 +2,8 @@
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, RockyLinux 
-and Mariner distributions with the `apt`, `yum`, `dnf`, `microdnf` and `tdnf` package manager installed.
+This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, RockyLinux, 
+Mariner and Azure Linux distributions with the `apt`, `yum`, `dnf`, `microdnf` and `tdnf` package manager installed.
 
 
 **Note:** Alpine is not supported because the rustup-init binary requires glibc to run, but Alpine Linux does not include `glibc` 
diff --git a/src/rust/README.md b/src/rust/README.md
index ef0bc2311..eca22932c 100644
--- a/src/rust/README.md
+++ b/src/rust/README.md
@@ -32,8 +32,8 @@ Installs Rust, common Rust utilities, and their required dependencies
 
 ## OS Support
 
-This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, RockyLinux 
-and Mariner distributions with the `apt`, `yum`, `dnf`, `microdnf` and `tdnf` package manager installed.
+This Feature should work on recent versions of Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, RockyLinux, 
+Mariner and Azure Linux distributions with the `apt`, `yum`, `dnf`, `microdnf` and `tdnf` package manager installed.
 
 
 **Note:** Alpine is not supported because the rustup-init binary requires glibc to run, but Alpine Linux does not include `glibc` 
diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index 88b64daed..d8d399cde 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "rust",
-    "version": "1.5.0",
+    "version": "1.5.1",
     "name": "Rust",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
     "description": "Installs Rust, common Rust utilities, and their required dependencies",
diff --git a/src/rust/install.sh b/src/rust/install.sh
index 99a7ba8f5..56bb35ea8 100755
--- a/src/rust/install.sh
+++ b/src/rust/install.sh
@@ -30,7 +30,7 @@ if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
     ADJUSTED_ID="debian"
 elif [ "${ID}" = "alpine" ]; then
     ADJUSTED_ID="alpine"
-elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
+elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "azurelinux" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"azurelinux"* || "${ID_LIKE}" = *"mariner"* ]]; then
     ADJUSTED_ID="rhel"
     VERSION_CODENAME="${ID}${VERSION_ID}"
 else
@@ -264,6 +264,7 @@ check_packages() {
                     "python3-minimal") packages[$i]="python3" ;;
                     "libpython3.*") packages[$i]="python3-devel" ;;
                     "gnupg2") packages[$i]="gnupg" ;;
+                    "passwd") packages[$i]="shadow-utils" ;;
                 esac
                 ;;
         esac
@@ -303,7 +304,7 @@ export DEBIAN_FRONTEND=noninteractive
 
 # Install curl, lldb, python3-minimal,libpython and rust dependencies if missing
 echo "Installing required dependencies..."
-check_packages curl ca-certificates gcc libc6-dev gnupg2 git
+check_packages curl ca-certificates gcc libc6-dev gnupg2 git passwd
 
 # Install optional dependencies (continue if they fail)
 case "$PKG_MANAGER" in
@@ -315,7 +316,7 @@ case "$PKG_MANAGER" in
         ;;
     tdnf)
         check_packages python3 python3-devel || true
-        # LLDB might not be available in Photon/Mariner
+        # LLDB might not be available in Photon/Mariner/Azure Linux
         ;;
 esac
 
diff --git a/test/rust/rust_with_azurelinux.sh b/test/rust/rust_with_azurelinux.sh
new file mode 100644
index 000000000..ac940136f
--- /dev/null
+++ b/test/rust/rust_with_azurelinux.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Helper function to check component is installed
+check_component_installed() {
+    local component=$1
+    if rustup component list | grep -q "${component}.*installed"; then
+        return 0  # Component is installed (success)
+    else
+        return 1  # Component is not installed (failure)
+    fi
+}
+
+# Definition specific tests
+check "cargo version" cargo  --version
+check "rustc version" rustc  --version
+check "correct rust version" rustup target list | grep aarch64-unknown-linux-gnu
+
+# Check that all specified extended components are installed
+check "rust-analyzer is installed" check_component_installed "rust-analyzer"
+check "rust-src is installed" check_component_installed "rust-src"
+check "rustfmt is installed" check_component_installed "rustfmt"
+check "clippy is installed" check_component_installed "clippy"
+check "rust-docs is installed" check_component_installed "rust-docs"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/rust/scenarios.json b/test/rust/scenarios.json
index 21e347947..87c93bfa7 100644
--- a/test/rust/scenarios.json
+++ b/test/rust/scenarios.json
@@ -134,5 +134,15 @@
                 "components": "rust-analyzer,rust-src,rustfmt,clippy,rust-docs"                
             }
         }
+    },
+    "rust_with_azurelinux": {
+        "image": "mcr.microsoft.com/azurelinux/base/core:3.0",
+        "features": {
+            "rust": {
+                "version": "latest",
+                "targets": "aarch64-unknown-linux-gnu",
+                "components": "rust-analyzer,rust-src,rustfmt,clippy,rust-docs"                
+            }
+        }
     }                                                                
 }

From 765e8ebd8f8012fb740cd7b41483a745bcedd212 Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Tue, 14 Jul 2026 14:56:43 +0100
Subject: [PATCH 469/478] Fix terraform feature OpenPGP error on Ubuntu 26.04
 (resolute) (#1683)

* Initial plan

* Extend GPG workaround to Ubuntu 26.04 (resolute) and add tests

* Use devcontainers base:resolute image for terraform resolute tests

* Bump terraform feature version to 1.4.4

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
---
 src/terraform/devcontainer-feature.json       |  2 +-
 src/terraform/install.sh                      |  6 +++---
 test/terraform/install_in_ubuntu_resolute.sh  | 17 ++++++++++++++++
 .../install_in_ubuntu_resolute_sentinel.sh    | 20 +++++++++++++++++++
 test/terraform/scenarios.json                 | 16 +++++++++++++++
 5 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100755 test/terraform/install_in_ubuntu_resolute.sh
 create mode 100755 test/terraform/install_in_ubuntu_resolute_sentinel.sh

diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index f9ebcbee8..37a60db26 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.4.3",
+    "version": "1.4.4",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index 8c4755ebe..8bc79107c 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -19,8 +19,8 @@ INSTALL_SENTINEL=${INSTALLSENTINEL:-false}
 INSTALL_TFSEC=${INSTALLTFSEC:-false}
 INSTALL_TERRAFORM_DOCS=${INSTALLTERRAFORMDOCS:-false}
 CUSTOM_DOWNLOAD_SERVER="${CUSTOMDOWNLOADSERVER:-""}"
-# This is because ubuntu noble and debian trixie don't support the old format of GPG keys and validation 
-NEW_GPG_CODENAMES="trixie noble"
+# This is because ubuntu noble, ubuntu resolute and debian trixie don't support the old format of GPG keys and validation 
+NEW_GPG_CODENAMES="trixie noble resolute"
 
 TERRAFORM_SHA256="${TERRAFORM_SHA256:-"automatic"}"
 TFLINT_SHA256="${TFLINT_SHA256:-"automatic"}"
@@ -52,7 +52,7 @@ if [ "$(id -u)" -ne 0 ]; then
     exit 1
 fi
 
-# Detect Ubuntu Noble or Debian Trixie and use new repo setup, else use legacy GPG logic
+# Detect Ubuntu Noble, Ubuntu Resolute or Debian Trixie and use new repo setup, else use legacy GPG logic
 IS_GPG_NEW=0
 . /etc/os-release
 if [[ "${NEW_GPG_CODENAMES}" == *"${VERSION_CODENAME}"* ]]; then
diff --git a/test/terraform/install_in_ubuntu_resolute.sh b/test/terraform/install_in_ubuntu_resolute.sh
new file mode 100755
index 000000000..8fa4cacb9
--- /dev/null
+++ b/test/terraform/install_in_ubuntu_resolute.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Import test library
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+# Check if terraform was installed correctly
+check "terraform installed" terraform --version
+
+check "tflint" tflint --version
+
+# Report results
+reportResults
diff --git a/test/terraform/install_in_ubuntu_resolute_sentinel.sh b/test/terraform/install_in_ubuntu_resolute_sentinel.sh
new file mode 100755
index 000000000..32c76bbe4
--- /dev/null
+++ b/test/terraform/install_in_ubuntu_resolute_sentinel.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+# Check if terraform was installed correctly
+check "terraform installed" terraform --version
+
+check "tflint" tflint --version
+
+# Sentinel specific tests
+check "sentinel" sentinel --version
+
+# Report result
+reportResults
diff --git a/test/terraform/scenarios.json b/test/terraform/scenarios.json
index 09bb0f598..393bd3303 100644
--- a/test/terraform/scenarios.json
+++ b/test/terraform/scenarios.json
@@ -31,6 +31,22 @@
             }
         }
     },
+    "install_in_ubuntu_resolute": {
+        "image": "mcr.microsoft.com/devcontainers/base:resolute",
+        "features": {
+            "terraform": {
+                "version": "latest"
+            }
+        }
+    },
+    "install_in_ubuntu_resolute_sentinel": {
+        "image": "mcr.microsoft.com/devcontainers/base:resolute",
+        "features": {
+            "terraform": {
+                "installSentinel": true
+            }
+        }
+    },
     "install_sentinel": {
         "image": "mcr.microsoft.com/devcontainers/base:jammy",
         "features": {

From 40aeb53ad77842bc30c9a1adb9ad28a41b753153 Mon Sep 17 00:00:00 2001
From: Venkumahanti Subhankar <v-subhankar-infy@github.com>
Date: Tue, 28 Jul 2026 15:49:25 +0530
Subject: [PATCH 470/478] docs(node): document pre-bundled items and how to opt
 out (#1695)

* docs(node): document pre-bundled items and how to opt out

Added notes on excluding pre-bundled items and VS Code extensions.

* Fix formatting in NOTES.md

Corrected formatting and punctuation in the NOTES.md file.

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 src/node/NOTES.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/node/NOTES.md b/src/node/NOTES.md
index 506fa1b4e..9f1c1d3bc 100644
--- a/src/node/NOTES.md
+++ b/src/node/NOTES.md
@@ -25,3 +25,27 @@ Debian/Ubuntu, RedHat Enterprise Linux, Fedora, Alma, and Rocky Linux distributi
 **Note**:  RedHat 7 Family (RedHat, CentOS, etc.) must use Node versions less than 18 due to its system libraries and long-term support (LTS) policies.
 
 `bash` is required to execute the `install.sh` script.
+
+## Pre-bundled items
+
+> [!NOTE]
+> Beyond the core install, this feature also sets up a few items by default for convenience — recommended VS Code extensions (such as a linter) and supporting tools. This is intentional behavior shared across features in this repository.
+
+## Excluding pre-bundled items
+
+Exclude a bundled **VS Code extension** by prefixing its ID with `-`, or (when supported by a feature option) disable a bundled **tool** by setting its version option to `none` (for example, `pnpmVersion`: `none`):
+
+```json
+{
+    "features": {
+        "ghcr.io/devcontainers/features/node:2": {
+            "pnpmVersion": "none"
+        }
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [ "-dbaeumer.vscode-eslint" ]
+        }
+    }
+}
+```

From 529a88d08e10671b5e61c48ade6904a02b867779 Mon Sep 17 00:00:00 2001
From: Venkumahanti Subhankar <v-subhankar-infy@github.com>
Date: Tue, 28 Jul 2026 15:51:09 +0530
Subject: [PATCH 471/478] fix(nix): Resolve PATH mismatch for packages option
 in multi-user mode (#1691)

* fix(nix): Resolve PATH mismatch for packages option in multi-user mode

* fix(nix): align package installs with the active multi-user profile
---
 src/nix/install.sh            |  6 ++----
 src/nix/post-install-steps.sh | 14 +++++++++++---
 test/nix/packages.sh          |  1 +
 test/nix/scenarios.json       |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/nix/install.sh b/src/nix/install.sh
index 0030c2b18..ca19f658a 100755
--- a/src/nix/install.sh
+++ b/src/nix/install.sh
@@ -113,10 +113,8 @@ fi
 chmod +x,o+r ${FEATURE_DIR} ${FEATURE_DIR}/post-install-steps.sh
 if [ "${MULTIUSER}" = "true" ]; then
     /usr/local/share/nix-entrypoint.sh
-    su ${USERNAME} -c "
-        . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
-        ${FEATURE_DIR}/post-install-steps.sh
-    "
+    . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
+    NIX_FEATURE_INSTALL_PROFILE=/nix/var/nix/profiles/default ${FEATURE_DIR}/post-install-steps.sh
 else
     su ${USERNAME} -c "
         . \$HOME/.nix-profile/etc/profile.d/nix.sh
diff --git a/src/nix/post-install-steps.sh b/src/nix/post-install-steps.sh
index 68f93a391..94cfed8a3 100755
--- a/src/nix/post-install-steps.sh
+++ b/src/nix/post-install-steps.sh
@@ -2,6 +2,14 @@
 set -e
 echo "(*) Executing post-installation steps..."
 
+# In multi-user mode, install into the default profile that is on PATH.
+NIX_ENV_PROFILE_ARGS=()
+NIX_PROFILE_INSTALL_ARGS=()
+if [ -n "${NIX_FEATURE_INSTALL_PROFILE}" ]; then
+  NIX_ENV_PROFILE_ARGS=(-p "${NIX_FEATURE_INSTALL_PROFILE}")
+  NIX_PROFILE_INSTALL_ARGS=(--profile "${NIX_FEATURE_INSTALL_PROFILE}")
+fi
+
 # if not starts with "nixpkgs." add it as prefix to package name
 add_nixpkgs_prefix() {
   local packages=$1
@@ -20,17 +28,17 @@ if [ ! -z "${PACKAGES}" ] && [ "${PACKAGES}" != "none" ]; then
   if [ "${USEATTRIBUTEPATH}" = "true" ]; then
     PACKAGES=$(add_nixpkgs_prefix "$PACKAGES")
     echo "Installing packages \"${PACKAGES}\" in profile..."
-    nix-env -iA ${PACKAGES}
+    nix-env "${NIX_ENV_PROFILE_ARGS[@]}" -iA ${PACKAGES}
   else
     echo "Installing packages \"${PACKAGES}\" in profile..."
-    nix-env --install ${PACKAGES}
+    nix-env "${NIX_ENV_PROFILE_ARGS[@]}" --install ${PACKAGES}
   fi
 fi
 
 # Install Nix flake in profile if specified
 if [ ! -z "${FLAKEURI}" ] && [ "${FLAKEURI}" != "none" ]; then
     echo "Installing flake ${FLAKEURI} in profile..."
-    nix profile install "${FLAKEURI}"
+  nix profile install "${NIX_PROFILE_INSTALL_ARGS[@]}" "${FLAKEURI}"
 fi
 
 nix-collect-garbage --delete-old
diff --git a/test/nix/packages.sh b/test/nix/packages.sh
index ad896e9e0..c59a6e6d9 100755
--- a/test/nix/packages.sh
+++ b/test/nix/packages.sh
@@ -29,6 +29,7 @@ check "nix-env" type nix-env
 check "vim_installed" type vim
 check "node_installed" type node
 check "yarn_installed" type yarn
+check "vim_in_default_profile" bash -lc "nix-env -p /nix/var/nix/profiles/default -q | grep -q '^vim'"
 
 # Report result
 # If any of the checks above exited with a non-zero exit code, the test will fail.
diff --git a/test/nix/scenarios.json b/test/nix/scenarios.json
index 38eed0268..3fb839629 100644
--- a/test/nix/scenarios.json
+++ b/test/nix/scenarios.json
@@ -86,7 +86,7 @@
         "remoteUser": "vscode",
         "features": {
             "nix": {
-                "packages": "nodePackages.nodejs,nixpkgs.vim,nixpkgs.yarn",
+                "packages": "nodejs,nixpkgs.vim,nixpkgs.yarn",
                 "useAttributePath": true
             }
         }

From 99a3f1c39fb6771640100bfcbbb4ef5de1e4aa1e Mon Sep 17 00:00:00 2001
From: Venkumahanti Subhankar <v-subhankar-infy@github.com>
Date: Tue, 28 Jul 2026 16:20:33 +0530
Subject: [PATCH 472/478] fix(java): Add retry logic for transient SDKMAN
 bootstrap failures (#1688)

* Implement retry logic for SDK installation

Added a retry mechanism for SDK installation and SDKMAN CLI installation.

* Update Java version from 1.8.0 to 1.8.1

Mandatory minor bump for fixing the sdkman transient error

* Update expected Java version in installation script

Java version updated due to upstream update from sdkman.

* Fix string quotes in install_latest_version.sh

* Change curl option from -sSL to -fsSL in install.sh
---
 src/java/devcontainer-feature.json  |  2 +-
 src/java/install.sh                 | 28 ++++++++++++++++++++++++++--
 test/java/install_latest_version.sh |  4 ++--
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index c82718a49..3a1170df7 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "name": "Java (via SDKMAN!)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
diff --git a/src/java/install.sh b/src/java/install.sh
index 988460307..a142ab9e3 100644
--- a/src/java/install.sh
+++ b/src/java/install.sh
@@ -195,6 +195,29 @@ updaterc() {
     fi
 }
 
+run_with_retries() {
+    local max_attempts="$1"
+    local wait_seconds="$2"
+    local operation="$3"
+    local attempt=1
+    shift 3
+
+    until "$@"; do
+        if [ "${attempt}" -ge "${max_attempts}" ]; then
+            echo "(!) ${operation} failed after ${max_attempts} attempts."
+            return 1
+        fi
+
+        echo "(*) ${operation} failed on attempt ${attempt}. Retrying in ${wait_seconds}s..."
+        attempt=$((attempt + 1))
+        sleep "${wait_seconds}"
+    done
+}
+
+install_sdkman_cli() {
+    bash -o pipefail -c 'curl -fsSL "https://get.sdkman.io?rcupdate=false" | bash'
+}
+
 find_version_list() {
     prefix="$1"
     suffix="$2"
@@ -284,7 +307,8 @@ sdk_install() {
         JAVA_VERSION=${requested_version}
     fi
 
-    su ${USERNAME} -c "umask 0002 && . ${SDKMAN_DIR}/bin/sdkman-init.sh && sdk install ${install_type} ${requested_version} && sdk flush archives && sdk flush temp"
+    run_with_retries 5 10 "Installing ${install_type} ${requested_version} via SDKMAN" \
+        su ${USERNAME} -c "umask 0002 && . ${SDKMAN_DIR}/bin/sdkman-init.sh && sdk install ${install_type} ${requested_version} && sdk flush archives && sdk flush temp"
 }
 
 export DEBIAN_FRONTEND=noninteractive
@@ -323,7 +347,7 @@ if [ ! -d "${SDKMAN_DIR}" ]; then
     if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${MAJOR_VERSION_ID}" = "8" ]; then
         export SDKMAN_NATIVE_VERSION="false"
     fi
-    curl -sSL "https://get.sdkman.io?rcupdate=false" | bash
+    run_with_retries 5 10 "Installing SDKMAN" install_sdkman_cli
     # For RHEL 8 systems, also disable native CLI in config file and remove native binaries
     if [ "${ADJUSTED_ID}" = "rhel" ] && [ "${MAJOR_VERSION_ID}" = "8" ]; then
         # Disable native CLI in config to prevent future usage
diff --git a/test/java/install_latest_version.sh b/test/java/install_latest_version.sh
index 03175e767..2c8852970 100644
--- a/test/java/install_latest_version.sh
+++ b/test/java/install_latest_version.sh
@@ -8,8 +8,8 @@ source dev-container-features-test-lib
 echo 'public class HelloWorld { public static void main(String[] args) { System.out.println("Hello, World!"); } }' > HelloWorld.java
 javac HelloWorld.java
 
-check "hello world" /bin/bash -c "java HelloWorld | grep "Hello, World!""
-check "java version latest installed" grep "25" <(java --version)
+check "hello world" /bin/bash -c 'java HelloWorld | grep "Hello, World!"'
+check "java version latest installed" grep "26" <(java --version)
 
 # Report result
 reportResults

From 4170bca4d08a2be5d96a33251a45a0027cc5cacb Mon Sep 17 00:00:00 2001
From: Kazuma Watanabe <watassbass@gmail.com>
Date: Tue, 28 Jul 2026 23:03:35 +0900
Subject: [PATCH 473/478] terraform: Add support for GitHub Attestations in
 TFLint installation (#1589)

* terraform: Add support for GitHub Attestations in TFLint installation

* terraform: Pin TFLint version in tflint_fallback_test

* terraform: Bump version to 1.4.3

* terraform: Update tflint_fallback_test for the latest version

---------

Co-authored-by: Kaniska <kaniska244@github.com>
Co-authored-by: Abdurrahmaan Iqbal <abdurriq@github.com>
---
 src/terraform/devcontainer-feature.json |  7 +-
 src/terraform/install.sh                | 70 ++++++++++++++------
 test/terraform/scenarios.json           |  4 +-
 test/terraform/tflint_fallback_test.sh  | 85 ++++++++++++++++---------
 4 files changed, 114 insertions(+), 52 deletions(-)

diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index 37a60db26..29d3efb30 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.4.4",
+    "version": "1.4.5",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
@@ -79,6 +79,11 @@
             }
         }
     },
+    "dependsOn": {
+        "ghcr.io/devcontainers/features/github-cli:1": {
+            "version": "latest"
+        }
+    },
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ]
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index 8bc79107c..ef0c73e5d 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -460,6 +460,23 @@ install_tflint() {
     curl -sSL -o /tmp/tf-downloads/${TFLINT_FILENAME} https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/${TFLINT_FILENAME}
 }
 
+verify_tflint_attestations() {
+    local checksums=$1
+    local checksums_sha256=$(sha256sum "$checksums" | cut -d " " -f 1)
+
+    check_packages jq
+
+    curl -L -f "https://api.github.com/repos/terraform-linters/tflint/attestations/sha256:${checksums_sha256}" > attestation.json
+    curl_exit_code=$?
+    if [ $curl_exit_code -ne 0 ]; then
+        echo "(*) Failed to fetch GitHub Attestations for tflint checksums"
+        return 1
+    fi
+
+    jq ".attestations[].bundle" attestation.json > bundle.jsonl
+    gh at verify "$checksums" -R terraform-linters/tflint -b bundle.jsonl
+}
+
 if [ "${TFLINT_VERSION}" != "none" ]; then
     echo "Downloading tflint..."
     TFLINT_FILENAME="tflint_linux_${architecture}.zip"
@@ -475,31 +492,44 @@ if [ "${TFLINT_VERSION}" != "none" ]; then
         else
             curl -sSL -o tflint_checksums.txt https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt
 
+            # Attempt GitHub Attestation verification (0.51.1+)
             set +e
-            curl -sSL -o checksums.txt.keyless.sig https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.keyless.sig
+            verify_tflint_attestations tflint_checksums.txt
+            verify_result=$?
             set -e
 
-            # Check that checksums.txt.keyless.sig exists and is not empty
-            if [ -s checksums.txt.keyless.sig ]; then
-                # Validate checksums with cosign
-                curl -sSL -o checksums.txt.pem https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.pem
-                ensure_cosign
-                cosign verify-blob \
-                    --certificate=/tmp/tf-downloads/checksums.txt.pem \
-                    --signature=/tmp/tf-downloads/checksums.txt.keyless.sig \
-                    --certificate-identity-regexp="^https://github.com/terraform-linters/tflint"  \
-                    --certificate-oidc-issuer=https://token.actions.githubusercontent.com \
-                    /tmp/tf-downloads/tflint_checksums.txt
-                # Ensure that checksums.txt has $TFLINT_FILENAME
-                grep ${TFLINT_FILENAME} /tmp/tf-downloads/tflint_checksums.txt
-                # Validate downloaded file
+            if [ $verify_result -eq 0 ]; then
                 sha256sum --ignore-missing -c tflint_checksums.txt
+                echo "(*) tflint_checksums.txt verified successfully using GitHub Attestation."
             else
-                # Fallback to older, GPG-based verification (pre-0.47.0 of tflint)
-                curl -sSL -o tflint_checksums.txt.sig https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.sig
-                curl -sSL -o tflint_key "${TFLINT_GPG_KEY_URI}"
-                gpg -q --import tflint_key
-                gpg --verify tflint_checksums.txt.sig tflint_checksums.txt
+                # Fallback to cosign verification
+                echo "(*) GitHub Attestation verification failed or not supported for this version, falling back to Cosign verification..."
+                set +e
+                curl -sSL -o checksums.txt.keyless.sig https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.keyless.sig
+                set -e
+
+                # Check that checksums.txt.keyless.sig exists and is not empty
+                if [ -s checksums.txt.keyless.sig ]; then
+                    # Validate checksums with cosign
+                    curl -sSL -o checksums.txt.pem https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.pem
+                    ensure_cosign
+                    cosign verify-blob \
+                        --certificate=/tmp/tf-downloads/checksums.txt.pem \
+                        --signature=/tmp/tf-downloads/checksums.txt.keyless.sig \
+                        --certificate-identity-regexp="^https://github.com/terraform-linters/tflint"  \
+                        --certificate-oidc-issuer=https://token.actions.githubusercontent.com \
+                        /tmp/tf-downloads/tflint_checksums.txt
+                    # Ensure that checksums.txt has $TFLINT_FILENAME
+                    grep ${TFLINT_FILENAME} /tmp/tf-downloads/tflint_checksums.txt
+                    # Validate downloaded file
+                    sha256sum --ignore-missing -c tflint_checksums.txt
+                else
+                    # Fallback to older, GPG-based verification (pre-0.47.0 of tflint)
+                    curl -sSL -o tflint_checksums.txt.sig https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.sig
+                    curl -sSL -o tflint_key "${TFLINT_GPG_KEY_URI}"
+                    gpg -q --import tflint_key
+                    gpg --verify tflint_checksums.txt.sig tflint_checksums.txt
+                fi
             fi
         fi
     fi
diff --git a/test/terraform/scenarios.json b/test/terraform/scenarios.json
index 393bd3303..796efbd3e 100644
--- a/test/terraform/scenarios.json
+++ b/test/terraform/scenarios.json
@@ -14,7 +14,7 @@
                 "installSentinel": true
             }
         }
-    },    
+    },
     "install_in_ubuntu_noble": {
         "image": "mcr.microsoft.com/devcontainers/base:noble",
         "features": {
@@ -138,4 +138,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/terraform/tflint_fallback_test.sh b/test/terraform/tflint_fallback_test.sh
index 5619ff4fb..33b75f3b0 100644
--- a/test/terraform/tflint_fallback_test.sh
+++ b/test/terraform/tflint_fallback_test.sh
@@ -22,7 +22,6 @@ keyserver hkps://keys.openpgp.org
 keyserver hkps://keyserver.pgp.com"
 
 check "tflint version as installed by feature" tflint --version
-check "cosign version as installed by feature" cosign version
 
 architecture="$(uname -m)"
 case ${architecture} in
@@ -221,14 +220,31 @@ install_tflint() {
     curl -sSL -o /tmp/tf-downloads/${TFLINT_FILENAME} https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/${TFLINT_FILENAME}
 }
 
+verify_tflint_attestations() {
+    local checksums=$1
+    local checksums_sha256=$(sha256sum "$checksums" | cut -d " " -f 1)
 
-try_install_dummy_tflint_cosign_version() {
+    check_packages jq
+
+    curl -L -f "https://api.github.com/repos/terraform-linters/tflint/attestations/sha256:${checksums_sha256}" > attestation.json
+    curl_exit_code=$?
+    if [ $curl_exit_code -ne 0 ]; then
+        echo "(*) Failed to fetch GitHub Attestations for tflint checksums"
+        return 1
+    fi
+
+    jq ".attestations[].bundle" attestation.json > bundle.jsonl
+    gh at verify "$checksums" -R terraform-linters/tflint -b bundle.jsonl
+}
+
+
+try_install_dummy_tflint_version() {
     mode=$1
     tflint_url='https://github.com/terraform-linters/tflint'
     mkdir -p /tmp/tf-downloads
     cd /tmp/tf-downloads
     echo -e "\nTrying to install dummy tflint version..."
-    TFLINT_VERSION="0.50.XYZ"
+    TFLINT_VERSION="0.60.XYZ"
     echo "Downloading tflint...v${TFLINT_VERSION}"
     TFLINT_FILENAME="tflint_linux_${architecture}.zip"
     install_tflint "$TFLINT_VERSION"
@@ -237,37 +253,50 @@ try_install_dummy_tflint_cosign_version() {
     fi
     if [ "${TFLINT_SHA256}" != "dev-mode" ]; then
 
-        if [ "${TFLINT_SHA256}" != "automatic" ]; then
+       if [ "${TFLINT_SHA256}" != "automatic" ]; then
             echo "${TFLINT_SHA256} *${TFLINT_FILENAME}" > tflint_checksums.txt
             sha256sum --ignore-missing -c tflint_checksums.txt
         else
             curl -sSL -o tflint_checksums.txt https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt
 
+            # Attempt GitHub Attestation verification (0.51.1+)
             set +e
-            curl -sSL -o checksums.txt.keyless.sig https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.keyless.sig
+            verify_tflint_attestations tflint_checksums.txt
+            verify_result=$?
             set -e
-            
-            # Check that checksums.txt.keyless.sig exists and is not empty
-            if [ -s checksums.txt.keyless.sig ]; then
-                # Validate checksums with cosign
-                curl -sSL -o checksums.txt.pem https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.pem
-                ensure_cosign $mode
-                cosign verify-blob \
-                    --certificate=/tmp/tf-downloads/checksums.txt.pem \
-                    --signature=/tmp/tf-downloads/checksums.txt.keyless.sig \
-                    --certificate-identity-regexp="^https://github.com/terraform-linters/tflint"  \
-                    --certificate-oidc-issuer=https://token.actions.githubusercontent.com \
-                    /tmp/tf-downloads/tflint_checksums.txt
-                # Ensure that checksums.txt has $TFLINT_FILENAME
-                grep ${TFLINT_FILENAME} /tmp/tf-downloads/tflint_checksums.txt
-                # Validate downloaded file
+
+            if [ $verify_result -eq 0 ]; then
                 sha256sum --ignore-missing -c tflint_checksums.txt
+                echo "(*) tflint_checksums.txt verified successfully using GitHub Attestation."
             else
-                # Fallback to older, GPG-based verification (pre-0.47.0 of tflint)
-                curl -sSL -o tflint_checksums.txt.sig https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.sig
-                curl -sSL -o tflint_key "${TFLINT_GPG_KEY_URI}"
-                gpg -q --import tflint_key
-                gpg --verify tflint_checksums.txt.sig tflint_checksums.txt
+                # Fallback to cosign verification
+                echo "(*) GitHub Attestation verification failed or not supported for this version, falling back to Cosign verification..."
+                set +e
+                curl -sSL -o checksums.txt.keyless.sig https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.keyless.sig
+                set -e
+
+                # Check that checksums.txt.keyless.sig exists and is not empty
+                if [ -s checksums.txt.keyless.sig ]; then
+                    # Validate checksums with cosign
+                    curl -sSL -o checksums.txt.pem https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.pem
+                    ensure_cosign $mode
+                    cosign verify-blob \
+                        --certificate=/tmp/tf-downloads/checksums.txt.pem \
+                        --signature=/tmp/tf-downloads/checksums.txt.keyless.sig \
+                        --certificate-identity-regexp="^https://github.com/terraform-linters/tflint"  \
+                        --certificate-oidc-issuer=https://token.actions.githubusercontent.com \
+                        /tmp/tf-downloads/tflint_checksums.txt
+                    # Ensure that checksums.txt has $TFLINT_FILENAME
+                    grep ${TFLINT_FILENAME} /tmp/tf-downloads/tflint_checksums.txt
+                    # Validate downloaded file
+                    sha256sum --ignore-missing -c tflint_checksums.txt
+                else
+                    # Fallback to older, GPG-based verification (pre-0.47.0 of tflint)
+                    curl -sSL -o tflint_checksums.txt.sig https://github.com/terraform-linters/tflint/releases/download/v${TFLINT_VERSION}/checksums.txt.sig
+                    curl -sSL -o tflint_key "${TFLINT_GPG_KEY_URI}"
+                    gpg -q --import tflint_key
+                    gpg --verify tflint_checksums.txt.sig tflint_checksums.txt
+                fi
             fi
         fi
     fi
@@ -276,12 +305,10 @@ try_install_dummy_tflint_cosign_version() {
     sudo mv -f tflint /usr/local/bin/
 }
 
-try_install_dummy_tflint_cosign_version "mode1"
+try_install_dummy_tflint_version "mode1"
 
 check "tflint version as installed when mode=1" tflint --version
-check "cosign version as installed when mode=1" cosign version
 
-try_install_dummy_tflint_cosign_version "mode2"
+try_install_dummy_tflint_version "mode2"
 
 check "tflint version as installed when mode=2" tflint --version
-check "cosign version as installed when mode=2" cosign version
\ No newline at end of file

From 73e636fb4f05942f8ebe6e9d685715d5466bf885 Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Fri, 7 Aug 2026 11:59:51 +0100
Subject: [PATCH 474/478] Support version pinning for terraform-docs in the
 Terraform feature (#1698)

* Initial plan

* Add terraformDocsVersion option to pin terraform-docs version

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
---
 src/terraform/README.md                        |  1 +
 src/terraform/devcontainer-feature.json        | 12 +++++++++++-
 src/terraform/install.sh                       |  2 +-
 .../install_terraform_docs_version.sh          | 18 ++++++++++++++++++
 test/terraform/scenarios.json                  |  9 +++++++++
 5 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 test/terraform/install_terraform_docs_version.sh

diff --git a/src/terraform/README.md b/src/terraform/README.md
index 4b37b4260..8cfb673dc 100644
--- a/src/terraform/README.md
+++ b/src/terraform/README.md
@@ -21,6 +21,7 @@ Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects la
 | installSentinel | Install sentinel, a language and framework for policy built to be embedded in existing software to enable fine-grained, logic-based policy decisions | boolean | false |
 | installTFsec | Install tfsec, a tool to spot potential misconfigurations for your terraform code | boolean | false |
 | installTerraformDocs | Install terraform-docs, a utility to generate documentation from Terraform modules | boolean | false |
+| terraformDocsVersion | terraform-docs version to install (only used when installTerraformDocs is true) (https://github.com/terraform-docs/terraform-docs/releases) | string | latest |
 | httpProxy | Connect to a keyserver using a proxy by configuring this option | string | - |
 | customDownloadServer | Custom server URL for downloading Terraform and Sentinel packages, including protocol (e.g., https://releases.hashicorp.com). If not provided, the default HashiCorp download server (https://releases.hashicorp.com) will be used. | string | - |
 
diff --git a/src/terraform/devcontainer-feature.json b/src/terraform/devcontainer-feature.json
index 29d3efb30..634d865ef 100644
--- a/src/terraform/devcontainer-feature.json
+++ b/src/terraform/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "terraform",
-    "version": "1.4.5",
+    "version": "1.5.0",
     "name": "Terraform, tflint, and TFGrunt",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/terraform",
     "description": "Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects latest version and installs needed dependencies.",
@@ -50,6 +50,16 @@
             "default": false,
             "description": "Install terraform-docs, a utility to generate documentation from Terraform modules"
         },
+        "terraformDocsVersion": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "0.20.0",
+                "0.19.0"
+            ],
+            "default": "latest",
+            "description": "terraform-docs version to install (only used when installTerraformDocs is true) (https://github.com/terraform-docs/terraform-docs/releases)"
+        },
         "httpProxy": {
             "type": "string",
             "default": "",
diff --git a/src/terraform/install.sh b/src/terraform/install.sh
index ef0c73e5d..43779f825 100755
--- a/src/terraform/install.sh
+++ b/src/terraform/install.sh
@@ -18,6 +18,7 @@ TERRAGRUNT_VERSION="${TERRAGRUNT:-"latest"}"
 INSTALL_SENTINEL=${INSTALLSENTINEL:-false}
 INSTALL_TFSEC=${INSTALLTFSEC:-false}
 INSTALL_TERRAFORM_DOCS=${INSTALLTERRAFORMDOCS:-false}
+TERRAFORM_DOCS_VERSION="${TERRAFORMDOCSVERSION:-"latest"}"
 CUSTOM_DOWNLOAD_SERVER="${CUSTOMDOWNLOADSERVER:-""}"
 # This is because ubuntu noble, ubuntu resolute and debian trixie don't support the old format of GPG keys and validation 
 NEW_GPG_CODENAMES="trixie noble resolute"
@@ -641,7 +642,6 @@ install_terraform_docs() {
 }
 
 if [ "${INSTALL_TERRAFORM_DOCS}" = "true" ]; then
-    TERRAFORM_DOCS_VERSION="latest"
     terraform_docs_url='https://github.com/terraform-docs/terraform-docs'
     find_version_from_git_tags TERRAFORM_DOCS_VERSION $terraform_docs_url
     tfdocs_filename="terraform-docs-v${TERRAFORM_DOCS_VERSION}-linux-${architecture}.tar.gz"
diff --git a/test/terraform/install_terraform_docs_version.sh b/test/terraform/install_terraform_docs_version.sh
new file mode 100644
index 000000000..4a747f82e
--- /dev/null
+++ b/test/terraform/install_terraform_docs_version.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+# Import test library for `check` command
+source dev-container-features-test-lib
+
+# Check to make sure the user is vscode
+check "user is vscode" whoami | grep vscode
+
+# Terraform Docs specific tests
+check "terraform-docs" terraform-docs --version
+
+# Verify the pinned version was installed
+check "terraform-docs version is pinned to 0.20.0" bash -c "terraform-docs --version | grep 'v0.20.0'"
+
+# Report result
+reportResults
diff --git a/test/terraform/scenarios.json b/test/terraform/scenarios.json
index 796efbd3e..de897b5e9 100644
--- a/test/terraform/scenarios.json
+++ b/test/terraform/scenarios.json
@@ -79,6 +79,15 @@
             }
         }
     },
+    "install_terraform_docs_version": {
+        "image": "mcr.microsoft.com/devcontainers/base:jammy",
+        "features": {
+            "terraform": {
+                "installTerraformDocs": true,
+                "terraformDocsVersion": "0.20.0"
+            }
+        }
+    },
     "terraform_docs_fallback_test": {
         "image": "mcr.microsoft.com/devcontainers/base:jammy",
         "features": {

From c6f2fbd033181b346af0cb039ad8219cd8e0f41c Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Fri, 7 Aug 2026 16:31:49 +0530
Subject: [PATCH 475/478] Use GitHub App token instead of PAT in update
 workflows (#1702)

---
 .../update-aws-cli-completer-scripts.yml       | 18 ++++++++++++++----
 .github/workflows/update-documentation.yml     | 18 ++++++++++++++----
 .../workflows/update-dotnet-install-script.yml | 18 ++++++++++++++----
 3 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/update-aws-cli-completer-scripts.yml b/.github/workflows/update-aws-cli-completer-scripts.yml
index fde3a29fc..ea6090fe9 100644
--- a/.github/workflows/update-aws-cli-completer-scripts.yml
+++ b/.github/workflows/update-aws-cli-completer-scripts.yml
@@ -9,10 +9,20 @@ jobs:
     runs-on: ubuntu-latest
     environment: documentation # grants access to secrets.PAT, for creating pull requests
     permissions:
-      contents: write
-      pull-requests: write
+      contents: read
     steps:
-      - uses: actions/checkout@v7
+      - name: Generate a token
+        id: app-token
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: ${{ vars.DEVCONTAINERS_REPO_AUTOMATION_ID }}
+          private-key: ${{ secrets.DEVCONTAINERS_REPO_AUTOMATION_PRIVATE_KEY }}
+
+      - name: Checkout
+        id: checkout
+        uses: actions/checkout@v7
+        with:
+          token: ${{ steps.app-token.outputs.token }}
 
       - name: Run fetch-latest-completer-scripts.sh
         run: src/aws-cli/scripts/fetch-latest-completer-scripts.sh
@@ -20,7 +30,7 @@ jobs:
       - name: Create a PR for completer scripts
         id: push_image_info
         env:
-          GITHUB_TOKEN: ${{ secrets.PAT }}
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
         run: |
           set -e
           echo "Start."
diff --git a/.github/workflows/update-documentation.yml b/.github/workflows/update-documentation.yml
index 50a643fd7..c766a6871 100644
--- a/.github/workflows/update-documentation.yml
+++ b/.github/workflows/update-documentation.yml
@@ -10,11 +10,21 @@ jobs:
     runs-on: ubuntu-latest
     environment: documentation
     permissions:
-      contents: write
-      pull-requests: write
+      contents: read
     if: "github.ref == 'refs/heads/main'"
     steps:
-      - uses: actions/checkout@v7
+      - name: Generate a token
+        id: app-token
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: ${{ vars.DEVCONTAINERS_REPO_AUTOMATION_ID }}
+          private-key: ${{ secrets.DEVCONTAINERS_REPO_AUTOMATION_PRIVATE_KEY }}
+
+      - name: Checkout
+        id: checkout
+        uses: actions/checkout@v7
+        with:
+          token: ${{ steps.app-token.outputs.token }}
 
       - name: Generate Documentation
         uses: devcontainers/action@v1
@@ -25,7 +35,7 @@ jobs:
       - name: Create a PR for Documentation
         id: push_image_info
         env:
-          GITHUB_TOKEN: ${{ secrets.PAT }}
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
         run: |
           set -e
           echo "Start."
diff --git a/.github/workflows/update-dotnet-install-script.yml b/.github/workflows/update-dotnet-install-script.yml
index 16f737ff2..fd2161d27 100644
--- a/.github/workflows/update-dotnet-install-script.yml
+++ b/.github/workflows/update-dotnet-install-script.yml
@@ -9,10 +9,20 @@ jobs:
     runs-on: ubuntu-latest
     environment: documentation # grants access to secrets.PAT, for creating pull requests
     permissions:
-      contents: write
-      pull-requests: write
+      contents: read
     steps:
-      - uses: actions/checkout@v7
+      - name: Generate a token
+        id: app-token
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: ${{ vars.DEVCONTAINERS_REPO_AUTOMATION_ID }}
+          private-key: ${{ secrets.DEVCONTAINERS_REPO_AUTOMATION_PRIVATE_KEY }}
+
+      - name: Checkout
+        id: checkout
+        uses: actions/checkout@v7
+        with:
+          token: ${{ steps.app-token.outputs.token }}
 
       - name: Run fetch-latest-dotnet-install.sh
         run: src/dotnet/scripts/fetch-latest-dotnet-install.sh
@@ -20,7 +30,7 @@ jobs:
       - name: Create a PR for dotnet-install.sh
         id: push_image_info
         env:
-          GITHUB_TOKEN: ${{ secrets.PAT }}
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
         run: |
           set -e
           echo "Start."

From 8b03a989e09c8a8f11e23145ab10de101baa3e1b Mon Sep 17 00:00:00 2001
From: Tyler Kropiewnicki <tylerkrop@github.com>
Date: Wed, 19 Aug 2026 09:08:14 -0400
Subject: [PATCH 476/478] feat(github-cli): support private extension installs
 (#1705)

Co-authored-by: Kaniska <kaniska244@github.com>
---
 src/github-cli/NOTES.md                      |  4 +++-
 src/github-cli/devcontainer-feature.json     |  2 +-
 src/github-cli/install.sh                    |  6 +++++-
 src/github-cli/scripts/install-extensions.sh | 18 ++++++++++++++++--
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/github-cli/NOTES.md b/src/github-cli/NOTES.md
index e742805e6..53c5322dd 100644
--- a/src/github-cli/NOTES.md
+++ b/src/github-cli/NOTES.md
@@ -6,4 +6,6 @@ This Feature should work on recent versions of Debian/Ubuntu-based distributions
 
 ## Extensions
 
-If you set the `extensions` option, the feature will run `gh extension install` for each entry (comma-separated). Extensions are installed for the most appropriate non-root user (based on `USERNAME` / `_REMOTE_USER`), with a fallback to `root`.
+If you set the `extensions` option, the feature will install each comma-separated entry. Extensions are installed for the most appropriate non-root user (based on `USERNAME` / `_REMOTE_USER`), with a fallback to `root`.
+
+Private extensions can be installed when `GH_TOKEN` or `GITHUB_TOKEN` is available during feature installation. The token is forwarded to the selected non-root user and used through the GitHub CLI Git credential helper.
diff --git a/src/github-cli/devcontainer-feature.json b/src/github-cli/devcontainer-feature.json
index 15a91e43d..58b3e5b2f 100644
--- a/src/github-cli/devcontainer-feature.json
+++ b/src/github-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "github-cli",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "name": "GitHub CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/github-cli",
     "description": "Installs the GitHub CLI. Auto-detects latest version and installs needed dependencies.",
diff --git a/src/github-cli/install.sh b/src/github-cli/install.sh
index e3eaba0c3..3638d9392 100755
--- a/src/github-cli/install.sh
+++ b/src/github-cli/install.sh
@@ -271,7 +271,11 @@ if [ -n "${EXTENSIONS}" ]; then
     else
         EXTENSIONS_ESCAPED="$(printf '%q' "${EXTENSIONS}")"
         USERNAME_ESCAPED="$(printf '%q' "${USERNAME}")"
-        su - "${USERNAME}" -c "EXTENSIONS=${EXTENSIONS_ESCAPED} USERNAME=${USERNAME_ESCAPED} INSTALL_EXTENSIONS=true bash '${EXTENSIONS_SCRIPT}'"
+        su \
+            --login \
+            --whitelist-environment=GH_TOKEN,GITHUB_TOKEN \
+            --command "EXTENSIONS=${EXTENSIONS_ESCAPED} USERNAME=${USERNAME_ESCAPED} INSTALL_EXTENSIONS=true bash '${EXTENSIONS_SCRIPT}'" \
+            "${USERNAME}"
         INSTALL_EXTENSIONS=false bash "${EXTENSIONS_SCRIPT}"
     fi
 fi
diff --git a/src/github-cli/scripts/install-extensions.sh b/src/github-cli/scripts/install-extensions.sh
index 436accf03..f8a893534 100644
--- a/src/github-cli/scripts/install-extensions.sh
+++ b/src/github-cli/scripts/install-extensions.sh
@@ -26,18 +26,32 @@ install_extension() {
 
     mkdir -p "${extensions_root}"
     if [ ! -d "${extensions_root}/${repo_name}" ]; then
-        git clone --depth 1 "https://github.com/${extension}.git" "${extensions_root}/${repo_name}"
+        git \
+            -c credential.helper= \
+            -c credential.helper='!gh auth git-credential' \
+            clone --depth 1 "https://github.com/${extension}.git" "${extensions_root}/${repo_name}"
     fi
 }
 
 ensure_gh_extension_list_wrapper() {
+    local gh_config_dir
+
     if [ "$(id -u)" -ne 0 ]; then
         return
     fi
 
-    if gh extension list >/dev/null 2>&1; then
+    gh_config_dir="$(mktemp -d)"
+    if env \
+        -u GH_TOKEN \
+        -u GITHUB_TOKEN \
+        -u GH_ENTERPRISE_TOKEN \
+        -u GITHUB_ENTERPRISE_TOKEN \
+        GH_CONFIG_DIR="${gh_config_dir}" \
+        gh extension list >/dev/null 2>&1; then
+        rm -rf "${gh_config_dir}"
         return
     fi
+    rm -rf "${gh_config_dir}"
 
     cat > /usr/local/bin/gh <<'EOF'
 #!/usr/bin/env bash

From be75f4afe80de657343c8c4966e32e3e96935c93 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Aug 2026 12:21:35 +0100
Subject: [PATCH 477/478] Bump actions/create-github-app-token from 2 to 3
 (#1706)

Bumps [actions/create-github-app-token](https://github.com/actions/create-github-app-token) from 2 to 3.
- [Release notes](https://github.com/actions/create-github-app-token/releases)
- [Changelog](https://github.com/actions/create-github-app-token/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/create-github-app-token/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/create-github-app-token
  dependency-version: '3'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/update-aws-cli-completer-scripts.yml | 2 +-
 .github/workflows/update-documentation.yml             | 2 +-
 .github/workflows/update-dotnet-install-script.yml     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/update-aws-cli-completer-scripts.yml b/.github/workflows/update-aws-cli-completer-scripts.yml
index ea6090fe9..eeec43475 100644
--- a/.github/workflows/update-aws-cli-completer-scripts.yml
+++ b/.github/workflows/update-aws-cli-completer-scripts.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Generate a token
         id: app-token
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         with:
           app-id: ${{ vars.DEVCONTAINERS_REPO_AUTOMATION_ID }}
           private-key: ${{ secrets.DEVCONTAINERS_REPO_AUTOMATION_PRIVATE_KEY }}
diff --git a/.github/workflows/update-documentation.yml b/.github/workflows/update-documentation.yml
index c766a6871..e5023ccb3 100644
--- a/.github/workflows/update-documentation.yml
+++ b/.github/workflows/update-documentation.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: Generate a token
         id: app-token
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         with:
           app-id: ${{ vars.DEVCONTAINERS_REPO_AUTOMATION_ID }}
           private-key: ${{ secrets.DEVCONTAINERS_REPO_AUTOMATION_PRIVATE_KEY }}
diff --git a/.github/workflows/update-dotnet-install-script.yml b/.github/workflows/update-dotnet-install-script.yml
index fd2161d27..d8f532d9d 100644
--- a/.github/workflows/update-dotnet-install-script.yml
+++ b/.github/workflows/update-dotnet-install-script.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Generate a token
         id: app-token
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         with:
           app-id: ${{ vars.DEVCONTAINERS_REPO_AUTOMATION_ID }}
           private-key: ${{ secrets.DEVCONTAINERS_REPO_AUTOMATION_PRIVATE_KEY }}

From 23c5205d67278aa170e1bc70a115ad0d89dd584b Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Fri, 21 Aug 2026 16:51:53 +0530
Subject: [PATCH 478/478] Removing flaky tests which are not compatible
 configurations and not required henceforth (#1701)

Removing flaky tests which are not compatible cases
---
 .github/workflows/test-all.yaml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml
index dd1d216a0..3d4aa3fed 100644
--- a/.github/workflows/test-all.yaml
+++ b/.github/workflows/test-all.yaml
@@ -50,6 +50,19 @@ jobs:
             "mcr.microsoft.com/devcontainers/base:debian",
             "mcr.microsoft.com/devcontainers/base:noble"
           ]
+        exclude:
+          - features: oryx
+            baseImage: ubuntu:jammy
+          - features: oryx
+            baseImage: mcr.microsoft.com/devcontainers/base:ubuntu
+          - features: docker-in-docker
+            baseImage: mcr.microsoft.com/devcontainers/base:debian         
+          - features: docker-outside-of-docker
+            baseImage: mcr.microsoft.com/devcontainers/base:debian
+          - features: docker-in-docker
+            baseImage: mcr.microsoft.com/devcontainers/base:ubuntu
+          - features: docker-outside-of-docker
+            baseImage: mcr.microsoft.com/devcontainers/base:ubuntu
     steps:
       - uses: actions/checkout@v7
 
@@ -100,6 +113,15 @@ jobs:
       - name: "Install latest devcontainer CLI"
         run: npm install -g @devcontainers/cli
 
+      - name: "Exclude iptables-isolation scenarios from docker-in-docker (run in separate 'iptables-isolation' job)"
+        if: matrix.features == 'docker-in-docker'
+        run: |
+          sudo apt-get update && sudo apt-get install -y jq
+          sed 's://.*$::' test/docker-in-docker/scenarios.json \
+            | jq 'del(.docker_with_default_iptables, .docker_with_default_iptables_ubuntu)' \
+            > test/docker-in-docker/scenarios.json.tmp
+          mv test/docker-in-docker/scenarios.json.tmp test/docker-in-docker/scenarios.json
+
       - name: "Testing '${{ matrix.features }}' scenarios"
         run: devcontainer features test -f ${{ matrix.features }} --skip-autogenerated  .