diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 08:09:14 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 08:09:22 +0000 |
| commit | 7a65023094f5782dc4f87797cd5da92d2f0f57de (patch) | |
| tree | 74916a6d76bef9cc2db54e0fa34c46e734256378 /pre_commit | |
| parent | Releasing debian version 3.6.2-1. (diff) | |
| download | pre-commit-7a65023094f5782dc4f87797cd5da92d2f0f57de.tar.xz pre-commit-7a65023094f5782dc4f87797cd5da92d2f0f57de.zip | |
Merging upstream version 3.7.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'pre_commit')
| -rw-r--r-- | pre_commit/commands/run.py | 2 | ||||
| -rw-r--r-- | pre_commit/languages/docker.py | 9 | ||||
| -rw-r--r-- | pre_commit/languages/docker_image.py | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/pre_commit/commands/run.py b/pre_commit/commands/run.py index 076f16d..2a08dff 100644 --- a/pre_commit/commands/run.py +++ b/pre_commit/commands/run.py @@ -298,7 +298,7 @@ def _run_hooks( verbose=args.verbose, use_color=args.color, ) retval |= current_retval - if retval and (config['fail_fast'] or hook.fail_fast): + if current_retval and (config['fail_fast'] or hook.fail_fast): break if retval and args.show_diff_on_failure and prior_diff: if args.all_files: diff --git a/pre_commit/languages/docker.py b/pre_commit/languages/docker.py index 2632851..4de1d58 100644 --- a/pre_commit/languages/docker.py +++ b/pre_commit/languages/docker.py @@ -108,10 +108,15 @@ def get_docker_user() -> tuple[str, ...]: # pragma: win32 no cover return () -def docker_cmd() -> tuple[str, ...]: # pragma: win32 no cover +def get_docker_tty(*, color: bool) -> tuple[str, ...]: # pragma: win32 no cover # noqa: E501 + return (('--tty',) if color else ()) + + +def docker_cmd(*, color: bool) -> tuple[str, ...]: # pragma: win32 no cover return ( 'docker', 'run', '--rm', + *get_docker_tty(color=color), *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 @@ -139,7 +144,7 @@ def run_hook( entry_tag = ('--entrypoint', entry_exe, docker_tag(prefix)) return lang_base.run_xargs( - (*docker_cmd(), *entry_tag, *cmd_rest), + (*docker_cmd(color=color), *entry_tag, *cmd_rest), file_args, require_serial=require_serial, color=color, diff --git a/pre_commit/languages/docker_image.py b/pre_commit/languages/docker_image.py index a1a2c16..60caa10 100644 --- a/pre_commit/languages/docker_image.py +++ b/pre_commit/languages/docker_image.py @@ -23,7 +23,7 @@ def run_hook( require_serial: bool, color: bool, ) -> tuple[int, bytes]: # pragma: win32 no cover - cmd = docker_cmd() + lang_base.hook_cmd(entry, args) + cmd = docker_cmd(color=color) + lang_base.hook_cmd(entry, args) return lang_base.run_xargs( cmd, file_args, |