From c6c8a775f499735709c47c694d8f2ed2f7d44313 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 2 Dec 2019 16:58:44 +0100 Subject: [PATCH] Update compose files --- docker-compose.yml | 2 +- docker_stack_deploy.yml | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2c04daa4..034448fd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,7 +32,7 @@ services: - /mnt/nopaque:/mnt/nopaque - ./logs:/home/nopaqued/logs - ../opaque_daemon/docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh - - ../opaque_daemon/nopaqued.py:/home/nopaqued/opaque_daemon.py + - ../opaque_daemon/nopaqued.py:/home/nopaqued/nopaqued.py - ../opaque_daemon/merge_corpus_files.py:/home/nopaqued/merge_corpus_files.py - ../opaque_daemon/requirements.txt:/home/nopaqued/requirements.txt - $HOME/.docker/config.json:/home/nopaqued/.docker/config.json diff --git a/docker_stack_deploy.yml b/docker_stack_deploy.yml index 5a5188f3..d650ee0d 100644 --- a/docker_stack_deploy.yml +++ b/docker_stack_deploy.yml @@ -6,10 +6,6 @@ services: placement: constraints: - node.role == manager - labels: - - com.docker.lb.hosts=nopaque - - com.docker.lb.port=8080 - - com.docker.lb.sticky_session_cookie=session env_file: - db.env - web.env @@ -18,7 +14,14 @@ services: - 5000:5000 volumes: - /mnt/nopaque:/mnt/nopaque + - ./app:/home/nopaque/app - ./logs:/home/nopaque/logs + - ./migrations:/home/nopaque/migrations + - ./tests:/home/nopaque/tests + - ./config.py:/home/nopaque/config.py + - ./docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh + - ./nopaque.py:/home/nopaque/nopaque.py + - ./requirements.txt:/home/nopaque/requirements.txt daemon: deploy: placement: @@ -31,6 +34,10 @@ services: volumes: - /mnt/nopaque:/mnt/nopaque - ./logs:/home/nopaqued/logs + - ../opaque_daemon/docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh + - ../opaque_daemon/nopaqued.py:/home/nopaqued/nopaqued.py + - ../opaque_daemon/merge_corpus_files.py:/home/nopaqued/merge_corpus_files.py + - ../opaque_daemon/requirements.txt:/home/nopaqued/requirements.txt - $HOME/.docker/config.json:/home/nopaqued/.docker/config.json db: deploy: