testcontainers 10.8.2 → 10.9.0

package/build/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "10.8.2";
+export declare const LIB_VERSION = "10.9.0";

package/build/version.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LIB_VERSION = void 0;
-exports.LIB_VERSION = "10.8.2";
+exports.LIB_VERSION = "10.9.0";
 //# sourceMappingURL=version.js.map

package/build/wait-strategies/one-shot-startup-startegy.d.ts

@@ -0,0 +1,8 @@
+import Dockerode from "dockerode";
+import { StartupCheckStrategy, StartupStatus } from "./startup-check-strategy";
+export declare class OneShotStartupCheckStrategy extends StartupCheckStrategy {
+    DOCKER_TIMESTAMP_ZERO: string;
+    private isDockerTimestampNonEmpty;
+    private isContainerStopped;
+    checkStartupState(dockerClient: Dockerode, containerId: string): Promise<StartupStatus>;
+}

package/build/wait-strategies/one-shot-startup-startegy.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OneShotStartupCheckStrategy = void 0;
+const startup_check_strategy_1 = require("./startup-check-strategy");
+class OneShotStartupCheckStrategy extends startup_check_strategy_1.StartupCheckStrategy {
+    DOCKER_TIMESTAMP_ZERO = "0001-01-01T00:00:00Z";
+    isDockerTimestampNonEmpty(dockerTimestamp) {
+        return dockerTimestamp !== "" && dockerTimestamp !== this.DOCKER_TIMESTAMP_ZERO && Date.parse(dockerTimestamp) > 0;
+    }
+    isContainerStopped({ State: state }) {
+        if (state.Running || state.Paused) {
+            return false;
+        }
+        return this.isDockerTimestampNonEmpty(state.StartedAt) && this.isDockerTimestampNonEmpty(state.FinishedAt);
+    }
+    async checkStartupState(dockerClient, containerId) {
+        const info = await dockerClient.getContainer(containerId).inspect();
+        if (!this.isContainerStopped(info)) {
+            return "PENDING";
+        }
+        if (info.State.ExitCode === 0) {
+            return "SUCCESS";
+        }
+        return "FAIL";
+    }
+}
+exports.OneShotStartupCheckStrategy = OneShotStartupCheckStrategy;
+//# sourceMappingURL=one-shot-startup-startegy.js.map

package/build/wait-strategies/one-shot-startup-startegy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"one-shot-startup-startegy.js","sourceRoot":"","sources":["../../src/wait-strategies/one-shot-startup-startegy.ts"],"names":[],"mappings":";;;AACA,qEAA+E;AAE/E,MAAa,2BAA4B,SAAQ,6CAAoB;IACnE,qBAAqB,GAAG,sBAAsB,CAAC;IAEvC,yBAAyB,CAAC,eAAuB;QACvD,OAAO,eAAe,KAAK,EAAE,IAAI,eAAe,KAAK,IAAI,CAAC,qBAAqB,IAAI,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;IACrH,CAAC;IAEO,kBAAkB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAwB;QAC/D,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE;YACjC,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC7G,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,YAAuB,EAAE,WAAmB;QACzE,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,CAAC;QAEpE,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE;YAClC,OAAO,SAAS,CAAC;SAClB;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,KAAK,CAAC,EAAE;YAC7B,OAAO,SAAS,CAAC;SAClB;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AA5BD,kEA4BC"}

package/build/wait-strategies/startup-check-strategy.d.ts

@@ -1,10 +1,8 @@
 import { AbstractWaitStrategy } from "./wait-strategy";
 import Dockerode from "dockerode";
-import { ContainerRuntimeClient } from "../container-runtime";
 export type StartupStatus = "PENDING" | "SUCCESS" | "FAIL";
 export declare abstract class StartupCheckStrategy extends AbstractWaitStrategy {
-    private readonly client;
-    constructor(client: ContainerRuntimeClient);
+    constructor();
     abstract checkStartupState(dockerClient: Dockerode, containerId: string): Promise<StartupStatus>;
     waitUntilReady(container: Dockerode.Container): Promise<void>;
 }

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

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StartupCheckStrategy = void 0;
 const wait_strategy_1 = require("./wait-strategy");
+const container_runtime_1 = require("../container-runtime");
 const common_1 = require("../common");
 class StartupCheckStrategy extends wait_strategy_1.AbstractWaitStrategy {
-    client;
-    constructor(client) {
+    constructor() {
         super();
-        this.client = client;
     }
     async waitUntilReady(container) {
-        const startupStatus = await new common_1.IntervalRetry(1000).retryUntil(async () => await this.checkStartupState(this.client.container.dockerode, container.id), (startupStatus) => startupStatus === "SUCCESS" || startupStatus === "FAIL", () => {
+        const client = await (0, container_runtime_1.getContainerRuntimeClient)();
+        const startupStatus = await new common_1.IntervalRetry(1000).retryUntil(async () => await this.checkStartupState(client.container.dockerode, container.id), (startupStatus) => startupStatus === "SUCCESS" || startupStatus === "FAIL", () => {
             const message = `Container not accessible after ${this.startupTimeout}ms`;
             common_1.log.error(message, { containerId: container.id });
             return new Error(message);

package/build/wait-strategies/startup-check-strategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"startup-check-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/startup-check-strategy.ts"],"names":[],"mappings":";;;AAAA,mDAAuD;AAGvD,sCAA+C;AAI/C,MAAsB,oBAAqB,SAAQ,oCAAoB;IACxC;IAA7B,YAA6B,MAA8B;QACzD,KAAK,EAAE,CAAC;QADmB,WAAM,GAAN,MAAM,CAAwB;IAE3D,CAAC;IAIe,KAAK,CAAC,cAAc,CAAC,SAA8B;QACjE,MAAM,aAAa,GAAG,MAAM,IAAI,sBAAa,CAAuB,IAAI,CAAC,CAAC,UAAU,CAClF,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,EACvF,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,KAAK,SAAS,IAAI,aAAa,KAAK,MAAM,EAC1E,GAAG,EAAE;YACH,MAAM,OAAO,GAAG,kCAAkC,IAAI,CAAC,cAAc,IAAI,CAAC;YAC1E,YAAG,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;YAClD,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5B,CAAC,EACD,IAAI,CAAC,cAAc,CACpB,CAAC;QAEF,IAAI,aAAa,YAAY,KAAK,EAAE;YAClC,MAAM,aAAa,CAAC;SACrB;aAAM,IAAI,aAAa,KAAK,MAAM,EAAE;YACnC,MAAM,IAAI,KAAK,CAAC,iCAAiC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;SAClE;IACH,CAAC;CACF;AAzBD,oDAyBC"}
+{"version":3,"file":"startup-check-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/startup-check-strategy.ts"],"names":[],"mappings":";;;AAAA,mDAAuD;AAEvD,4DAAiE;AACjE,sCAA+C;AAI/C,MAAsB,oBAAqB,SAAQ,oCAAoB;IACrE;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAIe,KAAK,CAAC,cAAc,CAAC,SAA8B;QACjE,MAAM,MAAM,GAAG,MAAM,IAAA,6CAAyB,GAAE,CAAC;QAEjD,MAAM,aAAa,GAAG,MAAM,IAAI,sBAAa,CAAuB,IAAI,CAAC,CAAC,UAAU,CAClF,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,EAClF,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,KAAK,SAAS,IAAI,aAAa,KAAK,MAAM,EAC1E,GAAG,EAAE;YACH,MAAM,OAAO,GAAG,kCAAkC,IAAI,CAAC,cAAc,IAAI,CAAC;YAC1E,YAAG,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;YAClD,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5B,CAAC,EACD,IAAI,CAAC,cAAc,CACpB,CAAC;QAEF,IAAI,aAAa,YAAY,KAAK,EAAE;YAClC,MAAM,aAAa,CAAC;SACrB;aAAM,IAAI,aAAa,KAAK,MAAM,EAAE;YACnC,MAAM,IAAI,KAAK,CAAC,iCAAiC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;SAClE;IACH,CAAC;CACF;AA3BD,oDA2BC"}

package/build/wait-strategies/wait.d.ts

@@ -8,6 +8,7 @@ export declare class Wait {
     static forListeningPorts(): WaitStrategy;
     static forLogMessage(message: Log | RegExp, times?: number): WaitStrategy;
     static forHealthCheck(): WaitStrategy;
+    static forOneShotStartup(): WaitStrategy;
     static forHttp(path: string, port: number, options?: HttpWaitStrategyOptions): HttpWaitStrategy;
     static forSuccessfulCommand(command: string): ShellWaitStrategy;
 }

package/build/wait-strategies/wait.js

@@ -7,6 +7,7 @@ const log_wait_strategy_1 = require("./log-wait-strategy");
 const shell_wait_strategy_1 = require("./shell-wait-strategy");
 const host_port_wait_strategy_1 = require("./host-port-wait-strategy");
 const composite_wait_strategy_1 = require("./composite-wait-strategy");
+const one_shot_startup_startegy_1 = require("./one-shot-startup-startegy");
 class Wait {
     static forAll(waitStrategies) {
         return new composite_wait_strategy_1.CompositeWaitStrategy(waitStrategies);
@@ -20,6 +21,9 @@ class Wait {
     static forHealthCheck() {
         return new health_check_wait_strategy_1.HealthCheckWaitStrategy();
     }
+    static forOneShotStartup() {
+        return new one_shot_startup_startegy_1.OneShotStartupCheckStrategy();
+    }
     static forHttp(path, port, options = { abortOnContainerExit: false }) {
         return new http_wait_strategy_1.HttpWaitStrategy(path, port, options);
     }

package/build/wait-strategies/wait.js.map

@@ -1 +1 @@
-{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/wait-strategies/wait.ts"],"names":[],"mappings":";;;AACA,6DAAiF;AACjF,6EAAuE;AACvE,2DAA2D;AAC3D,+DAA0D;AAC1D,uEAAiE;AACjE,uEAAkE;AAElE,MAAa,IAAI;IACR,MAAM,CAAC,MAAM,CAAC,cAA8B;QACjD,OAAO,IAAI,+CAAqB,CAAC,cAAc,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAC,iBAAiB;QAC7B,OAAO,IAAI,8CAAoB,EAAE,CAAC;IACpC,CAAC;IAEM,MAAM,CAAC,aAAa,CAAC,OAAqB,EAAE,KAAK,GAAG,CAAC;QAC1D,OAAO,IAAI,mCAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;IAEM,MAAM,CAAC,cAAc;QAC1B,OAAO,IAAI,oDAAuB,EAAE,CAAC;IACvC,CAAC;IAEM,MAAM,CAAC,OAAO,CACnB,IAAY,EACZ,IAAY,EACZ,UAAmC,EAAE,oBAAoB,EAAE,KAAK,EAAE;QAElE,OAAO,IAAI,qCAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAC,oBAAoB,CAAC,OAAe;QAChD,OAAO,IAAI,uCAAiB,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;CACF;AA5BD,oBA4BC"}
+{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/wait-strategies/wait.ts"],"names":[],"mappings":";;;AACA,6DAAiF;AACjF,6EAAuE;AACvE,2DAA2D;AAC3D,+DAA0D;AAC1D,uEAAiE;AACjE,uEAAkE;AAClE,2EAA0E;AAE1E,MAAa,IAAI;IACR,MAAM,CAAC,MAAM,CAAC,cAA8B;QACjD,OAAO,IAAI,+CAAqB,CAAC,cAAc,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAC,iBAAiB;QAC7B,OAAO,IAAI,8CAAoB,EAAE,CAAC;IACpC,CAAC;IAEM,MAAM,CAAC,aAAa,CAAC,OAAqB,EAAE,KAAK,GAAG,CAAC;QAC1D,OAAO,IAAI,mCAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;IAEM,MAAM,CAAC,cAAc;QAC1B,OAAO,IAAI,oDAAuB,EAAE,CAAC;IACvC,CAAC;IAEM,MAAM,CAAC,iBAAiB;QAC7B,OAAO,IAAI,uDAA2B,EAAE,CAAC;IAC3C,CAAC;IAEM,MAAM,CAAC,OAAO,CACnB,IAAY,EACZ,IAAY,EACZ,UAAmC,EAAE,oBAAoB,EAAE,KAAK,EAAE;QAElE,OAAO,IAAI,qCAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAC,oBAAoB,CAAC,OAAe;QAChD,OAAO,IAAI,uCAAiB,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;CACF;AAhCD,oBAgCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testcontainers",
-  "version": "10.8.2",
+  "version": "10.9.0",
   "author": "Cristian Greco",
   "license": "MIT",
   "keywords": [