From b3ae4d6ebd0674b9dff0abfef001e8fe47ccfd22 Mon Sep 17 00:00:00 2001 From: Ben Doan Date: Thu, 15 Mar 2018 18:21:52 -0500 Subject: [PATCH] avoid race condition in containers.list Signed-off-by: Ben Doan --- docker/models/containers.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/docker/models/containers.py b/docker/models/containers.py index 1e06ed60..789fa93f 100644 --- a/docker/models/containers.py +++ b/docker/models/containers.py @@ -6,7 +6,7 @@ from ..api import APIClient from ..constants import DEFAULT_DATA_CHUNK_SIZE from ..errors import ( ContainerError, DockerException, ImageNotFound, - create_unexpected_kwargs_error + NotFound, create_unexpected_kwargs_error ) from ..types import HostConfig from ..utils import version_gte @@ -896,7 +896,14 @@ class ContainerCollection(Collection): if sparse: return [self.prepare_model(r) for r in resp] else: - return [self.get(r['Id']) for r in resp] + containers = [] + for r in resp: + try: + containers.append(self.get(r['Id'])) + # a container may have been removed while iterating + except NotFound: + pass + return containers def prune(self, filters=None): return self.client.api.prune_containers(filters=filters)