diff options
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 9ff44b86f..408a2af63 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -96,6 +96,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python3-zaqarclient', ] %} {% else %} + {# NOTE(hrw): qpid-proton-c 0.26 from centos-openstack-train repo instead of epel #} {% set openstack_base_packages = openstack_base_packages + [ 'python2-cryptography', 'python2-eventlet', @@ -173,6 +174,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python2-webob', 'python-zaqarclient', 'PyYAML', + 'qpid-proton-c-0.26.*', 'sysvinit-tools' ] %} {% endif %} @@ -410,7 +412,9 @@ RUN ln -s openstack-base-source/* /requirements \ ENV PATH /var/lib/kolla/venv/bin:$PATH -RUN {{ macros.install_pip(openstack_base_pip_packages | customizable("pip_packages")) }} +{# NOTE(hrw): setuptools is capped in openstack/requirements as this version still has use_2to3 #} +RUN {{ macros.install_pip(["'setuptools < 58'"]) }} \ + && {{ macros.install_pip(openstack_base_pip_packages | customizable("pip_packages")) }} {% endif %} |