diff options
| author |   xudan <xudan16@huawei.com> | 2018-07-08 23:45:44 -0400 |
|---|---|---|
| committer | xudan <xudan16@huawei.com> | 2018-07-10 21:25:17 -0400 |
| commit | 149035093cac02a047aaa0436487ca67e95da0d9 (patch) | |
| tree | ae9d1f9f2659d8b6ce1397be230167cf84220227 /docker | |
| parent | b3e40f026d655501bfa581452c447784604ecb05 (diff) | |
Update the dockerfile for 2 docker images
1. Update the Dockerfile for 2 docker images
2. Update the docker-compose.yml with the new docker repo
JIRA: DOVETAIL-671
Change-Id: Idd0d676568a3aa2a63a1429288f984618281e13a
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile.api (renamed from docker/Dockerfile) | 10 | ||||
| -rw-r--r-- | docker/Dockerfile.web | 8 | ||||
| -rw-r--r-- | docker/docker-compose.yml | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile.api index f71423f..a577a49 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile.api @@ -25,7 +25,7 @@ FROM ubuntu:14.04 MAINTAINER SerenaFeng <feng.xiaowei@zte.com.cn> -LABEL version="v1" description="OPNFV TestAPI Docker container" +LABEL version="v2" description="API for OVP web portal backend" ARG BRANCH=master @@ -54,16 +54,16 @@ WORKDIR /home RUN git config --global http.sslVerify false -RUN git clone https://gerrit.opnfv.org/gerrit/dovetail.git +RUN git clone https://gerrit.opnfv.org/gerrit/dovetail-webportal -WORKDIR /home/dovetail +WORKDIR /home/dovetail-webportal RUN git checkout -f $BRANCH RUN mkdir -p /home/testapi RUN mkdir -p /home/testapi/logs/api -RUN cp -rf /home/dovetail/cvp/* /home/testapi +RUN cp -rf /home/dovetail-webportal/* /home/testapi -WORKDIR /home/dovetail/cvp +WORKDIR /home/dovetail-webportal RUN pip install -r requirements.txt RUN bash install.sh diff --git a/docker/Dockerfile.web b/docker/Dockerfile.web index 9f992df..438ada6 100644 --- a/docker/Dockerfile.web +++ b/docker/Dockerfile.web @@ -7,7 +7,7 @@ FROM ubuntu:16.04 MAINTAINER Leo Wang <grakiss.wanglei@huawei.com> -LABEL version="v1" description="CVP nginx" +LABEL version="v2" description="OVP nginx" ARG BRANCH=master @@ -19,14 +19,14 @@ RUN apt-get update RUN apt-get install -y git nginx supervisor RUN git config --global http.sslVerify false -RUN git clone https://gerrit.opnfv.org/gerrit/dovetail.git +RUN git clone https://gerrit.opnfv.org/gerrit/dovetail-webportal -WORKDIR /home/dovetail +WORKDIR /home/dovetail-webportal RUN git checkout -f $BRANCH RUN mkdir -p /home/testapi -RUN cp -rf /home/dovetail/cvp/* /home/testapi +RUN cp -rf /home/dovetail-webportal/* /home/testapi RUN mkdir /www RUN cp -r /home/testapi/3rd_party/static /www/ diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index a5da0b9..ca0f36d 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -20,7 +20,7 @@ services: expose: - "27017" web: - image: opnfv/dovetail:web.ovp.1.1.2 + image: opnfv/dovetail-webportal-web:latest container_name: cvp-web restart: always env_file: @@ -35,7 +35,7 @@ services: ports: - "8000:8000" cvpapi: - image: opnfv/dovetail:api.ovp.1.1.2 + image: opnfv/dovetail-webportal-api:latest container_name: cvp-cvpapi env_file: - config.env |