diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-03 13:27:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-03 13:27:16 +0000 |
| commit | 87e2afa68dc5269d7c5bcf2f5f31dc8e06f53c77 (patch) | |
| tree | 7828e9e835bd2f255c919064df7f1038c3918ff2 /docker | |
| parent | 8c1e2abb649c70ab254c39569192fe5d72a7b1f0 (diff) | |
| parent | 1c6eae70ef57069cba215e830651ae222229e24f (diff) | |
| download | kolla-87e2afa68dc5269d7c5bcf2f5f31dc8e06f53c77.tar.gz kolla-87e2afa68dc5269d7c5bcf2f5f31dc8e06f53c77.zip | |
Merge "Remove kuryr-lib in upper-constraints.txt file when install master kuryr"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kuryr/kuryr-base/Dockerfile.j2 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docker/kuryr/kuryr-base/Dockerfile.j2 b/docker/kuryr/kuryr-base/Dockerfile.j2 index 42d33bd5d..b5a2b4bb8 100644 --- a/docker/kuryr/kuryr-base/Dockerfile.j2 +++ b/docker/kuryr/kuryr-base/Dockerfile.j2 @@ -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 %} |