From a8887d2cfe3c5a1c1fb29b5029162e575bc49093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Flore-Th=C3=A9bault?= Date: Wed, 3 Jun 2020 17:45:44 +0200 Subject: [PATCH] the -u option is not necessary on a rootless environment (rewrite by hroncok) --- pre_commit/languages/docker.py | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pre_commit/languages/docker.py b/pre_commit/languages/docker.py index 9f2e137f..e3970f49 100644 --- a/pre_commit/languages/docker.py +++ b/pre_commit/languages/docker.py @@ -78,22 +78,15 @@ def install_environment( def get_docker_user() -> Tuple[str, ...]: # pragma: win32 no cover - try: - rootless = False - output = subprocess.check_output(('docker', 'system', 'info'), text=True) - for line in output.splitlines(): - # rootless docker has "rootless" - # rootless podman has "rootless: true" - if line.strip().startswith('rootless'): - if not 'false' in line: - rootless = True - break - if not rootless: - return ('-u', f'{os.getuid()}:{os.getgid()}') - else: - return() - except AttributeError: - return () + output = subprocess.check_output(('docker', 'system', 'info'), text=True) + for line in output.splitlines(): + # rootless docker has "rootless" + # rootless podman has "rootless: true" + if line.strip().startswith('rootless'): + if not 'false' in line: + return () # no -u for rootless + break + return ('-u', f'{os.getuid()}:{os.getgid()}') def docker_cmd() -> Tuple[str, ...]: # pragma: win32 no cover