aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-06-02 07:09:21 +0000
committerLinda Wang <wangwulin@huawei.com>2017-06-02 08:43:49 +0000
commit9eb9d093e1d96351d986066a0e14c91a74d3f9fc (patch)
tree750d2feda79b750fb89b4e40c958c084f13150f3
parentcce3644b0b0186676de974d32e02219e2ae5dc50 (diff)
Update setuptools version to 35.0.2
Docker build failed in CI due to the low version of setuptools(3.3) Change-Id: I5e9b15f59e2cc5e78f5ab1b30fd1525b667f09fb Signed-off-by: Linda Wang <wangwulin@huawei.com>
-rw-r--r--docker/Dockerfile2
-rw-r--r--docker/Dockerfile.aarch642
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 21ae33437..4c8205ae3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -66,7 +66,7 @@ sshpass \
wget \
--no-install-recommends
-RUN pip install --upgrade pip
+RUN pip install --upgrade pip && easy_install -U setuptools==35.0.2
RUN mkdir -p ${REPOS_DIR} \
&& mkdir -p ${REPOS_VNFS_DIR} \
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index 729646119..c35500fa0 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -65,7 +65,7 @@ sshpass \
wget \
--no-install-recommends
-RUN pip install --upgrade pip
+RUN pip install --upgrade pip && easy_install -U setuptools==35.0.2
RUN mkdir -p ${REPOS_DIR} \
&& mkdir -p ${REPOS_VNFS_DIR} \