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

DANGER: checking dockerenv

Browse source
This commit is contained in:
nothink 2018-07-25 23:12:01 +09:00
parent 22a6859cb5
commit d4dabb60bf
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -25,9 +25,7 @@ matrix:
- pip install -r requirements.txt - pip install -r requirements.txt
- pip install -r dev-requirements.txt - pip install -r dev-requirements.txt
script: script:
- sudo cat /.dockerenv # - pycodestyle szurubooru/
- sudo rm /.dockerenv
- pycodestyle szurubooru/
- ./wait-for-es - ./wait-for-es
- alembic upgrade head - alembic upgrade head
- py.test - py.test

4
server/szurubooru/config.py
View file

@ -51,8 +51,8 @@ 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'): # if os.path.exists('/.dockerenv'):
ret = merge(ret, docker_config()) # ret = merge(ret, docker_config())
return ret return ret