diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-02-20 09:58:38 -0800 |
|---|---|---|
| committer |   Georg Kunz <georg.kunz@ericsson.com> | 2018-02-28 14:49:30 +0000 |
| commit | 40932193dd77dbe9f0387c819fec85c303c8927e (patch) | |
| tree | 5dcb9641456933567c1ebff87f4d211adee11b9c /cvp/docker/docker-compose.yml | |
| parent | 53dacb0fc00d84b25d22352fd7207e7677dddc35 (diff) | |
Update CVP Docker Compose Configuration
- Uses extra files config.env, vhost.env to hold environment variables
for docker configuration.
- Provides samples for these config that can be copied and modified to
fit deployment requirements.
- Updates the docker images to the newest releases.
Change-Id: Ibe9b8597edfb38940297433708497c244200d0af
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Diffstat (limited to 'cvp/docker/docker-compose.yml')
| -rw-r--r-- | cvp/docker/docker-compose.yml | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/cvp/docker/docker-compose.yml b/cvp/docker/docker-compose.yml index 2b9958e6..55eb58d0 100644 --- a/cvp/docker/docker-compose.yml +++ b/cvp/docker/docker-compose.yml @@ -4,9 +4,8 @@ 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 + env_file: + - config.env volumes: - cvp-testapi-logs:/home/testapi/logs links: @@ -21,12 +20,12 @@ services: expose: - "27017" web: - image: opnfv/dovetail:web.cvp.0.7.0 + image: opnfv/dovetail:web.ovp.1.0.0 container_name: cvp-web restart: always - environment: - - testapi_url=testapi:8010 - - VIRTUAL_HOST=cvp.opnfv.org + env_file: + - config.env + - vhost.env volumes: - cvp-testapi-logs:/home/testapi/logs links: @@ -36,11 +35,10 @@ services: ports: - "8000:8000" cvpapi: - image: opnfv/dovetail:api.cvp.0.7.0 + image: opnfv/dovetail:api.ovp.1.0.0 container_name: cvp-cvpapi - environment: - - mongodb_url=mongodb://mongodb:27017/ - - base_url=https://cvp.opnfv.org + env_file: + - config.env volumes: - cvp-testapi-logs:/home/testapi/logs ports: |