From c12a205ab8e195541acfe0cb654b4888e16ea05c Mon Sep 17 00:00:00 2001 From: Josh Spicer Date: Fri, 3 Jun 2022 10:46:25 -0400 Subject: Pass options via environment variables (#39) * up to docker-in-docker converted * first pass at the rest of the features (and bash linting and updated CLI * move shell linter to own file * rename feature.json -> devcontainer-feature.json * continue on error * continue on error in right spot * formatting * fix AZ_VERSION * update python * restore variable name * update linter actions, fix dind/dfd/desktop scripts, add test-scenaerios * add tree because I like tree * glob for shell linter * fix test-scenarios * shell linter * more shell helper --- src/anaconda/devcontainer-feature.json | 22 ++++++++++++++++++++++ src/anaconda/feature.json | 22 ---------------------- src/anaconda/install.sh | 11 +++++------ 3 files changed, 27 insertions(+), 28 deletions(-) create mode 100644 src/anaconda/devcontainer-feature.json delete mode 100644 src/anaconda/feature.json (limited to 'src/anaconda') diff --git a/src/anaconda/devcontainer-feature.json b/src/anaconda/devcontainer-feature.json new file mode 100644 index 0000000..f733b63 --- /dev/null +++ b/src/anaconda/devcontainer-feature.json @@ -0,0 +1,22 @@ +{ + "id": "anaconda", + "name": "Anaconda", + "options": { + "version": { + "type": "string", + "proposals": [ + "latest" + ], + "default": "latest", + "description": "Select or enter an anaconda version." + } + }, + "containerEnv": { + "CONDA_DIR": "/usr/local/conda", + "PATH": "${CONDA_DIR}/bin:${PATH}" + }, + "install": { + "app": "", + "file": "install.sh" + } +} \ No newline at end of file diff --git a/src/anaconda/feature.json b/src/anaconda/feature.json deleted file mode 100644 index f733b63..0000000 --- a/src/anaconda/feature.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "anaconda", - "name": "Anaconda", - "options": { - "version": { - "type": "string", - "proposals": [ - "latest" - ], - "default": "latest", - "description": "Select or enter an anaconda version." - } - }, - "containerEnv": { - "CONDA_DIR": "/usr/local/conda", - "PATH": "${CONDA_DIR}/bin:${PATH}" - }, - "install": { - "app": "", - "file": "install.sh" - } -} \ No newline at end of file diff --git a/src/anaconda/install.sh b/src/anaconda/install.sh index f7dfd0b..272ba73 100644 --- a/src/anaconda/install.sh +++ b/src/anaconda/install.sh @@ -6,13 +6,12 @@ # # Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/anaconda.md # Maintainer: The VS Code and Codespaces Teams -# -# Syntax: ./anaconda-debian.sh [Conda version] [Non-root user] [Add rc files flag] -VERSION=${1:-"latest"} -USERNAME=${2:-"automatic"} -UPDATE_RC=${3:-"true"} +VERSION=${VERSION:-"latest"} + +USERNAME=${USERNAME:-"automatic"} +UPDATE_RC=${UPDATE_RC:-"true"} CONDA_DIR=${CONDA_DIR:-"/usr/local/conda"} set -eux @@ -32,7 +31,7 @@ chmod +x /etc/profile.d/00-restore-env.sh if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then USERNAME="" POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)") - for CURRENT_USER in ${POSSIBLE_USERS[@]}; do + for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do if id -u ${CURRENT_USER} > /dev/null 2>&1; then USERNAME=${CURRENT_USER} break -- cgit v1.2.3