Merge branch 'main' of https://github.com/devcontainers/images into samruddhikhandale/adapt-to-spec-.devcontainer

Author: samruddhikhandale

src/universal/.devcontainer/devcontainer.json

@@ -33,7 +33,7 @@
             "additionalVersions": "8.0.16",
             "installComposer": "true"
         },
-        "ghcr.io/devcontainers/features/anaconda:1": {
+        "ghcr.io/devcontainers/features/conda:1": {
             "version": "latest"
         },
         "ghcr.io/devcontainers/features/ruby:1": {
@@ -80,7 +80,7 @@
         "ghcr.io/devcontainers/features/python",
         "./local-features/machine-learning-packages",
         "ghcr.io/devcontainers/features/php",
-        "ghcr.io/devcontainers/features/anaconda",
+        "ghcr.io/devcontainers/features/conda",
         "ghcr.io/devcontainers/features/ruby",
         "ghcr.io/devcontainers/features/java",
         "ghcr.io/devcontainers/features/sshd",

src/universal/manifest.json

@@ -151,6 +151,10 @@
 			},
 			"Docker (Moby) CLI & Engine": {
 				"cgIgnore": true
+			},
+			"conda": {
+				"cgIgnore": true,
+				"path": "/opt/conda/bin"
 			}
 		},
 		"languages": {
@@ -197,7 +201,7 @@
 			"Jupyter Lab": {
 				"cgIgnore": true,
 				"versionCommand": "jupyter-lab --version",
-				"path": "/usr/local/conda/bin/jupyter-lab",
+				"path": "/home/codespace/.local/bin/jupyter-lab",
 				"downloadUrl": "https://jupyter.org/"
 			}
 		}

src/universal/test-project/test.sh

@@ -94,8 +94,8 @@ echo $(echo "php versions" && ls -a /usr/local/php)
 # Hugo
 check "hugo" hugo version
 
-# Anaconda
-check "Anaconda" conda --version
+# conda
+check "conda" conda --version
 
 # Go
 check "go" go version