From 574ac9f124f4d5048feb21c0131fdb13138e31c0 Mon Sep 17 00:00:00 2001 From: Andy Neff Date: Thu, 26 Oct 2017 11:42:57 -0400 Subject: [PATCH] Have stop_grace_period also set StopTimeout on create Signed-off-by: Andy Neff --- compose/service.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/compose/service.py b/compose/service.py index 8839c6cfd..14027a1cc 100644 --- a/compose/service.py +++ b/compose/service.py @@ -15,6 +15,7 @@ from docker.errors import ImageNotFound from docker.errors import NotFound from docker.types import LogConfig 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 split_port from docker.utils.utils import convert_tmpfs_mounts @@ -760,6 +761,11 @@ class Service(object): container_options['hostname'] = parts[0] 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: container_options['ports'] = build_container_ports( formatted_ports(container_options.get('ports', [])),