commit:     bb6b45d0925d990486dd5d2652dbb682708144ee
Author:     Robert Marko <robimarko <AT> gmail <DOT> com>
AuthorDate: Tue Apr  7 15:49:18 2020 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 07:24:48 2020 +0000
URL:        https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=bb6b45d0

Fix portage and stage3 generation

Removing standard-resolver enables keys to be fetched again, and image building 
will succeed.

Signed-off-by: Robert Marko <robimarko <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/78
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>

 portage.Dockerfile | 1 -
 stage3.Dockerfile  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/portage.Dockerfile b/portage.Dockerfile
index 5fda6fd..b551d42 100644
--- a/portage.Dockerfile
+++ b/portage.Dockerfile
@@ -14,7 +14,6 @@ ARG SIGNING_KEY="0xEC590EEAC9189250"
 RUN apk add --no-cache ca-certificates gnupg tar wget xz \
  && wget -q "${DIST}/${SNAPSHOT}" "${DIST}/${SNAPSHOT}.gpgsig" 
"${DIST}/${SNAPSHOT}.md5sum" \
  && gpg --list-keys \
- && echo "standard-resolver" >> ~/.gnupg/dirmngr.conf \
  && echo "honor-http-proxy" >> ~/.gnupg/dirmngr.conf \
  && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
  && gpg --keyserver hkps://keys.gentoo.org --recv-keys ${SIGNING_KEY} \

diff --git a/stage3.Dockerfile b/stage3.Dockerfile
index 925e305..778d531 100644
--- a/stage3.Dockerfile
+++ b/stage3.Dockerfile
@@ -21,7 +21,6 @@ RUN echo "Building Gentoo Container image for ${ARCH} 
${SUFFIX} fetching from ${
  && STAGE3="$(basename ${STAGE3PATH})" \
  && wget -q "${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 \
  && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
  && gpg --keyserver hkps://keys.gentoo.org --recv-keys ${SIGNING_KEY} \

Reply via email to