From 407a91c3690de16470f91359a628d77a68f639ea Mon Sep 17 00:00:00 2001 From: Jay Faulkner Date: Mon, 18 Apr 2016 13:30:35 -0700 Subject: [PATCH] Force container builds to use http.us.debian.org httpredir has multiple mirrors behind it, meaning on any given build we're relying on several mirrors to all stay up at the same time. This happens much less often than we'd like. By forcing this to http.us.debian.org, we're using a more curated set of mirrors which are less likely to be flakey. The long term fix is to use a debian mirror provided by infra for check/gate builds, but until that exists this should help. Depends-on: I5169faf25c36cfb494c9c1fafb14fb4f7f82cd9e Related-bug: #1571829 Change-Id: Ia7ea8d909df9ae86a6dbd68ba94746b171535eb8 --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7c34d58a8..e154f6e4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,8 +13,11 @@ ADD . /tmp/ironic-python-agent # 1.6. Using the ARG command will be a much cleaner solution. COPY proxy.sh /usr/bin/proxy.sh +# Ensure we hit a single mirror for builds, since httpredir is flakey +RUN sed -i 's/httpredir/http.us/g' /etc/apt/sources.list + # Add 'backports' for qemu-utils -RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list +RUN echo 'deb http://http.us.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list # Install requirements: Python for ironic-python-agent, others for putting an # image on disk