diff --git a/src/anaconda/devcontainer-feature.json b/src/anaconda/devcontainer-feature.json index e8f8655..e4b753d 100644 --- a/src/anaconda/devcontainer-feature.json +++ b/src/anaconda/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "anaconda", - "version": "1.0.6", + "version": "1.0.7", "name": "Anaconda", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/anaconda", "options": { @@ -15,6 +15,6 @@ }, "containerEnv": { "CONDA_DIR": "/usr/local/conda", - "PATH": "${PATH}:${CONDA_DIR}/bin:" + "PATH": "/usr/local/conda/bin:${PATH}" } } diff --git a/src/conda/devcontainer-feature.json b/src/conda/devcontainer-feature.json index 50b0940..fdc0d41 100644 --- a/src/conda/devcontainer-feature.json +++ b/src/conda/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "conda", - "version": "1.0.1", + "version": "1.0.2", "name": "Conda - A cross-platform, language-agnostic binary package manager", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda", "options": { @@ -22,6 +22,7 @@ }, "containerEnv": { "CONDA_DIR": "/opt/conda", - "PATH": "${PATH}:${CONDA_DIR}/bin:" + "CONDA_SCRIPT":"/opt/conda/etc/profile.d/conda.sh", + "PATH": "/opt/conda/bin:${PATH}" } } diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json index 4ee4164..5d9b0f3 100644 --- a/src/dotnet/devcontainer-feature.json +++ b/src/dotnet/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "dotnet", - "version": "1.0.5", + "version": "1.0.6", "name": "Dotnet CLI", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet", "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 @@ }, "containerEnv": { "DOTNET_ROOT": "/usr/local/dotnet/current", - "PATH": "${PATH}:${DOTNET_ROOT}" + "PATH": "/usr/local/dotnet/current:${PATH}" }, "customizations": { "vscode": { diff --git a/src/go/devcontainer-feature.json b/src/go/devcontainer-feature.json index f2b2388..a15ded0 100644 --- a/src/go/devcontainer-feature.json +++ b/src/go/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "go", - "version": "1.0.4", + "version": "1.0.5", "name": "Go", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/go", "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.", @@ -27,7 +27,7 @@ }, "containerEnv": { "GOPATH": "/usr/local/go", - "PATH": "${GOPATH}/bin:${PATH}" + "PATH": "/usr/local/go:${PATH}" }, "capAdd": [ "SYS_PTRACE" diff --git a/src/hugo/devcontainer-feature.json b/src/hugo/devcontainer-feature.json index 4aa50ef..2303397 100644 --- a/src/hugo/devcontainer-feature.json +++ b/src/hugo/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "hugo", - "version": "1.0.3", + "version": "1.0.4", "name": "Hugo", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/hugo", "options": { @@ -15,6 +15,6 @@ }, "containerEnv": { "HUGO_DIR": "/usr/local/hugo", - "PATH": "${HUGO_DIR}/bin:${PATH}" + "PATH": "/usr/local/hugo/bin:${PATH}" } } diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json index 18b577f..8eb83a1 100644 --- a/src/java/devcontainer-feature.json +++ b/src/java/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "java", - "version": "1.0.6", + "version": "1.0.7", "name": "Java (via SDKMAN!)", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java", "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.", @@ -43,6 +43,7 @@ "SDKMAN_DIR": "/usr/local/sdkman", "GRADLE_USER_HOME": "${HOME}/.gradle", "M2": "${HOME}/.m2", - "PATH": "${SDKMAN_DIR}/bin:${SDKMAN_DIR}/candidates/java/current/bin:${SDKMAN_DIR}/candidates/gradle/current/bin:${SDKMAN_DIR}/candidates/maven/current/bin:${PATH}" + "JAVA_HOME": "/usr/local/sdkman/candidates/java/current", + "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}" } } diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json index c70a3e5..965df90 100644 --- a/src/node/devcontainer-feature.json +++ b/src/node/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "node", - "version": "1.0.4", + "version": "1.0.5", "name": "Node.js (via nvm) and yarn", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node", "description": "Installs Node.js, nvm, yarn, and needed dependencies.", @@ -39,6 +39,6 @@ "containerEnv": { "NVM_DIR": "/usr/local/share/nvm", "NVM_SYMLINK_CURRENT": "true", - "PATH": "${NVM_DIR}/current/bin:${PATH}" + "PATH": "/usr/local/share/nvm/current/bin:${PATH}" } } diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json index ed6fce0..2e40e88 100644 --- a/src/oryx/devcontainer-feature.json +++ b/src/oryx/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "oryx", - "version": "1.0.5", + "version": "1.0.6", "name": "Oryx", "description": "Installs the oryx CLI", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx", @@ -11,6 +11,6 @@ "ORYX_PREFER_USER_INSTALLED_SDKS": "true", "ORYX_DIR": "/usr/local/oryx", "DEBIAN_FLAVOR": "focal-scm", - "PATH": "${ORYX_DIR}:${PATH}" + "PATH": "/usr/local/oryx:${PATH}" } } diff --git a/src/php/devcontainer-feature.json b/src/php/devcontainer-feature.json index 7486300..418162f 100644 --- a/src/php/devcontainer-feature.json +++ b/src/php/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "php", - "version": "1.0.5", + "version": "1.0.6", "name": "PHP", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/php", "options": { @@ -31,6 +31,6 @@ }, "containerEnv": { "PHP_PATH": "/usr/local/php/current", - "PATH": "${PHP_PATH}/bin:${PATH}" + "PATH": "/usr/local/php/current/bin:${PATH}" } } diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json index 59366ea..50a493f 100644 --- a/src/python/devcontainer-feature.json +++ b/src/python/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "python", - "version": "1.0.5", + "version": "1.0.6", "name": "Python", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python", "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 @@ "PYTHON_PATH": "/usr/local/python/current", "PIPX_HOME": "/usr/local/py-utils", "PIPX_BIN_DIR": "/usr/local/py-utils/bin", - "PATH": "${PYTHON_PATH}/bin:${PATH}:${PIPX_BIN_DIR}" + "PATH": "/usr/local/python/current/bin:/usr/local/py-utils/bin:${PATH}" }, "customizations": { "vscode": { diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json index fa9bfbf..e843f22 100644 --- a/src/rust/devcontainer-feature.json +++ b/src/rust/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "rust", - "version": "1.0.5", + "version": "1.0.6", "name": "Rust", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust", "description": "Installs Rust, common Rust utilities, and their required dependencies", @@ -49,7 +49,7 @@ "containerEnv": { "CARGO_HOME": "/usr/local/cargo", "RUSTUP_HOME": "/usr/local/rustup", - "PATH": "${CARGO_HOME}/bin:${PATH}" + "PATH": "/usr/local/cargo/bin:${PATH}" }, "capAdd": [ "SYS_PTRACE" diff --git a/test/conda/test.sh b/test/conda/test.sh index 24755c5..f300217 100755 --- a/test/conda/test.sh +++ b/test/conda/test.sh @@ -9,5 +9,8 @@ source dev-container-features-test-lib check "version" conda --version check "if conda-notice.txt exists" cat /usr/local/etc/vscode-dev-containers/conda-notice.txt +# Check env +check "CONDA_SCRIPT is set correctly" echo $CONDA_SCRIPT | grep "/opt/conda/etc/profile.d/conda.sh" + # Report result reportResults diff --git a/test/java/test.sh b/test/java/test.sh index 5c6fa89..3ba4409 100755 --- a/test/java/test.sh +++ b/test/java/test.sh @@ -8,5 +8,8 @@ source dev-container-features-test-lib # Definition specific tests check "version" java --version +# Check env +check "JAVA_HOME is set correctly" echo $JAVA_HOME | grep "/usr/local/sdkman/candidates/java/current" + # Report result reportResults \ No newline at end of file