Skip to content

Commit fb9059b

Browse files
nschonninschonni
authored
Merge pull request #1510 from nschonni/opengpg
chore: Use openpgp and Ubuntu keyservers
2 parents 149350d + 66b4629 commit fb9059b

File tree

24 files changed

+93
-139
lines changed

24 files changed

+93
-139
lines changed

‎12/alpine3.11/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ RUN addgroup -g 1000 node \
4848
108F52B48DB57BB0CC439B2997B01419BD92F80A \
4949
B9E2F5981AA6E0CD28160D9FF13993A75599653C \
5050
; do \
51-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
52-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
53-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
51+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
52+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
5453
done \
5554
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
5655
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -78,9 +77,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
7877
&& for key in \
7978
6A010C5166006599AA17F08146C2130DFD2497F5 \
8079
; do \
81-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
82-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
83-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
80+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
81+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
8482
done \
8583
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
8684
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \

‎12/alpine3.12/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ RUN addgroup -g 1000 node \
4848
108F52B48DB57BB0CC439B2997B01419BD92F80A \
4949
B9E2F5981AA6E0CD28160D9FF13993A75599653C \
5050
; do \
51-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
52-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
53-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
51+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
52+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
5453
done \
5554
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
5655
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -78,9 +77,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
7877
&& for key in \
7978
6A010C5166006599AA17F08146C2130DFD2497F5 \
8079
; do \
81-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
82-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
83-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
80+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
81+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
8482
done \
8583
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
8684
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \

‎12/buster-slim/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
3232
108F52B48DB57BB0CC439B2997B01419BD92F80A \
3333
B9E2F5981AA6E0CD28160D9FF13993A75599653C \
3434
; do \
35-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
36-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
37-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
35+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
36+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
3837
done \
3938
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
4039
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -65,9 +64,8 @@ RUN set -ex \
6564
&& for key in \
6665
6A010C5166006599AA17F08146C2130DFD2497F5 \
6766
; do \
68-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
69-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
70-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
67+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
68+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
7169
done \
7270
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
7371
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \

‎12/buster/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
3030
108F52B48DB57BB0CC439B2997B01419BD92F80A \
3131
B9E2F5981AA6E0CD28160D9FF13993A75599653C \
3232
; do \
33-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
34-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
35-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
33+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
34+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
3635
done \
3736
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
3837
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -51,9 +50,8 @@ RUN set -ex \
5150
&& for key in \
5251
6A010C5166006599AA17F08146C2130DFD2497F5 \
5352
; do \
54-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
55-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
56-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
53+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
54+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
5755
done \
5856
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
5957
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \

‎12/stretch-slim/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
3232
108F52B48DB57BB0CC439B2997B01419BD92F80A \
3333
B9E2F5981AA6E0CD28160D9FF13993A75599653C \
3434
; do \
35-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
36-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
37-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
35+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
36+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
3837
done \
3938
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
4039
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -65,9 +64,8 @@ RUN set -ex \
6564
&& for key in \
6665
6A010C5166006599AA17F08146C2130DFD2497F5 \
6766
; do \
68-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
69-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
70-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
67+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
68+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
7169
done \
7270
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
7371
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \

‎12/stretch/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
3030
108F52B48DB57BB0CC439B2997B01419BD92F80A \
3131
B9E2F5981AA6E0CD28160D9FF13993A75599653C \
3232
; do \
33-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
34-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
35-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
33+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
34+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
3635
done \
3736
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
3837
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -51,9 +50,8 @@ RUN set -ex \
5150
&& for key in \
5251
6A010C5166006599AA17F08146C2130DFD2497F5 \
5352
; do \
54-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
55-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
56-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
53+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
54+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
5755
done \
5856
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
5957
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \

‎14/alpine3.11/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ RUN addgroup -g 1000 node \
4848
108F52B48DB57BB0CC439B2997B01419BD92F80A \
4949
B9E2F5981AA6E0CD28160D9FF13993A75599653C \
5050
; do \
51-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
52-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
53-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
51+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
52+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
5453
done \
5554
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
5655
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -78,9 +77,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
7877
&& for key in \
7978
6A010C5166006599AA17F08146C2130DFD2497F5 \
8079
; do \
81-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
82-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
83-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
80+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
81+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
8482
done \
8583
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
8684
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \

‎14/alpine3.12/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ RUN addgroup -g 1000 node \
4848
108F52B48DB57BB0CC439B2997B01419BD92F80A \
4949
B9E2F5981AA6E0CD28160D9FF13993A75599653C \
5050
; do \
51-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
52-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
53-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
51+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
52+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
5453
done \
5554
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
5655
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -78,9 +77,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
7877
&& for key in \
7978
6A010C5166006599AA17F08146C2130DFD2497F5 \
8079
; do \
81-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
82-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
83-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
80+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
81+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
8482
done \
8583
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
8684
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \

‎14/alpine3.13/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ RUN addgroup -g 1000 node \
4848
108F52B48DB57BB0CC439B2997B01419BD92F80A \
4949
B9E2F5981AA6E0CD28160D9FF13993A75599653C \
5050
; do \
51-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
52-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
53-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
51+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
52+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
5453
done \
5554
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
5655
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -78,9 +77,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
7877
&& for key in \
7978
6A010C5166006599AA17F08146C2130DFD2497F5 \
8079
; do \
81-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
82-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
83-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
80+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
81+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
8482
done \
8583
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
8684
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \

‎14/buster-slim/Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
3232
108F52B48DB57BB0CC439B2997B01419BD92F80A \
3333
B9E2F5981AA6E0CD28160D9FF13993A75599653C \
3434
; do \
35-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
36-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
37-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
35+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
36+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
3837
done \
3938
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
4039
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -65,9 +64,8 @@ RUN set -ex \
6564
&& for key in \
6665
6A010C5166006599AA17F08146C2130DFD2497F5 \
6766
; do \
68-
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
69-
gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
70-
gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
67+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
68+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
7169
done \
7270
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
7371
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \

0 commit comments

Comments
 (0)