From 7d08b884344651d9ba3dd2830dcd976d2adba9f5 Mon Sep 17 00:00:00 2001 From: chenjiankun Date: Mon, 10 Apr 2017 11:01:57 +0000 Subject: 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 (cherry picked from commit bb365d411d88a71871993b4ed803c2ffbbcb79bf) --- docker/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'docker') 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 -- cgit 1.2.3-korg