add env variable REUSE_ENABLED

Author: Gigaszi

core/testcontainers/core/config.py

@@ -15,6 +15,7 @@
 RYUK_DOCKER_SOCKET: str = environ.get("TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE", "/var/run/docker.sock")
 RYUK_RECONNECTION_TIMEOUT: str = environ.get("RYUK_RECONNECTION_TIMEOUT", "10s")
 TC_HOST_OVERRIDE: Optional[str] = environ.get("TC_HOST", environ.get("TESTCONTAINERS_HOST_OVERRIDE"))
+REUSE_ENABLED: bool = environ.get("TESTCONTAINERS_REUSE_ENABLED", "false") == "true"
 
 TC_FILE = ".testcontainers.properties"
 TC_GLOBAL = Path.home() / TC_FILE
@@ -54,6 +55,7 @@ class TestcontainersConfiguration:
     tc_properties: dict[str, str] = field(default_factory=read_tc_properties)
     _docker_auth_config: Optional[str] = field(default_factory=lambda: environ.get("DOCKER_AUTH_CONFIG"))
     tc_host_override: Optional[str] = TC_HOST_OVERRIDE
+    reuse_enabled: bool = REUSE_ENABLED
     """
     https://github.com/testcontainers/testcontainers-go/blob/dd76d1e39c654433a3d80429690d07abcec04424/docker.go#L644
     if os env TC_HOST is set, use it

core/testcontainers/core/container.py

@@ -125,8 +125,8 @@ def _start():
                 encoding="utf-8",
             )
         ).hexdigest()
-
-        if self._reuse:
+        # TODO: warn user if with_reuse in use but REUSE_ENABLED false
+        if self._reuse and c.reuse_enabled:
             docker_client = self.get_docker_client()
             container = docker_client.find_container_by_hash(hash_)
             if container:
@@ -145,8 +145,9 @@ def _start():
 
     def stop(self, force=True, delete_volume=True) -> None:
         if self._container:
-            if self._reuse:
-                self._container.stop()
+            if self._reuse and c.reuse_enabled:
+                #self._container.stop()
+                return
             else:
                 self._container.remove(force=force, v=delete_volume)
         self.get_docker_client().client.close()

core/tests/test_reusable_containers.py

@@ -1,6 +1,7 @@
 from docker.models.containers import Container
 from testcontainers.core.container import DockerContainer
 from testcontainers.core.docker_client import DockerClient
+from testcontainers.core.waiting_utils import wait_for_logs
 
 
 def test_docker_container_reuse_default():
@@ -11,17 +12,27 @@ def test_docker_container_reuse_default():
     assert id not in [container.id for container in containers]
 
 
-def test_docker_container_with_reuse():
+def test_docker_container_with_reuse_reuse_disabled():
     with DockerContainer("hello-world").with_reuse() as container:
         assert container._reuse == True
         id = container._container.id
     containers = DockerClient().client.containers.list(all=True)
+    assert id not in [container.id for container in containers]
+
+
+def test_docker_container_with_reuse_reuse_enabled(monkeypatch):
+    monkeypatch.setattr("testcontainers.core.config.testcontainers_config.reuse_enabled", True)
+    monkeypatch.setattr("testcontainers.core.config.testcontainers_config.ryuk_disabled", True)
+    with DockerContainer("postgres", auto_remove=False).with_reuse() as container:
+        assert container._reuse == True
+        id = container._container.id
+    containers = DockerClient().client.containers.list(all=True)
     assert id in [container.id for container in containers]
 
 
 def test_docker_container_labels_hash():
     with DockerContainer("hello-world").with_reuse() as container:
-        assert container._container.labels["hash"] == "fd35c55b0a6d03b7d569828d4bc4cc7f74b4312ded5936ae9bb7035798bb3628"
+        assert container._container.labels["hash"] == "505d1d913abe7f54b5a66202e8559a4f798038a204d39fe8b1577735ed632e32"
 
 
 def test_docker_client_find_container_by_hash_not_existing():