diff options
| author | Samruddhi Khandale <skhandale@microsoft.com> | 2022-12-21 23:15:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-21 23:15:24 +0300 |
| commit | b9bfe406d211ce5645a165a73b72048e9ea9e88e (patch) | |
| tree | 9ff6ce0a2872cd0930c46b2963fe3fce6537af06 /src/git | |
| parent | 48678001d1e910477390c475165564a38936b058 (diff) | |
Update GPG_KEY_SERVERS: Remove `:80` from Ubuntu Keyserver (#354)
* Update GPG_KEY_SERVERS: Remove `:80` from Ubuntu Keyserver
* Fix ruby tests
Diffstat (limited to 'src/git')
| -rw-r--r-- | src/git/devcontainer-feature.json | 2 | ||||
| -rwxr-xr-x | src/git/install.sh | 19 |
2 files changed, 2 insertions, 19 deletions
diff --git a/src/git/devcontainer-feature.json b/src/git/devcontainer-feature.json index c68d69d..ea35c4b 100644 --- a/src/git/devcontainer-feature.json +++ b/src/git/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "git", - "version": "1.1.2", + "version": "1.1.3", "name": "Git (from source)", "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git", "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.", diff --git a/src/git/install.sh b/src/git/install.sh index 24e08e8..52081f1 100755 --- a/src/git/install.sh +++ b/src/git/install.sh @@ -11,7 +11,7 @@ GIT_VERSION=${VERSION} # 'system' checks the base image first, else installs 'la USE_PPA_IF_AVAILABLE=${PPA} GIT_CORE_PPA_ARCHIVE_GPG_KEY=E1DD270288B4E6030699E45FA1715D88E1DF1F24 -GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80 +GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com keyserver hkps://keys.openpgp.org keyserver hkp://keyserver.pgp.com" @@ -25,26 +25,9 @@ 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}" -} - # Import the specified key in a variable name passed in as receive_gpg_keys() { - get_common_setting $1 local keys=${!1} - get_common_setting GPG_KEY_SERVERS true local keyring_args="" if [ ! -z "$2" ]; then mkdir -p "$(dirname \"$2\")" |