Add support for reusing stopped containers

Author: cbrevik

packages/testcontainers/src/container-runtime/clients/container/docker-container-client.ts

@@ -35,7 +35,6 @@ export class DockerContainerClient implements ContainerClient {
       const containers = await this.dockerode.listContainers({
         limit: 1,
         filters: {
-          status: ["running"],
           label: [`${labelName}=${labelValue}`],
         },
       });

packages/testcontainers/src/generic-container/generic-container-reuse.test.ts

@@ -83,7 +83,7 @@ describe("GenericContainer reuse", () => {
     await container1.stop();
   });
 
-  it("should create a new container when an existing reusable container has stopped", async () => {
+  it("should create a new container when an existing reusable container has stopped and is removed", async () => {
     const container1 = await new GenericContainer("cristianrgreco/testcontainer:1.1.14")
       .withName("there_can_only_be_one")
       .withExposedPorts(8080)
@@ -102,6 +102,25 @@ describe("GenericContainer reuse", () => {
     await container2.stop();
   });
 
+  it("should reuse container when an existing reusable container has stopped but not removed", async () => {
+    const container1 = await new GenericContainer("cristianrgreco/testcontainer:1.1.14")
+      .withName("there_can_only_be_one")
+      .withExposedPorts(8080)
+      .withReuse()
+      .start();
+    await container1.stop({ remove: false });
+
+    const container2 = await new GenericContainer("cristianrgreco/testcontainer:1.1.14")
+      .withName("there_can_only_be_one")
+      .withExposedPorts(8080)
+      .withReuse()
+      .start();
+    await checkContainerIsHealthy(container2);
+
+    expect(container1.getId()).toBe(container2.getId());
+    await container2.stop();
+  });
+
   it("should keep the labels passed in when a new reusable container is created", async () => {
     const container = await new GenericContainer("cristianrgreco/testcontainer:1.1.14")
       .withName("there_can_only_be_one")

packages/testcontainers/src/generic-container/generic-container.ts

@@ -128,7 +128,14 @@ export class GenericContainer implements TestContainer {
   }
 
   private async reuseContainer(client: ContainerRuntimeClient, container: Container) {
-    const inspectResult = await client.container.inspect(container);
+    let inspectResult = await client.container.inspect(container);
+    if (!inspectResult.State.Running) {
+      log.debug("Reused container is not running, attempting to start it");
+      await client.container.start(container);
+      // Refetch the inspect result to get the updated state
+      inspectResult = await client.container.inspect(container);
+    }
+
     const mappedInspectResult = mapInspectResult(inspectResult);
     const boundPorts = BoundPorts.fromInspectResult(client.info.containerRuntime.hostIps, mappedInspectResult).filter(
       this.exposedPorts