testcontainers 11.14.0 → 12.0.1

package/build/common/file-lock.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -40,6 +7,7 @@ exports.withFileLock = withFileLock;
 const promises_1 = require("fs/promises");
 const path_1 = __importDefault(require("path"));
 const proper_lockfile_1 = __importDefault(require("proper-lockfile"));
+const tmp_1 = __importDefault(require("tmp"));
 const logger_1 = require("./logger");
 async function withFileLock(fileName, fn) {
     const file = await createEmptyTmpFile(fileName);
@@ -61,8 +29,7 @@ async function withFileLock(fileName, fn) {
     }
 }
 async function createEmptyTmpFile(fileName) {
-    const tmp = await Promise.resolve().then(() => __importStar(require("tmp")));
-    const file = path_1.default.resolve(tmp.tmpdir, fileName);
+    const file = path_1.default.resolve(tmp_1.default.tmpdir, fileName);
     await (0, promises_1.writeFile)(file, "");
     return file;
 }

package/build/docker-compose-environment/docker-compose-environment.js

@@ -8,7 +8,7 @@ const reaper_1 = require("../reaper/reaper");
 const bound_ports_1 = require("../utils/bound-ports");
 const map_inspect_result_1 = require("../utils/map-inspect-result");
 const pull_policy_1 = require("../utils/pull-policy");
