aboutsummaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2025-05-31 00:25:53 +0000
committerGerrit Code Review <review@openstack.org>2025-05-31 00:25:53 +0000
commit4a81f224b8b39bce6e471e44fda142ff8eb12875 (patch)
tree938f143575e4b7ebe319e75791997bf4574522f9 /docker/base/Dockerfile.j2
parentba805a4989fd960503c47b0c94c679583aae82c4 (diff)
parentb5849adc45e3a39e0837dea3ee8e1fb3cd057dd8 (diff)
downloadkolla-4a81f224b8b39bce6e471e44fda142ff8eb12875.tar.gz
kolla-4a81f224b8b39bce6e471e44fda142ff8eb12875.zip
Merge "[base] Ensure full control over APT sources for Ubuntu"
Diffstat (limited to 'docker/base/Dockerfile.j2')
-rw-r--r--docker/base/Dockerfile.j22
1 files changed, 1 insertions, 1 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