Skip to content

Fix docker based hooks failing on Windows #1094

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 4 commits into from
Jul 25, 2019
Merged

Fix docker based hooks failing on Windows #1094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7ce5db
Use fallback uid and gid if os.getuid() and os.getgid() are unavailable
geieredgar Jul 23, 2019
b43b6a6
Add docker uid and gid fallback tests
geieredgar Jul 23, 2019
a21a4f4
Fix missing create=True attribute in docker tests
geieredgar Jul 23, 2019
d4a9ff4
Simplify docker user fallback implementation and test
geieredgar Jul 25, 2019
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
9 changes: 8 additions & 1 deletion pre_commit/languages/docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,18 @@ def install_environment(
os.mkdir(directory)


def get_docker_user(): # pragma: windows no cover
try:
return '{}:{}'.format(os.getuid(), os.getgid())
except AttributeError:
return '1000:1000'


def docker_cmd(): # pragma: windows no cover
return (
'docker', 'run',
'--rm',
'-u', '{}:{}'.format(os.getuid(), os.getgid()),
'-u', 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
11 changes: 11 additions & 0 deletions tests/languages/docker_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,14 @@ def test_docker_is_running_process_error():
side_effect=CalledProcessError(*(None,) * 4),
):
assert docker.docker_is_running() is False


def test_docker_fallback_user():
def invalid_attribute():
raise AttributeError
with mock.patch.multiple(
'os', create=True,
getuid=invalid_attribute,
getgid=invalid_attribute,
):
assert docker.get_docker_user() == '1000:1000'