diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-10-20 00:35:40 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-10-24 16:11:19 +0800 |
| commit | 1c6eae70ef57069cba215e830651ae222229e24f (patch) | |
| tree | a03d52610123999d5230e00346a6c28e3d64fe95 | |
| parent | 2e91c3a43c649852789e13badf408506e13e6f7a (diff) | |
| download | kolla-1c6eae70ef57069cba215e830651ae222229e24f.tar.gz kolla-1c6eae70ef57069cba215e830651ae222229e24f.zip | |
Remove kuryr-lib in upper-constraints.txt file when install master kuryr
kuryr add itself to upper-constrains.txt file with kuryr-lib===0.1.0 .
then installing master kuryr which is > 0.1.0 with constraints will
raises an error. There is nothing we can do unless removing the
kuryr-lib line in upper-constrains.txt file.
TrivialFix
Change-Id: Iec7d8a3bc9e00b2d08665329e2f3c2c5ccc43818
| -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 %} |