diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2023-03-20 21:10:17 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2023-03-28 14:27:10 +0000 |
| commit | 395e9e56594201ac06a5842eac32b0d65daafcf9 (patch) | |
| tree | 7dbbdc3abdb86fecaa2d5d69ffcf63030bd98d07 /docker/neutron | |
| parent | a8d0098bd2575bbfab6155265d649bb0e4e729f6 (diff) | |
| download | kolla-395e9e56594201ac06a5842eac32b0d65daafcf9.tar.gz kolla-395e9e56594201ac06a5842eac32b0d65daafcf9.zip | |
neutron-mlnx-agent: pin pyzmq at 21.*
20.* fails to build so let us try version where upstream fixed packaging
issues.
Change-Id: I099b21872a12c2dccaba4065965d9227ee2e87bc
(cherry picked from commit b2d5307a442994d1a9348926f0664bb94ef96248)
Diffstat (limited to 'docker/neutron')
| -rw-r--r-- | docker/neutron/neutron-mlnx-agent/Dockerfile.j2 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 index ec7243e57..3b5aadaa2 100644 --- a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 @@ -17,10 +17,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.install_packages(neutron_mlnx_agent_packages | customizable("packages")) }} {% set neutron_mlnx_agent_pip_packages = [ - 'networking-mlnx' + 'networking-mlnx', ] %} -RUN {{ macros.install_pip(neutron_mlnx_agent_pip_packages | customizable("pip_packages")) }} +{# NOTE(hrw): pyzmq 20 fails to build while 19.* and 21.* build fine. #} +RUN sed -e "s/^pyzmq===20.0.0/pyzmq==21.*/g" -i /requirements/upper-constraints.txt \ + && {{ macros.install_pip(neutron_mlnx_agent_pip_packages | customizable("pip_packages")) }} {% block neutron_mlnx_agent_footer %}{% endblock %} {% block footer %}{% endblock %} |