ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2026-09-12 19:07:24 +00:00
Code Packages Projects Releases Wiki Activity

Make sure plugins/module_utils/socket_handler.py works when Docker SDK for Python is not installed. (#620)

Browse Source
This commit is contained in:
Felix Fontein
2023-05-15 21:43:31 +02:00
committed by GitHub
parent 7bdb2127e0
commit d7f7e44b9e
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelogs/fragments/620-bugfixes.yml
+2
View File
@@ -0,0 +1,2 @@
bugfixes:
- "socket_handler module utils - make sure this fully works when Docker SDK for Python is not available (https://github.com/ansible-collections/community.docker/pull/620)."
plugins/module_utils/socket_handler.py
+2 -6
View File
@@ -9,15 +9,11 @@ __metaclass__ = type
import os import os
import os.path import os.path
import socket as pysocket import socket as pysocket
import struct
from ansible.module_utils.six import PY2 from ansible.module_utils.six import PY2
try: from ansible_collections.community.docker.plugins.module_utils._api.utils import socket as docker_socket
from docker.utils import socket as docker_socket
import struct
except Exception:
# missing Docker SDK for Python handled in ansible_collections.community.docker.plugins.module_utils.common
pass
from ansible_collections.community.docker.plugins.module_utils.socket_helper import ( from ansible_collections.community.docker.plugins.module_utils.socket_helper import (
make_unblocking, make_unblocking,