bugfix: copy hosts file

[bottlenecks.git] / docker / Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
index f5ac0e8..69e1d65 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -15,6 +15,9 @@ LABEL image=opnfv/bottlenecks
 # GIT repo directory
 ENV REPOS_DIR /home/opnfv
 
+# CI docker image label
+ARG BRANCH=master
+
 # Bottlenecks repo
 ENV BOTTLENECKS_REPO_DIR ${REPOS_DIR}/bottlenecks
 ENV RELENG_REPO_DIR ${REPOS_DIR}/releng
@@ -33,8 +36,9 @@ RUN apt-get update && apt-get install -y \
     python \
     python-dev \
     python-pip \
+    vim \
     python-setuptools && \
-    easy_install -U setuptools
+    easy_install -U setuptools==30.0.0
 
 RUN apt-get -y autoremove && \
     apt-get clean
@@ -42,8 +46,9 @@ 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/bottlenecks ${BOTTLENECKS_REPO_DIR}
+RUN git clone -b $BRANCH https://gerrit.opnfv.org/gerrit/bottlenecks ${BOTTLENECKS_REPO_DIR}
 RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
 
 RUN easy_install pytz
-RUN pip install -r ${REPOS_DIR}/bottlenecks/requirements.txt
+RUN pip install -r ${REPOS_DIR}/bottlenecks/requirements/requirements.txt
+RUN pip install -U /home/opnfv/bottlenecks