diff options
| author | Zuul <zuul@review.opendev.org> | 2025-05-31 00:25:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-05-31 00:25:53 +0000 |
| commit | 4a81f224b8b39bce6e471e44fda142ff8eb12875 (patch) | |
| tree | 938f143575e4b7ebe319e75791997bf4574522f9 | |
| parent | ba805a4989fd960503c47b0c94c679583aae82c4 (diff) | |
| parent | b5849adc45e3a39e0837dea3ee8e1fb3cd057dd8 (diff) | |
| download | kolla-4a81f224b8b39bce6e471e44fda142ff8eb12875.tar.gz kolla-4a81f224b8b39bce6e471e44fda142ff8eb12875.zip | |
Merge "[base] Ensure full control over APT sources for Ubuntu"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu | 4 | ||||
| -rw-r--r-- | releasenotes/notes/bug-2112140-41a1924c260e531c.yaml | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 6bd94a2cc..eae52d1db 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -249,7 +249,7 @@ RUN cat /tmp/kolla_bashrc >> /etc/bash.bashrc \ {% block base_ubuntu_package_sources_list %} {% if base_distro == 'debian' or ( base_distro == 'ubuntu' and base_arch == 'x86_64' ) %} -RUN rm -f /etc/apt/sources.list.d/debian.sources +RUN rm -f /etc/apt/sources.list.d/{{ base_distro }}.sources COPY sources.list.{{ base_distro }} /etc/apt/sources.list {% else %} COPY sources.list.{{ base_distro }}.{{ base_arch }} /etc/apt/sources.list diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index 929aebbc0..f0d1f4e37 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -3,11 +3,9 @@ # Default repos deb mirror://mirrors.ubuntu.com/mirrors.txt noble main universe deb mirror://mirrors.ubuntu.com/mirrors.txt noble-updates main universe +deb mirror://mirrors.ubuntu.com/mirrors.txt noble-backports main universe deb mirror://mirrors.ubuntu.com/mirrors.txt noble-security main universe -# Backports have a lower priority and must be explicitly installed to be used -deb http://archive.ubuntu.com/ubuntu/ noble-backports main universe - # We need to add the repo for the updated packages they provide. The main ones # are qemu, libvirt, and openvswitch. deb http://ubuntu-cloud.archive.canonical.com/ubuntu noble-updates/epoxy main diff --git a/releasenotes/notes/bug-2112140-41a1924c260e531c.yaml b/releasenotes/notes/bug-2112140-41a1924c260e531c.yaml new file mode 100644 index 000000000..5fec5c5aa --- /dev/null +++ b/releasenotes/notes/bug-2112140-41a1924c260e531c.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Ensures Kolla uses only configured APT mirror on Ubuntu for full source control. + `LP#2112140 <https://launchpad.net/bugs/2112140>`__ |