mirror/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-01-14 21:10:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1371 from killuazhu/windows-no-user

Browse Source 
Don't use --user when running docker on windows
This commit is contained in:
Anthony Sottile
2020-03-20 08:27:07 -07:00
committed by GitHub
parent bb6f1efe63 23d5b78fdb
commit 528c7afd18
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pre_commit/languages/docker.py
View File

@@ -76,18 +76,18 @@ def install_environment(
os.mkdir(directory)
def get_docker_user() -> str: # pragma: win32 no cover
def get_docker_user() -> Tuple[str, ...]: # pragma: win32 no cover
try:
return f'{os.getuid()}:{os.getgid()}'
return ('-u', f'{os.getuid()}:{os.getgid()}')
except AttributeError:
return '1000:1000'
return ()
def docker_cmd() -> Tuple[str, ...]: # pragma: win32 no cover
return (
'docker', 'run',
'--rm',
'-u', get_docker_user(),
*get_docker_user(),
# https://docs.docker.com/engine/reference/commandline/run/#mount-volumes-from-container-volumes-from
# The `Z` option tells Docker to label the content with a private
# unshared label. Only the current container can use a private volume.

2
tests/languages/docker_test.py
View File

@@ -20,4 +20,4 @@ def test_docker_fallback_user():
getuid=invalid_attribute,
getgid=invalid_attribute,
):
assert docker.get_docker_user() == '1000:1000'
assert docker.get_docker_user() == ()