summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo wang <grakiss.wanglei@huawei.com>2017-09-29 06:15:08 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-29 06:15:08 +0000
commit35a3158bcbe5a60928101d5c125e4540452e3876 (patch)
tree2517d664e3545fde0a633dd9b7dd409c4f742a74
parent98e068ebee68513afc2b25acaa0c9112f447b80b (diff)
parent07c661e5752524b1782cf11998e4b93e11783720 (diff)
Merge "[cvp-web]remove useless docker-compose yaml"
-rw-r--r--cvp/docker/docker-compose.yml14
-rw-r--r--cvp/docker/docker-compose.yml.new60
2 files changed, 7 insertions, 67 deletions
diff --git a/cvp/docker/docker-compose.yml b/cvp/docker/docker-compose.yml
index 1825f02..2b9958e 100644
--- 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
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: