Merge branch 'main' of https://github.com/devcontainers/images into samruddhikhandale/dual-tag

Author: samruddhikhandale

.devcontainer/devcontainer.json

@@ -19,5 +19,5 @@
         "ghcr.io/devcontainers/features/docker-in-docker:1": {},
         "ghcr.io/devcontainers/features/azure-cli:1": {}
     },
-    "postCreateCommand": "npm install -g @devcontainers/cli"
+    "postCreateCommand": "npm install -g @devcontainers/cli@0.14.1"
 }

.github/actions/smoke-test/build.sh

@@ -5,7 +5,7 @@ set -e
 
 export DOCKER_BUILDKIT=1
 echo "(*) Installing @devcontainer/cli"
-npm install -g @devcontainers/cli
+npm install -g @devcontainers/cli@0.14.1
 
 echo "(*) Building image - ${IMAGE}"
 id_label="test-container=${IMAGE}"

.github/workflows/push-again.yml

@@ -64,7 +64,7 @@ jobs:
         # Setup build CLI
         cd "$GITHUB_WORKSPACE/ref"
         yarn install
-        npm install -g @devcontainers/cli
+        npm install -g @devcontainers/cli@0.14.1
 
         # Go to the release, symlink the build tool from ref since this is the version for the workflow
         cd "$GITHUB_WORKSPACE/release"

.github/workflows/push-dev.yml

@@ -53,7 +53,7 @@ jobs:
 
         # Build and push dev images
         yarn install
-        npm install -g @devcontainers/cli
+        npm install -g @devcontainers/cli@0.14.1
         GIT_BRANCH=$(echo "${{ github.ref }}" | grep -oP 'refs/(heads|tags)/\K(.+)')
         if [ "$GIT_BRANCH" == "" ]; then 
             GIT_BRANCH=main

.github/workflows/push.yml

@@ -57,7 +57,7 @@ jobs:
 
         # Build and push images
         yarn install
-        npm install -g @devcontainers/cli
+        npm install -g @devcontainers/cli@0.14.1
         build/vscdc push  --page ${{ matrix.page }} \
                           --pageTotal ${{ matrix.page-total }} \
                           --release ${{ steps.get_tag_name.outputs.tag }} \

src/universal/.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/README.md

@@ -47,7 +47,7 @@ Access to the Anaconda repository is covered by the [Anaconda Terms of Service](
 
 While the image itself works unmodified, you can also directly reference pre-built versions of `Dockerfile` by using the `image` property in `.devcontainer.json` or updating the `FROM` statement in your own  `Dockerfile` to:
 
-`mcr.microsoft.com/devcontainers/universal:1-linux`
+`mcr.microsoft.com/devcontainers/universal:2-linux`
 
 Alternatively, you can use the contents of the `Dockerfile` to fully customize your container's contents or to build it for a container host architecture not supported by the image.
 

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