diff options
| author | Zuul <zuul@review.opendev.org> | 2026-07-11 08:08:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-07-11 08:08:51 +0000 |
| commit | c0c6ec5a00711de6a5f69e692c1049eefa1a1f06 (patch) | |
| tree | e7585a751b276f6804174df8e95b77f66ea3d36c /kolla/docker/base | |
| parent | 6b3724a59c94dd7818821f5ea9c9d50b2a880d09 (diff) | |
| parent | 77d310a9ff344a09f35b2c0536b0f7b9e8677deb (diff) | |
| download | kolla-c0c6ec5a00711de6a5f69e692c1049eefa1a1f06.tar.gz kolla-c0c6ec5a00711de6a5f69e692c1049eefa1a1f06.zip | |
Merge "Add support to override base repos"
Diffstat (limited to 'kolla/docker/base')
| -rw-r--r-- | kolla/docker/base/Dockerfile.j2 | 14 | ||||
| -rw-r--r-- | kolla/docker/base/ubuntu.sources | 7 |
2 files changed, 10 insertions, 11 deletions
diff --git a/kolla/docker/base/Dockerfile.j2 b/kolla/docker/base/Dockerfile.j2 index 0e2f3c1ab..6c1022ece 100644 --- a/kolla/docker/base/Dockerfile.j2 +++ b/kolla/docker/base/Dockerfile.j2 @@ -34,10 +34,8 @@ RUN cat /tmp/kolla_bashrc >> /etc/skel/.bashrc \ ENV PS1="$(tput bold)($(printenv KOLLA_SERVICE_NAME))$(tput sgr0)[$(id -un)@$(hostname -s) $(pwd)]$ " {% if base_package_type == 'rpm' %} -# For RPM Variants, enable the correct repositories - this should all be done -# in the base image so repos are consistent throughout the system. This also -# enables to provide repo overrides at a later date in a simple fashion if we -# desire such functionality. I think we will :) + +{{ macros.enable_extra_repos(['baseos', 'appstream']) }} ENV KOLLA_RPM_OVS_VERSION=3.5 \ KOLLA_RPM_OVN_VERSION=26.03 @@ -154,6 +152,7 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen {# endif for base_package_type rpm #} {% elif base_package_type == 'deb' %} + # This will prevent questions from being asked during the install ENV DEBIAN_FRONTEND noninteractive @@ -195,9 +194,16 @@ COPY {{ base_distro }}.sources.arm64 /etc/apt/sources.list.d/{{ base_distro }}.s {% else %} COPY {{ base_distro }}.sources /etc/apt/sources.list.d/ {% endif %} + COPY sources.list /etc/apt/sources.list.d/kolla-custom.list {% endblock %} +{% if base_distro == 'debian' %} +{{ macros.enable_extra_repos(['debian', 'debian-security']) }} +{% elif base_distro == 'ubuntu' %} +{{ macros.enable_extra_repos(['ubuntu', 'ubuntu-security', 'ubuntu-cloud-archive']) }} +{% endif %} + {% block base_debian_after_sources_list %}{% endblock %} {# install Debian Openstack repos - they are not mirrored on CI #} diff --git a/kolla/docker/base/ubuntu.sources b/kolla/docker/base/ubuntu.sources index f8f609cee..46b817b7e 100644 --- a/kolla/docker/base/ubuntu.sources +++ b/kolla/docker/base/ubuntu.sources @@ -12,13 +12,6 @@ Suites: noble-security Components: main universe Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg -## Ubuntu Cloud Archive -Types: deb -URIs: http://ubuntu-cloud.archive.canonical.com/ubuntu -Suites: noble-updates/gazpacho -Components: main -Signed-By: /usr/share/keyrings/ubuntu-cloud-keyring.gpg - # NOTE(hrw): extra repositories are added into image when they are needed as # separate files in /etc/apt/sources.list.d/ directory. For that purpose they # are defined in kolla/template/repos.yaml file. |