Merge pull request #1572 from rkm/issues/1569-docker-perf · precommit/pre-commit@2e0ee5f · GitHub
Skip to content

Commit 2e0ee5f

Browse files
authored
Merge pull request pre-commit#1572 from rkm/issues/1569-docker-perf
remove docker_is_running check from source
2 parents f1de792 + eb8b48a commit 2e0ee5f

4 files changed

Lines changed: 11 additions & 31 deletions

File tree

pre_commit/languages/docker.py

Lines changed: 0 additions & 19 deletions

pre_commit/languages/docker_image.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
from pre_commit.hook import Hook
55
from pre_commit.languages import helpers
6-
from pre_commit.languages.docker import assert_docker_available
76
from pre_commit.languages.docker import docker_cmd
87

98
ENVIRONMENT_DIR = None
@@ -17,6 +16,5 @@ def run_hook(
1716
file_args: Sequence[str],
1817
color: bool,
1918
) -> Tuple[int, bytes]: # pragma: win32 no cover
20-
assert_docker_available()
2119
cmd = docker_cmd() + hook.cmd
2220
return helpers.run_xargs(hook, cmd, file_args, color=color)

testing/util.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,24 @@
55
import pytest
66

77
from pre_commit import parse_shebang
8-
from pre_commit.languages.docker import docker_is_running
8+
from pre_commit.util import CalledProcessError
99
from pre_commit.util import cmd_output
10+
from pre_commit.util import cmd_output_b
1011
from testing.auto_namedtuple import auto_namedtuple
1112

1213

1314
TESTING_DIR = os.path.abspath(os.path.dirname(__file__))
1415

1516

17+
def docker_is_running() -> bool: # pragma: win32 no cover
18+
try:
19+
cmd_output_b('docker', 'ps')
20+
except CalledProcessError: # pragma: no cover
21+
return False
22+
else:
23+
return True
24+
25+
1626
def get_resource_path(path):
1727
return os.path.join(TESTING_DIR, 'resources', path)
1828

tests/languages/docker_test.py

Lines changed: 0 additions & 9 deletions

0 commit comments

Comments
 (0)