From 4e545a50cdf959e5d90fcfe7d703750e18878aab Mon Sep 17 00:00:00 2001
From: John Watson <johnw@planetscale.com>
Date: Fri, 4 Sep 2020 11:58:15 -0700
Subject: [PATCH] Try to install apt keys from list of different keyservers

Signed-off-by: John Watson <johnw@planetscale.com>
---
 docker/lite/install_dependencies.sh | 30 +++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh
index 986d80df05d..61e1451a851 100755
--- a/docker/lite/install_dependencies.sh
+++ b/docker/lite/install_dependencies.sh
@@ -10,12 +10,22 @@ set -euo pipefail
 FLAVOR="$1"
 export DEBIAN_FRONTEND=noninteractive
 
-retry() {
-    for i in $(seq 1 10); do
-        if "$@"; then return; fi
+KEYSERVERS=(
+    ha.pool.sks-keyservers.net
+    keyserver.ubuntu.com
+    hkp://p80.pool.sks-keyservers.net:80
+    hkp://keyserver.ubuntu.com:80
+)
+
+add_apt_key() {
+    for i in {1..3}; do
+        for keyserver in "${KEYSERVERS[@]}"; do
+            if apt-key adv --no-tty --keyserver "${keyserver}" --recv-keys "$1"; then return; fi
+        done
     done
 }
 
+
 # Install base packages that are common to all flavors.
 BASE_PACKAGES=(
     bzip2
@@ -102,16 +112,16 @@ esac
 case "${FLAVOR}" in
 mysql56|mysql57|mysql80)
     # repo.mysql.com
-    retry apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 8C718D3B5072E1F5
+    add_apt_key 8C718D3B5072E1F5
     ;;
 mariadb|mariadb103)
     # digitalocean.com
-    retry apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys F1656F24C74CD1D8
+    add_apt_key F1656F24C74CD1D8
     ;;
 esac
 
 # All flavors (except mariadb*) include Percona XtraBackup (from repo.percona.com).
-retry apt-key adv --no-tty --keyserver keys.gnupg.net --recv-keys 9334A25F8507EFA5
+add_apt_key 9334A25F8507EFA5
 
 # Add extra apt repositories for MySQL.
 case "${FLAVOR}" in
@@ -171,7 +181,7 @@ esac
 # Install flavor-specific packages
 apt-get update
 apt-get install -y --no-install-recommends "${PACKAGES[@]}"
- 
- # Clean up files we won't need in the final image.
- rm -rf /var/lib/apt/lists/*
- rm -rf /var/lib/mysql/
+
+# Clean up files we won't need in the final image.
+rm -rf /var/lib/apt/lists/*
+rm -rf /var/lib/mysql/