Merge remote-tracking branch 'origin/main' into reusable_containers

core/testcontainers/core/config.py

@@ -123,8 +123,7 @@ def tc_properties_testcontainers_reuse_enable(self) -> bool:
         enabled = self.tc_properties.get("testcontainers.reuse.enable")
         return enabled == "true"
 
-    @property
-    def timeout(self):
+    def timeout(self) -> int:
         return self.max_tries * self.sleep_time
 
 

core/testcontainers/core/container.py

@@ -2,6 +2,7 @@
 import hashlib
 import logging
 from platform import system
+from os import PathLike
 from socket import socket
 from typing import TYPE_CHECKING, Optional, Union
 
@@ -109,6 +110,17 @@ def start(self) -> Self:
         logger.info("Pulling image %s", self.image)
         self._configure()
 
+        network_kwargs = (
+            {
+                "network": self._network.name,
+                "networking_config": {
+                    self._network.name: EndpointConfig(version.__version__, aliases=self._network_aliases)
+                },
+            }
+            if self._network
+            else {}
+        )
+
         if self._reuse and not c.tc_properties_testcontainers_reuse_enable:
             logging.warning(
                 "Reuse was requested (`with_reuse`) but the environment does not "
@@ -138,15 +150,15 @@ def start(self) -> Self:
                 self._container = container
                 logger.info("Container is already running: %s", container.id)
             else:
-                self._start(hash_)
+                self._start(network_kwargs, hash_)
         else:
-            self._start()
+            self._start(network_kwargs)
 
         if self._network:
             self._network.connect(self._container.id, self._network_aliases)
         return self
 
-    def _start(self, hash_=None):
+    def _start(self, network_kwargs, hash_=None):
         docker_client = self.get_docker_client()
         self._container = docker_client.run(
             self.image,
@@ -157,10 +169,12 @@ def _start(self, hash_=None):
             name=self._name,
             volumes=self.volumes,
             labels={"hash": hash_} if hash is not None else {},
+            **network_kwargs,
             **self._kwargs,
         )
 
         logger.info("Container started: %s", self._container.short_id)
+        return self
 
     def stop(self, force=True, delete_volume=True) -> None:
         if self._container: