1. docker
  2. Commit e285a304dbcce26d22e78c788cd0087c1b82b3e1
Browse code

allow replacing httpredir or deb mirror in jessie

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 060196ee4cdf2d60800faef67662989d74f5c03a)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>

Andrew Hsu authored on 2016/11/21 07:14:51
Showing 3 changed files
Dockerfile
History View file @ e285a30
... ... 
@@ -25,16 +25,15 @@
25 25
26 26 
 FROM debian:jessie
27 27
28 
+# allow replacing httpredir or deb mirror
29 
+ARG APT_MIRROR=deb.debian.org
30 
+RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
31 
+
28 32 
 # Add zfs ppa
29 33 
 RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys E871F18B51E0147C77796AC81196BA81F6B0FC61 \
30 34 
 	|| apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys E871F18B51E0147C77796AC81196BA81F6B0FC61
31 35 
 RUN echo deb http://ppa.launchpad.net/zfs-native/stable/ubuntu trusty main > /etc/apt/sources.list.d/zfs.list
32 36
33 
-
34 
-# Allow replacing httpredir mirror
35 
-ARG APT_MIRROR=httpredir.debian.org
36 
-RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list
37 
-
38 37 
 # Packaged dependencies
39 38 
 RUN apt-get update && apt-get install -y \
40 39 
 	apparmor \
Dockerfile.armhf
History View file @ e285a30
... ... 
@@ -17,6 +17,10 @@
17 17
18 18 
 FROM armhf/debian:jessie
19 19
20 
+# allow replacing httpredir or deb mirror
21 
+ARG APT_MIRROR=deb.debian.org
22 
+RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
23 
+
20 24 
 # Packaged dependencies
21 25 
 RUN apt-get update && apt-get install -y \
22 26 
 	apparmor \
Dockerfile.simple
History View file @ e285a30
... ... 
@@ -7,6 +7,10 @@
7 7
8 8 
 FROM debian:jessie
9 9
10 
+# allow replacing httpredir or deb mirror
11 
+ARG APT_MIRROR=deb.debian.org
12 
+RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
13 
+
10 14 
 # Compile and runtime deps
11 15 
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
12 16 
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies