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.ts

@@ -130,6 +130,11 @@ export class GenericContainer implements TestContainer {
   private async reuseContainer(client: ContainerRuntimeClient, container: Container) {
     const inspectResult = await client.container.inspect(container);
     const mappedInspectResult = mapInspectResult(inspectResult);
+    if (!mappedInspectResult.state.running) {
+      log.debug("Reused container is not running, attempting to start it");
+      await client.container.start(container);
+    }
+
     const boundPorts = BoundPorts.fromInspectResult(client.info.containerRuntime.hostIps, mappedInspectResult).filter(
       this.exposedPorts
     );

packages/testcontainers/src/utils/map-inspect-result.ts

@@ -7,7 +7,10 @@ export function mapInspectResult(inspectResult: ContainerInspectInfo): InspectRe
   return {
     name: inspectResult.Name,
     hostname: inspectResult.Config.Hostname,
-    ports: mapPorts(inspectResult),
+    ports: {
+      ...mapHostConfigPortBindings(inspectResult),
+      ...mapPorts(inspectResult),
+    },
     healthCheckStatus: mapHealthCheckStatus(inspectResult),
     networkSettings: mapNetworkSettings(inspectResult),
     state: {
@@ -20,6 +23,27 @@ export function mapInspectResult(inspectResult: ContainerInspectInfo): InspectRe
   };
 }
 
+type HostConfigPortBindings = {
+  [port: string]: Array<{
+    HostIp: string;
+    HostPort: string;
+  }>;
+};
+
+function mapHostConfigPortBindings(inspectInfo: ContainerInspectInfo): Ports {
+  return Object.entries(inspectInfo.HostConfig.PortBindings as HostConfigPortBindings)
+    .filter(([, hostPorts]) => hostPorts !== null)
+    .map(([containerPort, hostPorts]) => {
+      return {
+        [parseInt(containerPort)]: hostPorts.map((hostPort) => ({
+          hostIp: hostPort.HostIp,
+          hostPort: parseInt(hostPort.HostPort),
+        })),
+      };
+    })
+    .reduce((acc, curr) => ({ ...acc, ...curr }), {});
+}
+
 function mapPorts(inspectInfo: ContainerInspectInfo): Ports {
   return Object.entries(inspectInfo.NetworkSettings.Ports)
     .filter(([, hostPorts]) => hostPorts !== null)