Skip to content

Commit

Permalink
1. Fix occassional GPG key retrieval failures (jessfraz#449)
Browse files Browse the repository at this point in the history
GPG key retrieval from the single server failed on each and every
build for me. I found a solution recorded under issue jessfraz#35 at
tianon/gosu:
tianon/gosu#35 (comment)

2. Update gosu to latest version whilst we're at it.

Container tested for 24 hours, no observed issues.
  • Loading branch information
jjo93sa authored and Ryan Gerstenkorn committed Apr 22, 2021
1 parent efd8297 commit b286faf
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions unifi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ RUN apt-get update && apt-get install -y \
&& rm -rf /var/lib/apt/lists/*

# install gosu
ENV GOSU_VERSION 1.10
ENV GOSU_VERSION 1.11
RUN set -ex; \
\
fetchDeps=' \
Expand All @@ -56,7 +56,13 @@ RUN set -ex; \
\
# verify the signature
export GNUPGHOME="$(mktemp -d)"; \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
for server in $(shuf -e ha.pool.sks-keyservers.net \
hkp://p80.pool.sks-keyservers.net:80 \
keyserver.ubuntu.com \
hkp://keyserver.ubuntu.com:80 \
pgp.mit.edu) ; do \
gpg --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \
done && \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
\
Expand Down

0 comments on commit b286faf

Please sign in to comment.