diff options
Diffstat (limited to 'src/aws-cli')
| -rw-r--r-- | src/aws-cli/devcontainer-feature.json | 2 | ||||
| -rwxr-xr-x | src/aws-cli/install.sh | 18 |
2 files changed, 1 insertions, 19 deletions
diff --git a/src/aws-cli/devcontainer-feature.json b/src/aws-cli/devcontainer-feature.json index 8de4318..35a0359 100644 --- a/src/aws-cli/devcontainer-feature.json +++ b/src/aws-cli/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "aws-cli", - "version": "1.0.6", + "version": "1.0.7", "name": "AWS CLI", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/aws-cli", "description": "Installs the AWS CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.", diff --git a/src/aws-cli/install.sh b/src/aws-cli/install.sh index a8b414e..d802400 100755 --- a/src/aws-cli/install.sh +++ b/src/aws-cli/install.sh @@ -50,21 +50,6 @@ if [ "$(id -u)" -ne 0 ]; then exit 1 fi -# Get central common setting -get_common_setting() { - if [ "${common_settings_file_loaded}" != "true" ]; then - curl -sfL "https://aka.ms/vscode-dev-containers/script-library/settings.env" 2>/dev/null -o /tmp/vsdc-settings.env || echo "Could not download settings file. Skipping." - common_settings_file_loaded=true - fi - if [ -f "/tmp/vsdc-settings.env" ]; then - local multi_line="" - if [ "$2" = "true" ]; then multi_line="-z"; fi - local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')" - if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi - fi - echo "$1=${!1}" -} - apt_get_update() { echo "Running apt-get update..." @@ -89,9 +74,6 @@ check_packages curl ca-certificates gnupg2 dirmngr unzip verify_aws_cli_gpg_signature() { local filePath=$1 local sigFilePath=$2 - - get_common_setting AWSCLI_GPG_KEY - get_common_setting AWSCLI_GPG_KEY_MATERIAL true local awsGpgKeyring=aws-cli-public-key.gpg echo "${AWSCLI_GPG_KEY_MATERIAL}" | gpg --dearmor > "./${awsGpgKeyring}" |