From 6b3afdcef3373734b0245d10990fd88b1c7a7f30 Mon Sep 17 00:00:00 2001 From: Maxime Petazzoni Date: Thu, 14 Nov 2013 15:45:19 -0800 Subject: [PATCH] Smarter request timeout for stopping a container Signed-off-by: Maxime Petazzoni --- docker/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/client.py b/docker/client.py index 208df0f5..1ef12d22 100644 --- a/docker/client.py +++ b/docker/client.py @@ -522,7 +522,7 @@ class Client(requests.Session): container = container.get('Id') params = {'t': timeout} url = self._url("/containers/{0}/stop".format(container)) - res = self._post(url, params=params) + res = self._post(url, params=params, timeout=max(timeout, self._timeout)) self._raise_for_status(res) def tag(self, image, repository, tag=None, force=False):