mirror of
https://github.com/ansible-collections/community.docker.git
synced 2025-12-16 11:58:43 +00:00
Compare commits
No commits in common. "dc0a5549669a6f3b60056c6f17fa2c97ab5d221a" and "1edfa73f4b819fb262775618e0771cf80777cd2f" have entirely different histories.
dc0a554966
...
1edfa73f4b
@ -1,3 +0,0 @@
|
|||||||
bugfixes:
|
|
||||||
- "docker_container - when the same port is mapped more than once for the same protocol without specifying an interface, a bug caused an invalid value to be passed for the interface
|
|
||||||
(https://github.com/ansible-collections/community.docker/issues/1213, https://github.com/ansible-collections/community.docker/pull/1214)."
|
|
||||||
@ -1 +0,0 @@
|
|||||||
release_summary: Bugfix release.
|
|
||||||
@ -23,7 +23,6 @@ from ansible_collections.community.docker.plugins.module_utils._platform import
|
|||||||
)
|
)
|
||||||
|
|
||||||
from ansible_collections.community.docker.plugins.module_utils.module_container.base import (
|
from ansible_collections.community.docker.plugins.module_utils.module_container.base import (
|
||||||
_DEFAULT_IP_REPLACEMENT_STRING,
|
|
||||||
OPTION_AUTO_REMOVE,
|
OPTION_AUTO_REMOVE,
|
||||||
OPTION_BLKIO_WEIGHT,
|
OPTION_BLKIO_WEIGHT,
|
||||||
OPTION_CAPABILITIES,
|
OPTION_CAPABILITIES,
|
||||||
@ -118,6 +117,9 @@ from ansible_collections.community.docker.plugins.module_utils._api.utils.utils
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
_DEFAULT_IP_REPLACEMENT_STRING = '[[DEFAULT_IP:iewahhaeB4Sae6Aen8IeShairoh4zeph7xaekoh8Geingunaesaeweiy3ooleiwi]]'
|
||||||
|
|
||||||
|
|
||||||
def _get_ansible_type(type):
|
def _get_ansible_type(type):
|
||||||
if type == 'set':
|
if type == 'set':
|
||||||
return 'list'
|
return 'list'
|
||||||
@ -1268,26 +1270,16 @@ def _preprocess_value_ports(module, client, api_version, options, values):
|
|||||||
if 'published_ports' not in values:
|
if 'published_ports' not in values:
|
||||||
return values
|
return values
|
||||||
found = False
|
found = False
|
||||||
for port_specs in values["published_ports"].values():
|
for port_spec in values['published_ports'].values():
|
||||||
if not isinstance(port_specs, list):
|
if port_spec[0] == _DEFAULT_IP_REPLACEMENT_STRING:
|
||||||
port_specs = [port_specs]
|
found = True
|
||||||
for port_spec in port_specs:
|
break
|
||||||
if port_spec[0] == _DEFAULT_IP_REPLACEMENT_STRING:
|
|
||||||
found = True
|
|
||||||
break
|
|
||||||
if not found:
|
if not found:
|
||||||
return values
|
return values
|
||||||
default_ip = _get_default_host_ip(module, client)
|
default_ip = _get_default_host_ip(module, client)
|
||||||
for port, port_specs in values["published_ports"].items():
|
for port, port_spec in values['published_ports'].items():
|
||||||
if isinstance(port_specs, list):
|
if port_spec[0] == _DEFAULT_IP_REPLACEMENT_STRING:
|
||||||
for index, port_spec in enumerate(port_specs):
|
values['published_ports'][port] = tuple([default_ip] + list(port_spec[1:]))
|
||||||
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
|
return values
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -277,58 +277,6 @@
|
|||||||
- published_ports_2 is not changed
|
- published_ports_2 is not changed
|
||||||
- published_ports_3 is changed
|
- published_ports_3 is changed
|
||||||
|
|
||||||
####################################################################
|
|
||||||
## published_ports: duplicate ports ################################
|
|
||||||
####################################################################
|
|
||||||
|
|
||||||
- name: published_ports -- duplicate ports
|
|
||||||
community.docker.docker_container:
|
|
||||||
image: "{{ docker_test_image_alpine }}"
|
|
||||||
command: '/bin/sh -c "sleep 10m"'
|
|
||||||
name: "{{ cname }}"
|
|
||||||
state: started
|
|
||||||
published_ports:
|
|
||||||
- 8000:80
|
|
||||||
- 10000:80
|
|
||||||
register: published_ports_1
|
|
||||||
|
|
||||||
- name: published_ports -- duplicate ports (idempotency)
|
|
||||||
community.docker.docker_container:
|
|
||||||
image: "{{ docker_test_image_alpine }}"
|
|
||||||
command: '/bin/sh -c "sleep 10m"'
|
|
||||||
name: "{{ cname }}"
|
|
||||||
state: started
|
|
||||||
published_ports:
|
|
||||||
- 8000:80
|
|
||||||
- 10000:80
|
|
||||||
force_kill: true
|
|
||||||
register: published_ports_2
|
|
||||||
|
|
||||||
- name: published_ports -- duplicate ports (idempotency w/ protocol)
|
|
||||||
community.docker.docker_container:
|
|
||||||
image: "{{ docker_test_image_alpine }}"
|
|
||||||
command: '/bin/sh -c "sleep 10m"'
|
|
||||||
name: "{{ cname }}"
|
|
||||||
state: started
|
|
||||||
published_ports:
|
|
||||||
- 8000:80/tcp
|
|
||||||
- 10000:80/tcp
|
|
||||||
force_kill: true
|
|
||||||
register: published_ports_3
|
|
||||||
|
|
||||||
- name: cleanup
|
|
||||||
community.docker.docker_container:
|
|
||||||
name: "{{ cname }}"
|
|
||||||
state: absent
|
|
||||||
force_kill: true
|
|
||||||
diff: false
|
|
||||||
|
|
||||||
- ansible.builtin.assert:
|
|
||||||
that:
|
|
||||||
- published_ports_1 is changed
|
|
||||||
- published_ports_2 is not changed
|
|
||||||
- published_ports_3 is not changed
|
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
## published_ports: IPv6 addresses #################################
|
## published_ports: IPv6 addresses #################################
|
||||||
####################################################################
|
####################################################################
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user