ulysia/szurubooru
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix config.py

Browse source
This commit is contained in:
nothink 2018-07-26 01:53:52 +09:00
parent 8837fe6b92
commit a8adcf6538
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/szurubooru/config.py
View file

@ -23,7 +23,7 @@ def docker_config() -> Dict:
'POSTGRES_HOST', 'POSTGRES_HOST',
'ESEARCH_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') raise errors.ConfigError(f'Environment variable "{key}" not set')
return { return {
'debug': True, 'debug': True,
@ -51,9 +51,7 @@ def read_config() -> Dict:
if os.path.exists('../config.yaml'): if os.path.exists('../config.yaml'):
with open('../config.yaml') as handle: with open('../config.yaml') as handle:
ret = merge(ret, yaml.load(handle.read())) ret = merge(ret, yaml.load(handle.read()))
if os.getenv('CI') == 'true': elif os.path.exists('/.dockerenv') and if os.getenv('CI') != 'true':
pass
elif os.path.exists('/.dockerenv'):
ret = merge(ret, docker_config()) ret = merge(ret, docker_config())
return ret return ret