tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-21 04:34:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Have stop_grace_period also set StopTimeout on create

Browse Source 
Signed-off-by: Andy Neff <andrew.neff@visionsystemsinc.com>
This commit is contained in:
Andy Neff 2017-10-26 11:42:57 -04:00 committed by Joffrey F
parent f89a55e488
commit 574ac9f124
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compose/service.py
View File

@ -15,6 +15,7 @@ from docker.errors import ImageNotFound
from docker.errors import NotFound from docker.errors import NotFound
from docker.types import LogConfig from docker.types import LogConfig
from docker.utils import version_lt from docker.utils import version_lt
from docker.utils import version_gte
from docker.utils.ports import build_port_bindings from docker.utils.ports import build_port_bindings
from docker.utils.ports import split_port from docker.utils.ports import split_port
from docker.utils.utils import convert_tmpfs_mounts from docker.utils.utils import convert_tmpfs_mounts
@ -760,6 +761,11 @@ class Service(object):
container_options['hostname'] = parts[0] container_options['hostname'] = parts[0]
container_options['domainname'] = parts[2] container_options['domainname'] = parts[2]
if (version_gte(self.client.api_version, '1.25') and
'stop_grace_period' in self.options):
container_options['stop_timeout'] = parse_seconds_float(
self.options.pop('stop_grace_period'))
if 'ports' in container_options or 'expose' in self.options: if 'ports' in container_options or 'expose' in self.options:
container_options['ports'] = build_container_ports( container_options['ports'] = build_container_ports(
formatted_ports(container_options.get('ports', [])), formatted_ports(container_options.get('ports', [])),