ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2025-12-16 11:58:43 +00:00
Code Packages Projects Releases Wiki Activity

Improve container detection. (#522) (#524)

Browse Source 
(cherry picked from commit e87b327764)
This commit is contained in:
Felix Fontein 2022-12-06 08:31:25 +01:00 committed by GitHub
parent 5d99e4f61e
commit e2053d7cc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/522-current-image.yml Normal file
View File

@ -0,0 +1,2 @@
bugfixes:
- "current_container_facts - make container detection work better in more cases (https://github.com/ansible-collections/community.docker/pull/522)."

5
plugins/modules/current_container_facts.py
View File

@ -103,10 +103,13 @@ def main():
with open(mountinfo_path, 'rb') as f:
contents = f.read().decode('utf-8')
# As to why this works, see the explanations by Matt Clay in
# https://github.com/ansible/ansible/blob/80d2f8da02052f64396da6b8caaf820eedbf18e2/test/lib/ansible_test/_internal/docker_util.py#L571-L610
for line in contents.splitlines():
parts = line.split()
if len(parts) >= 5 and parts[4] == '/etc/hostname':
m = re.match('.*/docker/containers/([a-f0-9]+)/hostname', parts[3])
m = re.match('.*/([a-f0-9]{64})/hostname$', parts[3])
if m:
container_id = m.group(1)
container_type = 'docker'