Skip to content

Commit 70f5691

Browse files
committed
More resilient gpg getting
- move to "high-availability" [subset](https://sks-keyservers.net/overview-of-pools.php#pool_ha). - do keys one at a time to ensure every key imports
1 parent d0bacd4 commit 70f5691

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

2.7/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ ENV LANG C.UTF-8
1010
ENV PYTHON_VERSION 2.7.9
1111

1212
# gpg: key 18ADD4FF: public key "Benjamin Peterson <benjamin@python.org>" imported
13-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
13+
ENV GPG_KEYS C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
14+
RUN set -xe \
15+
&& for key in $GPG_KEYS; do \
16+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
17+
done
1418

1519
RUN set -x \
1620
&& mkdir -p /usr/src/python \

3.3/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ ENV LANG C.UTF-8
1010
ENV PYTHON_VERSION 3.3.6
1111

1212
# gpg: key 36580288: public key "Georg Brandl (Python release signing key) <georg@python.org>" imported
13-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 26DEA9D4613391EF3E25C9FF0A5B101836580288
13+
ENV GPG_KEYS 26DEA9D4613391EF3E25C9FF0A5B101836580288
14+
RUN set -xe \
15+
&& for key in $GPG_KEYS; do \
16+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
17+
done
1418

1519
RUN set -x \
1620
&& mkdir -p /usr/src/python \

3.4/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ ENV LANG C.UTF-8
1010
ENV PYTHON_VERSION 3.4.3
1111

1212
# gpg: key F73C700D: public key "Larry Hastings <larry@hastings.org>" imported
13-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 97FC712E4C024BBEA48A61ED3A5CA953F73C700D
13+
ENV GPG_KEYS 97FC712E4C024BBEA48A61ED3A5CA953F73C700D
14+
RUN set -xe \
15+
&& for key in $GPG_KEYS; do \
16+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
17+
done
1418

1519
RUN set -x \
1620
&& mkdir -p /usr/src/python \

0 commit comments

Comments
 (0)