summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo wang <grakiss.wanglei@huawei.com>2017-09-29 06:18:32 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-29 06:18:32 +0000
commit6253966250881c8928db93ec19223b1f136c840a (patch)
tree3aa476c298cde5ec0f20ef6b2c23082cd4a7d43c
parent35a3158bcbe5a60928101d5c125e4540452e3876 (diff)
parentf52ef45c787d5cd6166bb7cbf812e4f598c51061 (diff)
Merge "[cvp-web]correct dockerfile"
-rw-r--r--cvp/docker/Dockerfile15
-rw-r--r--cvp/docker/Dockerfile.web12
2 files changed, 25 insertions, 2 deletions
diff --git a/cvp/docker/Dockerfile b/cvp/docker/Dockerfile
index 126afce..fa39ac6 100644
--- a/cvp/docker/Dockerfile
+++ b/cvp/docker/Dockerfile
@@ -27,6 +27,9 @@ FROM ubuntu:14.04
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
# Packaged dependencies
@@ -40,10 +43,20 @@ python-pip \
crudini \
--no-install-recommends
+
+WORKDIR /home
+
RUN pip install --upgrade pip
RUN git config --global http.sslVerify false
-RUN git clone https://github.com/grakiss888/testapi.git /home/testapi
+
+RUN git clone https://gerrit.opnfv.org/gerrit/dovetail.git
+
+WORKDIR /home/dovetail
+RUN git checkout -f $COMMIT_ID
+
+RUN mkdir -p /home/testapi
+RUN cp -rf /home/dovetail/cvp/* /home/testapi
WORKDIR /home/testapi/
RUN pip install -r requirements.txt
diff --git a/cvp/docker/Dockerfile.web b/cvp/docker/Dockerfile.web
index cee1551..b8a3dfc 100644
--- a/cvp/docker/Dockerfile.web
+++ b/cvp/docker/Dockerfile.web
@@ -9,6 +9,8 @@ FROM ubuntu:16.04
MAINTAINER Leo Wang <grakiss.wanglei@huawei.com>
LABEL version="v1" description="CVP nginx"
+ARG BRANCH=master
+ARG COMMIT_ID=master
ENV HOME /home
WORKDIR /home
@@ -17,7 +19,15 @@ RUN apt-get update
RUN apt-get install -y git nginx supervisor
-RUN git clone http://github.com/grakiss888/testapi
+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 mkdir -p /home/testapi
+
+RUN cp -rf /home/dovetail/cvp/* /home/testapi
RUN mkdir /www
RUN cp -r /home/testapi/3rd_party/static /www/