diff options
| author | Zuul <zuul@review.opendev.org> | 2025-12-16 12:20:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-12-16 12:20:52 +0000 |
| commit | dd3cb3dd1ffc4770a2afa259a6f0a467bb845f61 (patch) | |
| tree | b30c08dcea9ef24a89aebae1eb68dd77e090e9d5 /docker/base/Dockerfile.j2 | |
| parent | 443ea2f9aaa803dbd1d6af9441c3d89249a52211 (diff) | |
| parent | a7ee5ccb2b551af5be80c0f082e503f6cbd54096 (diff) | |
| download | kolla-dd3cb3dd1ffc4770a2afa259a6f0a467bb845f61.tar.gz kolla-dd3cb3dd1ffc4770a2afa259a6f0a467bb845f61.zip | |
Merge "debian: Switch to deb822"
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 5ba1d5a87..53ef731cc 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -187,12 +187,12 @@ RUN cat /tmp/kolla_bashrc >> /etc/bash.bashrc \ && sed -i -e s/#*LAST_SYSTEM_UID=999/LAST_SYSTEM_UID=59999/g \ -e s/#*LAST_SYSTEM_GID=999/LAST_SYSTEM_GID=59999/g /etc/adduser.conf +{# NOTE(mnasiadka): Ubuntu arm64 uses ports.ubuntu.com #} {% 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/{{ base_distro }}.sources -COPY sources.list.{{ base_distro }} /etc/apt/sources.list +{% if base_distro == "ubuntu" and base_arch == 'aarch64' %} +COPY {{ base_distro }}.sources.arm64 /etc/apt/sources.list.d/{{ base_distro }}.sources {% else %} -COPY sources.list.{{ base_distro }}.{{ base_arch }} /etc/apt/sources.list +COPY {{ base_distro }}.sources /etc/apt/sources.list.d/ {% endif %} COPY sources.list /etc/apt/sources.list.d/kolla-custom.list {% endblock %} |