diff options
| author |   Leo wang <grakiss.wanglei@huawei.com> | 2017-10-10 01:53:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-10 01:53:01 +0000 |
| commit | 8b916429666565f5b7b1ffda7dc912addb308152 (patch) | |
| tree | f181b7e15caa496e943934050f613d6d612fc954 | |
| parent | deaa56c739278b52d1b6793b748c761a2a3c9355 (diff) | |
| parent | f3d7d48db89d9c3fbace41eb513e43cc9624ebad (diff) | |
Merge "[web-cvp]fix api&web service in dockerfiles"
| -rw-r--r-- | cvp/docker/Dockerfile | 12 | ||||
| -rw-r--r-- | cvp/docker/Dockerfile.web | 4 |
2 files changed, 10 insertions, 6 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"] diff --git a/cvp/docker/Dockerfile.web b/cvp/docker/Dockerfile.web index b8a3dfc4..9f992df7 100644 --- 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"] |