diff options
| author | Joffrey F <joffrey@docker.com> | 2018-01-25 14:17:26 -0800 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2018-01-25 17:32:07 -0800 |
| commit | 33db9d78ce8903b03175e8ad8c5a0ba9865bf2e4 (patch) | |
| tree | 749e2db6d5f247845094c9240887616e7714b16b /docker/models/containers.py | |
| parent | 9e2148dcc417c1fd613a69ee558c64349b30173d (diff) | |
| download | docker-py-bump_api_version_1.35.tar.gz | |
Bump default API version to 1.35bump_api_version_1.35
Add ContainerSpec.isolation support
Add until support in logs
Add condition support in wait
Add workdir support in exec_create
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker/models/containers.py')
| -rw-r--r-- | docker/models/containers.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/docker/models/containers.py b/docker/models/containers.py index 5e2aa88..e8380f9 100644 --- a/docker/models/containers.py +++ b/docker/models/containers.py @@ -126,7 +126,7 @@ class Container(Model): def exec_run(self, cmd, stdout=True, stderr=True, stdin=False, tty=False, privileged=False, user='', detach=False, stream=False, - socket=False, environment=None): + socket=False, environment=None, workdir=None): """ Run a command inside this container. Similar to ``docker exec``. @@ -147,6 +147,7 @@ class Container(Model): environment (dict or list): A dictionary or a list of strings in the following format ``["PASSWORD=xxx"]`` or ``{"PASSWORD": "xxx"}``. + workdir (str): Path to working directory for this exec session Returns: (generator or str): @@ -159,7 +160,8 @@ class Container(Model): """ resp = self.client.api.exec_create( self.id, cmd, stdout=stdout, stderr=stderr, stdin=stdin, tty=tty, - privileged=privileged, user=user, environment=environment + privileged=privileged, user=user, environment=environment, + workdir=workdir ) return self.client.api.exec_start( resp['Id'], detach=detach, tty=tty, stream=stream, socket=socket @@ -427,6 +429,9 @@ class Container(Model): Args: timeout (int): Request timeout + condition (str): Wait until a container state reaches the given + condition, either ``not-running`` (default), ``next-exit``, + or ``removed`` Returns: (int): The exit code of the container. Returns ``-1`` if the API |