Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

This commit is contained in:
Patrick Jentsch 2019-12-05 16:06:00 +01:00
commit c9a5139a56

View File

@ -51,7 +51,7 @@ services:
- ../opaque_daemon/nopaqued.py:/home/nopaqued/nopaqued.py - ../opaque_daemon/nopaqued.py:/home/nopaqued/nopaqued.py
- ../opaque_daemon/merge_corpus_files.py:/home/nopaqued/merge_corpus_files.py - ../opaque_daemon/merge_corpus_files.py:/home/nopaqued/merge_corpus_files.py
- ../opaque_daemon/requirements.txt:/home/nopaqued/requirements.txt - ../opaque_daemon/requirements.txt:/home/nopaqued/requirements.txt
- $HOME/.docker/config.json:/home/nopaqued/.docker/config.json - $HOME/.docker:/home/nopaqued/.docker
db: db:
env_file: db.env env_file: db.env
image: postgres:11 image: postgres:11