Merge "[bugfix]tc006 failed due to volume attached to different location "/dev/vdc""

[yardstick.git] / docker / Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0c6e804..959315c 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -21,18 +21,16 @@ ENV REPOS_DIR="/home/opnfv/repos" \
 
 # Yardstick repo
 ENV YARDSTICK_REPO_DIR="${REPOS_DIR}/yardstick" \
-    RELENG_REPO_DIR="${REPOS_DIR}/releng" \
     STORPERF_REPO_DIR="${REPOS_DIR}/storperf"
 
-RUN apt-get update && apt-get install -y git python-setuptools python-pip
+RUN apt-get update && apt-get install -y git python-setuptools python-pip && apt-get -y autoremove && apt-get clean
 RUN easy_install -U setuptools==30.0.0
-RUN pip install appdirs==1.4.0
+RUN pip install appdirs==1.4.0 pyopenssl==17.5.0 python-openstackclient==3.11.0 python-heatclient==1.11.0
 
 RUN mkdir -p ${REPOS_DIR}
 
 RUN git config --global http.sslVerify false
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/yardstick ${YARDSTICK_REPO_DIR}
-RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/storperf ${STORPERF_REPO_DIR}
 
 WORKDIR ${YARDSTICK_REPO_DIR}
@@ -48,5 +46,8 @@ ADD http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-d
 
 COPY ./exec_tests.sh /usr/local/bin/
 
+ENV NSB_DIR="/opt/nsb_bin" \
+    PYTHONPATH="${PYTHONPATH}:${NSB_DIR}/trex_client:${NSB_DIR}/trex_client/stl"
+
 WORKDIR ${REPOS_DIR}
 CMD ["/usr/bin/supervisord"]