diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-30 20:13:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-30 20:13:03 +0000 |
| commit | e97239f03e734195a49b383f0e77aae3bdea9a35 (patch) | |
| tree | 6e642b2c4dc807e60d5b3ba84d0d5defa6b9a8ca /docker/kolla-toolbox | |
| parent | 63ad9cd0de0926f401a7f26bff505b1629f2e520 (diff) | |
| parent | 4b4e26262b9e03190c639481fb60a8f4f92c532a (diff) | |
| download | kolla-e97239f03e734195a49b383f0e77aae3bdea9a35.tar.gz kolla-e97239f03e734195a49b383f0e77aae3bdea9a35.zip | |
Merge "CentOS 8: Update packages in images"
Diffstat (limited to 'docker/kolla-toolbox')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index d4ad59f03..6486e882d 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -30,9 +30,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'mariadb-devel', 'openssh-clients', 'openssl-devel', - 'python-devel', - 'rabbitmq-server-3.7.10', ] %} + {% if distro_package_manager == 'dnf' %} + {% set kolla_toolbox_packages = kolla_toolbox_packages + [ + 'python3-devel', + 'rabbitmq-server-3.7.*' + ] %} + {% else %} + # NOTE(mandre) Remove rabbitmq-server pinning once package dependencies are met + # https://bugs.launchpad.net/kolla/+bug/1814233 + {% set kolla_toolbox_packages = kolla_toolbox_packages + [ + 'python-devel', + 'rabbitmq-server-3.7.10' + ] %} + {% endif %} {% elif base_package_type == 'deb' %} {% set kolla_toolbox_packages = [ |
