Add stop_silent for stop containers after exit (#104)

Author: Mark Andreev

testcontainers/core/cleaner.py

@@ -1,36 +1,16 @@
-import atexit
-
 from docker.errors import NotFound
 
 from testcontainers.core.utils import setup_logger
 
 logger = setup_logger(__name__)
 
 
-class ResourceCleaner:
-    __INSTANCE = None
-
-    def __init__(self):
-        self.containers = []
-
-    def attach(self, container):
-        self.containers.append(container)
-
-        return container
-
-    def clean(self):
-        for c in self.containers:
-            try:
-                c.stop()
-            except NotFound:
-                pass
-            except Exception as e:
-                logger.exception(e)
-
-    @classmethod
-    def instance(cls):
-        if cls.__INSTANCE is None:
-            cls.__INSTANCE = ResourceCleaner()
-            atexit.register(cls.__INSTANCE.clean)
-
-        return cls.__INSTANCE
+def stop_silent(container):
+    def wrapper():
+        try:
+            container.stop()
+        except NotFound:
+            pass
+        except Exception as e:
+            logger.exception(e)
+    return wrapper

testcontainers/core/docker_client.py

@@ -10,12 +10,13 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+import atexit
 import os
 import urllib
 import docker
 from docker.models.containers import Container
 
-from testcontainers.core.cleaner import ResourceCleaner
+from testcontainers.core.cleaner import stop_silent
 from testcontainers.core.utils import inside_container
 from testcontainers.core.utils import default_gateway_ip
 
@@ -32,8 +33,7 @@ def run(self, image: str,
             stdout: bool = True,
             stderr: bool = False,
             remove: bool = False, **kwargs) -> Container:
-        return ResourceCleaner.instance().attach(
-            self.client.containers.run(image,
+        container = self.client.containers.run(image,
                                        command=command,
                                        stdout=stdout,
                                        stderr=stderr,
@@ -42,7 +42,9 @@ def run(self, image: str,
                                        environment=environment,
                                        ports=ports,
                                        **kwargs)
-        )
+        atexit.register(stop_silent(container))
+
+        return container
 
     def port(self, container_id, port):
         port_mappings = self.client.api.port(container_id, port)