the -u option is not necessary on a rootless environment (rewrite by hroncok)

This commit is contained in:
Fabrice Flore-Thébault 2020-06-03 17:45:44 +02:00
parent 5c1cd8168a
commit a8887d2cfe

View file

@ -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