commit 4993111e388d203d2200a3dd88449517db548c05
author Joan Touzet <wohali@users.noreply.github.com> Wed Jul 07 22:18:55 2021 +0000
committer GitHub <noreply@github.com> Wed Jul 07 18:18:55 2021 -0400
tree c700086902eecd89dbb95259c9238afa876bd066
parent a727920c8db0050c48a06809f3cd4a9ec18c81ed

Incorporate downstream Dockerfile feedback (#203)

2.3.1/Dockerfile

diff --git a/2.3.1/Dockerfile b/2.3.1/Dockerfile
index 75d0c24..f083992 100644
--- a/2.3.1/Dockerfile
+++ b/2.3.1/Dockerfile
@@ -45,11 +45,9 @@
     apt-get update; \
     apt-get install -y curl; \
     export GNUPGHOME="$(mktemp -d)"; \
-    echo "disable-ipv6" >> ${GNUPGHOME}/dirmngr.conf; \
-    curl https://couchdb.apache.org/repo/keys.asc | \
-        gpg --dearmor | \
-        tee /usr/share/keyrings/couchdb-archive-keyring.gpg >/dev/null 2>&1; \
-    gpg --show-keys /usr/share/keyrings/couchdb-archive-keyring.gpg | grep -q ${GPG_COUCH_KEY}; \
+    curl -fL -o keys.asc https://couchdb.apache.org/repo/keys.asc; \
+    gpg --batch --import keys.asc; \
+    gpg --batch --export "${GPG_COUCH_KEY}" > /usr/share/keyrings/couchdb-archive-keyring.gpg; \
     command -v gpgconf && gpgconf --kill all || :; \
     rm -rf "$GNUPGHOME"; \
     apt-key list; \

3.1.1/Dockerfile

diff --git a/3.1.1/Dockerfile b/3.1.1/Dockerfile
index 4677c45..75b4b29 100644
--- a/3.1.1/Dockerfile
+++ b/3.1.1/Dockerfile
@@ -45,11 +45,9 @@
     apt-get update; \
     apt-get install -y curl; \
     export GNUPGHOME="$(mktemp -d)"; \
-    echo "disable-ipv6" >> ${GNUPGHOME}/dirmngr.conf; \
-    curl https://couchdb.apache.org/repo/keys.asc | \
-        gpg --dearmor | \
-        tee /usr/share/keyrings/couchdb-archive-keyring.gpg >/dev/null 2>&1; \
-    gpg --show-keys /usr/share/keyrings/couchdb-archive-keyring.gpg | grep -q ${GPG_COUCH_KEY}; \
+    curl -fL -o keys.asc https://couchdb.apache.org/repo/keys.asc; \
+    gpg --batch --import keys.asc; \
+    gpg --batch --export "${GPG_COUCH_KEY}" > /usr/share/keyrings/couchdb-archive-keyring.gpg; \
     command -v gpgconf && gpgconf --kill all || :; \
     rm -rf "$GNUPGHOME"; \
     apt-key list; \