1. docker
  2. Commit dbe17defd15d16d1d85d794c8beaea595df1d0ba
Browse code

sed replace apt mirror with default deb.debian.org for debian distros

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

Andrew Hsu authored on 2016/10/21 12:34:26
Showing 4 changed files
contrib/builder/deb/amd64/debian-jessie/Dockerfile
History View file @ dbe17de
... ... 
@@ -4,9 +4,9 @@
4 4
5 5 
 FROM debian:jessie
6 6
7 
-# allow replacing httpredir mirror
8 
-ARG APT_MIRROR=httpredir.debian.org
9 
-RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list
7 
+# allow replacing httpredir or deb mirror
8 
+ARG APT_MIRROR=deb.debian.org
9 
+RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
10 10
11 11 
 RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev  libsqlite3-dev pkg-config libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
12 12
contrib/builder/deb/amd64/debian-stretch/Dockerfile
History View file @ dbe17de
... ... 
@@ -4,9 +4,9 @@
4 4
5 5 
 FROM debian:stretch
6 6
7 
-# allow replacing httpredir mirror
8 
-ARG APT_MIRROR=httpredir.debian.org
9 
-RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list
7 
+# allow replacing httpredir or deb mirror
8 
+ARG APT_MIRROR=deb.debian.org
9 
+RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
10 10
11 11 
 RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
12 12
contrib/builder/deb/amd64/debian-wheezy/Dockerfile
History View file @ dbe17de
... ... 
@@ -4,10 +4,10 @@
4 4
5 5 
 FROM debian:wheezy-backports
6 6
7 
-# allow replacing httpredir mirror
8 
-ARG APT_MIRROR=httpredir.debian.org
9 
-RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list
10 
-RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list.d/backports.list
7 
+# allow replacing httpredir or deb mirror
8 
+ARG APT_MIRROR=deb.debian.org
9 
+RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
10 
+RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list.d/backports.list
11 11
12 12 
 RUN apt-get update && apt-get install -y -t wheezy-backports btrfs-tools --no-install-recommends && rm -rf /var/lib/apt/lists/*
13 13 
 RUN apt-get update && apt-get install -y apparmor bash-completion  build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev  libsqlite3-dev pkg-config --no-install-recommends && rm -rf /var/lib/apt/lists/*
contrib/builder/deb/amd64/generate.sh
History View file @ dbe17de
... ... 
@@ -43,14 +43,14 @@ for version in "${versions[@]}"; do
43 43
44 44 
 	if [ "$distro" = "debian" ]; then
45 45 
 		cat >> "$version/Dockerfile" <<-'EOF'
46 
-			# allow replacing httpredir mirror
47 
-			ARG APT_MIRROR=httpredir.debian.org
48 
-			RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list
46 
+			# allow replacing httpredir or deb mirror
47 
+			ARG APT_MIRROR=deb.debian.org
48 
+			RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
49 49 
 		EOF
50 50
51 51 
 		if [ "$suite" = "wheezy" ]; then
52 52 
 			cat >> "$version/Dockerfile" <<-'EOF'
53 
-				RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list.d/backports.list
53 
+				RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list.d/backports.list
54 54 
 			EOF
55 55 
 		fi
56 56