From 5069c5facdfbadbc008a2618c2c1e3249b3e3775 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 8 Apr 2020 17:40:56 +0200 Subject: [PATCH] removed variables again --- config.py | 2 +- docker-compose.yml | 4 ++-- nopaque.env.tpl | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config.py b/config.py index ca4fb620..7289846c 100644 --- a/config.py +++ b/config.py @@ -20,7 +20,7 @@ class Config: ''' ### Opaque ### ''' NOPAQUE_ADMIN = os.environ.get('NOPAQUE_ADMIN') - NOPAQUE_STORAGE = os.environ.get('NOPAQUE_STORAGE') + NOPAQUE_STORAGE = '/mnt/dind_swarm/nopaque' @staticmethod def init_app(app): diff --git a/docker-compose.yml b/docker-compose.yml index 8fbb5333..dd255691 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: - default - reverse-proxy volumes: - - "/mnt/dind_swarm/nopaque:/mnt/nopaque" + - "/mnt/dind_swarm/nopaque:/mnt/dind_swarm/nopaque" - "./app:/home/nopaque/app" - "./logs:/home/nopaque/logs" - "./migrations:/home/nopaque/migrations" @@ -38,7 +38,7 @@ services: - "host.docker.internal:172.17.0.1" image: gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/opaque_daemon:latest volumes: - - "/mnt/dind_swarm/nopaque:/mnt/nopaque" + - "/mnt/dind_swarm/nopaque:/mnt/dind_swarm/nopaque" - "./logs:/home/nopaqued/logs" - "../opaque_daemon/docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh" - "../opaque_daemon/nopaqued.py:/home/nopaqued/nopaqued.py" diff --git a/nopaque.env.tpl b/nopaque.env.tpl index 101fbf64..5197f158 100644 --- a/nopaque.env.tpl +++ b/nopaque.env.tpl @@ -26,5 +26,4 @@ MAIL_DEFAULT_SENDER= ### nopaque ### NOPAQUE_ADMIN= -NOPAQUE_HOST_STORAGE= NOPAQUE_STORAGE=