Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b9bfe40

Browse files
samruddhikhandalesamruddhikhandale
authored
Update GPG_KEY_SERVERS: Remove :80 from Ubuntu Keyserver (#354)
* Update GPG_KEY_SERVERS: Remove `:80` from Ubuntu Keyserver * Fix ruby tests
1 parent 4867800 commit b9bfe40

18 files changed

Lines changed: 38 additions & 167 deletions

‎src/git-lfs/devcontainer-feature.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "git-lfs",
3-
"version": "1.0.4",
3+
"version": "1.0.5",
44
"name": "Git Large File Support (LFS)",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/git-lfs",
66
"description": "Installs Git Large File Support (Git LFS) along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like git and curl.",

‎src/git-lfs/install.sh‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ GIT_LFS_ARCHIVE_GPG_KEY_URI="https://packagecloud.io/github/git-lfs/gpgkey"
1313
GIT_LFS_ARCHIVE_ARCHITECTURES="amd64 arm64"
1414
GIT_LFS_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal jammy"
1515
GIT_LFS_CHECKSUM_GPG_KEYS="0x88ace9b29196305ba9947552f1ba225c0223b187 0x86cd3297749375bcf8206715f54fe648088335a9 0xaa3b3450295830d2de6db90caba67be5a5795889"
16-
GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80
16+
GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
1717
keyserver hkps://keys.openpgp.org
1818
keyserver hkp://keyserver.pgp.com"
1919

@@ -27,21 +27,6 @@ if [ "$(id -u)" -ne 0 ]; then
2727
exit 1
2828
fi
2929

30-
# Get central common setting
31-
get_common_setting() {
32-
if [ "${common_settings_file_loaded}" != "true" ]; then
33-
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."
34-
common_settings_file_loaded=true
35-
fi
36-
if [ -f "/tmp/vsdc-settings.env" ]; then
37-
local multi_line=""
38-
if [ "$2" = "true" ]; then multi_line="-z"; fi
39-
local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
40-
if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
41-
fi
42-
echo "$1=${!1}"
43-
}
44-
4530
# Figure out correct version of a three part version number is not passed
4631
find_version_from_git_tags() {
4732
local variable_name=$1
@@ -78,9 +63,7 @@ find_version_from_git_tags() {
7863

7964
# Import the specified key in a variable name passed in as
8065
receive_gpg_keys() {
81-
get_common_setting $1
8266
local keys=${!1}
83-
get_common_setting GPG_KEY_SERVERS true
8467

8568
# Use a temporary locaiton for gpg keys to avoid polluting image
8669
export GNUPGHOME="/tmp/tmp-gnupg"
@@ -133,7 +116,6 @@ install_using_apt() {
133116
version_suffix=""
134117
fi
135118
# Install
136-
get_common_setting GIT_LFS_ARCHIVE_GPG_KEY_URI
137119
curl -sSL "${GIT_LFS_ARCHIVE_GPG_KEY_URI}" | gpg --dearmor > /usr/share/keyrings/gitlfs-archive-keyring.gpg
138120
echo -e "deb [arch=${architecture} signed-by=/usr/share/keyrings/gitlfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/${ID} ${VERSION_CODENAME} main\ndeb-src [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/gitlfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/${ID} ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/git-lfs.list
139121

‎src/git/devcontainer-feature.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "git",
3-
"version": "1.1.2",
3+
"version": "1.1.3",
44
"name": "Git (from source)",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
66
"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.",

‎src/git/install.sh‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ GIT_VERSION=${VERSION} # 'system' checks the base image first, else installs 'la
1111
USE_PPA_IF_AVAILABLE=${PPA}
1212

1313
GIT_CORE_PPA_ARCHIVE_GPG_KEY=E1DD270288B4E6030699E45FA1715D88E1DF1F24
14-
GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80
14+
GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
1515
keyserver hkps://keys.openpgp.org
1616
keyserver hkp://keyserver.pgp.com"
1717

@@ -25,26 +25,9 @@ if [ "$(id -u)" -ne 0 ]; then
2525
exit 1
2626
fi
2727

28-
# Get central common setting
29-
get_common_setting() {
30-
if [ "${common_settings_file_loaded}" != "true" ]; then
31-
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."
32-
common_settings_file_loaded=true
33-
fi
34-
if [ -f "/tmp/vsdc-settings.env" ]; then
35-
local multi_line=""
36-
if [ "$2" = "true" ]; then multi_line="-z"; fi
37-
local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
38-
if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
39-
fi
40-
echo "$1=${!1}"
41-
}
42-
4328
# Import the specified key in a variable name passed in as
4429
receive_gpg_keys() {
45-
get_common_setting $1
4630
local keys=${!1}
47-
get_common_setting GPG_KEY_SERVERS true
4831
local keyring_args=""
4932
if [ ! -z "$2" ]; then
5033
mkdir -p "$(dirname \"$2\")"

‎src/github-cli/devcontainer-feature.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "github-cli",
3-
"version": "1.0.8",
3+
"version": "1.0.9",
44
"name": "GitHub CLI",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/github-cli",
66
"description": "Installs the GitHub CLI. Auto-detects latest version and installs needed dependencies.",

‎src/github-cli/install.sh‎

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CLI_VERSION=${VERSION:-"latest"}
1111
INSTALL_DIRECTLY_FROM_GITHUB_RELEASE=${INSTALLDIRECTLYFROMGITHUBRELEASE:-"true"}
1212

1313
GITHUB_CLI_ARCHIVE_GPG_KEY=23F3D4EA75716059
14-
GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80
14+
GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
1515
keyserver hkps://keys.openpgp.org
1616
keyserver hkp://keyserver.pgp.com"
1717

@@ -25,58 +25,10 @@ if [ "$(id -u)" -ne 0 ]; then
2525
exit 1
2626
fi
2727

28-
# Get central common setting
29-
get_common_setting() {
30-
if [ "${common_settings_file_loaded}" != "true" ]; then
31-
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."
32-
common_settings_file_loaded=true
33-
fi
34-
if [ -f "/tmp/vsdc-settings.env" ]; then
35-
local multi_line=""
36-
if [ "$2" = "true" ]; then multi_line="-z"; fi
37-
local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
38-
if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
39-
fi
40-
echo "$1=${!1}"
41-
}
42-
43-
# Import the specified key in a variable name passed in as
44-
receive_gpg_keys() {
45-
get_common_setting $1
46-
local keys=${!1}
47-
get_common_setting GPG_KEY_SERVERS true
48-
49-
# Use a temporary locaiton for gpg keys to avoid polluting image
50-
export GNUPGHOME="/tmp/tmp-gnupg"
51-
mkdir -p ${GNUPGHOME}
52-
chmod 700 ${GNUPGHOME}
53-
echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" > ${GNUPGHOME}/dirmngr.conf
54-
# GPG key download sometimes fails for some reason and retrying fixes it.
55-
local retry_count=0
56-
local gpg_ok="false"
57-
set +e
58-
until [ "${gpg_ok}" = "true" ] || [ "${retry_count}" -eq "5" ];
59-
do
60-
echo "(*) Downloading GPG key..."
61-
( echo "${keys}" | xargs -n 1 gpg --recv-keys) 2>&1 && gpg_ok="true"
62-
if [ "${gpg_ok}" != "true" ]; then
63-
echo "(*) Failed getting key, retring in 10s..."
64-
(( retry_count++ ))
65-
sleep 10s
66-
fi
67-
done
68-
set -e
69-
if [ "${gpg_ok}" = "false" ]; then
70-
echo "(!) Failed to get gpg key."
71-
exit 1
72-
fi
73-
}
7428

7529
# Import the specified key in a variable name passed in as
7630
receive_gpg_keys() {
77-
get_common_setting $1
7831
local keys=${!1}
79-
get_common_setting GPG_KEY_SERVERS true
8032
local keyring_args=""
8133
if [ ! -z "$2" ]; then
8234
keyring_args="--no-default-keyring --keyring $2"

‎src/kubectl-helm-minikube/devcontainer-feature.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "kubectl-helm-minikube",
3-
"version": "1.1.1",
3+
"version": "1.1.2",
44
"name": "Kubectl, Helm, and Minikube",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
66
"description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",

‎src/kubectl-helm-minikube/install.sh‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ MINIKUBE_SHA256="${MINIKUBE_SHA256:-"automatic"}"
2222
USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
2323

2424
HELM_GPG_KEYS_URI="https://raw.githubusercontent.com/helm/helm/main/KEYS"
25-
GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80
25+
GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
2626
keyserver hkps://keys.openpgp.org
2727
keyserver hkp://keyserver.pgp.com"
2828

@@ -53,22 +53,6 @@ if [ "$USERNAME" = "root" ]; then
5353
USERHOME="/root"
5454
fi
5555

56-
57-
# Get central common setting
58-
get_common_setting() {
59-
if [ "${common_settings_file_loaded}" != "true" ]; then
60-
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."
61-
common_settings_file_loaded=true
62-
fi
63-
if [ -f "/tmp/vsdc-settings.env" ]; then
64-
local multi_line=""
65-
if [ "$2" = "true" ]; then multi_line="-z"; fi
66-
local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
67-
if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
68-
fi
69-
echo "$1=${!1}"
70-
}
71-
7256
# Figure out correct version of a three part version number is not passed
7357
find_version_from_git_tags() {
7458
local variable_name=$1
@@ -182,8 +166,6 @@ curl -sSL "https://github.com/helm/helm/releases/download/${HELM_VERSION}/${helm
182166
export GNUPGHOME="/tmp/helm/gnupg"
183167
mkdir -p "${GNUPGHOME}"
184168
chmod 700 ${GNUPGHOME}
185-
get_common_setting HELM_GPG_KEYS_URI
186-
get_common_setting GPG_KEY_SERVERS true
187169
curl -sSL "${HELM_GPG_KEYS_URI}" -o /tmp/helm/KEYS
188170
echo -e "disable-ipv6\n${GPG_KEY_SERVERS}" > ${GNUPGHOME}/dirmngr.conf
189171
gpg -q --import "/tmp/helm/KEYS"

‎src/nix/devcontainer-feature.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "nix",
3-
"version": "1.1.0",
3+
"version": "1.1.1",
44
"name": "Nix Package Manager",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/nix",
66
"description": "Installs the Nix package manager and optionally a set of packages.",

‎src/nix/install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
1414

1515
# Nix keys for securly verifying installer download signature per https://nixos.org/download.html#nix-verify-installation
1616
NIX_GPG_KEYS="B541D55301270E0BCF15CA5D8170B4726D7198DE"
17-
GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com:80
17+
GPG_KEY_SERVERS="keyserver hkp://keyserver.ubuntu.com
1818
keyserver hkps://keys.openpgp.org
1919
keyserver hkp://keyserver.pgp.com"
2020

0 commit comments

Comments
 (0)