fix(core): use auto_remove=True with reaper instance (#499)

fix #489 , supercede #491, #498

Co-authored-by: Stefan Hoffmeister <[email protected]>

Author: alexanderankin

core/testcontainers/core/container.py

@@ -193,7 +193,7 @@ def _create_instance(cls) -> "Reaper":
             .with_name(f"testcontainers-ryuk-{SESSION_ID}")
             .with_exposed_ports(8080)
             .with_volume_mapping(RYUK_DOCKER_SOCKET, "/var/run/docker.sock", "rw")
-            .with_kwargs(privileged=RYUK_PRIVILEGED)
+            .with_kwargs(privileged=RYUK_PRIVILEGED, auto_remove=True)
             .start()
         )
         wait_for_logs(Reaper._container, r".* Started!")

core/tests/test_ryuk.py

@@ -1,9 +1,14 @@
+from contextlib import contextmanager
+
+import pytest
+
 from testcontainers.core import container
 from testcontainers.core.container import Reaper
 from testcontainers.core.container import DockerContainer
 from testcontainers.core.waiting_utils import wait_for_logs
 
 
+@pytest.mark.skip("invalid test - ryuk logs 'Removed' right before exiting")
 def test_wait_for_reaper():
     container = DockerContainer("hello-world").start()
     wait_for_logs(container, "Hello from Docker!")
@@ -17,8 +22,16 @@ def test_wait_for_reaper():
     Reaper.delete_instance()
 
 
+@contextmanager
+def reset_reaper_instance():
+    old_value = Reaper._instance
+    Reaper._instance = None
+    yield
+    Reaper._instance = old_value
+
+
 def test_container_without_ryuk(monkeypatch):
     monkeypatch.setattr(container, "RYUK_DISABLED", True)
-    with DockerContainer("hello-world") as cont:
+    with reset_reaper_instance(), DockerContainer("hello-world") as cont:
         wait_for_logs(cont, "Hello from Docker!")
         assert Reaper._instance is None