X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=docker%2FDockerfile;h=afb2ce5c697fcb8ae1b2faaf4cc5df3956d347a4;hb=13d09b66c8e2dba58056513093e71b77f255cc97;hp=36db2bb1374c53df4e1a467739a2b673aad685c4;hpb=8264f8cfd71ac8bacd5a4cce2206cbdc2f76a707;p=yardstick.git

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 36db2bb13..afb2ce5c6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -11,6 +11,8 @@ FROM ubuntu:14.04
 
 LABEL image=opnfv/yardstick
 
+ARG BRANCH=master
+
 # GIT repo directory
 ENV REPOS_DIR /home/opnfv/repos
 
@@ -39,6 +41,7 @@ RUN apt-get update && apt-get install -y \
     kpartx \
     libffi-dev \
     libssl-dev \
+    libzmq-dev \
     python \
     python-dev \
     libxml2-dev \
@@ -46,8 +49,9 @@ RUN apt-get update && apt-get install -y \
     nginx \
     uwsgi \
     uwsgi-plugin-python \
+    supervisor \
     python-setuptools && \
-    easy_install -U setuptools
+    easy_install -U setuptools==30.0.0
 
 RUN apt-get -y autoremove && \
     apt-get clean
@@ -55,8 +59,8 @@ RUN apt-get -y autoremove && \
 RUN mkdir -p ${REPOS_DIR}
 
 RUN git config --global http.sslVerify false
-RUN git clone https://gerrit.opnfv.org/gerrit/yardstick ${YARDSTICK_REPO_DIR}
-RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
+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}
 
 # install yardstick + dependencies
 RUN cd ${YARDSTICK_REPO_DIR} && easy_install -U pip
@@ -71,3 +75,4 @@ ADD http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img /home/op
 ADD http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img /home/opnfv/images/
 
 COPY ./exec_tests.sh /usr/local/bin/
+CMD ["/usr/bin/supervisord"]