From 445d1e558952b54fccd5febe20299b7e0e4d3675 Mon Sep 17 00:00:00 2001 From: p0ps Date: Sun, 24 Apr 2022 13:35:54 +0200 Subject: [PATCH] Improve test, if we're running in docker (#10531) --- medusa/__main__.py | 2 +- medusa/updater/version_checker.py | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/medusa/__main__.py b/medusa/__main__.py index 6666c8c206..df4a9c3fda 100755 --- a/medusa/__main__.py +++ b/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') diff --git a/medusa/updater/version_checker.py b/medusa/updater/version_checker.py index dc40dd8f5d..31f58d3533 100644 --- a/medusa/updater/version_checker.py +++ b/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