aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Marko <robimarko@gmail.com>2020-04-07 17:49:18 +0200
committerAlexys Jacob <ultrabug@gentoo.org>2020-04-09 09:24:48 +0200
commitbb6b45d0925d990486dd5d2652dbb682708144ee (patch)
treea2bfee4f91d61629e7184a25610303e71c34e7e6
parentFix extended attributes (diff)
downloaddocker-images-bb6b45d0925d990486dd5d2652dbb682708144ee.tar.gz
docker-images-bb6b45d0925d990486dd5d2652dbb682708144ee.tar.bz2
docker-images-bb6b45d0925d990486dd5d2652dbb682708144ee.zip
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@gmail.com> Closes: https://github.com/gentoo/gentoo-docker-images/pull/78 Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
-rw-r--r--portage.Dockerfile1
-rw-r--r--stage3.Dockerfile1
2 files changed, 0 insertions, 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} \