From 02c7efd42d072107d086f3d0885e4a19073cec5a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 13 Nov 2019 16:54:38 +0100 Subject: Ubuntu: use local APT mirrors if possible APT has a way to fetch mirror list and autoselect best mirror. Change-Id: I8209770ca1353fd89aacef0859ca3a373645c6b2 --- docker/base/sources.list.ubuntu | 6 +++--- releasenotes/notes/ubuntu-uses-mirrors-now-0858d579944eea48.yaml | 5 +++++ tests/templates/template_overrides.j2 | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/ubuntu-uses-mirrors-now-0858d579944eea48.yaml diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index cac229954..5bfc3a10e 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -1,9 +1,9 @@ # For non-x86 architectures we use sources.list.ubuntu. # Default repos -deb http://archive.ubuntu.com/ubuntu/ bionic main universe -deb http://archive.ubuntu.com/ubuntu/ bionic-updates main universe -deb http://archive.ubuntu.com/ubuntu/ bionic-security main universe +deb mirror://mirrors.ubuntu.com/mirrors.txt bionic main universe +deb mirror://mirrors.ubuntu.com/mirrors.txt bionic-updates main universe +deb mirror://mirrors.ubuntu.com/mirrors.txt bionic-security main universe # Backports have a lower priority and must be explicitly installed to be used deb http://archive.ubuntu.com/ubuntu/ bionic-backports main universe diff --git a/releasenotes/notes/ubuntu-uses-mirrors-now-0858d579944eea48.yaml b/releasenotes/notes/ubuntu-uses-mirrors-now-0858d579944eea48.yaml new file mode 100644 index 000000000..aa5d418ea --- /dev/null +++ b/releasenotes/notes/ubuntu-uses-mirrors-now-0858d579944eea48.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Ubuntu based images use APT mirrors now. May affect builds done behind http + proxies. diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index 515ae63ce..c25ddb928 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -75,7 +75,7 @@ RUN sed -i -e "s|http://deb.debian.org|http://{{ nodepool_mirror_host }}|" \ {% elif base_distro == "ubuntu" %} {% endraw %} -RUN sed -i -e "s|http://archive.ubuntu.com|http://{{ nodepool_mirror_host }}|" \ +RUN sed -i -e "s|mirror://mirrors.ubuntu.com/mirrors.txt|http://{{ nodepool_mirror_host }}/ubuntu/|" \ -e "s|http://ubuntu-cloud.archive.canonical.com/ubuntu|http://{{ nodepool_mirror_host }}/ubuntu-cloud-archive|" \ /etc/apt/sources.list -- cgit v1.2.3