[cvp-web]remove useless docker-compose yaml

JIRA: DOVETAIL-514

remove useless docker-compose yaml

Change-Id: Ic754488611571c3464515772680ad94bbe5651ea
Signed-off-by: grakiss <grakiss.wanglei@huawei.com>

diff --git a/cvp/docker/docker-compose.yml b/cvp/docker/docker-compose.yml
index 1825f02..2b9958e 100644 (file)
--- a/cvp/docker/docker-compose.yml
+++ b/cvp/docker/docker-compose.yml
@@ -1,12 +1,12 @@
 ---
-version: '2'
+version: '3'
 services:
     testapi:
-        image: opnfv/testapi:latest
+        image: opnfv/testapi:cvp.0.5.0
         container_name: cvp-testapi
         environment:
             - mongodb_url=mongodb://mongodb:27017/
-            - base_url=http://116.66.187.136:9999
+            - base_url=https://cvp.opnfv.org
         volumes:
             - cvp-testapi-logs:/home/testapi/logs
         links:
@@ -21,12 +21,12 @@ services:
         expose:
             - "27017"
     web:
-        image: opnfv/dovetail:web.cvp.latest
+        image: opnfv/dovetail:web.cvp.0.7.0
         container_name: cvp-web
         restart: always
         environment:
             - testapi_url=testapi:8010
-#            - VIRTUAL_HOST=cvp.opnfv.org
+            - VIRTUAL_HOST=cvp.opnfv.org
         volumes:
             - cvp-testapi-logs:/home/testapi/logs
         links:
@@ -36,11 +36,11 @@ services:
         ports:
             - "8000:8000"
     cvpapi:
-        image: opnfv/dovetail:api.cvp.latest
+        image: opnfv/dovetail:api.cvp.0.7.0
         container_name: cvp-cvpapi
         environment:
             - mongodb_url=mongodb://mongodb:27017/
-            - base_url=http://116.66.187.136:9999
+            - base_url=https://cvp.opnfv.org
         volumes:
             - cvp-testapi-logs:/home/testapi/logs
         ports:

diff --git a/cvp/docker/docker-compose.yml.new b/cvp/docker/docker-compose.yml.new
deleted file mode 100644 (file)
index a1312fd..0000000
--- a/cvp/docker/docker-compose.yml.new
+++ /dev/null
@@ -1,60 +0,0 @@
----
-version: '3'
-services:
-    testapi:
-        image: opnfv/testapi:cvp.0.5.0
-        container_name: cvp-testapi
-        environment:
-            - mongodb_url=mongodb://mongodb:27017/
-            - base_url=https://cvp.opnfv.org
-        volumes:
-            - cvp-testapi-logs:/home/testapi/logs
-        links:
-            - mongodb
-        ports:
-            - "8010:8010"
-    mongodb:
-        image: mongo:3.2.1
-        container_name: cvp-db
-        volumes:
-            - cvp-db:/data/db
-        expose:
-            - "27017"
-    web:
-        image: opnfv/dovetail:web.cvp.0.6.1
-        container_name: cvp-web
-        restart: always
-        environment:
-            - testapi_url=testapi:8010
-            - VIRTUAL_HOST=cvp.opnfv.org
-        volumes:
-            - cvp-testapi-logs:/home/testapi/logs
-        links:
-            - mongodb
-            - testapi
-            - cvpapi
-        ports:
-            - "8000:8000"
-    cvpapi:
-        image: opnfv/dovetail:api.cvp.0.6.1
-        container_name: cvp-cvpapi
-        environment:
-            - mongodb_url=mongodb://mongodb:27017/
-            - base_url=https://cvp.opnfv.org
-        volumes:
-            - cvp-testapi-logs:/home/testapi/logs
-        ports:
-            - "8011:8011"
-    nginx:
-        image: jwilder/nginx-proxy
-        container_name: cvp-nginx
-        volumes:
-            - /var/run/docker.sock:/tmp/docker.sock:ro
-        depends_on:
-            - web
-        ports:
-            - "80:80"
-
-volumes:
-    cvp-db:
-    cvp-testapi-logs: