Merge "Fix pycparser wheel package issue"

This commit is contained in:
Jenkins 2016-10-03 07:43:00 +00:00 committed by Gerrit Code Review
commit 1abe1136d9
2 changed files with 8 additions and 2 deletions
docker

@ -48,11 +48,13 @@ MAINTAINER {{ maintainer }}
{% endif %}
{{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }}
# TODO(Jeffrey4l): remove `--no-binary pycparser` when the bug[0] is fixed.
# [0] https://github.com/eliben/pycparser/issues/147
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
&& python get-pip.py \
&& rm get-pip.py \
&& pip --no-cache-dir install pytz \
&& pip --no-cache-dir install \
&& pip --no-cache-dir install --no-binary pycparser \
ansible==2.1.1.0 \
MySQL-python \
os-client-config==1.16.0 \

@ -15,5 +15,9 @@
{% macro install_pip(packages) %}
RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt {% for package in packages %}{{ package }} {% endfor %}
{#-
TODO(Jeffrey4l): remove `--no-binary pycparser` when the bug[0] is fixed.
[0] https://github.com/eliben/pycparser/issues/147
-#}
RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade --no-binary pycparser -c requirements/upper-constraints.txt {% for package in packages %}{{ package }} {% endfor %}
{% endmacro %}