From 24bfd033b0fa0ccd05ba8b4af177e730a8982068 Mon Sep 17 00:00:00 2001 From: Endial Fang Date: Wed, 22 Apr 2020 11:41:55 +0800 Subject: [PATCH] =?UTF-8?q?[fix:10]=20=E5=A2=9E=E5=8A=A0GPG=E7=A7=98?= =?UTF-8?q?=E9=92=A5=E6=9C=8D=E5=8A=A1=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 10/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/10/Dockerfile b/10/Dockerfile index 31219d9..50db7bc 100644 --- a/10/Dockerfile +++ b/10/Dockerfile @@ -2,7 +2,7 @@ FROM endial/ubuntu:18.04 ENV PG_MAJOR=10 \ PG_VERSION="10.12-2.pgdg18.04+1" \ - PG_KEYS=B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 \ + GPG_KEY='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ PGDATA=/srv/data/postgresql \ PATH=$PATH:/usr/lib/postgresql/10/bin @@ -28,8 +28,11 @@ RUN set -eux; \ apt install -y --no-install-recommends ${fetchDeps}; \ \ export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "${PG_KEYS}"; \ - gpg --batch --export "${PG_KEYS}" > /etc/apt/trusted.gpg.d/postgres.gpg; \ + gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "${GPG_KEY}"|| \ + gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPG_KEY" || \ + gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPG_KEY" || \ + gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPG_KEY"; \ + gpg --batch --export "${GPG_KEY}" > /etc/apt/trusted.gpg.d/postgres.gpg; \ command -v gpgconf > /dev/null && gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ apt-key list; \