Skip to content

Commit d032522

Browse files
chorrellchorrell
committed
Merge pull request #31 from infosiftr/resilient-gpg
Update "gpg" usage to be more resilient to transient failure
2 parents 840ec06 + 2ac7cf7 commit d032522

File tree

9 files changed

+63
-9
lines changed

9 files changed

+63
-9
lines changed

‎0.10/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ FROM buildpack-deps:jessie
33
# verify gpg and sha256: http://nodejs.org/dist/v0.10.31/SHASUMS256.txt.asc
44
# gpg: aka "Timothy J Fontaine (Work) <[email protected]>"
55
# gpg: aka "Julien Gilli <[email protected]>"
6-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
6+
RUN set -ex \
7+
&& for key in \
8+
7937DFD2AB06298B2293C3187D33FF9D0246406D \
9+
114F43EE0176B71C7BC219DD50A3051F888C628D \
10+
; do \
11+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
12+
done
713

814
ENV NODE_VERSION 0.10.40
915
ENV NPM_VERSION 2.13.2

‎0.10/slim/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ FROM debian:jessie
33
# verify gpg and sha256: http://nodejs.org/dist/v0.10.31/SHASUMS256.txt.asc
44
# gpg: aka "Timothy J Fontaine (Work) <[email protected]>"
55
# gpg: aka "Julien Gilli <[email protected]>"
6-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
6+
RUN set -ex \
7+
&& for key in \
8+
7937DFD2AB06298B2293C3187D33FF9D0246406D \
9+
114F43EE0176B71C7BC219DD50A3051F888C628D \
10+
; do \
11+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
12+
done
713

814
ENV NODE_VERSION 0.10.40
915
ENV NPM_VERSION 2.13.2

‎0.10/wheezy/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ FROM buildpack-deps:wheezy
33
# verify gpg and sha256: http://nodejs.org/dist/v0.10.31/SHASUMS256.txt.asc
44
# gpg: aka "Timothy J Fontaine (Work) <[email protected]>"
55
# gpg: aka "Julien Gilli <[email protected]>"
6-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
6+
RUN set -ex \
7+
&& for key in \
8+
7937DFD2AB06298B2293C3187D33FF9D0246406D \
9+
114F43EE0176B71C7BC219DD50A3051F888C628D \
10+
; do \
11+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
12+
done
713

814
ENV NODE_VERSION 0.10.40
915
ENV NPM_VERSION 2.13.2

‎0.12/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ FROM buildpack-deps:jessie
33
# verify gpg and sha256: http://nodejs.org/dist/v0.10.30/SHASUMS256.txt.asc
44
# gpg: aka "Timothy J Fontaine (Work) <[email protected]>"
55
# gpg: aka "Julien Gilli <[email protected]>"
6-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
6+
RUN set -ex \
7+
&& for key in \
8+
7937DFD2AB06298B2293C3187D33FF9D0246406D \
9+
114F43EE0176B71C7BC219DD50A3051F888C628D \
10+
; do \
11+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
12+
done
713

814
ENV NODE_VERSION 0.12.7
915
ENV NPM_VERSION 2.13.2

‎0.12/slim/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ FROM debian:jessie
33
# verify gpg and sha256: http://nodejs.org/dist/v0.10.30/SHASUMS256.txt.asc
44
# gpg: aka "Timothy J Fontaine (Work) <[email protected]>"
55
# gpg: aka "Julien Gilli <[email protected]>"
6-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
6+
RUN set -ex \
7+
&& for key in \
8+
7937DFD2AB06298B2293C3187D33FF9D0246406D \
9+
114F43EE0176B71C7BC219DD50A3051F888C628D \
10+
; do \
11+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
12+
done
713

814
ENV NODE_VERSION 0.12.7
915
ENV NPM_VERSION 2.13.2

‎0.12/wheezy/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ FROM buildpack-deps:wheezy
33
# verify gpg and sha256: http://nodejs.org/dist/v0.10.30/SHASUMS256.txt.asc
44
# gpg: aka "Timothy J Fontaine (Work) <[email protected]>"
55
# gpg: aka "Julien Gilli <[email protected]>"
6-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
6+
RUN set -ex \
7+
&& for key in \
8+
7937DFD2AB06298B2293C3187D33FF9D0246406D \
9+
114F43EE0176B71C7BC219DD50A3051F888C628D \
10+
; do \
11+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
12+
done
713

814
ENV NODE_VERSION 0.12.7
915
ENV NPM_VERSION 2.13.2

‎0.8/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ FROM buildpack-deps:jessie
33
# verify gpg and sha256: http://nodejs.org/dist/v0.10.30/SHASUMS256.txt.asc
44
# gpg: aka "Timothy J Fontaine (Work) <[email protected]>"
55
# gpg: aka "Julien Gilli <[email protected]>"
6-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
6+
RUN set -ex \
7+
&& for key in \
8+
7937DFD2AB06298B2293C3187D33FF9D0246406D \
9+
114F43EE0176B71C7BC219DD50A3051F888C628D \
10+
; do \
11+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
12+
done
713

814
ENV NODE_VERSION 0.8.28
915
ENV NPM_VERSION 2.13.2

‎0.8/slim/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ FROM debian:jessie
33
# verify gpg and sha256: http://nodejs.org/dist/v0.10.30/SHASUMS256.txt.asc
44
# gpg: aka "Timothy J Fontaine (Work) <[email protected]>"
55
# gpg: aka "Julien Gilli <[email protected]>"
6-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
6+
RUN set -ex \
7+
&& for key in \
8+
7937DFD2AB06298B2293C3187D33FF9D0246406D \
9+
114F43EE0176B71C7BC219DD50A3051F888C628D \
10+
; do \
11+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
12+
done
713

814
ENV NODE_VERSION 0.8.28
915
ENV NPM_VERSION 2.13.2

‎0.8/wheezy/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ FROM buildpack-deps:wheezy
33
# verify gpg and sha256: http://nodejs.org/dist/v0.10.30/SHASUMS256.txt.asc
44
# gpg: aka "Timothy J Fontaine (Work) <[email protected]>"
55
# gpg: aka "Julien Gilli <[email protected]>"
6-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 7937DFD2AB06298B2293C3187D33FF9D0246406D 114F43EE0176B71C7BC219DD50A3051F888C628D
6+
RUN set -ex \
7+
&& for key in \
8+
7937DFD2AB06298B2293C3187D33FF9D0246406D \
9+
114F43EE0176B71C7BC219DD50A3051F888C628D \
10+
; do \
11+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
12+
done
713

814
ENV NODE_VERSION 0.8.28
915
ENV NPM_VERSION 2.13.2

0 commit comments

Comments
 (0)