Improve test, if we're running in docker (#10531)

medusa/__main__.py

@@ -527,7 +527,7 @@ def initialize(self, console_logging=True):
                 app.BRANCH = commit_branch_env
 
             # Asume we only have these environ variables when building a docker container.
-            app.RUNS_IN_DOCKER = os.environ.get('MEDUSA_COMMIT_HASH') and os.environ.get('MEDUSA_COMMIT_BRANCH')
+            app.RUNS_IN_DOCKER = CheckVersion.runs_in_docker()
 
             app.ACTUAL_CACHE_DIR = check_setting_str(app.CFG, 'General', 'cache_dir', 'cache')
 

medusa/updater/version_checker.py

@@ -347,4 +347,17 @@ def runs_in_docker():
         if app.RUNS_IN_DOCKER is not None:
             return app.RUNS_IN_DOCKER
 
-        return os.environ.get('MEDUSA_COMMIT_HASH') and os.environ.get('MEDUSA_COMMIT_BRANCH')
+        try:
+            path = '/.dockerenv'
+            if os.path.isfile(path):
+                app.RUNS_IN_DOCKER = True
+                return True
+        except (EnvironmentError, OSError) as error:
+            log.info(u'Tried to check the path {path} if we are running in a docker container, '
+                     u'but an error occurred: {error}', {'path': path, 'error': error})
+
+        if os.environ.get('MEDUSA_COMMIT_HASH') and os.environ.get('MEDUSA_COMMIT_BRANCH'):
+            app.RUNS_IN_DOCKER = True
+            return True
+
+        return False