aboutsummaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorsickcodes <[email protected]>2022-11-10 00:11:18 +0000
committersickcodes <[email protected]>2022-11-10 00:11:18 +0000
commit1e00c9cfd712915169bb5c7a335bbedc76738e60 (patch)
tree6eecf6a0086fe21a9944f541d4f07ee518e6b3b9 /Dockerfile
parentFix qemu build (diff)
downloaddocker-osx-1e00c9cfd712915169bb5c7a335bbedc76738e60.tar.xz
docker-osx-1e00c9cfd712915169bb5c7a335bbedc76738e60.zip
Fix keyserver issues, cherry pick aaronjamt/patch-1
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile7
1 files changed, 6 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index 2efd7a5..f7f1a71 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -80,9 +80,14 @@ RUN if [[ "${RANKMIRRORS}" ]]; then \
&& cat /etc/pacman.d/mirrorlist \
; fi
+# Fixes issue with invalid GPG keys: update the archlinux-keyring package to get the latest keys, then remove and regenerate gnupg keys
+RUN pacman -Sy archlinux-keyring --noconfirm && rm -rf /etc/pacman.d/gnupg && pacman-key --init && pacman-key --populate
+
RUN tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkp://keyserver.ubuntu.com' \
&& tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkps://hkps.pool.sks-keyservers.net:443' \
- && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkp://pgp.mit.edu:11371'
+ && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkp://pgp.mit.edu:11371' \
+ && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkps://keys.openpgp.org' \
+ && tee -a /etc/pacman.d/gnupg/gpg.conf <<< 'keyserver hkps://keys.mailvelope.com'
# This fails on hub.docker.com, useful for debugging in cloud
# RUN [[ $(egrep -c '(svm|vmx)' /proc/cpuinfo) -gt 0 ]] || { echo KVM not possible on this host && exit 1; }