summaryrefslogtreecommitdiffstats
path: root/cvp/docker/Dockerfile
diff options
context:
space:
mode:
authorgrakiss <grakiss.wanglei@huawei.com>2017-10-09 05:23:15 -0400
committergrakiss <grakiss.wanglei@huawei.com>2017-10-09 05:23:15 -0400
commitf3d7d48db89d9c3fbace41eb513e43cc9624ebad (patch)
tree5413d9517d77519cb9ea501ac378080cafd858a2 /cvp/docker/Dockerfile
parent8c11c765a9e5af8eb8ac4598d79932ce4f95152c (diff)
[web-cvp]fix api&web service in dockerfiles
JIRA: DOVETAIL-523 api&web services is not running due to packages installation errors Change-Id: I5175d987dfda3cefe28a3a37754acc9fc8d7bc13 Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
Diffstat (limited to 'cvp/docker/Dockerfile')
-rw-r--r--cvp/docker/Dockerfile12
1 files changed, 8 insertions, 4 deletions
diff --git a/cvp/docker/Dockerfile b/cvp/docker/Dockerfile
index fa39ac65..e0cb32fe 100644
--- a/cvp/docker/Dockerfile
+++ b/cvp/docker/Dockerfile
@@ -28,7 +28,6 @@ MAINTAINER SerenaFeng <feng.xiaowei@zte.com.cn>
LABEL version="v1" description="OPNFV TestAPI Docker container"
ARG BRANCH=master
-ARG COMMIT_ID=master
ENV HOME /home
@@ -41,24 +40,29 @@ wget \
python-dev \
python-pip \
crudini \
+libffi-dev \
+libssl-dev \
+libxml2-dev \
+libxslt1-dev \
--no-install-recommends
WORKDIR /home
-RUN pip install --upgrade pip
+#RUN pip install --upgrade pip
RUN git config --global http.sslVerify false
RUN git clone https://gerrit.opnfv.org/gerrit/dovetail.git
WORKDIR /home/dovetail
-RUN git checkout -f $COMMIT_ID
+RUN git checkout -f $BRANCH
RUN mkdir -p /home/testapi
RUN cp -rf /home/dovetail/cvp/* /home/testapi
-WORKDIR /home/testapi/
+WORKDIR /home/dovetail/cvp
RUN pip install -r requirements.txt
RUN bash install.sh
+
CMD ["bash", "docker/start-server.sh"]