third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-04-16 02:21:46 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improving DinD detection

Browse source
This commit is contained in:
Jiri Tyr 2022-02-09 23:12:09 +00:00
parent 7858ad066f
commit 039db10d86
2 changed files with 43 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pre_commit/languages/docker.py
View file

@ -22,7 +22,17 @@ healthy = helpers.basic_healthy
def _is_in_docker() -> bool: def _is_in_docker() -> bool:
try: try:
with open('/proc/1/cgroup', 'rb') as f: with open('/proc/1/cgroup', 'rb') as f:
return b'docker' in f.read() for line in f.readlines():
if b'docker' in line:
break
else:
_, name, path = line.strip().split(b':')
if name == b'cpuset' and len(os.path.basename(path)) == 64:
break
else:
return False
return True
except FileNotFoundError: except FileNotFoundError:
return False return False

38
tests/languages/docker_test.py
View file

@ -12,7 +12,7 @@ import pytest
from pre_commit.languages import docker from pre_commit.languages import docker
from pre_commit.util import CalledProcessError from pre_commit.util import CalledProcessError
DOCKER_CGROUP_EXAMPLE = b'''\ DOCKER_CGROUP_EXAMPLE1 = b'''\
12:hugetlb:/docker/c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7 12:hugetlb:/docker/c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7
11:blkio:/docker/c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7 11:blkio:/docker/c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7
10:freezer:/docker/c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7 10:freezer:/docker/c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7
@ -28,7 +28,23 @@ DOCKER_CGROUP_EXAMPLE = b'''\
0::/system.slice/containerd.service 0::/system.slice/containerd.service
''' # noqa: E501 ''' # noqa: E501
# The ID should match the above cgroup example. DOCKER_CGROUP_EXAMPLE2 = b'''\
12:blkio:/actions_job/c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7
11:memory:/actions_job/c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7
10:hugetlb:/actions_job/c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7
9:devices:/actions_job/c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7
8:freezer:/actions_job/c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7
7:cpu,cpuacct:/actions_job/c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7
6:cpuset:/actions_job/c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7
5:pids:/actions_job/c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7
4:net_cls,net_prio:/actions_job/c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7
3:perf_event:/actions_job/c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7
2:rdma:/
1:name=systemd:/actions_job/c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7
0::/system.slice/containerd.service
''' # noqa: E501
# The ID should match the above cgroup examples.
CONTAINER_ID = 'c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7' # noqa: E501 CONTAINER_ID = 'c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7' # noqa: E501
NON_DOCKER_CGROUP_EXAMPLE = b'''\ NON_DOCKER_CGROUP_EXAMPLE = b'''\
@ -74,8 +90,13 @@ def _mock_open(data):
) )
def test_in_docker_docker_in_file(): def test_in_docker_docker_in_file1():
with _mock_open(DOCKER_CGROUP_EXAMPLE): with _mock_open(DOCKER_CGROUP_EXAMPLE1):
assert docker._is_in_docker() is True
def test_in_docker_docker_in_file2():
with _mock_open(DOCKER_CGROUP_EXAMPLE2):
assert docker._is_in_docker() is True assert docker._is_in_docker() is True
@ -84,8 +105,13 @@ def test_in_docker_docker_not_in_file():
assert docker._is_in_docker() is False assert docker._is_in_docker() is False
def test_get_container_id(): def test_get_container_id1():
with _mock_open(DOCKER_CGROUP_EXAMPLE): with _mock_open(DOCKER_CGROUP_EXAMPLE1):
assert docker._get_container_id() == CONTAINER_ID
def test_get_container_id2():
with _mock_open(DOCKER_CGROUP_EXAMPLE2):
assert docker._get_container_id() == CONTAINER_ID assert docker._get_container_id() == CONTAINER_ID