openstack
/
kolla
Code Issues Proposed changes

Merge "Remove kuryr-lib in upper-constraints.txt file when install master kuryr"

This commit is contained in:
Jenkins 2016-11-03 13:27:16 +00:00 committed by Gerrit Code Review
parent 8c1e2abb64 1c6eae70ef
commit 87e2afa68d
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/kuryr/kuryr-base/Dockerfile.j2
View File

@ -9,7 +9,10 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% elif install_type == 'source' %}
ADD kuryr-base-archive /kuryr-base-source
# NOTE(Jeffrey4l): remove kuryr-lib constraint in upper-constraints.txt file.
# Otherwise, it will be failed.
RUN ln -s kuryr-base-source/* kuryr-base \
&& sed -i 's|^kuryr-lib===.*$||g' requirements/upper-constraints.txt \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /kuryr-base
{% endif %}