ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2026-07-29 11:55:04 +00:00
Code Packages Projects Releases Wiki Activity

docker_container: do not send wrong host IP for duplicate ports (#1214) (#1215)

Browse Source 
* DRY.

* Port spec can be a list of port specs.

* Add changelog fragment.

* Add test.

(cherry picked from commit 846fc8564b)
This commit is contained in:
Felix Fontein
2025-11-26 08:08:38 +01:00
committed by GitHub
parent a049898f19
commit dc0a554966
3 changed files with 73 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/module_utils/module_container/docker_api.py
+18 -10
View File
@@ -23,6 +23,7 @@ from ansible_collections.community.docker.plugins.module_utils._platform import
)
from ansible_collections.community.docker.plugins.module_utils.module_container.base import (
_DEFAULT_IP_REPLACEMENT_STRING,
OPTION_AUTO_REMOVE,
OPTION_BLKIO_WEIGHT,
OPTION_CAPABILITIES,
@@ -117,9 +118,6 @@ from ansible_collections.community.docker.plugins.module_utils._api.utils.utils
)
_DEFAULT_IP_REPLACEMENT_STRING = '[[DEFAULT_IP:iewahhaeB4Sae6Aen8IeShairoh4zeph7xaekoh8Geingunaesaeweiy3ooleiwi]]'
def _get_ansible_type(type):
if type == 'set':
return 'list'
@@ -1270,16 +1268,26 @@ def _preprocess_value_ports(module, client, api_version, options, values):
if 'published_ports' not in values:
return values
found = False
for port_spec in values['published_ports'].values():
if port_spec[0] == _DEFAULT_IP_REPLACEMENT_STRING:
found = True
break
for port_specs in values["published_ports"].values():
if not isinstance(port_specs, list):
port_specs = [port_specs]
for port_spec in port_specs:
if port_spec[0] == _DEFAULT_IP_REPLACEMENT_STRING:
found = True
break
if not found:
return values
default_ip = _get_default_host_ip(module, client)
for port, port_spec in values['published_ports'].items():
if port_spec[0] == _DEFAULT_IP_REPLACEMENT_STRING:
values['published_ports'][port] = tuple([default_ip] + list(port_spec[1:]))
for port, port_specs in values["published_ports"].items():
if isinstance(port_specs, list):
for index, port_spec in enumerate(port_specs):
if port_spec[0] == _DEFAULT_IP_REPLACEMENT_STRING:
port_specs[index] = tuple([default_ip] + list(port_spec[1:]))
else:
if port_specs[0] == _DEFAULT_IP_REPLACEMENT_STRING:
values["published_ports"][port] = tuple(
[default_ip] + list(port_specs[1:])
)
return values