Ubuntu: use local APT mirrors if possible

APT has a way to fetch mirror list and autoselect best mirror.

Change-Id: I8209770ca1353fd89aacef0859ca3a373645c6b2
This commit is contained in:
Marcin Juszkiewicz 2019-11-13 16:54:38 +01:00
parent e2f013357b
commit 02c7efd42d
3 changed files with 9 additions and 4 deletions

View File

@ -1,9 +1,9 @@
# For non-x86 architectures we use sources.list.ubuntu.<arch>
# 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

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Ubuntu based images use APT mirrors now. May affect builds done behind http
proxies.

View File

@ -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