diff options
Diffstat (limited to 'src/go')
| -rw-r--r-- | src/go/devcontainer-feature.json | 2 | ||||
| -rwxr-xr-x | src/go/install.sh | 16 |
2 files changed, 1 insertions, 17 deletions
diff --git a/src/go/devcontainer-feature.json b/src/go/devcontainer-feature.json index 9cd89b2..307ab21 100644 --- a/src/go/devcontainer-feature.json +++ b/src/go/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "go", - "version": "1.2.1", + "version": "1.2.2", "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.", diff --git a/src/go/install.sh b/src/go/install.sh index f79fc6f..90e0973 100755 --- a/src/go/install.sh +++ b/src/go/install.sh @@ -84,21 +84,6 @@ find_version_from_git_tags() { echo "${variable_name}=${!variable_name}" } -# 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() { if [ "$(find /var/lib/apt/lists/* | wc -l)" = "0" ]; then @@ -148,7 +133,6 @@ if [[ "${TARGET_GO_VERSION}" != "none" ]] && [[ "$(go version)" != *"${TARGET_GO export GNUPGHOME="/tmp/tmp-gnupg" mkdir -p ${GNUPGHOME} chmod 700 ${GNUPGHOME} - get_common_setting GO_GPG_KEY_URI curl -sSL -o /tmp/tmp-gnupg/golang_key "${GO_GPG_KEY_URI}" gpg -q --import /tmp/tmp-gnupg/golang_key echo "Downloading Go ${TARGET_GO_VERSION}..." |