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

Check Travis-CI env

Browse source
This commit is contained in:
nothink 2018-07-26 00:17:24 +09:00
parent 44be726dbb
commit 60ecc3dccf
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/szurubooru/config.py
View file

@ -51,7 +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.path.exists('/.dockerenv') and not os.getenv('CI', False): if os.path.exists('/.dockerenv') and os.getenv('CI', '') == 'true':
ret = merge(ret, docker_config()) ret = merge(ret, docker_config())
return ret return ret