aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorchenjiankun <chenjiankun1@huawei.com>2017-04-10 11:01:57 +0000
committerJing Lu <lvjing5@huawei.com>2017-04-22 00:39:37 +0000
commit7d08b884344651d9ba3dd2830dcd976d2adba9f5 (patch)
tree5397b1050a84fc6e31775cc7b4a13bedd54295b7 /docker
parent87d8de27074f71db307891e1230a9341f852d945 (diff)
Yardstick virtualenv support
JIRA: YARDSTICK-620 In the patch, I separate python-setuptools from install.sh and separate appdirs from requirements.txt because there will be error when install them in virtualenv. Also I will update the documentation when this patch merged; Change-Id: I99a532d1851983775869e7c5e8e65fd0229e86df Signed-off-by: chenjiankun <chenjiankun1@huawei.com> (cherry picked from commit bb365d411d88a71871993b4ed803c2ffbbcb79bf)
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile5
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 52a15df1b..96a5d774d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -23,7 +23,10 @@ ENV IMAGE_DIR /home/opnfv/images/
ENV YARDSTICK_REPO_DIR ${REPOS_DIR}/yardstick
ENV RELENG_REPO_DIR ${REPOS_DIR}/releng
-RUN apt-get update && apt-get install -y git
+RUN apt-get update && apt-get install -y git python-setuptools python-pip
+RUN easy_install -U setuptools==30.0.0
+RUN pip install appdirs==1.4.0
+
RUN mkdir -p ${REPOS_DIR}
RUN git config --global http.sslVerify false