From a8adcf65387356d8a36c730539deba0e2ec7c1aa Mon Sep 17 00:00:00 2001 From: nothink Date: Thu, 26 Jul 2018 01:53:52 +0900 Subject: [PATCH] Fix config.py --- server/szurubooru/config.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/server/szurubooru/config.py b/server/szurubooru/config.py index b13a04a2..b3a2bbff 100644 --- a/server/szurubooru/config.py +++ b/server/szurubooru/config.py @@ -23,7 +23,7 @@ def docker_config() -> Dict: 'POSTGRES_HOST', 'ESEARCH_HOST' ]: - if not os.getenv(key, False): + if not os.getenv(key, False) and if os.getenv('CI') != 'true': raise errors.ConfigError(f'Environment variable "{key}" not set') return { 'debug': True, @@ -51,9 +51,7 @@ def read_config() -> Dict: if os.path.exists('../config.yaml'): with open('../config.yaml') as handle: ret = merge(ret, yaml.load(handle.read())) - if os.getenv('CI') == 'true': - pass - elif os.path.exists('/.dockerenv'): + elif os.path.exists('/.dockerenv') and if os.getenv('CI') != 'true': ret = merge(ret, docker_config()) return ret