DANGER: checking dockerenv

.travis.yml

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

server/szurubooru/config.py

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