From 7c16c3e53ffffc39d792dfd984bc470b494bc48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Flore-Th=C3=A9bault?= Date: Tue, 2 Jun 2020 14:48:23 +0200 Subject: [PATCH] fix #1243 - the -u option is not necessary on podman --- pre_commit/languages/docker.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pre_commit/languages/docker.py b/pre_commit/languages/docker.py index 4091492c..b0b7727f 100644 --- a/pre_commit/languages/docker.py +++ b/pre_commit/languages/docker.py @@ -1,5 +1,6 @@ import hashlib import os +import subprocess from typing import Sequence from typing import Tuple @@ -78,7 +79,11 @@ def install_environment( def get_docker_user() -> Tuple[str, ...]: # pragma: win32 no cover try: - return ('-u', f'{os.getuid()}:{os.getgid()}') + ver_cmd = 'docker', '--version' + if subprocess.check_output(ver_cmd).startswith(b'podman version '): + return () + else: + return ('-u', f'{os.getuid()}:{os.getgid()}') except AttributeError: return ()