summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierrick Louin <pierrick.louin@orange.com>2020-12-03 22:18:41 +0000
committerCédric Ollivier <cedric.ollivier@orange.com>2021-01-05 12:20:27 +0100
commit302abd9369e12c6f199216602941ee97ffbb2d37 (patch)
tree5abb6785dc6b170c70fdbb867cf52da47e52b497
parent7ab8c4f3c2996b05f366ea85032162eff90778ba (diff)
NFVBENCH-195: Work around a fatal error encountered with the latest pip release, building the container.
Signed-off-by: Pierrick Louin <pierrick.louin@orange.com> Change-Id: I7dbfa076360be0c62a1b9893070f059dc2566842
-rw-r--r--docker/Dockerfile2
-rw-r--r--tox.ini1
2 files changed, 2 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d871acc..990f07e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update && apt-get install -y \
&& cp -a /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex /usr/local/lib/python3.6/dist-packages/ \
&& rm -rf /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex \
&& wget https://bootstrap.pypa.io/get-pip.py \
- && python3 get-pip.py \
+ && python3 get-pip.py pip==20.2.4 \
&& pip3 install -U pbr \
&& pip3 install -U setuptools \
&& cd / \
diff --git a/tox.ini b/tox.ini
index 6d12050..3cf573e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,7 @@ envlist = py36,pep8,lint,docs,docs-linkcheck
skipsdist = True
[testenv]
+pip_version = pip==20.2.4
usedevelop = True
install_command = pip install -U {opts} {packages}
setenv =