Skip to content

Commit 80e46b3

Browse files
chorrellchorrell
authored
Merge pull request #375 from chorrell/alt-key-servers
Try other key servers if ha.pool.sks-keyservers.net is unreachable
2 parents 9cc6c9e + 06bb597 commit 80e46b3

File tree

16 files changed

+96
-32
lines changed

16 files changed

+96
-32
lines changed

‎4.8/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ RUN set -ex \
1515
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
1616
56730D5401028683275BD23C23EFEFE93C4CFFFE \
1717
; do \
18-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
18+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
19+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
20+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
1921
done
2022

2123
ENV NPM_CONFIG_LOGLEVEL info
@@ -35,7 +37,9 @@ RUN set -ex \
3537
&& for key in \
3638
6A010C5166006599AA17F08146C2130DFD2497F5 \
3739
; do \
38-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
40+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
41+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
42+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
3943
done \
4044
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
4145
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \

‎4.8/alpine/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ RUN addgroup -g 1000 node \
2828
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
2929
56730D5401028683275BD23C23EFEFE93C4CFFFE \
3030
; do \
31-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
31+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
32+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
33+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
3234
done \
3335
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
3436
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -50,7 +52,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg \
5052
&& for key in \
5153
6A010C5166006599AA17F08146C2130DFD2497F5 \
5254
; do \
53-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
55+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
56+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
57+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
5458
done \
5559
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
5660
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \

‎4.8/slim/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ RUN set -ex \
1515
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
1616
56730D5401028683275BD23C23EFEFE93C4CFFFE \
1717
; do \
18-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
18+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
19+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
20+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
1921
done
2022

2123
ENV NPM_CONFIG_LOGLEVEL info
@@ -40,7 +42,9 @@ RUN set -ex \
4042
&& for key in \
4143
6A010C5166006599AA17F08146C2130DFD2497F5 \
4244
; do \
43-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
45+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
46+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
47+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
4448
done \
4549
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
4650
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \

‎4.8/wheezy/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ RUN set -ex \
1515
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
1616
56730D5401028683275BD23C23EFEFE93C4CFFFE \
1717
; do \
18-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
18+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
19+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
20+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
1921
done
2022

2123
ENV NPM_CONFIG_LOGLEVEL info
@@ -35,7 +37,9 @@ RUN set -ex \
3537
&& for key in \
3638
6A010C5166006599AA17F08146C2130DFD2497F5 \
3739
; do \
38-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
40+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
41+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
42+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
3943
done \
4044
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
4145
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \

‎6.10/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ RUN set -ex \
1515
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
1616
56730D5401028683275BD23C23EFEFE93C4CFFFE \
1717
; do \
18-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
18+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
19+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
20+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
1921
done
2022

2123
ENV NPM_CONFIG_LOGLEVEL info
@@ -35,7 +37,9 @@ RUN set -ex \
3537
&& for key in \
3638
6A010C5166006599AA17F08146C2130DFD2497F5 \
3739
; do \
38-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
40+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
41+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
42+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
3943
done \
4044
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
4145
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \

‎6.10/alpine/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ RUN addgroup -g 1000 node \
2828
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
2929
56730D5401028683275BD23C23EFEFE93C4CFFFE \
3030
; do \
31-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
31+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
32+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
33+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
3234
done \
3335
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
3436
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -50,7 +52,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg \
5052
&& for key in \
5153
6A010C5166006599AA17F08146C2130DFD2497F5 \
5254
; do \
53-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
55+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
56+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
57+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
5458
done \
5559
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
5660
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \

‎6.10/slim/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ RUN set -ex \
1515
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
1616
56730D5401028683275BD23C23EFEFE93C4CFFFE \
1717
; do \
18-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
18+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
19+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
20+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
1921
done
2022

2123
ENV NPM_CONFIG_LOGLEVEL info
@@ -40,7 +42,9 @@ RUN set -ex \
4042
&& for key in \
4143
6A010C5166006599AA17F08146C2130DFD2497F5 \
4244
; do \
43-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
45+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
46+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
47+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
4448
done \
4549
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
4650
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \

‎6.10/wheezy/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ RUN set -ex \
1515
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
1616
56730D5401028683275BD23C23EFEFE93C4CFFFE \
1717
; do \
18-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
18+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
19+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
20+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
1921
done
2022

2123
ENV NPM_CONFIG_LOGLEVEL info
@@ -35,7 +37,9 @@ RUN set -ex \
3537
&& for key in \
3638
6A010C5166006599AA17F08146C2130DFD2497F5 \
3739
; do \
38-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
40+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
41+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
42+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
3943
done \
4044
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
4145
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \

‎7.8/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ RUN set -ex \
1515
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
1616
56730D5401028683275BD23C23EFEFE93C4CFFFE \
1717
; do \
18-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
18+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
19+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
20+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
1921
done
2022

2123
ENV NPM_CONFIG_LOGLEVEL info
@@ -35,7 +37,9 @@ RUN set -ex \
3537
&& for key in \
3638
6A010C5166006599AA17F08146C2130DFD2497F5 \
3739
; do \
38-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
40+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
41+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
42+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
3943
done \
4044
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
4145
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \

‎7.8/alpine/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ RUN addgroup -g 1000 node \
2828
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
2929
56730D5401028683275BD23C23EFEFE93C4CFFFE \
3030
; do \
31-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
31+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
32+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
33+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
3234
done \
3335
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
3436
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -50,7 +52,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg \
5052
&& for key in \
5153
6A010C5166006599AA17F08146C2130DFD2497F5 \
5254
; do \
53-
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
55+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
56+
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
57+
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
5458
done \
5559
&& curl -fSL -o yarn.js "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js" \
5660
&& curl -fSL -o yarn.js.asc "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-legacy-$YARN_VERSION.js.asc" \

0 commit comments

Comments
 (0)