summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2017-12-19 13:21:56 -0800
committerJoffrey F <joffrey@docker.com>2017-12-19 13:51:47 -0800
commit598f16771ca4673886c3ea9b86fa280d77829beb (patch)
tree4e986b245772c35f1d00f853a778ddf5c549260e /docker
parentf10c008aa57c4c48cce1a718a0160a54a2b1a371 (diff)
downloaddocker-py-2.7.0-release.tar.gz
Don't attempt to retrieve container's stderr if `auto_remove` was set2.7.0-release
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/models/containers.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/models/containers.py b/docker/models/containers.py
index f16b7cd..6ba308e 100644
--- a/docker/models/containers.py
+++ b/docker/models/containers.py
@@ -737,7 +737,9 @@ class ContainerCollection(Collection):
exit_status = container.wait()
if exit_status != 0:
- out = container.logs(stdout=False, stderr=True)
+ out = None
+ if not kwargs.get('auto_remove'):
+ out = container.logs(stdout=False, stderr=True)
if remove:
container.remove()