diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-03 07:43:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-03 07:43:00 +0000 |
| commit | 1abe1136d9e1cdaae0f3e924f754393ecbe854c5 (patch) | |
| tree | e43dd96403aa997a27833a4d67d4a0087c064410 | |
| parent | 99e65fda54b3daa55545decd7a80502e63c829d9 (diff) | |
| parent | 195bcd0f4323462b77d025936b898c85ddd8fdb3 (diff) | |
| download | kolla-1abe1136d9e1cdaae0f3e924f754393ecbe854c5.tar.gz kolla-1abe1136d9e1cdaae0f3e924f754393ecbe854c5.zip | |
Merge "Fix pycparser wheel package issue"
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/macros.j2 | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 78b0a6cbd..1793ba6f7 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -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 \ diff --git a/docker/macros.j2 b/docker/macros.j2 index 32496a921..c19098e30 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -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 %} |