Kaydet (Commit) 729c2e78 authored tarafından Yincen Xia's avatar Yincen Xia Kaydeden (comit) Ulysses Souza

Update doc for container.exec_run & exec_api about demux

Signed-off-by: 's avatarYincen Xia <philip980507@msn.cn>
üst 0f7af860
...@@ -137,7 +137,8 @@ class ExecApiMixin(object): ...@@ -137,7 +137,8 @@ class ExecApiMixin(object):
(generator or str or tuple): If ``stream=True``, a generator (generator or str or tuple): If ``stream=True``, a generator
yielding response chunks. If ``socket=True``, a socket object for yielding response chunks. If ``socket=True``, a socket object for
the connection. A string containing response data otherwise. If the connection. A string containing response data otherwise. If
``demux=True``, stdout and stderr are separated. ``demux=True``, a tuple with two elements of type byte: stdout and
stderr.
Raises: Raises:
:py:class:`docker.errors.APIError` :py:class:`docker.errors.APIError`
......
...@@ -173,9 +173,10 @@ class Container(Model): ...@@ -173,9 +173,10 @@ class Container(Model):
exit_code: (int): exit_code: (int):
Exit code for the executed command or ``None`` if Exit code for the executed command or ``None`` if
either ``stream```or ``socket`` is ``True``. either ``stream```or ``socket`` is ``True``.
output: (generator or bytes): output: (generator, bytes, or tuple):
If ``stream=True``, a generator yielding response chunks. If ``stream=True``, a generator yielding response chunks.
If ``socket=True``, a socket object for the connection. If ``socket=True``, a socket object for the connection.
If ``demux=True``, a tuple of two bytes: stdout and stderr.
A bytestring containing response data otherwise. A bytestring containing response data otherwise.
Raises: Raises:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment