Merge .env files and add docker configurations for the nopaqued service.

This commit is contained in:
Patrick Jentsch
2020-01-06 09:36:51 +01:00
parent 852c8a22a6
commit 54b431c70c
6 changed files with 30 additions and 30 deletions

View File

@ -7,9 +7,7 @@ services:
depends_on:
- db
- redis
env_file:
- db.env
- web.env
env_file: nopaque.env
image: gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/opaque:development
volumes:
- /mnt/nopaque:/mnt/nopaque
@ -24,9 +22,7 @@ services:
daemon:
depends_on:
- db
env_file:
- db.env
- web.env
env_file: nopaque.env
extra_hosts:
- "host.docker.internal:172.17.0.1"
image: gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/opaque_daemon:latest
@ -39,7 +35,7 @@ services:
- ../opaque_daemon/requirements.txt:/home/nopaqued/requirements.txt
- $HOME/.docker:/home/nopaqued/.docker
db:
env_file: db.env
env_file: nopaque.env
image: postgres:11
volumes:
- /srv/nopaque/database:/var/lib/postgresql/data