diff options
author | Jose Lausuch <jose.lausuch@ericsson.com> | 2017-06-06 13:14:51 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-06-06 13:14:52 +0000 |
commit | d10784616cacae7aa56778d9542b775d7f313936 (patch) | |
tree | 7d0e944d8dd4a8ea98629af4fd28b5a4cd177633 | |
parent | d1fe9ae1d51537c73f3264cb1e01342888f5fd3f (diff) | |
parent | 6fc422cd42f92155e740f5e143e8baeab61a9b65 (diff) |
Merge "Update setuptools version to 30.0.0"
-rw-r--r-- | docker/Dockerfile | 2 | ||||
-rw-r--r-- | docker/Dockerfile.aarch64 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 4c8205ae3..ff532ccc6 100644 --- 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 c35500fa0..44e6904b1 100644 --- 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} \ |