From: xudan <xudan16@huawei.com>
Date: Mon, 23 Oct 2017 03:37:50 +0000 (-0400)
Subject: Bugfix: build docker image failed
X-Git-Tag: ovp.0.9.0~61
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F01%2F46101%2F2;p=dovetail.git

Bugfix: build docker image failed

1. When build Dovetail docker image, the job failed.
2. https://build.opnfv.org/ci/view/dovetail/job/dovetail-docker-build-push-master/279/console
3. That's because the setuptools version is old.
4. It needs to upgrade setuptools in the Dockerfile.

JIRA: DOVETAIL-534

Change-Id: If37a4d7c3b57ea79903565fd880c5447da97b13b
Signed-off-by: xudan <xudan16@huawei.com>
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a622f796..c5239dbb 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -23,6 +23,8 @@ RUN \
 && \
     apt-get update
 
+RUN easy_install -U setuptools==30.0.0
+
 RUN wget -qO- https://get.docker.com/ \
 | \
     sed 's/-q docker-ce/-q docker-ce=17.03.0~ce-0~ubuntu-trusty/' \