Skip to content

Don't use --user when running docker on windows #1371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asottile merged 1 commit into from
Mar 20, 2020
Merged

Don't use --user when running docker on windows #1371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pre_commit/languages/docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Comment thread
asottile marked this conversation as resolved.
*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.
Expand Down
2 changes: 1 addition & 1 deletion tests/languages/docker_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ def invalid_attribute():
getuid=invalid_attribute,
getgid=invalid_attribute,
):
assert docker.get_docker_user() == '1000:1000'
assert docker.get_docker_user() == ()