From b5849adc45e3a39e0837dea3ee8e1fb3cd057dd8 Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Thu, 29 May 2025 19:53:55 +0200 Subject: [base] Ensure full control over APT sources for Ubuntu Ubuntu images were occasionally failing to build due to unavailability or slowness of the official Ubuntu security repositories. Although Kolla uses `mirror://` URLs to leverage Ubuntu mirror infrastructure, the original `/etc/apt/sources.list.d/ubuntu.sources` file was still present, causing the system to fallback to default sources. This commit aligns Ubuntu behavior with Debian by explicitly removing the distro `.sources` file and relying solely on the sources configured by Kolla. This ensures consistent and reproducible builds both in CI and on local environments. Closes-Bug: #2112140 Change-Id: I00bcb30662bb12ed8711b28a64ef1941dcce893a --- docker/base/Dockerfile.j2 | 2 +- docker/base/sources.list.ubuntu | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'docker/base') 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 -- cgit v1.2.3