Code Review / functest-xtesting.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 1: d1fe9ae)
Merge "Update setuptools version to 30.0.0"
authorJose Lausuch <jose.lausuch@ericsson.com>
Tue, 6 Jun 2017 13:14:51 +0000 (13:14 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 6 Jun 2017 13:14:52 +0000 (13:14 +0000)
docker/Dockerfile patch | blob | history
docker/Dockerfile.aarch64 patch | blob | history

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4c8205a..ff532cc 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -66,7 +66,7 @@ sshpass \
 wget \
 --no-install-recommends
 
-RUN pip install --upgrade pip && easy_install -U setuptools==35.0.2
+RUN pip install --upgrade pip && easy_install -U setuptools==30.0.0
 
 RUN mkdir -p ${REPOS_DIR} \
     && mkdir -p ${REPOS_VNFS_DIR} \
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index c35500f..44e6904 100644 (file)
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -65,7 +65,7 @@ sshpass \
 wget \
 --no-install-recommends
 
-RUN pip install --upgrade pip && easy_install -U setuptools==35.0.2
+RUN pip install --upgrade pip && easy_install -U setuptools==30.0.0
 
 RUN mkdir -p ${REPOS_DIR} \
     && mkdir -p ${REPOS_VNFS_DIR} \