docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added timeout param to Client.wait

This commit is contained in:
Joffrey F 2014-12-15 17:32:42 -08:00
parent 7fcddc22ce
commit 51c6b34859
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/client.py
View File

@ -1038,11 +1038,11 @@ class Client(requests.Session):
res = self._post(url) res = self._post(url)
self._raise_for_status(res) self._raise_for_status(res)
def wait(self, container): def wait(self, container, timeout=None):
if isinstance(container, dict): if isinstance(container, dict):
container = container.get('Id') container = container.get('Id')
url = self._url("/containers/{0}/wait".format(container)) url = self._url("/containers/{0}/wait".format(container))
res = self._post(url, timeout=None) res = self._post(url, timeout=timeout)
self._raise_for_status(res) self._raise_for_status(res)
json_ = res.json() json_ = res.json()
if 'StatusCode' in json_: if 'StatusCode' in json_: