From: Tim Düsterhus <tim@bastelstu.be>
Date: Thu, 22 Mar 2018 11:57:33 +0000 (+0100)
Subject: Retrieve GPG via keyserver in Dockerfile
X-Git-Tag: 1.7.2~12^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F2103%2Fhead;p=thirdparty%2Frspamd.git

Retrieve GPG via keyserver in Dockerfile
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4cd61fff45..53d52da155 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,10 +1,15 @@
 FROM debian:stretch
 
-RUN	apt-get update \
-	&& apt-get install -y --no-install-recommends gnupg dirmngr curl \
-	&& curl -fsSL http://rspamd.com/apt-stable/gpg.key | apt-key add - \
-	&& apt-get purge -y --auto-remove curl \
-	&& rm -rf /var/lib/apt/lists/*
+RUN	apt-get update && apt-get install -y --no-install-recommends gnupg dirmngr && rm -rf /var/lib/apt/lists/*
+
+RUN	set -x \
+# gpg: key FFA232EDBF21E25E: public key "Rspamd Nightly Builds (Rspamd Nightly Builds) <vsevolod@highsecure.ru>" imported
+	&& key='3FA347D5E599BE4595CA2576FFA232EDBF21E25E' \
+	&& export GNUPGHOME="$(mktemp -d)" \
+	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \
+	&& gpg --export "$key" > /etc/apt/trusted.gpg.d/rspamd.gpg \
+	&& rm -rf "$GNUPGHOME" \
+	&& apt-key list > /dev/null
 
 RUN	echo "deb http://rspamd.com/apt-stable/ stretch main" > /etc/apt/sources.list.d/rspamd.list