Code Review / dovetail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 8c11c76)
[web-cvp]fix api&web service in dockerfiles 55/44555/1
authorgrakiss <grakiss.wanglei@huawei.com>
Mon, 9 Oct 2017 09:23:15 +0000 (05:23 -0400)
committergrakiss <grakiss.wanglei@huawei.com>
Mon, 9 Oct 2017 09:23:15 +0000 (05:23 -0400)
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>
cvp/docker/Dockerfile patch | blob | history
cvp/docker/Dockerfile.web patch | blob | history

diff --git a/cvp/docker/Dockerfile b/cvp/docker/Dockerfile
index fa39ac6..e0cb32f 100644 (file)
--- 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"]
diff --git a/cvp/docker/Dockerfile.web b/cvp/docker/Dockerfile.web
index b8a3dfc..9f992df 100644 (file)
--- a/cvp/docker/Dockerfile.web
+++ b/cvp/docker/Dockerfile.web
@@ -10,7 +10,6 @@ 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
@@ -23,7 +22,7 @@ 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
 
@@ -39,4 +38,5 @@ ADD nginx/sites-enabled/default /etc/nginx/sites-enabled/default
 ADD supervisor/conf.d/nginx.conf /etc/supervisor/conf.d/nginx.conf
 ADD start-nginx.sh /home/start-nginx.sh
 
+WORKDIR /home
 CMD ["bash", "start-nginx.sh"]