Merge "pip install openstack clients"

[bottlenecks.git] / ci / docker / Dockerfile

diff --git a/ci/docker/Dockerfile b/ci/docker/Dockerfile
index 217c136..706718c 100644 (file)
--- a/ci/docker/Dockerfile
+++ b/ci/docker/Dockerfile
@@ -8,6 +8,7 @@
 ##############################################################################
 
 FROM ubuntu:14.04
+MAINTAINER MatthewLi <matthew.lijun@huawei.com>
 
 LABEL image=opnfv/bottlenecks
 
@@ -25,11 +26,8 @@ RUN apt-get update && apt-get install -y \
     git \
     sshpass \
     python \
-    python-glanceclient \
-    python-heatclient \
-    python-keystoneclient \
-    python-neutronclient \
-    python-novaclient
+    python-dev \
+    python-pip
 
 RUN apt-get -y autoremove && \
     apt-get clean
@@ -37,7 +35,7 @@ RUN apt-get -y autoremove && \
 RUN mkdir -p ${REPOS_DIR}
 
 RUN git config --global http.sslVerify false
-# TODO fix code clone handler
-#RUN git clone https://gerrit.opnfv.org/gerrit/bottlenecks ${BOTTLENECKS_REPO_DIR}
-#RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
+RUN git clone https://gerrit.opnfv.org/gerrit/bottlenecks ${BOTTLENECKS_REPO_DIR}
+RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
 
+RUN pip install -r ${REPOS_DIR}/bottlenecks/requirements.txt