diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2017-06-06 08:55:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-06-06 08:55:55 +0000 |
| commit | d1fe9ae1d51537c73f3264cb1e01342888f5fd3f (patch) | |
| tree | c258e154ae941b1e3c887918f4494a54ef5e00af | |
| parent | ec97f28675daea3b3221c196764c58c3c9bd65d4 (diff) | |
| parent | 9eb9d093e1d96351d986066a0e14c91a74d3f9fc (diff) | |
Merge "Update setuptools version to 35.0.2"
| -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 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} \ |