diff --git a/.travis.yml b/.travis.yml index 284f78ec..a54c7e82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,8 +29,6 @@ matrix: - sed -i -e 's/^#database:$/database:\ postgres:\/\/szuru:dog@localhost:5432\/szuru_test/' ../config.yaml - sed -i -e 's/^#elasticsearch:/elasticsearch:/' ../config.yaml - sed -i -e 's/^# / /' ../config.yaml - - printenv TRAVIS - - printenv CI install: - pip install -r requirements.txt - pip install -r dev-requirements.txt diff --git a/server/szurubooru/config.py b/server/szurubooru/config.py index ea9aff4d..dd906722 100644 --- a/server/szurubooru/config.py +++ b/server/szurubooru/config.py @@ -51,7 +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.path.exists('/.dockerenv') and os.getenv('CI', '') == 'true': + if os.path.exists('/.dockerenv') and os.getenv('CI', '') != 'true': ret = merge(ret, docker_config()) return ret