Browse code
Allow specifying the apt mirror to use when generating deb packages
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Kenfe-Mickael Laventure authored on 2016/04/28 02:56:34Showing 5 changed files
- contrib/builder/deb/amd64/debian-jessie/Dockerfile
- contrib/builder/deb/amd64/debian-stretch/Dockerfile
- contrib/builder/deb/amd64/debian-wheezy/Dockerfile
- contrib/builder/deb/amd64/generate.sh
- contrib/builder/deb/armhf/debian-jessie/Dockerfile
| ... | ... |
@@ -4,6 +4,10 @@ |
| 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 |
|
| 10 |
+ |
|
| 7 | 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/* |
| 8 | 12 |
|
| 9 | 13 |
ENV GO_VERSION 1.5.4 |
| ... | ... |
@@ -4,6 +4,10 @@ |
| 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 |
|
| 10 |
+ |
|
| 7 | 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/* |
| 8 | 12 |
|
| 9 | 13 |
ENV GO_VERSION 1.5.4 |
| ... | ... |
@@ -4,6 +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 |
+ |
|
| 7 | 11 |
RUN apt-get update && apt-get install -y -t wheezy-backports btrfs-tools --no-install-recommends && rm -rf /var/lib/apt/lists/* |
| 8 | 12 |
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/* |
| 9 | 13 |
|
| ... | ... |
@@ -41,6 +41,15 @@ for version in "${versions[@]}"; do
|
| 41 | 41 |
|
| 42 | 42 |
echo >> "$version/Dockerfile" |
| 43 | 43 |
|
| 44 |
+ if [ "$distro" = "debian" ]; then |
|
| 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 |
|
| 49 |
+ |
|
| 50 |
+ EOF |
|
| 51 |
+ fi |
|
| 52 |
+ |
|
| 44 | 53 |
extraBuildTags='pkcs11' |
| 45 | 54 |
runcBuildTags= |
| 46 | 55 |
|
| ... | ... |
@@ -1,5 +1,9 @@ |
| 1 | 1 |
FROM armhf/debian:jessie |
| 2 | 2 |
|
| 3 |
+# allow replacing httpredir mirror |
|
| 4 |
+ARG APT_MIRROR=httpredir.debian.org |
|
| 5 |
+RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list |
|
| 6 |
+ |
|
| 3 | 7 |
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 libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
| 4 | 8 |
|
| 5 | 9 |
ENV GO_VERSION 1.4.3 |