diff options
| author | Zuul <zuul@review.opendev.org> | 2023-06-29 14:11:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-06-29 14:11:18 +0000 |
| commit | 00cebc3cde7aa35dfdca04dfe490c9dd7c3c40b7 (patch) | |
| tree | 611c3756e215b4d204e2774fcb0202649530905a /docker/base | |
| parent | 079e2f6a500f202751459f0af50ee94ec84c786c (diff) | |
| parent | 3e4d291b12719e8ede9b2801847da987db2885dc (diff) | |
| download | kolla-00cebc3cde7aa35dfdca04dfe490c9dd7c3c40b7.tar.gz kolla-00cebc3cde7aa35dfdca04dfe490c9dd7c3c40b7.zip | |
Merge "base: Debian 12 uses new APT sources file"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 1300fb45f..9fc935a79 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -239,6 +239,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 COPY sources.list.{{ base_distro }} /etc/apt/sources.list {% else %} COPY sources.list.{{ base_distro }}.{{ base_arch }} /etc/apt/sources.list |