Commit 193db5d9 authored by Ryan Herbert's avatar Ryan Herbert

docker-compose.yml refactor volumes

Using the "volumes_from" paramter allows us to remove a lot of
redundancy in the docker-compose.yml file.
parent 3efe9126
...@@ -36,10 +36,8 @@ services: ...@@ -36,10 +36,8 @@ services:
fuse: fuse:
image: vidjil:test image: vidjil:test
command: bash /entrypoints/fuse-entrypoint.sh command: bash /entrypoints/fuse-entrypoint.sh
volumes: volumes_from:
- /opt/vidjil/result/results:/mnt/result/results - uwsgi
- /opt/vidjil/result/tmp:/mnt/result/tmp
- /opt/vidjil/upload/uploads:/mnt/upload/uploads
nginx: nginx:
image: vidjil:test image: vidjil:test
depends_on: depends_on:
...@@ -55,12 +53,8 @@ services: ...@@ -55,12 +53,8 @@ services:
workers: workers:
image: vidjil:test image: vidjil:test
command: /usr/local/bin/gosu www-data python /usr/share/vidjil/server/web2py/web2py.py -K vidjil,vidjil,vidjil command: /usr/local/bin/gosu www-data python /usr/share/vidjil/server/web2py/web2py.py -K vidjil,vidjil,vidjil
volumes: volumes_from:
- /opt/vidjil/databases:/usr/share/vidjil/server/web2py/applications/vidjil/databases - uwsgi
- /opt/vidjil/result:/mnt/result
- /opt/vidjil/result/tmp:/mnt/result/tmp
- /opt/vidjil/upload:/mnt/upload
- /opt/vidjil/log:/var/vidjil
depends_on: depends_on:
- uwsgi - uwsgi
- mysql - mysql
...@@ -69,12 +63,9 @@ services: ...@@ -69,12 +63,9 @@ services:
reporter: reporter:
build: ./reporter build: ./reporter
image: reporter:test image: reporter:test
volumes_from:
- uwsgi
volumes: volumes:
- /opt/vidjil/databases:/usr/share/vidjil/server/web2py/applications/vidjil/databases
- /opt/vidjil/result/results:/mnt/result/results
- /opt/vidjil/result/tmp:/mnt/result/tmp
- /opt/vidjil/upload/uploads:/mnt/upload/uploads
- /opt/vidjil/log:/var/vidjil
- ./reporter/code:/opt/reporter - ./reporter/code:/opt/reporter
depends_on: depends_on:
- uwsgi - uwsgi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment