aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2021-04-20 14:30:56 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2021-04-20 14:36:00 +0200
commit054feb2bbfe0a984b4cfd43942d4b4f098eff8b3 (patch)
tree8428709e96ebcc5bdd6a8b7482dfc3a4d78b9c65
parentc1a34de014f9b9d50dc9d688426aa0fda044505a (diff)
Install setuptools_scm before xrally
Else upper-constraints basically fails. Change-Id: I022f101e2ed44708afd0b88d47b77d2f7ca85458 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 75170fc0b528c7e182b8164d5905fcbaa6957faa)
-rw-r--r--docker/core/Dockerfile4
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 5125a9cc..cd81ff34 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -28,6 +28,10 @@ RUN apk -U upgrade && \
pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \
-c/src/requirements/upper-constraints.txt \
+ setuptools_scm && \
+ pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src \
+ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \
+ -c/src/requirements/upper-constraints.txt \
/src/functest-kubernetes && \
(cd /src/rally && patch -p1 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \
(cd /usr/lib/python3.8/site-packages/xrally_kubernetes/ && \