Skip to content

Commit 674b096

Browse files
Conda and Java: sync env variables (devcontainers#153)
* conda script * Adds JAVA_HOME * Update src/conda/devcontainer-feature.json Co-authored-by: Josh Spicer <joshspicer@github.com> * modify containerEnv * fix version * bump python version Co-authored-by: Josh Spicer <joshspicer@github.com>
1 parent b7b5d8b commit 674b096

13 files changed

Lines changed: 30 additions & 22 deletions

src/anaconda/devcontainer-feature.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "anaconda",
3-
"version": "1.0.6",
3+
"version": "1.0.7",
44
"name": "Anaconda",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/anaconda",
66
"options": {
@@ -15,6 +15,6 @@
1515
},
1616
"containerEnv": {
1717
"CONDA_DIR": "/usr/local/conda",
18-
"PATH": "${PATH}:${CONDA_DIR}/bin:"
18+
"PATH": "/usr/local/conda/bin:${PATH}"
1919
}
2020
}

src/conda/devcontainer-feature.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "conda",
3-
"version": "1.0.1",
3+
"version": "1.0.2",
44
"name": "Conda - A cross-platform, language-agnostic binary package manager",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
66
"options": {
@@ -22,6 +22,7 @@
2222
},
2323
"containerEnv": {
2424
"CONDA_DIR": "/opt/conda",
25-
"PATH": "${PATH}:${CONDA_DIR}/bin:"
25+
"CONDA_SCRIPT":"/opt/conda/etc/profile.d/conda.sh",
26+
"PATH": "/opt/conda/bin:${PATH}"
2627
}
2728
}

src/dotnet/devcontainer-feature.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "dotnet",
3-
"version": "1.0.5",
3+
"version": "1.0.6",
44
"name": "Dotnet CLI",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
66
"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.",
@@ -29,7 +29,7 @@
2929
},
3030
"containerEnv": {
3131
"DOTNET_ROOT": "/usr/local/dotnet/current",
32-
"PATH": "${PATH}:${DOTNET_ROOT}"
32+
"PATH": "/usr/local/dotnet/current:${PATH}"
3333
},
3434
"customizations": {
3535
"vscode": {

src/go/devcontainer-feature.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "go",
3-
"version": "1.0.4",
3+
"version": "1.0.5",
44
"name": "Go",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/go",
66
"description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.",
@@ -27,7 +27,7 @@
2727
},
2828
"containerEnv": {
2929
"GOPATH": "/usr/local/go",
30-
"PATH": "${GOPATH}/bin:${PATH}"
30+
"PATH": "/usr/local/go:${PATH}"
3131
},
3232
"capAdd": [
3333
"SYS_PTRACE"

src/hugo/devcontainer-feature.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "hugo",
3-
"version": "1.0.3",
3+
"version": "1.0.4",
44
"name": "Hugo",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/hugo",
66
"options": {
@@ -15,6 +15,6 @@
1515
},
1616
"containerEnv": {
1717
"HUGO_DIR": "/usr/local/hugo",
18-
"PATH": "${HUGO_DIR}/bin:${PATH}"
18+
"PATH": "/usr/local/hugo/bin:${PATH}"
1919
}
2020
}

src/java/devcontainer-feature.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "java",
3-
"version": "1.0.6",
3+
"version": "1.0.7",
44
"name": "Java (via SDKMAN!)",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
66
"description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
@@ -43,6 +43,7 @@
4343
"SDKMAN_DIR": "/usr/local/sdkman",
4444
"GRADLE_USER_HOME": "${HOME}/.gradle",
4545
"M2": "${HOME}/.m2",
46-
"PATH": "${SDKMAN_DIR}/bin:${SDKMAN_DIR}/candidates/java/current/bin:${SDKMAN_DIR}/candidates/gradle/current/bin:${SDKMAN_DIR}/candidates/maven/current/bin:${PATH}"
46+
"JAVA_HOME": "/usr/local/sdkman/candidates/java/current",
47+
"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}"
4748
}
4849
}

src/node/devcontainer-feature.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "node",
3-
"version": "1.0.4",
3+
"version": "1.0.5",
44
"name": "Node.js (via nvm) and yarn",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
66
"description": "Installs Node.js, nvm, yarn, and needed dependencies.",
@@ -39,6 +39,6 @@
3939
"containerEnv": {
4040
"NVM_DIR": "/usr/local/share/nvm",
4141
"NVM_SYMLINK_CURRENT": "true",
42-
"PATH": "${NVM_DIR}/current/bin:${PATH}"
42+
"PATH": "/usr/local/share/nvm/current/bin:${PATH}"
4343
}
4444
}

src/oryx/devcontainer-feature.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "oryx",
3-
"version": "1.0.5",
3+
"version": "1.0.6",
44
"name": "Oryx",
55
"description": "Installs the oryx CLI",
66
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
@@ -11,6 +11,6 @@
1111
"ORYX_PREFER_USER_INSTALLED_SDKS": "true",
1212
"ORYX_DIR": "/usr/local/oryx",
1313
"DEBIAN_FLAVOR": "focal-scm",
14-
"PATH": "${ORYX_DIR}:${PATH}"
14+
"PATH": "/usr/local/oryx:${PATH}"
1515
}
1616
}

src/php/devcontainer-feature.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "php",
3-
"version": "1.0.5",
3+
"version": "1.0.6",
44
"name": "PHP",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/php",
66
"options": {
@@ -31,6 +31,6 @@
3131
},
3232
"containerEnv": {
3333
"PHP_PATH": "/usr/local/php/current",
34-
"PATH": "${PHP_PATH}/bin:${PATH}"
34+
"PATH": "/usr/local/php/current/bin:${PATH}"
3535
}
3636
}

src/python/devcontainer-feature.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "python",
3-
"version": "1.0.5",
3+
"version": "1.0.6",
44
"name": "Python",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
66
"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.",
@@ -50,7 +50,7 @@
5050
"PYTHON_PATH": "/usr/local/python/current",
5151
"PIPX_HOME": "/usr/local/py-utils",
5252
"PIPX_BIN_DIR": "/usr/local/py-utils/bin",
53-
"PATH": "${PYTHON_PATH}/bin:${PATH}:${PIPX_BIN_DIR}"
53+
"PATH": "/usr/local/python/current/bin:/usr/local/py-utils/bin:${PATH}"
5454
},
5555
"customizations": {
5656
"vscode": {

0 commit comments

Comments
 (0)