mirror of
https://github.com/ansible-collections/community.docker.git
synced 2025-12-16 20:08:41 +00:00
docker_compose - Fix timeout defaulting behavior (#163)
* Initial commit * Adding changelog fragment * Updating changelog for breaking change
This commit is contained in:
parent
26d8aa1c80
commit
14f15c0aec
4
changelogs/fragments/163-docker_compose-timeout-fix.yml
Normal file
4
changelogs/fragments/163-docker_compose-timeout-fix.yml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
breaking_changes:
|
||||||
|
- docker_compose - fixed ``timeout`` defaulting behavior so that ``stop_grace_period``, if defined in the compose
|
||||||
|
file, will be used if `timeout`` is not specified (https://github.com/ansible-collections/community.docker/pull/163).
|
||||||
@ -163,8 +163,10 @@ options:
|
|||||||
timeout:
|
timeout:
|
||||||
description:
|
description:
|
||||||
- Timeout in seconds for container shutdown when attached or when containers are already running.
|
- Timeout in seconds for container shutdown when attached or when containers are already running.
|
||||||
|
- By default C(compose) will use a C(10s) timeout unless C(default_grace_period) is defined for a
|
||||||
|
particular service in the I(project_src).
|
||||||
type: int
|
type: int
|
||||||
default: 10
|
default: null
|
||||||
use_ssh_client:
|
use_ssh_client:
|
||||||
description:
|
description:
|
||||||
- Currently ignored for this module, but might suddenly be supported later on.
|
- Currently ignored for this module, but might suddenly be supported later on.
|
||||||
@ -495,14 +497,13 @@ try:
|
|||||||
from compose.cli.command import project_from_options
|
from compose.cli.command import project_from_options
|
||||||
from compose.service import NoSuchImageError
|
from compose.service import NoSuchImageError
|
||||||
from compose.cli.main import convergence_strategy_from_opts, build_action_from_opts, image_type_from_opt
|
from compose.cli.main import convergence_strategy_from_opts, build_action_from_opts, image_type_from_opt
|
||||||
from compose.const import DEFAULT_TIMEOUT, LABEL_SERVICE, LABEL_PROJECT, LABEL_ONE_OFF
|
from compose.const import LABEL_SERVICE, LABEL_PROJECT, LABEL_ONE_OFF
|
||||||
HAS_COMPOSE = True
|
HAS_COMPOSE = True
|
||||||
HAS_COMPOSE_EXC = None
|
HAS_COMPOSE_EXC = None
|
||||||
MINIMUM_COMPOSE_VERSION = '1.7.0'
|
MINIMUM_COMPOSE_VERSION = '1.7.0'
|
||||||
except ImportError as dummy:
|
except ImportError as dummy:
|
||||||
HAS_COMPOSE = False
|
HAS_COMPOSE = False
|
||||||
HAS_COMPOSE_EXC = traceback.format_exc()
|
HAS_COMPOSE_EXC = traceback.format_exc()
|
||||||
DEFAULT_TIMEOUT = 10
|
|
||||||
|
|
||||||
from ansible.module_utils.common.text.converters import to_native
|
from ansible.module_utils.common.text.converters import to_native
|
||||||
|
|
||||||
@ -1177,7 +1178,7 @@ def main():
|
|||||||
pull=dict(type='bool', default=False),
|
pull=dict(type='bool', default=False),
|
||||||
nocache=dict(type='bool', default=False),
|
nocache=dict(type='bool', default=False),
|
||||||
debug=dict(type='bool', default=False),
|
debug=dict(type='bool', default=False),
|
||||||
timeout=dict(type='int', default=DEFAULT_TIMEOUT)
|
timeout=dict(type='int')
|
||||||
)
|
)
|
||||||
|
|
||||||
mutually_exclusive = [
|
mutually_exclusive = [
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user