From a6eceade84a4af088c902ca15908c4a3e7613818 Mon Sep 17 00:00:00 2001 From: Alisha Mayor Date: Wed, 12 May 2021 12:05:02 -0700 Subject: [PATCH] Adding more GPG keyservers to prevent availability failures --- base/debian-9/install.sh | 4 +++- base/redhat-8/install.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/base/debian-9/install.sh b/base/debian-9/install.sh index f8c22be6..b52aa612 100755 --- a/base/debian-9/install.sh +++ b/base/debian-9/install.sh @@ -39,7 +39,9 @@ PY_SHORT=${PYTHON_VERSION%.*} wget -O /tmp/python.tgz https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz wget -O /tmp/Python-gpg-sig-${PYTHON_VERSION}.tgz.asc https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz.asc apt-get install dirmngr -y -gpg --keyserver pool.sks-keyservers.net --recv-keys $PYTHON_GPG_KEY_ID +gpg --keyserver pool.sks-keyservers.net --recv-keys $PYTHON_GPG_KEY_ID \ + || gpg --keyserver pgp.mit.edu --recv-keys $PYTHON_GPG_KEY_ID \ + || gpg --keyserver keyserver.pgp.com --recv-keys $PYTHON_GPG_KEY_ID gpg --verify /tmp/Python-gpg-sig-${PYTHON_VERSION}.tgz.asc /tmp/python.tgz rm /tmp/Python-gpg-sig-${PYTHON_VERSION}.tgz.asc mkdir -p /tmp/pyinstall diff --git a/base/redhat-8/install.sh b/base/redhat-8/install.sh index 6d5da966..1f2e167c 100755 --- a/base/redhat-8/install.sh +++ b/base/redhat-8/install.sh @@ -35,7 +35,9 @@ microdnf -y --nodocs update gnutls kernel-headers librepo libnghttp2 tzdata PY_SHORT=${PYTHON_VERSION%.*} wget -O /tmp/python.tgz https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz wget -O /tmp/Python-gpg-sig-${PYTHON_VERSION}.tgz.asc https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz.asc -gpg --keyserver pool.sks-keyservers.net --recv-keys $PYTHON_GPG_KEY_ID +gpg --keyserver pool.sks-keyservers.net --recv-keys $PYTHON_GPG_KEY_ID \ + || gpg --keyserver pgp.mit.edu --recv-keys $PYTHON_GPG_KEY_ID \ + || gpg --keyserver keyserver.pgp.com --recv-keys $PYTHON_GPG_KEY_ID gpg --verify /tmp/Python-gpg-sig-${PYTHON_VERSION}.tgz.asc /tmp/python.tgz rm /tmp/Python-gpg-sig-${PYTHON_VERSION}.tgz.asc mkdir -p /tmp/pyinstall