-const wait_1 = require("../wait-strategies/wait");
+const wait_strategy_selector_1 = require("../wait-strategies/utils/wait-strategy-selector");
 const wait_for_container_1 = require("../wait-strategies/wait-for-container");
 const started_docker_compose_environment_1 = require("./started-docker-compose-environment");
 class DockerComposeEnvironment {
@@ -22,7 +22,7 @@ class DockerComposeEnvironment {
     profiles = [];
     environment = {};
     pullPolicy = pull_policy_1.PullPolicy.defaultPolicy();
-    defaultWaitStrategy = wait_1.Wait.forListeningPorts();
+    defaultWaitStrategy;
     waitStrategy = {};
     startupTimeoutMs;
     clientOptions = {};
@@ -129,9 +129,11 @@ class DockerComposeEnvironment {
             const inspectResult = await client.container.inspect(container);
             const mappedInspectResult = (0, map_inspect_result_1.mapInspectResult)(inspectResult);
             const boundPorts = bound_ports_1.BoundPorts.fromInspectResult(client.info.containerRuntime.hostIps, mappedInspectResult);
-            const waitStrategy = this.waitStrategy[containerName]
-                ? this.waitStrategy[containerName]
-                : this.defaultWaitStrategy;
+            const waitStrategy = await (0, wait_strategy_selector_1.selectWaitStrategy)({
+                client,
+                inspectResult,
+                waitStrategy: this.waitStrategy[containerName] ?? this.defaultWaitStrategy,
+            });
             if (this.startupTimeoutMs !== undefined) {
                 waitStrategy.withStartupTimeout(this.startupTimeoutMs);
             }

package/build/generic-container/generic-container.d.ts

@@ -1,6 +1,6 @@
-import { ContainerCreateOptions, HostConfig } from "dockerode";
+import { ContainerCreateOptions, ContainerInspectInfo, HostConfig } from "dockerode";
 import { Readable } from "stream";
-import { ImageName } from "../container-runtime";
+import { ContainerRuntimeClient, ImageName } from "../container-runtime";
 import { StartedNetwork } from "../network/network";
 import { StartedTestContainer, TestContainer } from "../test-container";
 import { ArchiveToCopy, BindMount, ContentToCopy, CopyToContainerOptions, DirectoryToCopy, Environment, ExtraHost, FileToCopy, HealthCheck, InspectResult, Labels, ResourcesQuota, TmpFs, Ulimits } from "../types";
@@ -14,7 +14,7 @@ export declare class GenericContainer implements TestContainer {
     protected hostConfig: HostConfig;
     protected imageName: ImageName;
     protected startupTimeoutMs?: number;
-    protected waitStrategy: WaitStrategy;
+    protected waitStrategy: WaitStrategy | undefined;
     protected environment: Record<string, string>;
     protected exposedPorts: PortWithOptionalBinding[];
     protected reuse: boolean;
@@ -37,6 +37,7 @@ export declare class GenericContainer implements TestContainer {
     protected containerCreated?(containerId: string): Promise<void>;
     protected containerStarting?(inspectResult: InspectResult, reused: boolean): Promise<void>;
     start(): Promise<StartedTestContainer>;
+    protected selectWaitStrategy(client: ContainerRuntimeClient, inspectResult: ContainerInspectInfo, waitStrategy?: WaitStrategy | undefined): Promise<WaitStrategy>;
     private reuseOrStartContainer;
     private reuseContainer;
     private startContainer;

package/build/generic-container/generic-container.js

@@ -17,7 +17,7 @@ const labels_1 = require("../utils/labels");
 const map_inspect_result_1 = require("../utils/map-inspect-result");
 const port_1 = require("../utils/port");
 const pull_policy_1 = require("../utils/pull-policy");
-const wait_1 = require("../wait-strategies/wait");
+const wait_strategy_selector_1 = require("../wait-strategies/utils/wait-strategy-selector");
 const wait_for_container_1 = require("../wait-strategies/wait-for-container");
 const generic_container_builder_1 = require("./generic-container-builder");
 const inspect_container_util_ports_exposed_1 = require("./inspect-container-util-ports-exposed");
@@ -31,7 +31,7 @@ class GenericContainer {
     hostConfig;
     imageName;
     startupTimeoutMs;
-    waitStrategy = wait_1.Wait.forListeningPorts();
+    waitStrategy;
     environment = {};
     exposedPorts = [];
     reuse = false;
@@ -50,13 +50,13 @@ class GenericContainer {
     constructor(image) {
         this.imageName = container_runtime_1.ImageName.fromString(image);
         this.createOpts = { Image: this.imageName.string };
-        this.hostConfig = { AutoRemove: this.imageName.string === reaper_1.REAPER_IMAGE };
+        this.hostConfig = { AutoRemove: this.imageName.string === (0, reaper_1.getReaperImage)() };
     }
     isHelperContainer() {
         return this.isReaper() || this.imageName.string === port_forwarder_1.SSHD_IMAGE;
     }
     isReaper() {
-        return this.imageName.string === reaper_1.REAPER_IMAGE;
+        return this.imageName.string === (0, reaper_1.getReaperImage)();
     }
     async start() {
         const client = await (0, container_runtime_1.getContainerRuntimeClient)();
@@ -85,6 +85,15 @@ class GenericContainer {
         }
         return this.startContainer(client);
     }
+    async selectWaitStrategy(client, inspectResult, waitStrategy = this.waitStrategy) {
+        return (0, wait_strategy_selector_1.selectWaitStrategy)({
+            client,
+            inspectResult,
+            waitStrategy,
+            healthCheck: this.healthCheck,
+            imageNames: [this.imageName.string],
+        });
+    }
     async reuseOrStartContainer(client) {
         const containerHash = (0, common_1.hash)(JSON.stringify(this.createOpts));
         this.createOpts.Labels = { ...this.createOpts.Labels, [labels_1.LABEL_TESTCONTAINERS_CONTAINER_HASH]: containerHash };
@@ -110,11 +119,12 @@ class GenericContainer {
         }
         const mappedInspectResult = (0, map_inspect_result_1.mapInspectResult)(inspectResult);
         const boundPorts = bound_ports_1.BoundPorts.fromInspectResult(client.info.containerRuntime.hostIps, mappedInspectResult).filter(this.exposedPorts);
+        const waitStrategy = await this.selectWaitStrategy(client, inspectResult);
         if (this.startupTimeoutMs !== undefined) {
-            this.waitStrategy.withStartupTimeout(this.startupTimeoutMs);
+            waitStrategy.withStartupTimeout(this.startupTimeoutMs);
         }
-        await (0, wait_for_container_1.waitForContainer)(client, container, this.waitStrategy, boundPorts);
-        return new started_generic_container_1.StartedGenericContainer(container, client.info.containerRuntime.host, inspectResult, boundPorts, inspectResult.Name, this.waitStrategy, this.autoRemove);
+        await (0, wait_for_container_1.waitForContainer)(client, container, waitStrategy, boundPorts);
+        return new started_generic_container_1.StartedGenericContainer(container, client.info.containerRuntime.host, inspectResult, boundPorts, inspectResult.Name, waitStrategy, this.autoRemove);
     }
     async startContainer(client) {
         const container = await client.container.create({ ...this.createOpts, HostConfig: this.hostConfig });
@@ -142,9 +152,6 @@ class GenericContainer {
         const inspectResult = await (0, inspect_container_util_ports_exposed_1.inspectContainerUntilPortsExposed)(() => client.container.inspect(container), container.id);
         const mappedInspectResult = (0, map_inspect_result_1.mapInspectResult)(inspectResult);
         const boundPorts = bound_ports_1.BoundPorts.fromInspectResult(client.info.containerRuntime.hostIps, mappedInspectResult).filter(this.exposedPorts);
-        if (this.startupTimeoutMs !== undefined) {
-            this.waitStrategy.withStartupTimeout(this.startupTimeoutMs);
-        }
         if (common_1.containerLog.enabled() || this.logConsumer !== undefined) {
             if (this.logConsumer !== undefined) {
                 this.logConsumer(await client.container.logs(container));
@@ -158,8 +165,12 @@ class GenericContainer {
         if (this.containerStarting) {
             await this.containerStarting(mappedInspectResult, false);
         }
-        await (0, wait_for_container_1.waitForContainer)(client, container, this.waitStrategy, boundPorts);
-        const startedContainer = new started_generic_container_1.StartedGenericContainer(container, client.info.containerRuntime.host, inspectResult, boundPorts, inspectResult.Name, this.waitStrategy, this.autoRemove);
+        const waitStrategy = await this.selectWaitStrategy(client, inspectResult);
+        if (this.startupTimeoutMs !== undefined) {
+            waitStrategy.withStartupTimeout(this.startupTimeoutMs);
+        }
+        await (0, wait_for_container_1.waitForContainer)(client, container, waitStrategy, boundPorts);
+        const startedContainer = new started_generic_container_1.StartedGenericContainer(container, client.info.containerRuntime.host, inspectResult, boundPorts, inspectResult.Name, waitStrategy, this.autoRemove);
         if (this.containerStarted) {
             await this.containerStarted(startedContainer, mappedInspectResult, false);
         }

package/build/reaper/reaper.d.ts

@@ -1,5 +1,12 @@
 import { ContainerRuntimeClient } from "../container-runtime";
-export declare const REAPER_IMAGE: string;
+/**
+ * Resolve the Ryuk reaper image name. Read lazily so that callers (and tests)
+ * can set `process.env.RYUK_CONTAINER_IMAGE` _after_ this module is imported —
+ * including via `.env` files loaded by `dotenv` at runtime.
+ *
+ * See https://github.com/testcontainers/testcontainers-node/issues/1310.
+ */
+export declare function getReaperImage(): string;
 export interface Reaper {
     sessionId: string;
     containerId: string;

package/build/reaper/reaper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.REAPER_IMAGE = void 0;
+exports.getReaperImage = getReaperImage;
 exports.getReaper = getReaper;
 const net_1 = require("net");
 const os_1 = require("os");
@@ -9,9 +9,18 @@ const container_runtime_1 = require("../container-runtime");
 const generic_container_1 = require("../generic-container/generic-container");
 const labels_1 = require("../utils/labels");
 const wait_1 = require("../wait-strategies/wait");
-exports.REAPER_IMAGE = process.env["RYUK_CONTAINER_IMAGE"]
-    ? container_runtime_1.ImageName.fromString(process.env["RYUK_CONTAINER_IMAGE"]).string
-    : container_runtime_1.ImageName.fromString("testcontainers/ryuk:0.14.0").string;
+/**
+ * Resolve the Ryuk reaper image name. Read lazily so that callers (and tests)
+ * can set `process.env.RYUK_CONTAINER_IMAGE` _after_ this module is imported —
+ * including via `.env` files loaded by `dotenv` at runtime.
+ *
+ * See https://github.com/testcontainers/testcontainers-node/issues/1310.
+ */
+function getReaperImage() {
+    return process.env["RYUK_CONTAINER_IMAGE"]
+        ? container_runtime_1.ImageName.fromString(process.env["RYUK_CONTAINER_IMAGE"]).string
+        : container_runtime_1.ImageName.fromString("testcontainers/ryuk:0.14.0").string;
+}
 let reaper;
 let sessionId;
 async function getReaper(client) {
@@ -63,7 +72,7 @@ async function useExistingReaper(reaperContainer, sessionId, host) {
 }
 async function createNewReaper(sessionId, remoteSocketPath) {
     common_1.log.debug(`Creating new Reaper for session "${sessionId}" with socket path "${remoteSocketPath}"...`);
-    const container = new generic_container_1.GenericContainer(exports.REAPER_IMAGE)
+    const container = new generic_container_1.GenericContainer(getReaperImage())
         .withName(`testcontainers-ryuk-${sessionId}`)
         .withExposedPorts(process.env["TESTCONTAINERS_RYUK_PORT"]
         ? { container: 8080, host: parseInt(process.env["TESTCONTAINERS_RYUK_PORT"]) }

package/build/utils/map-inspect-result.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapInspectResult = mapInspectResult;
+const health_check_1 = require("../wait-strategies/utils/health-check");
 function mapInspectResult(inspectResult) {
     const finishedAt = new Date(inspectResult.State.FinishedAt);
     return {
@@ -34,12 +35,12 @@ function mapPorts(inspectInfo) {
         .reduce((acc, curr) => ({ ...acc, ...curr }), {});
 }
 function mapHealthCheckStatus(inspectResult) {
-    const health = inspectResult.State.Health;
-    if (health === undefined) {
+    const status = (0, health_check_1.getHealthCheckStatusFromInspect)(inspectResult);
+    if (status === undefined) {
         return "none";
     }
     else {
-        return health.Status;
+        return status;
     }
 }
 function mapNetworkSettings(inspectResult) {

package/build/utils/port-generator.js

@@ -1,42 +1,9 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FixedPortGenerator = exports.RandomPortGenerator = void 0;
 class RandomPortGenerator {
     async generatePort() {
-        const { default: getPort } = await Promise.resolve().then(() => __importStar(require("get-port")));
+        const { default: getPort } = await import("get-port");
         return getPort();
     }
 }

package/build/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "11.14.0";
+export declare const LIB_VERSION = "12.0.1";

package/build/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LIB_VERSION = void 0;
-exports.LIB_VERSION = "11.14.0";
+exports.LIB_VERSION = "12.0.1";

package/build/wait-strategies/health-check-wait-strategy.js

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HealthCheckWaitStrategy = void 0;
 const common_1 = require("../common");
 const container_runtime_1 = require("../container-runtime");
+const health_check_1 = require("./utils/health-check");
 const wait_strategy_1 = require("./wait-strategy");
 class HealthCheckWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
     async waitUntilReady(container) {
         common_1.log.debug(`Waiting for health check...`, { containerId: container.id });
         const client = await (0, container_runtime_1.getContainerRuntimeClient)();
-        const status = await new common_1.IntervalRetry(100).retryUntil(async () => (await client.container.inspect(container)).State.Health?.Status, (healthCheckStatus) => healthCheckStatus === "healthy" || healthCheckStatus === "unhealthy", () => {
+        const status = await new common_1.IntervalRetry(100).retryUntil(async () => (0, health_check_1.getHealthCheckStatusFromInspect)(await client.container.inspect(container)), (healthCheckStatus) => healthCheckStatus === "healthy" || healthCheckStatus === "unhealthy", () => {
             const timeout = this.startupTimeoutMs;
             const message = `Health check not healthy after ${timeout}ms`;
             common_1.log.error(message, { containerId: container.id });

package/build/wait-strategies/utils/health-check.d.ts

@@ -0,0 +1,12 @@
+import { ContainerInspectInfo, HealthConfig, ImageInspectInfo } from "dockerode";
+import { HealthCheck, HealthCheckStatus } from "../../types";
+type HealthCheckConfig = HealthConfig | HealthCheck;
+type HealthCheckInspectInfo = ContainerInspectInfo | ImageInspectInfo;
+export declare const isHealthCheckDisabled: (healthCheck: HealthCheckConfig | undefined) => boolean;
+export declare const hasHealthCheck: (healthCheck: HealthCheckConfig | undefined) => boolean;
+export declare const getHealthCheckConfig: (inspectResult: HealthCheckInspectInfo) => HealthConfig | undefined;
+export declare const hasHealthCheckConfig: (inspectResult: HealthCheckInspectInfo) => boolean;
+export declare const hasDisabledHealthCheckConfig: (inspectResult: HealthCheckInspectInfo) => boolean;
+export declare const getHealthCheckStatusFromInspect: (inspectResult: ContainerInspectInfo) => HealthCheckStatus | undefined;
+export declare const hasHealthCheckStatus: (inspectResult: ContainerInspectInfo) => boolean;
+export {};

package/build/wait-strategies/utils/health-check.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasHealthCheckStatus = exports.getHealthCheckStatusFromInspect = exports.hasDisabledHealthCheckConfig = exports.hasHealthCheckConfig = exports.getHealthCheckConfig = exports.hasHealthCheck = exports.isHealthCheckDisabled = void 0;
+const DISABLED_HEALTH_CHECK_TEST = "NONE";
+const getHealthCheckTest = (healthCheck) => {
+    if ("test" in healthCheck) {
+        return healthCheck.test;
+    }
+    return healthCheck.Test;
+};
+const isDisabledHealthCheck = (test) => {
+    return test[0].toUpperCase() === DISABLED_HEALTH_CHECK_TEST;
+};
+const isHealthCheckDisabled = (healthCheck) => {
+    if (healthCheck === undefined) {
+        return false;
+    }
+    const test = getHealthCheckTest(healthCheck);
+    if (test === undefined || test.length === 0) {
+        return false;
+    }
+    return isDisabledHealthCheck(test);
+};
+exports.isHealthCheckDisabled = isHealthCheckDisabled;
+const hasHealthCheck = (healthCheck) => {
+    if (healthCheck === undefined) {
+        return false;
+    }
+    const test = getHealthCheckTest(healthCheck);
+    if (test === undefined || test.length === 0) {
+        return false;
+    }
+    return !(0, exports.isHealthCheckDisabled)(healthCheck);
+};
+exports.hasHealthCheck = hasHealthCheck;
+const getHealthCheckConfig = (inspectResult) => {
+    const inspectWithHealthCheckConfig = inspectResult;
+    return (inspectWithHealthCheckConfig.Config?.Healthcheck ??
+        inspectWithHealthCheckConfig.Config?.HealthCheck ??
+        inspectWithHealthCheckConfig.ContainerConfig?.Healthcheck ??
+        inspectWithHealthCheckConfig.ContainerConfig?.HealthCheck ??
+        inspectWithHealthCheckConfig.Healthcheck ??
+        inspectWithHealthCheckConfig.HealthCheck);
+};
+exports.getHealthCheckConfig = getHealthCheckConfig;
+const hasHealthCheckConfig = (inspectResult) => {
+    return (0, exports.hasHealthCheck)((0, exports.getHealthCheckConfig)(inspectResult));
+};
+exports.hasHealthCheckConfig = hasHealthCheckConfig;
+const hasDisabledHealthCheckConfig = (inspectResult) => {
+    return (0, exports.isHealthCheckDisabled)((0, exports.getHealthCheckConfig)(inspectResult));
+};
+exports.hasDisabledHealthCheckConfig = hasDisabledHealthCheckConfig;
+const getHealthCheckStatusFromInspect = (inspectResult) => {
+    const state = inspectResult.State;
+    const status = state.Health?.Status ?? state.Healthcheck?.Status;
+    return status === undefined || status === "" ? undefined : status;
+};
+exports.getHealthCheckStatusFromInspect = getHealthCheckStatusFromInspect;
+const hasHealthCheckStatus = (inspectResult) => {
+    return (0, exports.getHealthCheckStatusFromInspect)(inspectResult) !== undefined;
+};
+exports.hasHealthCheckStatus = hasHealthCheckStatus;

package/build/wait-strategies/utils/wait-strategy-selector.d.ts

@@ -0,0 +1,13 @@
+import { ContainerInspectInfo } from "dockerode";
+import { ContainerRuntimeClient } from "../../container-runtime";
+import { HealthCheck } from "../../types";
+import { WaitStrategy } from "../wait-strategy";
+type WaitStrategySelectorOptions = {
+    client: ContainerRuntimeClient;
+    inspectResult: ContainerInspectInfo;
+    waitStrategy?: WaitStrategy;
+    healthCheck?: HealthCheck;
+    imageNames?: string[];
+};
+export declare const selectWaitStrategy: ({ client, inspectResult, waitStrategy, healthCheck, imageNames, }: WaitStrategySelectorOptions) => Promise<WaitStrategy>;
+export {};

package/build/wait-strategies/utils/wait-strategy-selector.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.selectWaitStrategy = void 0;
+const common_1 = require("../../common");
+const container_runtime_1 = require("../../container-runtime");
+const wait_1 = require("../wait");
+const health_check_1 = require("./health-check");
+const selectWaitStrategy = async ({ client, inspectResult, waitStrategy, healthCheck, imageNames = getImageNames(inspectResult), }) => {
+    if (waitStrategy)
+        return waitStrategy;
+    if ((0, health_check_1.hasHealthCheck)(healthCheck))
+        return wait_1.Wait.forHealthCheck();
+    if ((0, health_check_1.hasDisabledHealthCheckConfig)(inspectResult))
+        return wait_1.Wait.forListeningPorts();
+    if ((0, health_check_1.hasHealthCheckConfig)(inspectResult) || (0, health_check_1.hasHealthCheckStatus)(inspectResult))
+        return wait_1.Wait.forHealthCheck();
+    if (await imageHasHealthCheck(client, imageNames))
+        return wait_1.Wait.forHealthCheck();
+    return wait_1.Wait.forListeningPorts();
+};
+exports.selectWaitStrategy = selectWaitStrategy;
+const getImageNames = (inspectResult) => {
+    return Array.from(new Set([inspectResult.Config.Image, inspectResult.Image].filter((imageName) => imageName !== undefined && imageName !== "")));
+};
+const imageHasHealthCheck = async (client, imageNames) => {
+    for (const imageName of imageNames) {
+        try {
+            if ((0, health_check_1.hasHealthCheckConfig)(await client.image.inspect(container_runtime_1.ImageName.fromString(imageName)))) {
+                return true;
+            }
+        }
+        catch (err) {
+            common_1.log.warn(`Failed to inspect image "${imageName}" for health check config: ${err}`);
+        }
+    }
+    return false;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testcontainers",
-  "version": "11.14.0",
+  "version": "12.0.1",
   "author": "Cristian Greco",
   "license": "MIT",
   "keywords": [
@@ -37,14 +37,14 @@
     "byline": "^5.0.0",
     "debug": "^4.4.3",
     "docker-compose": "^1.4.2",
-    "dockerode": "^4.0.10",
+    "dockerode": "^5.0.0",
     "get-port": "^7.2.0",
     "proper-lockfile": "^4.1.2",
     "properties-reader": "^3.0.1",
     "ssh-remote-port-forward": "^1.0.4",
     "tar-fs": "^3.1.2",
-    "tmp": "^0.2.5",
-    "undici": "^7.24.5"
+    "tmp": "^0.2.6",
+    "undici": "^7.25.0"
   },
   "devDependencies": {
     "@types/archiver": "^7.0.0",