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

improve Docker env detection heuristic

Browse source 
With cgroupsv2, /proc/1/cgroup contains only `0::/`.
Use `/.dockerenv` to detect Docker environment
and hostname to detect the current container id.
This commit is contained in:
Cyril Jouve 2025-05-30 15:58:46 +02:00
parent 5f0c773e74
commit 7b1b6604bb
2 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tests/languages/docker_test.py
View file

@ -30,8 +30,13 @@ DOCKER_CGROUP_EXAMPLE = b'''\
0::/system.slice/containerd.service
''' # noqa: E501
DOCKER_CGROUPV2_EXAMPLE = b"""\
0::/
"""
# The ID should match the above cgroup example.
CONTAINER_ID = 'c33988ec7651ebc867cb24755eaf637a6734088bc7eef59d5799293a9e5450f7' # noqa: E501
SHORT_CONTAINER_ID = CONTAINER_ID[:12]
NON_DOCKER_CGROUP_EXAMPLE = b'''\
12:perf_event:/
@ -117,8 +122,17 @@ def test_in_docker_docker_in_file():
assert docker._is_in_docker() is True
def _mock_dockerenv(exists):
return mock.patch('os.path.exists', return_value=exists)
def test_in_docker_cgroupv2():
with _mock_open(DOCKER_CGROUPV2_EXAMPLE), _mock_dockerenv(True):
assert docker._is_in_docker() is True
def test_in_docker_docker_not_in_file():
with _mock_open(NON_DOCKER_CGROUP_EXAMPLE):
with _mock_open(NON_DOCKER_CGROUP_EXAMPLE), _mock_dockerenv(False):
assert docker._is_in_docker() is False
@ -127,8 +141,16 @@ def test_get_container_id():
assert docker._get_container_id() == CONTAINER_ID
def test_get_container_id_cgroupv2():
with _mock_open(DOCKER_CGROUPV2_EXAMPLE), \
mock.patch('socket.gethostname', return_value=SHORT_CONTAINER_ID):
assert docker._get_container_id() == SHORT_CONTAINER_ID
def test_get_container_id_failure():
with _mock_open(b''), pytest.raises(RuntimeError):
with _mock_open(b''), \
mock.patch('socket.gethostname', return_value='foo'), \
pytest.raises(RuntimeError):
docker._get_container_id()