From 1c6eae70ef57069cba215e830651ae222229e24f Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Thu, 20 Oct 2016 00:35:40 +0800 Subject: [PATCH] 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 --- docker/kuryr/kuryr-base/Dockerfile.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/kuryr/kuryr-base/Dockerfile.j2 b/docker/kuryr/kuryr-base/Dockerfile.j2 index 42d33bd5dd..b5a2b4bb8f 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 %}