Skip to content

Commit 393def7

Browse files
use conda
1 parent a83edb7 commit 393def7

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

src/universal/.devcontainer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@
3333
"additionalVersions": "8.0.16",
3434
"installComposer": "true"
3535
},
36-
"ghcr.io/devcontainers/features/anaconda:1": {
37-
"version": "latest"
36+
"ghcr.io/devcontainers/features/conda:1": {
37+
"version": "latest",
38+
"addCondaForge": "true"
3839
},
3940
"ghcr.io/devcontainers/features/ruby:1": {
4041
"version": "3.1",
@@ -80,7 +81,7 @@
8081
"ghcr.io/devcontainers/features/python",
8182
"./local-features/machine-learning-packages",
8283
"ghcr.io/devcontainers/features/php",
83-
"ghcr.io/devcontainers/features/anaconda",
84+
"ghcr.io/devcontainers/features/conda",
8485
"ghcr.io/devcontainers/features/ruby",
8586
"ghcr.io/devcontainers/features/java",
8687
"ghcr.io/devcontainers/features/sshd",

src/universal/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Access to the Anaconda repository is covered by the [Anaconda Terms of Service](
4747

4848
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:
4949

50-
`mcr.microsoft.com/devcontainers/universal:1-linux`
50+
`mcr.microsoft.com/devcontainers/universal:2-linux`
5151

5252
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.
5353

src/universal/manifest.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,10 @@
151151
},
152152
"Docker (Moby) CLI & Engine": {
153153
"cgIgnore": true
154+
},
155+
"conda": {
156+
"cgIgnore": true,
157+
"path": "/opt/conda/bin"
154158
}
155159
},
156160
"languages": {
@@ -197,7 +201,7 @@
197201
"Jupyter Lab": {
198202
"cgIgnore": true,
199203
"versionCommand": "jupyter-lab --version",
200-
"path": "/usr/local/conda/bin/jupyter-lab",
204+
"path": "/home/codespace/.local/bin/jupyter-lab",
201205
"downloadUrl": "https://jupyter.org/"
202206
}
203207
}

src/universal/test-project/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ echo $(echo "php versions" && ls -a /usr/local/php)
9494
# Hugo
9595
check "hugo" hugo version
9696

97-
# Anaconda
98-
check "Anaconda" conda --version
97+
# conda
98+
check "conda" conda --version
9999

100100
# Go
101101
check "go" go version

0 commit comments

Comments
 (0)