From ebb9e8de8c6ed7c68f263b88a9d94d003df51ec2 Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Wed, 27 Apr 2016 10:56:34 -0700 Subject: [PATCH] Allow specifying the apt mirror to use when generating deb packages Signed-off-by: Kenfe-Mickael Laventure Upstream-commit: d0a65a03e9f789b73956e2d30447a385d6531dfe Component: engine --- .../contrib/builder/deb/amd64/debian-jessie/Dockerfile | 4 ++++ .../contrib/builder/deb/amd64/debian-stretch/Dockerfile | 4 ++++ .../contrib/builder/deb/amd64/debian-wheezy/Dockerfile | 4 ++++ components/engine/contrib/builder/deb/amd64/generate.sh | 9 +++++++++ .../contrib/builder/deb/armhf/debian-jessie/Dockerfile | 4 ++++ 5 files changed, 25 insertions(+) diff --git a/components/engine/contrib/builder/deb/amd64/debian-jessie/Dockerfile b/components/engine/contrib/builder/deb/amd64/debian-jessie/Dockerfile index 43e2cb08bc..9470d06aff 100644 --- a/components/engine/contrib/builder/deb/amd64/debian-jessie/Dockerfile +++ b/components/engine/contrib/builder/deb/amd64/debian-jessie/Dockerfile @@ -4,6 +4,10 @@ FROM debian:jessie +# allow replacing httpredir mirror +ARG APT_MIRROR=httpredir.debian.org +RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list + 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/* ENV GO_VERSION 1.5.4 diff --git a/components/engine/contrib/builder/deb/amd64/debian-stretch/Dockerfile b/components/engine/contrib/builder/deb/amd64/debian-stretch/Dockerfile index 5bba0ae08b..0d51fab7ed 100644 --- a/components/engine/contrib/builder/deb/amd64/debian-stretch/Dockerfile +++ b/components/engine/contrib/builder/deb/amd64/debian-stretch/Dockerfile @@ -4,6 +4,10 @@ FROM debian:stretch +# allow replacing httpredir mirror +ARG APT_MIRROR=httpredir.debian.org +RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list + 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/* ENV GO_VERSION 1.5.4 diff --git a/components/engine/contrib/builder/deb/amd64/debian-wheezy/Dockerfile b/components/engine/contrib/builder/deb/amd64/debian-wheezy/Dockerfile index 3568c69d2d..2e2bb72077 100644 --- a/components/engine/contrib/builder/deb/amd64/debian-wheezy/Dockerfile +++ b/components/engine/contrib/builder/deb/amd64/debian-wheezy/Dockerfile @@ -4,6 +4,10 @@ FROM debian:wheezy-backports +# allow replacing httpredir mirror +ARG APT_MIRROR=httpredir.debian.org +RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list + RUN apt-get update && apt-get install -y -t wheezy-backports btrfs-tools --no-install-recommends && rm -rf /var/lib/apt/lists/* 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/* diff --git a/components/engine/contrib/builder/deb/amd64/generate.sh b/components/engine/contrib/builder/deb/amd64/generate.sh index fe9ff224a2..df1a2ff120 100755 --- a/components/engine/contrib/builder/deb/amd64/generate.sh +++ b/components/engine/contrib/builder/deb/amd64/generate.sh @@ -41,6 +41,15 @@ for version in "${versions[@]}"; do echo >> "$version/Dockerfile" + if [ "$distro" = "debian" ]; then + cat >> "$version/Dockerfile" <<-'EOF' + # allow replacing httpredir mirror + ARG APT_MIRROR=httpredir.debian.org + RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list + + EOF + fi + extraBuildTags='pkcs11' runcBuildTags= diff --git a/components/engine/contrib/builder/deb/armhf/debian-jessie/Dockerfile b/components/engine/contrib/builder/deb/armhf/debian-jessie/Dockerfile index fff136d7c8..7636e890d3 100644 --- a/components/engine/contrib/builder/deb/armhf/debian-jessie/Dockerfile +++ b/components/engine/contrib/builder/deb/armhf/debian-jessie/Dockerfile @@ -1,5 +1,9 @@ FROM armhf/debian:jessie +# allow replacing httpredir mirror +ARG APT_MIRROR=httpredir.debian.org +RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list + 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/* ENV GO_VERSION 1.4.3