commit:     3071064e1d28f1b7056ca9afb51dcc6f01f36bde
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 02:12:30 2024 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 17:11:57 2024 +0000
URL:        https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=3071064e

stage3.Dockerfile: try harder to find releng's gpg key

On a recent build action, we got:
```
1.106 gpg: directory '/root/.gnupg' created
1.107 gpg: /root/.gnupg/trustdb.gpg: trustdb created
64.28 gpg: keyserver receive failed: Operation timed out
```

Try to use gpg --auto-key-locate=clear,nodefault,wkd --locate-key releng <AT> 
gentoo.org
like we do in the handbook as a fallback.

Signed-off-by: Sam James <sam <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/138
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 stage3.Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/stage3.Dockerfile b/stage3.Dockerfile
index 3289fcf..2aeb250 100644
--- a/stage3.Dockerfile
+++ b/stage3.Dockerfile
@@ -19,7 +19,8 @@ RUN echo "Building Gentoo Container image for ${ARCH} 
${SUFFIX} fetching from ${
  && gpg --list-keys \
  && echo "honor-http-proxy" >> ~/.gnupg/dirmngr.conf \
  && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
- && gpg --keyserver hkps://keys.gentoo.org --recv-keys ${SIGNING_KEY} \
+ && gpg --keyserver hkps://keys.gentoo.org --recv-keys ${SIGNING_KEY} || \
+       gpg --auto-key-locate=clear,nodefault,wkd --locate-key 
rel...@gentoo.org \
  && wget -q "${DIST}/latest-stage3-${MICROARCH}${SUFFIX}.txt" \
  && gpg --verify "latest-stage3-${MICROARCH}${SUFFIX}.txt" \
  && STAGE3PATH="$(sed -n '6p' "latest-stage3-${MICROARCH}${SUFFIX}.txt" | cut 
-f 1 -d ' ')" \

Reply via email to