Browse code

Use gpg keyserver pool

Make the install script independent from the ubuntu keyserver by using
the sks-keyservers pool instead.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>

Arnaud Porterie authored on 2015/02/12 07:16:41
Showing 8 changed files
... ...
@@ -43,7 +43,7 @@ More detailed usage information can be found at
43 43
 The Docker installation configuration is equivalent to running:
44 44
 
45 45
 ```
46
-apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys\
46
+apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys\
47 47
 36A1D7869245C8950F966E92D8576A8BA88D21E9
48 48
 sh -c "echo deb https://get.docker.com/ubuntu docker main\
49 49
 > /etc/apt/sources.list.d/docker.list"
... ...
@@ -59,7 +59,7 @@ a MongoDB repository file for the package manager.
59 59
 
60 60
     # Installation:
61 61
     # Import MongoDB public GPG key AND create a MongoDB list file
62
-    RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
62
+    RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv 7F0CEB10
63 63
     RUN echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | tee /etc/apt/sources.list.d/10gen.list
64 64
 
65 65
 After this initial preparation we can update our packages and install MongoDB.
... ...
@@ -7,7 +7,7 @@ MAINTAINER Docker
7 7
 
8 8
 # Installation:
9 9
 # Import MongoDB public GPG key AND create a MongoDB list file
10
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
10
+RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv 7F0CEB10
11 11
 RUN echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | tee /etc/apt/sources.list.d/10gen.list
12 12
 
13 13
 # Update apt-get sources AND install MongoDB
... ...
@@ -7,7 +7,7 @@ MAINTAINER SvenDowideit@docker.com
7 7
 
8 8
 # Add the PostgreSQL PGP key to verify their Debian packages.
9 9
 # It should be the same key as https://www.postgresql.org/media/keys/ACCC4CF8.asc 
10
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
10
+RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
11 11
 
12 12
 # Add PostgreSQL's repository. It contains the most recent stable release
13 13
 #     of PostgreSQL, ``9.3``.
... ...
@@ -29,7 +29,7 @@ Start by creating a new `Dockerfile`:
29 29
 
30 30
     # Add the PostgreSQL PGP key to verify their Debian packages.
31 31
     # It should be the same key as https://www.postgresql.org/media/keys/ACCC4CF8.asc
32
-    RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
32
+    RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
33 33
 
34 34
     # Add PostgreSQL's repository. It contains the most recent stable release
35 35
     #     of PostgreSQL, ``9.3``.
... ...
@@ -55,7 +55,7 @@ should exist. If it doesn't, you need to install the package
55 55
 
56 56
 Then, add the Docker repository key to your local keychain.
57 57
 
58
-    $ sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
58
+    $ sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
59 59
 
60 60
 Add the Docker repository to your apt sources list, update and install
61 61
 the `lxc-docker` package.
... ...
@@ -147,7 +147,7 @@ should exist. If it doesn't, you need to install the package
147 147
 
148 148
 Then, add the Docker repository key to your local keychain.
149 149
 
150
-    $ sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
150
+    $ sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
151 151
 
152 152
 Add the Docker repository to your apt sources list, update and install
153 153
 the `lxc-docker` package.
... ...
@@ -203,7 +203,7 @@ Docker is available as a Debian package, which makes installation easy.
203 203
 
204 204
 First add the Docker repository key to your local keychain.
205 205
 
206
-    $ sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
206
+    $ sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
207 207
 
208 208
 Add the Docker repository to your apt sources list, update and install
209 209
 the `lxc-docker` package.
... ...
@@ -161,9 +161,9 @@ case "$lsb_dist" in
161 161
 		(
162 162
 			set -x
163 163
 			if [ "https://get.docker.com/" = "$url" ]; then
164
-				$sh_c "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9"
164
+				$sh_c "apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9"
165 165
 			elif [ "https://test.docker.com/" = "$url" ]; then
166
-				$sh_c "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 740B314AE3941731B942C66ADF4FD13717AAD7D6"
166
+				$sh_c "apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 740B314AE3941731B942C66ADF4FD13717AAD7D6"
167 167
 			else
168 168
 				$sh_c "$curl ${url}gpg | apt-key add -"
169 169
 			fi
... ...
@@ -292,7 +292,7 @@ fi
292 292
 echo deb $(s3_url)/ubuntu docker main > /etc/apt/sources.list.d/docker.list
293 293
 
294 294
 # Then import the repository key
295
-apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys $gpgFingerprint
295
+apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys $gpgFingerprint
296 296
 
297 297
 # Install docker
298 298
 apt-get update