aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Randall <javabrett@gmail.com>2017-12-12 15:30:22 -0500
committerManuel RĂ¼ger <manuel@rueg.eu>2017-12-15 17:51:04 +0100
commit44740cf939d222150a1ae79575ccaf876c8b49d7 (patch)
tree21a7ee027a6813f564cd1addcdab6aac91f42612
parentUpgraded default builder from Alpine 3.6 to 3.7. (diff)
downloaddocker-images-44740cf939d222150a1ae79575ccaf876c8b49d7.tar.gz
docker-images-44740cf939d222150a1ae79575ccaf876c8b49d7.tar.bz2
docker-images-44740cf939d222150a1ae79575ccaf876c8b49d7.zip
Initialized GPG dirmngr with standard-resolver and honor-http-proxy options.
Possible that Travis builds are seeing (intermittent?) occurances of this bug or similar: - https://dev.gnupg.org/T2889 gnupg/dirmngr 2.1.17 fails on all keyserver operations Changes made working towards a fix for #53.
-rw-r--r--portage.Dockerfile3
-rw-r--r--stage3.Dockerfile3
2 files changed, 6 insertions, 0 deletions
diff --git a/portage.Dockerfile b/portage.Dockerfile
index 4c0dcf7..53f37ca 100644
--- a/portage.Dockerfile
+++ b/portage.Dockerfile
@@ -16,6 +16,9 @@ ARG SIGNING_KEY="0xEC590EEAC9189250"
RUN apk add --no-cache gnupg tar wget xz \
&& wget -q -c "${DIST}/${SNAPSHOT}" "${DIST}/${SNAPSHOT}.gpgsig" "${DIST}/${SNAPSHOT}.md5sum" \
+ && gpg --list-keys \
+ && echo "standard-resolver" >> ~/.gnupg/dirmngr.conf \
+ && echo "honor-http-proxy" >> ~/.gnupg/dirmngr.conf \
&& gpg --keyserver hkps.pool.sks-keyservers.net --recv-keys ${SIGNING_KEY} \
&& gpg --verify "${SNAPSHOT}.gpgsig" "${SNAPSHOT}" \
|| gpg --keyserver keys.gnupg.net --recv-keys ${SIGNING_KEY} \
diff --git a/stage3.Dockerfile b/stage3.Dockerfile
index 23db06a..c40984d 100644
--- a/stage3.Dockerfile
+++ b/stage3.Dockerfile
@@ -22,6 +22,9 @@ RUN echo "Building Gentoo Container image for ${ARCH} ${SUFFIX} fetching from ${
&& STAGE3PATH="$(wget -q -O- "${DIST}/latest-stage3-${MICROARCH}${SUFFIX}.txt" | tail -n 1 | cut -f 1 -d ' ')" \
&& STAGE3="$(basename ${STAGE3PATH})" \
&& wget -q -c "${DIST}/${STAGE3PATH}" "${DIST}/${STAGE3PATH}.CONTENTS" "${DIST}/${STAGE3PATH}.DIGESTS.asc" \
+ && gpg --list-keys \
+ && echo "standard-resolver" >> ~/.gnupg/dirmngr.conf \
+ && echo "honor-http-proxy" >> ~/.gnupg/dirmngr.conf \
&& gpg --keyserver hkps.pool.sks-keyservers.net --recv-keys ${SIGNING_KEY} \
|| gpg --keyserver keys.gnupg.net --recv-keys ${SIGNING_KEY} \
|| gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys ${SIGNING_KEY} \