Skip to content

Commit 1d46a71

Browse files
committed
Merge branch 'resilient-gpg-fix' of https://github.com/jbhannah/docker-iojs into jbhannah-resilient-gpg-fix
2 parents 42f779e + 2e7ec88 commit 1d46a71

File tree

6 files changed

+36
-24
lines changed

6 files changed

+36
-24
lines changed

1.8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN set -ex \
1111
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
1212
; do \
1313
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \
14-
done
14+
; done
1515

1616
ENV NPM_CONFIG_LOGLEVEL info
1717
ENV IOJS_VERSION 1.8.4

1.8/slim/Dockerfile

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
FROM buildpack-deps:jessie-curl
22

33
# gpg keys listed at https://github.com/nodejs/io.js
4-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys \
5-
9554F04D7259F04124DE6B476D5A82AC7E37093B \
6-
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
7-
0034A06D9D9B0064CE8ADF6BF1747F4AD2306D93 \
8-
FD3A5288F042B6850C66B31F09FE44734EB7990E \
9-
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
10-
DD8F2338BAE7501E3DD5AC78C273792F7D83545D
4+
RUN set -ex \
5+
&& for key in \
6+
9554F04D7259F04124DE6B476D5A82AC7E37093B \
7+
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
8+
0034A06D9D9B0064CE8ADF6BF1747F4AD2306D93 \
9+
FD3A5288F042B6850C66B31F09FE44734EB7990E \
10+
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
11+
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
12+
; do \
13+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \
14+
; done
1115

1216
ENV NPM_CONFIG_LOGLEVEL info
1317
ENV IOJS_VERSION 1.8.4

2.5/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN set -ex \
1111
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
1212
; do \
1313
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \
14-
done
14+
; done
1515

1616
ENV NPM_CONFIG_LOGLEVEL info
1717
ENV IOJS_VERSION 2.5.0

2.5/slim/Dockerfile

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
FROM buildpack-deps:jessie-curl
22

33
# gpg keys listed at https://github.com/nodejs/io.js
4-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys \
5-
9554F04D7259F04124DE6B476D5A82AC7E37093B \
6-
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
7-
0034A06D9D9B0064CE8ADF6BF1747F4AD2306D93 \
8-
FD3A5288F042B6850C66B31F09FE44734EB7990E \
9-
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
10-
DD8F2338BAE7501E3DD5AC78C273792F7D83545D
4+
RUN set -ex \
5+
&& for key in \
6+
9554F04D7259F04124DE6B476D5A82AC7E37093B \
7+
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
8+
0034A06D9D9B0064CE8ADF6BF1747F4AD2306D93 \
9+
FD3A5288F042B6850C66B31F09FE44734EB7990E \
10+
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
11+
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
12+
; do \
13+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \
14+
; done
1115

1216
ENV NPM_CONFIG_LOGLEVEL info
1317
ENV IOJS_VERSION 2.5.0

3.3/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN set -ex \
1111
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
1212
; do \
1313
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \
14-
done
14+
; done
1515

1616
ENV NPM_CONFIG_LOGLEVEL info
1717
ENV IOJS_VERSION 3.3.0

3.3/slim/Dockerfile

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
FROM buildpack-deps:jessie-curl
22

33
# gpg keys listed at https://github.com/nodejs/io.js
4-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys \
5-
9554F04D7259F04124DE6B476D5A82AC7E37093B \
6-
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
7-
0034A06D9D9B0064CE8ADF6BF1747F4AD2306D93 \
8-
FD3A5288F042B6850C66B31F09FE44734EB7990E \
9-
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
10-
DD8F2338BAE7501E3DD5AC78C273792F7D83545D
4+
RUN set -ex \
5+
&& for key in \
6+
9554F04D7259F04124DE6B476D5A82AC7E37093B \
7+
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
8+
0034A06D9D9B0064CE8ADF6BF1747F4AD2306D93 \
9+
FD3A5288F042B6850C66B31F09FE44734EB7990E \
10+
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
11+
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
12+
; do \
13+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" \
14+
; done
1115

1216
ENV NPM_CONFIG_LOGLEVEL info
1317
ENV IOJS_VERSION 3.3.0

0 commit comments

Comments
 (0)