diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-10-05 16:05:20 -0700 |
|---|---|---|
| committer | Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-10-08 17:03:33 -0700 |
| commit | 6d4019e59eda897384e9c00d1daf8b2ce87d128f (patch) | |
| tree | 8e1b8d419007f941d2cbbb1ce763866b55c7865c /docker-compose.yml | |
| parent | 245bde8fc320c47061de3898379c20496848740c (diff) | |
Development Override Compose File
Now that images are built and hosted for the dashboard and worker
container the compose file can reference upstream images instead of
ones locally built.
A second compose file is added which overrides compose configuration so
that images are built locally.
Initial commands for running the container are moved into 'init.sh'
which gets copied into the image, since the current images cannot be ran
by themselves as they require the command listed in the compose file.
The compose version bumped from 2 to 3 as there are no version 2
specific features being used that need to be modified.
Change-Id: I23813a859a676ba009cba8f5a62b7153da006eef
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 4e57ff3..19e9afd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,9 +7,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## - - -version: '2' +version: '3' services: nginx: restart: always @@ -19,27 +17,23 @@ services: - "80:80" volumes: - ./config/nginx:/etc/nginx/conf.d - - /var/lib/pharos_dashboard/static:/static - - /var/lib/pharos_dashboard/media:/media + - pharos-static:/static:ro + - pharos-media:/media depends_on: - web web: + image: opnfv/pharos-tools-laas-dashboard:latest restart: always - build: ./web/ container_name: dg01 - # yamllint disable rule:line-length - command: bash -c "python manage.py migrate && python manage.py collectstatic --no-input && gunicorn pharos_dashboard.wsgi -b 0.0.0.0:8000" - # yamllint enable rule:line-length depends_on: - postgres links: - postgres env_file: config.env volumes: - - ./:/pharos_dashboard - - /var/lib/pharos_dashboard/static:/static - - /var/lib/pharos_dashboard/media:/media + - pharos-static:/pharos_dashboard/static/ + - pharos-media:/pharos_dashboard/media/ expose: - "8000" @@ -59,17 +53,14 @@ services: - "5672:5672" worker: + image: opnfv/pharos-tools-laas-celery:latest restart: always - build: ./worker/ - # yamllint disable rule:line-length - command: bash -c "celery -A pharos_dashboard worker -l info -B --schedule=~/celerybeat-schedule" - # yamllint enable rule:line-length env_file: config.env links: - postgres - rabbitmq - volumes: - - ./:/pharos_dashboard volumes: + pharos-media: + pharos-static: pharos-data: external: true |