aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2023-03-20 21:10:17 +0100
committerMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2023-03-20 21:11:18 +0100
commitb2d5307a442994d1a9348926f0664bb94ef96248 (patch)
tree3642b32bfb5692bc837875391c1d22e2045fbf89 /docker
parent3d008b7f5ec2a54d004e8e9370f303ef9dc7858b (diff)
downloadkolla-b2d5307a442994d1a9348926f0664bb94ef96248.tar.gz
kolla-b2d5307a442994d1a9348926f0664bb94ef96248.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
Diffstat (limited to 'docker')
-rw-r--r--docker/neutron/neutron-mlnx-agent/Dockerfile.j26
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 %}