Skip to content

Commit

Permalink
Try for work around gpg issue (found here: tianon/gosu#35)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ajoergensen
ajoergensen committed May 28, 2018
1 parent 5e28586 commit 19fe4ea
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 10 deletions.
16 changes: 14 additions & 2 deletions 10.1/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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 || true; \
\
Expand Down Expand Up @@ -60,7 +66,13 @@ ENV GPG_KEYS \
RUN set -ex; \
export GNUPGHOME="$(mktemp -d)"; \
for key in $GPG_KEYS; do \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
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 "$key" && break || : ; \
done ; \
done; \
gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \
rm -r "$GNUPGHOME" || true; \
Expand Down
21 changes: 17 additions & 4 deletions 10.2/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,14 @@ 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 || true; \
\
Expand Down Expand Up @@ -59,9 +66,15 @@ ENV GPG_KEYS \
4D1BB29D63D98E422B2113B19334A25F8507EFA5
RUN set -ex; \
export GNUPGHOME="$(mktemp -d)"; \
for key in $GPG_KEYS; do \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
for key in $GPG_KEYS; do \
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 "$key" && break || : ; \
done ; \
done; \
gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \
rm -r "$GNUPGHOME" || true; \
apt-key list
Expand Down
20 changes: 16 additions & 4 deletions 10.3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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 || true; \
\
Expand Down Expand Up @@ -59,9 +65,15 @@ ENV GPG_KEYS \
4D1BB29D63D98E422B2113B19334A25F8507EFA5
RUN set -ex; \
export GNUPGHOME="$(mktemp -d)"; \
for key in $GPG_KEYS; do \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done; \
for key in $GPG_KEYS; do \
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 "$key" && break || : ; \
done ; \
done; \
gpg --export $GPG_KEYS > /etc/apt/trusted.gpg.d/mariadb.gpg; \
rm -r "$GNUPGHOME" || true; \
apt-key list
Expand Down

0 comments on commit 19fe4ea

Please sign in to comment.