diff options
| author | Zuul <zuul@review.opendev.org> | 2021-05-10 18:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-05-10 18:39:53 +0000 |
| commit | 5687029e38aec76bff18c27e2421825ac431ad30 (patch) | |
| tree | 0fb8de11f0e8bbabbe4b17829bed82e71a6f3d32 /docker | |
| parent | bb1b8c37d4336c136fbe33d262006771debfa100 (diff) | |
| parent | 3b378b0a10570b91549a23055863d14e869768b5 (diff) | |
| download | kolla-5687029e38aec76bff18c27e2421825ac431ad30.tar.gz kolla-5687029e38aec76bff18c27e2421825ac431ad30.zip | |
Merge "[CI] Trust only infra mirrors and fix APT mirrors" into stable/train
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index f89b392a2..a683edcd7 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -448,6 +448,8 @@ COPY sources.list.{{ base_distro }}.{{ base_arch }} /etc/apt/sources.list COPY sources.list /etc/apt/sources.list.d/kolla-custom.list {% endblock %} +{% block base_debian_after_sources_list %}{% endblock %} + {% block base_ubuntu_package_apt_preferences %} COPY apt_preferences.{{ base_distro }} /etc/apt/preferences COPY apt_preferences /etc/apt/preferences.d/kolla-custom diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index df69e38d2..6f1785349 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.<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 |