summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorTomas Tomecek <ttomecek@redhat.com>2016-10-26 16:58:27 +0200
committerTomas Tomecek <ttomecek@redhat.com>2016-11-29 16:04:52 +0100
commit515db1f6fd8db15edda33b72cd6f0fd955f8d777 (patch)
tree1424b3603d619116aa7152ecee1c569bd9a27fde /docker
parent6a16edee3e7110e0439ef067e5c11db51bd4371a (diff)
downloaddocker-py-515db1f6fd8db15edda33b72cd6f0fd955f8d777.tar.gz
exec: fix running with detach=True
Fixes #1271 Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/api/exec_api.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/api/exec_api.py b/docker/api/exec_api.py
index 694b30a..6c3e638 100644
--- a/docker/api/exec_api.py
+++ b/docker/api/exec_api.py
@@ -137,7 +137,8 @@ class ExecApiMixin(object):
data=data,
stream=True
)
-
+ if detach:
+ return self._result(res)
if socket:
return self._get_raw_response_socket(res)
return self._read_from_socket(res, stream)