p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22606 from mlaventure/allow-changing-wheezy-backport-mirror

Browse Source 
Allow changing wheezy deb builder backport mirror
Upstream-commit: 9ffd2652e249f02515410487bdc41e348e7979b1
Component: engine
This commit is contained in:
Tibor Vass
2016-05-09 12:23:58 -04:00
parent 3843118a42 8d0748f1ff
commit 2268ea362d
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/engine/contrib/builder/deb/amd64/debian-wheezy/Dockerfile
View File

@ -7,6 +7,7 @@ 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 sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list.d/backports.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/*

9
components/engine/contrib/builder/deb/amd64/generate.sh
View File

@ -46,8 +46,15 @@ for version in "${versions[@]}"; do
# 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
if [ "$suite" = "wheezy" ]; then
cat >> "$version/Dockerfile" <<-'EOF'
RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list.d/backports.list
EOF
fi
echo "" >> "$version/Dockerfile"
fi
extraBuildTags='pkcs11'