1. docker
  2. Commit 4fd82db4beba03a126dfc557c86d5d52e9066dae
Browse code

refactor($hack,$docs): be consistent in apt-key keyserver URI usage, as done in #4740

In #4740, the apt-key call in docs is changed to use the keyserver port 80 instead of
port 11371, as the previous call would fail with a restrictive firewall or proxy.
This commit extends the change to all apt-key calls in the repository.

Docker-DCO-1.1-Signed-off-by: Viktor Vojnovski <vojnovski@gmail.com> (github: vojnovski)

Viktor Vojnovski authored on 2014/03/19 08:00:48
Showing 5 changed files
docs/sources/examples/postgresql_service.Dockerfile
History View file @ 4fd82db
... ... 
@@ -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 keyserver.ubuntu.com --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
10 
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com: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``.
docs/sources/installation/ubuntulinux.rst
History View file @ 4fd82db
... ... 
@@ -144,7 +144,7 @@ First add the Docker repository key to your local keychain.
144 144
145 145 
 .. code-block:: bash
146 146
147 
-   sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
147 
+   sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
148 148
149 149 
 Add the Docker repository to your apt sources list, update and install the
150 150 
 ``lxc-docker`` package.
hack/infrastructure/docker-ci/Dockerfile
History View file @ 4fd82db
... ... 
@@ -16,7 +16,7 @@ RUN apt-get install -y --no-install-recommends  python2.7 python-dev \
16 16 
 RUN cd /tmp; wget http://python-distribute.org/distribute_setup.py
17 17 
 RUN cd /tmp; python distribute_setup.py; easy_install pip; rm distribute_setup.py
18 18
19 
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
19 
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
20 20 
 RUN echo 'deb http://get.docker.io/ubuntu docker main' > \
21 21 
       /etc/apt/sources.list.d/docker.list; apt-get update
22 22 
 RUN apt-get install -y lxc-docker-0.8.0
hack/install.sh
History View file @ 4fd82db
... ... 
@@ -111,9 +111,9 @@ case "$lsb_dist" in
111 111 
 		(
112 112 
 			set -x
113 113 
 			if [ "https://get.docker.io/" = "$url" ]; then
114 
-				$sh_c "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9"
114 
+				$sh_c "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9"
115 115 
 			elif [ "https://test.docker.io/" = "$url" ]; then
116 
-				$sh_c "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 740B314AE3941731B942C66ADF4FD13717AAD7D6"
116 
+				$sh_c "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 740B314AE3941731B942C66ADF4FD13717AAD7D6"
117 117 
 			else
118 118 
 				$sh_c "$curl ${url}gpg | apt-key add -"
119 119 
 			fi
hack/release.sh
History View file @ 4fd82db
... ... 
@@ -246,7 +246,7 @@ EOF
246 246 
 # Add the repository to your APT sources
247 247 
 echo deb $(s3_url)/ubuntu docker main > /etc/apt/sources.list.d/docker.list
248 248 
 # Then import the repository key
249 
-apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
249 
+apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
250 250 
 # Install docker
251 251 
 apt-get update ; apt-get install -y lxc-docker
252 252