bug-fix: kubectl not installed in Bottlenecks docker

[bottlenecks.git] / docker / Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
index f5ac0e8..ef63e3b 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -7,18 +7,20 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-FROM ubuntu:14.04
-MAINTAINER MatthewLi <matthew.lijun@huawei.com>
+FROM ubuntu:16.04
+MAINTAINER Yang (Gabriel) Yu <gabriel.yuyang@huawei.com>
 
 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
-ENV creds ${BOTTLENECKS_REPO_DIR}/config/openstack.creds
 
 #new test suite required packages can be added here
 RUN apt-get update && apt-get install -y \
@@ -29,21 +31,25 @@ RUN apt-get update && apt-get install -y \
     curl \
     wget \
     git \
-    sshpass \
     python \
-    python-dev \
     python-pip \
+    vim \
+    iputils-ping \
+    sshpass \
+    sudo \
     python-setuptools && \
-    easy_install -U setuptools
-
-RUN apt-get -y autoremove && \
+    apt-get -y autoremove && \
     apt-get clean
 
+RUN easy_install -U setuptools==30.0.0
+
 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 bash ${BOTTLENECKS_REPO_DIR}/utils/k8s_setup/kubectl_install.sh
+
+RUN pip install -r ${BOTTLENECKS_REPO_DIR}/requirements/requirements.txt
+RUN pip install -U ${BOTTLENECKS_REPO_DIR}