diff options
author | Josh Spicer <joshspicer@github.com> | 2022-06-03 17:46:25 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-03 17:46:25 +0300 |
commit | c12a205ab8e195541acfe0cb654b4888e16ea05c (patch) | |
tree | a1a45ac7dec9f31fa62972a65414b6d6fd1fd60d /src/php | |
parent | 283b8e1f8f5dec9e54199c107e772ce56683769e (diff) |
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
Diffstat (limited to 'src/php')
-rw-r--r-- | src/php/devcontainer-feature.json (renamed from src/php/feature.json) | 17 | ||||
-rw-r--r-- | src/php/install.sh | 20 |
2 files changed, 20 insertions, 17 deletions
diff --git a/src/php/feature.json b/src/php/devcontainer-feature.json index 4c5dcac..2832eb1 100644 --- a/src/php/feature.json +++ b/src/php/devcontainer-feature.json @@ -4,19 +4,22 @@ "options": { "version": { "type": "string", - "proposals": ["latest", "8.0.16"], + "proposals": [ + "latest", + "8.0.16" + ], "default": "latest", "description": "Select or enter a PHP version" }, - "installComposer": { + "install_composer": { "type": "boolean", "default": true, "description": "Install PHP Composer?" }, - "overrideDefaultVersion": { - "type": "boolean", - "default": "true", - "description": "If true, overrides existing version (if any) of dotnet on the PATH" + "override_default_version": { + "type": "boolean", + "default": "true", + "description": "If true, overrides existing version (if any) of dotnet on the PATH" } }, "extensions": [ @@ -27,7 +30,7 @@ ], "containerEnv": { "PHP_PATH": "/usr/local/php/current", - "PATH":"${PHP_PATH}:${PHP_PATH}/bin:${PATH}" + "PATH": "${PHP_PATH}:${PHP_PATH}/bin:${PATH}" }, "install": { "app": "", diff --git a/src/php/install.sh b/src/php/install.sh index 125460d..7da6cb8 100644 --- a/src/php/install.sh +++ b/src/php/install.sh @@ -5,17 +5,17 @@ #------------------------------------------------------------------------------------------------------------- # # Maintainer: The VS Code and Codespaces Teams -# -# Syntax: ./php-debian.sh [PHP version] [PHP_DIR] [Add Composer flag] [Non-root user] [Add rc files flag] - -VERSION=${1:-"latest"} -export PHP_DIR=${2:-"/usr/local/php"} -INSTALL_COMPOSER=${3:-"true"} -USERNAME=${4:-"automatic"} -UPDATE_RC=${5:-"true"} -OVERRIDE_DEFAULT_VERSION=${6:-"true"} set -eux + +VERSION=${VERSION:-"latest"} +INSTALL_COMPOSER=${INSTALL_COMPOSER:-"true"} +OVERRIDE_DEFAULT_VERSION=${OVERRIDE_DEFAULT_VERSION:-"true"} + +export PHP_DIR=${PHP_DIR:-"/usr/local/php"} +USERNAME=${USERNAME:-"automatic"} +UPDATE_RC=${UPDATE_RC:-"true"} + export DEBIAN_FRONTEND=noninteractive if [ "$(id -u)" -ne 0 ]; then @@ -33,7 +33,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 |