Merge branch 'main' into npm-version

Author: sireeshajonnalagadda

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",

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

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.",

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

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

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

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": {}
+        }
     }
 }

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": {}
+        }
     }
 }

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