From db41b9fbce9613dcc9c600b9a32b18e34bd171b6 Mon Sep 17 00:00:00 2001
From: nothink <nothing@yasagure.jp>
Date: Wed, 1 Aug 2018 13:31:07 +0900
Subject: [PATCH] Remove CI checking from config.py

---
 .travis.yml                 | 12 ++----------
 server/szurubooru/config.py |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1505c2ff..ef654a6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,12 @@ services:
 
 matrix:
   include:
-    - language: python          # Backend test for on-premise
+    - language: python
       python:
         - "3.6"
       allow_failures:
         - python: "3.6"
-      name: ""
+      name: "Backend test for on-premise / 3.6"
       before_install:
         - sudo apt-get -y install software-properties-common
         - sudo add-apt-repository -y ppa:mc3man/trusty-media
@@ -35,7 +35,6 @@ matrix:
         - pip install -r requirements.txt
         - pip install -r dev-requirements.txt
       script:
-#        - pycodestyle wait-for-es generate-thumb szurubooru/
         - ./wait-for-es
         - alembic upgrade head
         - py.test
@@ -67,17 +66,10 @@ matrix:
         - pip install -r requirements.txt
         - pip install -r dev-requirements.txt
       script:
-#        - pycodestyle wait-for-es generate-thumb szurubooru/
         - ./wait-for-es
         - alembic upgrade head
         - py.test
 
-    - language: python
-      python:
-        - "3.6"
-      script:
-        - sudo cat /.dockerenv
-
     - language: node_js          # Frontend test using npm
       node_js:
         - "9"
diff --git a/server/szurubooru/config.py b/server/szurubooru/config.py
index d7d34852..a8f87921 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'):
             ret = merge(ret, docker_config())
 
         return ret