summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorBen Firshman <ben@firshman.co.uk>2016-12-05 11:00:10 +0000
committerGitHub <noreply@github.com>2016-12-05 11:00:10 +0000
commitdd8ad21c88021d1c19e4cec034e6ff9413cac481 (patch)
tree14725a4c2c82e0f1c9bedc128cee71ed0ebb0623 /docker
parentc02493cf18bbb0b28bce7934b45a042147671be2 (diff)
parent515db1f6fd8db15edda33b72cd6f0fd955f8d777 (diff)
downloaddocker-py-dd8ad21c88021d1c19e4cec034e6ff9413cac481.tar.gz
Merge pull request #1272 from TomasTomecek/1271-fix-detach-in-exec-start
exec: fix running with detach=True
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)