testcontainers 10.27.0 → 11.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +2 -2
- package/README.md +3 -4
- package/build/common/file-lock.js +18 -9
- package/build/common/file-lock.js.map +1 -1
- package/build/common/hash.js +1 -2
- package/build/common/hash.js.map +1 -1
- package/build/common/index.d.ts +2 -1
- package/build/common/index.js +3 -2
- package/build/common/index.js.map +1 -1
- package/build/common/logger.js.map +1 -1
- package/build/common/retry.d.ts +4 -4
- package/build/common/retry.js +4 -4
- package/build/common/retry.js.map +1 -1
- package/build/common/streams.js.map +1 -1
- package/build/common/time.d.ts +2 -0
- package/build/common/time.js +8 -0
- package/build/common/time.js.map +1 -0
- package/build/container-runtime/auth/auths.js.map +1 -1
- package/build/container-runtime/auth/cred-helpers.js.map +1 -1
- package/build/container-runtime/auth/credential-provider.js.map +1 -1
- package/build/container-runtime/auth/creds-store.js.map +1 -1
- package/build/container-runtime/auth/get-auth-config.js.map +1 -1
- package/build/container-runtime/clients/client.js +3 -4
- package/build/container-runtime/clients/client.js.map +1 -1
- package/build/container-runtime/clients/compose/compose-client.d.ts +0 -3
- package/build/container-runtime/clients/compose/compose-client.js +16 -132
- package/build/container-runtime/clients/compose/compose-client.js.map +1 -1
- package/build/container-runtime/clients/compose/default-compose-options.d.ts +0 -1
- package/build/container-runtime/clients/compose/default-compose-options.js +1 -2
- package/build/container-runtime/clients/compose/default-compose-options.js.map +1 -1
- package/build/container-runtime/clients/compose/parse-compose-container-name.js +1 -2
- package/build/container-runtime/clients/compose/parse-compose-container-name.js.map +1 -1
- package/build/container-runtime/clients/compose/types.d.ts +0 -1
- package/build/container-runtime/clients/container/container-client.d.ts +0 -2
- package/build/container-runtime/clients/container/docker-container-client.d.ts +0 -2
- package/build/container-runtime/clients/container/docker-container-client.js +3 -4
- package/build/container-runtime/clients/container/docker-container-client.js.map +1 -1
- package/build/container-runtime/clients/image/docker-image-client.js.map +1 -1
- package/build/container-runtime/clients/network/docker-network-client.js.map +1 -1
- package/build/container-runtime/clients/types.d.ts +0 -5
- package/build/container-runtime/image-name.js.map +1 -1
- package/build/container-runtime/strategies/configuration-strategy.d.ts +0 -3
- package/build/container-runtime/strategies/configuration-strategy.js +9 -15
- package/build/container-runtime/strategies/configuration-strategy.js.map +1 -1
- package/build/container-runtime/strategies/npipe-socket-strategy.d.ts +0 -1
- package/build/container-runtime/strategies/npipe-socket-strategy.js.map +1 -1
- package/build/container-runtime/strategies/rootless-unix-socket-strategy.d.ts +0 -1
- package/build/container-runtime/strategies/rootless-unix-socket-strategy.js.map +1 -1
- package/build/container-runtime/strategies/testcontainers-host-strategy.js.map +1 -1
- package/build/container-runtime/strategies/types.d.ts +0 -1
- package/build/container-runtime/strategies/unix-socket-strategy.d.ts +0 -1
- package/build/container-runtime/strategies/unix-socket-strategy.js.map +1 -1
- package/build/container-runtime/strategies/utils/config.d.ts +0 -1
- package/build/container-runtime/strategies/utils/config.js.map +1 -1
- package/build/container-runtime/utils/attach-container.js.map +1 -1
- package/build/container-runtime/utils/demux-stream.d.ts +0 -1
- package/build/container-runtime/utils/demux-stream.js +1 -2
- package/build/container-runtime/utils/demux-stream.js.map +1 -1
- package/build/container-runtime/utils/image-exists.js +1 -2
- package/build/container-runtime/utils/image-exists.js.map +1 -1
- package/build/container-runtime/utils/lookup-host-ips.js.map +1 -1
- package/build/container-runtime/utils/pull-image.js.map +1 -1
- package/build/container-runtime/utils/remote-container-runtime-socket-path.d.ts +0 -5
- package/build/container-runtime/utils/remote-container-runtime-socket-path.js.map +1 -1
- package/build/container-runtime/utils/resolve-host.d.ts +0 -5
- package/build/container-runtime/utils/resolve-host.js.map +1 -1
- package/build/container-runtime/utils/run-in-container.js.map +1 -1
- package/build/container-runtime/utils/start-container.js.map +1 -1
- package/build/docker-compose-environment/docker-compose-environment.d.ts +2 -2
- package/build/docker-compose-environment/docker-compose-environment.js +5 -5
- package/build/docker-compose-environment/docker-compose-environment.js.map +1 -1
- package/build/docker-compose-environment/started-docker-compose-environment.js.map +1 -1
- package/build/generic-container/abstract-started-container.d.ts +0 -2
- package/build/generic-container/abstract-started-container.js.map +1 -1
- package/build/generic-container/abstract-stopped-container.d.ts +0 -1
- package/build/generic-container/generic-container-builder.js +1 -1
- package/build/generic-container/generic-container-builder.js.map +1 -1
- package/build/generic-container/generic-container.d.ts +1 -2
- package/build/generic-container/generic-container.js +9 -10
- package/build/generic-container/generic-container.js.map +1 -1
- package/build/generic-container/started-generic-container.d.ts +0 -2
- package/build/generic-container/started-generic-container.js.map +1 -1
- package/build/generic-container/stopped-generic-container.d.ts +0 -1
- package/build/index.d.ts +4 -4
- package/build/index.js +4 -4
- package/build/index.js.map +1 -1
- package/build/port-forwarder/port-forwarder.js +1 -1
- package/build/port-forwarder/port-forwarder.js.map +1 -1
- package/build/reaper/reaper.js +2 -2
- package/build/reaper/reaper.js.map +1 -1
- package/build/test-container.d.ts +0 -2
- package/build/test-containers.js.map +1 -1
- package/build/types.d.ts +0 -2
- package/build/utils/bound-ports.js.map +1 -1
- package/build/utils/dockerfile-parser.js +1 -2
- package/build/utils/dockerfile-parser.js.map +1 -1
- package/build/utils/labels.js +2 -2
- package/build/utils/labels.js.map +1 -1
- package/build/utils/map-inspect-result.js +1 -2
- package/build/utils/map-inspect-result.js.map +1 -1
- package/build/utils/port-generator.d.ts +1 -4
- package/build/utils/port-generator.js +19 -24
- package/build/utils/port-generator.js.map +1 -1
- package/build/version.d.ts +1 -1
- package/build/version.js +1 -1
- package/build/version.js.map +1 -1
- package/build/wait-strategies/composite-wait-strategy.d.ts +1 -1
- package/build/wait-strategies/composite-wait-strategy.js +2 -2
- package/build/wait-strategies/composite-wait-strategy.js.map +1 -1
- package/build/wait-strategies/health-check-wait-strategy.js +2 -2
- package/build/wait-strategies/health-check-wait-strategy.js.map +1 -1
- package/build/wait-strategies/host-port-wait-strategy.js +2 -2
- package/build/wait-strategies/host-port-wait-strategy.js.map +1 -1
- package/build/wait-strategies/http-wait-strategy.d.ts +19 -11
- package/build/wait-strategies/http-wait-strategy.js +33 -9
- package/build/wait-strategies/http-wait-strategy.js.map +1 -1
- package/build/wait-strategies/log-wait-strategy.js +2 -2
- package/build/wait-strategies/log-wait-strategy.js.map +1 -1
- package/build/wait-strategies/one-shot-startup-startegy.js.map +1 -1
- package/build/wait-strategies/shell-wait-strategy.js +2 -2
- package/build/wait-strategies/shell-wait-strategy.js.map +1 -1
- package/build/wait-strategies/startup-check-strategy.js +2 -2
- package/build/wait-strategies/startup-check-strategy.js.map +1 -1
- package/build/wait-strategies/utils/port-check.js.map +1 -1
- package/build/wait-strategies/wait-for-container.js.map +1 -1
- package/build/wait-strategies/wait-strategy.d.ts +3 -3
- package/build/wait-strategies/wait-strategy.js +4 -4
- package/build/wait-strategies/wait-strategy.js.map +1 -1
- package/package.json +8 -8
|
@@ -15,37 +15,32 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.FixedPortGenerator = exports.
|
|
36
|
+
exports.FixedPortGenerator = exports.RandomPortGenerator = void 0;
|
|
27
37
|
class RandomPortGenerator {
|
|
28
38
|
async generatePort() {
|
|
29
39
|
const { default: getPort } = await Promise.resolve().then(() => __importStar(require("get-port")));
|
|
30
40
|
return getPort();
|
|
31
41
|
}
|
|
32
42
|
}
|
|
33
|
-
|
|
34
|
-
portGenerator;
|
|
35
|
-
static assignedPorts = new Set();
|
|
36
|
-
constructor(portGenerator = new RandomPortGenerator()) {
|
|
37
|
-
this.portGenerator = portGenerator;
|
|
38
|
-
}
|
|
39
|
-
async generatePort() {
|
|
40
|
-
let port;
|
|
41
|
-
do {
|
|
42
|
-
port = await this.portGenerator.generatePort();
|
|
43
|
-
} while (RandomUniquePortGenerator.assignedPorts.has(port));
|
|
44
|
-
RandomUniquePortGenerator.assignedPorts.add(port);
|
|
45
|
-
return port;
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
exports.RandomUniquePortGenerator = RandomUniquePortGenerator;
|
|
43
|
+
exports.RandomPortGenerator = RandomPortGenerator;
|
|
49
44
|
class FixedPortGenerator {
|
|
50
45
|
ports;
|
|
51
46
|
portIndex = 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"port-generator.js","sourceRoot":"","sources":["../../src/utils/port-generator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"port-generator.js","sourceRoot":"","sources":["../../src/utils/port-generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,MAAa,mBAAmB;IACvB,KAAK,CAAC,YAAY;QACvB,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,wDAAa,UAAU,GAAC,CAAC;QACtD,OAAO,OAAO,EAAE,CAAC;IACnB,CAAC;CACF;AALD,kDAKC;AAED,MAAa,kBAAkB;IAGA;IAFrB,SAAS,GAAG,CAAC,CAAC;IAEtB,YAA6B,KAAe;QAAf,UAAK,GAAL,KAAK,CAAU;IAAG,CAAC;IAEzC,YAAY;QACjB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IACvD,CAAC;CACF;AARD,gDAQC"}
|
package/build/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const LIB_VERSION = "
|
|
1
|
+
export declare const LIB_VERSION = "11.0.0";
|
package/build/version.js
CHANGED
package/build/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG,QAAQ,CAAC"}
|
|
@@ -6,6 +6,6 @@ export declare class CompositeWaitStrategy extends AbstractWaitStrategy {
|
|
|
6
6
|
private deadline?;
|
|
7
7
|
constructor(waitStrategies: WaitStrategy[]);
|
|
8
8
|
waitUntilReady(container: Dockerode.Container, boundPorts: BoundPorts, startTime?: Date): Promise<void>;
|
|
9
|
-
withStartupTimeout(
|
|
9
|
+
withStartupTimeout(startupTimeoutMs: number): this;
|
|
10
10
|
withDeadline(deadline: number): this;
|
|
11
11
|
}
|
|
@@ -34,10 +34,10 @@ class CompositeWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
|
|
|
34
34
|
});
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
|
-
withStartupTimeout(
|
|
37
|
+
withStartupTimeout(startupTimeoutMs) {
|
|
38
38
|
this.waitStrategies
|
|
39
39
|
.filter((waitStrategy) => !waitStrategy.isStartupTimeoutSet())
|
|
40
|
-
.forEach((waitStrategy) => waitStrategy.withStartupTimeout(
|
|
40
|
+
.forEach((waitStrategy) => waitStrategy.withStartupTimeout(startupTimeoutMs));
|
|
41
41
|
return this;
|
|
42
42
|
}
|
|
43
43
|
withDeadline(deadline) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"composite-wait-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/composite-wait-strategy.ts"],"names":[],"mappings":";;;AACA,sCAAgC;AAEhC,mDAAqE;AAErE,MAAa,qBAAsB,SAAQ,oCAAoB;IAGhC;IAFrB,QAAQ,CAAU;IAE1B,YAA6B,cAA8B;QACzD,KAAK,EAAE,CAAC;QADmB,mBAAc,GAAd,cAAc,CAAgB;IAE3D,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,SAA8B,EAAE,UAAsB,EAAE,SAAgB;QAClG,YAAG,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QAErE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,eAA+B,CAAC;YACpC,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;
|
|
1
|
+
{"version":3,"file":"composite-wait-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/composite-wait-strategy.ts"],"names":[],"mappings":";;;AACA,sCAAgC;AAEhC,mDAAqE;AAErE,MAAa,qBAAsB,SAAQ,oCAAoB;IAGhC;IAFrB,QAAQ,CAAU;IAE1B,YAA6B,cAA8B;QACzD,KAAK,EAAE,CAAC;QADmB,mBAAc,GAAd,cAAc,CAAgB;IAE3D,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,SAA8B,EAAE,UAAsB,EAAE,SAAgB;QAClG,YAAG,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QAErE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,eAA+B,CAAC;YACpC,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAChC,eAAe,GAAG,UAAU,CAAC,GAAG,EAAE;oBAChC,MAAM,OAAO,GAAG,gDAAgD,IAAI,CAAC,QAAQ,IAAI,CAAC;oBAClF,YAAG,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;oBAClD,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC7B,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACpB,CAAC;YAED,OAAO,CAAC,GAAG,CACT,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CACzG;iBACE,IAAI,CAAC,GAAG,EAAE;gBACT,YAAG,CAAC,KAAK,CAAC,kCAAkC,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC7E,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;iBAC3B,OAAO,CAAC,GAAG,EAAE;gBACZ,IAAI,eAAe,EAAE,CAAC;oBACpB,YAAY,CAAC,eAAe,CAAC,CAAC;gBAChC,CAAC;YACH,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;IAEe,kBAAkB,CAAC,gBAAwB;QACzD,IAAI,CAAC,cAAc;aAChB,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC;aAC7D,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAChF,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,YAAY,CAAC,QAAgB;QAClC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA/CD,sDA+CC"}
|
|
@@ -9,11 +9,11 @@ class HealthCheckWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
|
|
|
9
9
|
common_1.log.debug(`Waiting for health check...`, { containerId: container.id });
|
|
10
10
|
const client = await (0, container_runtime_1.getContainerRuntimeClient)();
|
|
11
11
|
const status = await new common_1.IntervalRetry(100).retryUntil(async () => (await client.container.inspect(container)).State.Health?.Status, (healthCheckStatus) => healthCheckStatus === "healthy" || healthCheckStatus === "unhealthy", () => {
|
|
12
|
-
const timeout = this.
|
|
12
|
+
const timeout = this.startupTimeoutMs;
|
|
13
13
|
const message = `Health check not healthy after ${timeout}ms`;
|
|
14
14
|
common_1.log.error(message, { containerId: container.id });
|
|
15
15
|
throw new Error(message);
|
|
16
|
-
}, this.
|
|
16
|
+
}, this.startupTimeoutMs);
|
|
17
17
|
if (status !== "healthy") {
|
|
18
18
|
const message = `Health check failed: ${status}`;
|
|
19
19
|
common_1.log.error(message, { containerId: container.id });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health-check-wait-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/health-check-wait-strategy.ts"],"names":[],"mappings":";;;AACA,sCAA+C;AAC/C,4DAAiE;AACjE,mDAAuD;AAEvD,MAAa,uBAAwB,SAAQ,oCAAoB;IACxD,KAAK,CAAC,cAAc,CAAC,SAA8B;QACxD,YAAG,CAAC,KAAK,CAAC,6BAA6B,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QACxE,MAAM,MAAM,GAAG,MAAM,IAAA,6CAAyB,GAAE,CAAC;QAEjD,MAAM,MAAM,GAAG,MAAM,IAAI,sBAAa,CAA4B,GAAG,CAAC,CAAC,UAAU,CAC/E,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAC5E,CAAC,iBAAiB,EAAE,EAAE,CAAC,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,KAAK,WAAW,EAC3F,GAAG,EAAE;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"health-check-wait-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/health-check-wait-strategy.ts"],"names":[],"mappings":";;;AACA,sCAA+C;AAC/C,4DAAiE;AACjE,mDAAuD;AAEvD,MAAa,uBAAwB,SAAQ,oCAAoB;IACxD,KAAK,CAAC,cAAc,CAAC,SAA8B;QACxD,YAAG,CAAC,KAAK,CAAC,6BAA6B,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QACxE,MAAM,MAAM,GAAG,MAAM,IAAA,6CAAyB,GAAE,CAAC;QAEjD,MAAM,MAAM,GAAG,MAAM,IAAI,sBAAa,CAA4B,GAAG,CAAC,CAAC,UAAU,CAC/E,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAC5E,CAAC,iBAAiB,EAAE,EAAE,CAAC,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,KAAK,WAAW,EAC3F,GAAG,EAAE;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC;YACtC,MAAM,OAAO,GAAG,kCAAkC,OAAO,IAAI,CAAC;YAC9D,YAAG,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC,EACD,IAAI,CAAC,gBAAgB,CACtB,CAAC;QAEF,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,OAAO,GAAG,wBAAwB,MAAM,EAAE,CAAC;YACjD,YAAG,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;QAED,YAAG,CAAC,KAAK,CAAC,qCAAqC,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IAClF,CAAC;CACF;AAzBD,0DAyBC"}
|
|
@@ -32,10 +32,10 @@ class HostPortWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
|
|
|
32
32
|
}
|
|
33
33
|
async waitForPort(container, port, portCheck) {
|
|
34
34
|
await new common_1.IntervalRetry(100).retryUntil(() => portCheck.isBound(port), (isBound) => isBound, () => {
|
|
35
|
-
const message = `Port ${port} not bound after ${this.
|
|
35
|
+
const message = `Port ${port} not bound after ${this.startupTimeoutMs}ms`;
|
|
36
36
|
common_1.log.error(message, { containerId: container.id });
|
|
37
37
|
throw new Error(message);
|
|
38
|
-
}, this.
|
|
38
|
+
}, this.startupTimeoutMs);
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
exports.HostPortWaitStrategy = HostPortWaitStrategy;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"host-port-wait-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/host-port-wait-strategy.ts"],"names":[],"mappings":";;;AACA,sCAA+C;AAC/C,4DAAiE;AAEjE,mDAAiF;AACjF,mDAAuD;AAEvD,MAAa,oBAAqB,SAAQ,oCAAoB;IACrD,KAAK,CAAC,cAAc,CAAC,SAA8B,EAAE,UAAsB;QAChF,MAAM,MAAM,GAAG,MAAM,IAAA,6CAAyB,GAAE,CAAC;QACjD,MAAM,aAAa,GAAG,IAAI,0BAAa,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,iBAAiB,GAAG,IAAI,8BAAiB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAEnE,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,SAAS,EAAE,UAAU,CAAC;YAC3D,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,SAAS,EAAE,UAAU,CAAC;SACpE,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,SAAoB,EACpB,SAA8B,EAC9B,UAAsB;QAEtB,KAAK,MAAM,CAAC,EAAE,QAAQ,CAAC,IAAI,UAAU,CAAC,QAAQ,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"host-port-wait-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/host-port-wait-strategy.ts"],"names":[],"mappings":";;;AACA,sCAA+C;AAC/C,4DAAiE;AAEjE,mDAAiF;AACjF,mDAAuD;AAEvD,MAAa,oBAAqB,SAAQ,oCAAoB;IACrD,KAAK,CAAC,cAAc,CAAC,SAA8B,EAAE,UAAsB;QAChF,MAAM,MAAM,GAAG,MAAM,IAAA,6CAAyB,GAAE,CAAC;QACjD,MAAM,aAAa,GAAG,IAAI,0BAAa,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,iBAAiB,GAAG,IAAI,8BAAiB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAEnE,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,SAAS,EAAE,UAAU,CAAC;YAC3D,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,SAAS,EAAE,UAAU,CAAC;SACpE,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,SAAoB,EACpB,SAA8B,EAC9B,UAAsB;QAEtB,KAAK,MAAM,CAAC,EAAE,QAAQ,CAAC,IAAI,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC;YACjD,YAAG,CAAC,KAAK,CAAC,yBAAyB,QAAQ,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;YACjF,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;YACvD,YAAG,CAAC,KAAK,CAAC,aAAa,QAAQ,QAAQ,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QAC1E,CAAC;QACD,YAAG,CAAC,KAAK,CAAC,kCAAkC,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IAC/E,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAChC,SAAoB,EACpB,SAA8B,EAC9B,UAAsB;QAEtB,KAAK,MAAM,CAAC,YAAY,CAAC,IAAI,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC;YACnD,YAAG,CAAC,KAAK,CAAC,6BAA6B,YAAY,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;YACzF,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;YAC3D,YAAG,CAAC,KAAK,CAAC,iBAAiB,YAAY,QAAQ,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QAClF,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,SAA8B,EAAE,IAAY,EAAE,SAAoB;QAC1F,MAAM,IAAI,sBAAa,CAAiB,GAAG,CAAC,CAAC,UAAU,CACrD,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAC7B,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EACpB,GAAG,EAAE;YACH,MAAM,OAAO,GAAG,QAAQ,IAAI,oBAAoB,IAAI,CAAC,gBAAgB,IAAI,CAAC;YAC1E,YAAG,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC,EACD,IAAI,CAAC,gBAAgB,CACtB,CAAC;IACJ,CAAC;CACF;AAjDD,oDAiDC"}
|
|
@@ -11,22 +11,30 @@ export declare class HttpWaitStrategy extends AbstractWaitStrategy {
|
|
|
11
11
|
private protocol;
|
|
12
12
|
private method;
|
|
13
13
|
private headers;
|
|
14
|
-
private predicates;
|
|
14
|
+
private readonly predicates;
|
|
15
15
|
private _allowInsecure;
|
|
16
|
-
private
|
|
16
|
+
private readTimeoutMs;
|
|
17
17
|
constructor(path: string, port: number, options: HttpWaitStrategyOptions);
|
|
18
|
-
forStatusCode(statusCode: number):
|
|
19
|
-
forStatusCodeMatching(predicate: (statusCode: number) => boolean):
|
|
20
|
-
forResponsePredicate(predicate: (response: string) => boolean):
|
|
21
|
-
withMethod(method: string):
|
|
18
|
+
forStatusCode(statusCode: number): this;
|
|
19
|
+
forStatusCodeMatching(predicate: (statusCode: number) => boolean): this;
|
|
20
|
+
forResponsePredicate(predicate: (response: string) => boolean): this;
|
|
21
|
+
withMethod(method: string): this;
|
|
22
22
|
withHeaders(headers: {
|
|
23
23
|
[key: string]: string;
|
|
24
|
-
}):
|
|
25
|
-
withBasicCredentials(username: string, password: string):
|
|
26
|
-
withReadTimeout(
|
|
27
|
-
usingTls():
|
|
28
|
-
allowInsecure():
|
|
24
|
+
}): this;
|
|
25
|
+
withBasicCredentials(username: string, password: string): this;
|
|
26
|
+
withReadTimeout(startupTimeoutMs: number): this;
|
|
27
|
+
usingTls(): this;
|
|
28
|
+
allowInsecure(): this;
|
|
29
29
|
waitUntilReady(container: Dockerode.Container, boundPorts: BoundPorts): Promise<void>;
|
|
30
30
|
private handleContainerExit;
|
|
31
|
+
/**
|
|
32
|
+
* Converts an undici response to a fetch response.
|
|
33
|
+
* This is necessary because node's fetch does not support disabling SSL validation (https://github.com/orgs/nodejs/discussions/44038).
|
|
34
|
+
*
|
|
35
|
+
* @param undiciResponse The undici response to convert.
|
|
36
|
+
* @returns The fetch response.
|
|
37
|
+
*/
|
|
38
|
+
private undiciResponseToFetchResponse;
|
|
31
39
|
private getAgent;
|
|
32
40
|
}
|
|
@@ -14,7 +14,7 @@ class HttpWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
|
|
|
14
14
|
headers = {};
|
|
15
15
|
predicates = [];
|
|
16
16
|
_allowInsecure = false;
|
|
17
|
-
|
|
17
|
+
readTimeoutMs = 1000;
|
|
18
18
|
constructor(path, port, options) {
|
|
19
19
|
super();
|
|
20
20
|
this.path = path;
|
|
@@ -46,8 +46,8 @@ class HttpWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
|
|
|
46
46
|
this.headers = { ...this.headers, Authorization: `Basic ${base64Encoded}` };
|
|
47
47
|
return this;
|
|
48
48
|
}
|
|
49
|
-
withReadTimeout(
|
|
50
|
-
this.
|
|
49
|
+
withReadTimeout(startupTimeoutMs) {
|
|
50
|
+
this.readTimeoutMs = startupTimeoutMs;
|
|
51
51
|
return this;
|
|
52
52
|
}
|
|
53
53
|
usingTls() {
|
|
@@ -64,7 +64,7 @@ class HttpWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
|
|
|
64
64
|
let containerExited = false;
|
|
65
65
|
const client = await (0, container_runtime_1.getContainerRuntimeClient)();
|
|
66
66
|
const { abortOnContainerExit } = this.options;
|
|
67
|
-
await new common_1.IntervalRetry(this.
|
|
67
|
+
await new common_1.IntervalRetry(this.readTimeoutMs).retryUntil(async () => {
|
|
68
68
|
try {
|
|
69
69
|
const url = `${this.protocol}://${client.info.containerRuntime.host}:${boundPorts.getBinding(this.port)}${this.path}`;
|
|
70
70
|
if (abortOnContainerExit) {
|
|
@@ -74,12 +74,12 @@ class HttpWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
|
|
|
74
74
|
return;
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
|
-
return await
|
|
77
|
+
return this.undiciResponseToFetchResponse(await (0, undici_1.request)(url, {
|
|
78
78
|
method: this.method,
|
|
79
|
-
signal: AbortSignal.timeout(this.
|
|
79
|
+
signal: AbortSignal.timeout(this.readTimeoutMs),
|
|
80
80
|
headers: this.headers,
|
|
81
81
|
dispatcher: this.getAgent(),
|
|
82
|
-
});
|
|
82
|
+
}));
|
|
83
83
|
}
|
|
84
84
|
catch {
|
|
85
85
|
return undefined;
|
|
@@ -104,10 +104,10 @@ class HttpWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
|
|
|
104
104
|
return true;
|
|
105
105
|
}
|
|
106
106
|
}, () => {
|
|
107
|
-
const message = `URL ${this.path} not accessible after ${this.
|
|
107
|
+
const message = `URL ${this.path} not accessible after ${this.startupTimeoutMs}ms`;
|
|
108
108
|
common_1.log.error(message, { containerId: container.id });
|
|
109
109
|
throw new Error(message);
|
|
110
|
-
}, this.
|
|
110
|
+
}, this.startupTimeoutMs);
|
|
111
111
|
if (abortOnContainerExit && containerExited) {
|
|
112
112
|
return this.handleContainerExit(container);
|
|
113
113
|
}
|
|
@@ -131,6 +131,30 @@ class HttpWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
|
|
|
131
131
|
common_1.log.error(message, { containerId: container.id });
|
|
132
132
|
throw new Error(message);
|
|
133
133
|
}
|
|
134
|
+
/**
|
|
135
|
+
* Converts an undici response to a fetch response.
|
|
136
|
+
* This is necessary because node's fetch does not support disabling SSL validation (https://github.com/orgs/nodejs/discussions/44038).
|
|
137
|
+
*
|
|
138
|
+
* @param undiciResponse The undici response to convert.
|
|
139
|
+
* @returns The fetch response.
|
|
140
|
+
*/
|
|
141
|
+
undiciResponseToFetchResponse(undiciResponse) {
|
|
142
|
+
const headers = new Headers();
|
|
143
|
+
for (const [key, value] of Object.entries(undiciResponse.headers)) {
|
|
144
|
+
if (Array.isArray(value)) {
|
|
145
|
+
for (const v of value) {
|
|
146
|
+
headers.append(key, v);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
else if (value !== undefined) {
|
|
150
|
+
headers.set(key, value);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
return new Response(undiciResponse.body, {
|
|
154
|
+
status: undiciResponse.statusCode,
|
|
155
|
+
headers,
|
|
156
|
+
});
|
|
157
|
+
}
|
|
134
158
|
getAgent() {
|
|
135
159
|
if (this._allowInsecure) {
|
|
136
160
|
return new undici_1.Agent({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-wait-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/http-wait-strategy.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"http-wait-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/http-wait-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,10 +22,10 @@ class LogWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
|
|
|
22
22
|
const stream = await client.container.logs(container, { since: startTime ? startTime.getTime() / 1000 : 0 });
|
|
23
23
|
return new Promise((resolve, reject) => {
|
|
24
24
|
const timeout = setTimeout(() => {
|
|
25
|
-
const message = `Log message "${this.message}" not received after ${this.
|
|
25
|
+
const message = `Log message "${this.message}" not received after ${this.startupTimeoutMs}ms`;
|
|
26
26
|
common_1.log.error(message, { containerId: container.id });
|
|
27
27
|
reject(new Error(message));
|
|
28
|
-
}, this.
|
|
28
|
+
}, this.startupTimeoutMs);
|
|
29
29
|
const comparisonFn = (line) => {
|
|
30
30
|
if (this.message instanceof RegExp) {
|
|
31
31
|
return this.message.test(line);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log-wait-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/log-wait-strategy.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAE5B,sCAAgC;AAChC,4DAAiE;AAEjE,mDAAuD;AAIvD,MAAa,eAAgB,SAAQ,oCAAoB;IAEpC;IACA;IAFnB,YACmB,OAAqB,EACrB,KAAa;QAE9B,KAAK,EAAE,CAAC;QAHS,YAAO,GAAP,OAAO,CAAc;QACrB,UAAK,GAAL,KAAK,CAAQ;IAGhC,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,SAA8B,EAAE,UAAsB,EAAE,SAAgB;QAClG,YAAG,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,OAAO,MAAM,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QACzF,MAAM,MAAM,GAAG,MAAM,IAAA,6CAAyB,GAAE,CAAC;QACjD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC7G,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC9B,MAAM,OAAO,GAAG,gBAAgB,IAAI,CAAC,OAAO,wBAAwB,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"log-wait-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/log-wait-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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,CAAC;YAClC,OAAO,KAAK,CAAC;QACf,CAAC;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,CAAC;YACnC,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AA5BD,kEA4BC"}
|
|
@@ -19,10 +19,10 @@ class ShellWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
|
|
|
19
19
|
});
|
|
20
20
|
return exitCode;
|
|
21
21
|
}, (exitCode) => exitCode === 0, () => {
|
|
22
|
-
const message = `Shell command "${this.command}" not successful after ${this.
|
|
22
|
+
const message = `Shell command "${this.command}" not successful after ${this.startupTimeoutMs}ms`;
|
|
23
23
|
common_1.log.error(message, { containerId: container.id });
|
|
24
24
|
throw new Error(message);
|
|
25
|
-
}, this.
|
|
25
|
+
}, this.startupTimeoutMs);
|
|
26
26
|
common_1.log.debug(`Shell wait strategy complete`, { containerId: container.id });
|
|
27
27
|
}
|
|
28
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell-wait-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/shell-wait-strategy.ts"],"names":[],"mappings":";;;AACA,sCAA+C;AAC/C,4DAAiE;AACjE,mDAAuD;AAEvD,MAAa,iBAAkB,SAAQ,oCAAoB;IAC5B;IAA7B,YAA6B,OAAe;QAC1C,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAQ;IAE5C,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,SAA8B;QACxD,YAAG,CAAC,KAAK,CAAC,yCAAyC,IAAI,CAAC,OAAO,MAAM,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QACtG,MAAM,MAAM,GAAG,MAAM,IAAA,6CAAyB,GAAE,CAAC;QAEjD,MAAM,IAAI,sBAAa,CAAgB,GAAG,CAAC,CAAC,UAAU,CACpD,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;gBAC3F,GAAG,EAAE,KAAK;aACX,CAAC,CAAC;YACH,OAAO,QAAQ,CAAC;QAClB,CAAC,EACD,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,KAAK,CAAC,EAC5B,GAAG,EAAE;YACH,MAAM,OAAO,GAAG,kBAAkB,IAAI,CAAC,OAAO,0BAA0B,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"shell-wait-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/shell-wait-strategy.ts"],"names":[],"mappings":";;;AACA,sCAA+C;AAC/C,4DAAiE;AACjE,mDAAuD;AAEvD,MAAa,iBAAkB,SAAQ,oCAAoB;IAC5B;IAA7B,YAA6B,OAAe;QAC1C,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAQ;IAE5C,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,SAA8B;QACxD,YAAG,CAAC,KAAK,CAAC,yCAAyC,IAAI,CAAC,OAAO,MAAM,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QACtG,MAAM,MAAM,GAAG,MAAM,IAAA,6CAAyB,GAAE,CAAC;QAEjD,MAAM,IAAI,sBAAa,CAAgB,GAAG,CAAC,CAAC,UAAU,CACpD,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;gBAC3F,GAAG,EAAE,KAAK;aACX,CAAC,CAAC;YACH,OAAO,QAAQ,CAAC;QAClB,CAAC,EACD,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,KAAK,CAAC,EAC5B,GAAG,EAAE;YACH,MAAM,OAAO,GAAG,kBAAkB,IAAI,CAAC,OAAO,0BAA0B,IAAI,CAAC,gBAAgB,IAAI,CAAC;YAClG,YAAG,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;YAClD,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC,EACD,IAAI,CAAC,gBAAgB,CACtB,CAAC;QAEF,YAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3E,CAAC;CACF;AA3BD,8CA2BC"}
|
|
@@ -11,10 +11,10 @@ class StartupCheckStrategy extends wait_strategy_1.AbstractWaitStrategy {
|
|
|
11
11
|
async waitUntilReady(container) {
|
|
12
12
|
const client = await (0, container_runtime_1.getContainerRuntimeClient)();
|
|
13
13
|
const startupStatus = await new common_1.IntervalRetry(1000).retryUntil(async () => await this.checkStartupState(client.container.dockerode, container.id), (startupStatus) => startupStatus === "SUCCESS" || startupStatus === "FAIL", () => {
|
|
14
|
-
const message = `Container not accessible after ${this.
|
|
14
|
+
const message = `Container not accessible after ${this.startupTimeoutMs}ms`;
|
|
15
15
|
common_1.log.error(message, { containerId: container.id });
|
|
16
16
|
return new Error(message);
|
|
17
|
-
}, this.
|
|
17
|
+
}, this.startupTimeoutMs);
|
|
18
18
|
if (startupStatus instanceof Error) {
|
|
19
19
|
throw startupStatus;
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startup-check-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/startup-check-strategy.ts"],"names":[],"mappings":";;;AACA,sCAA+C;AAC/C,4DAAiE;AACjE,mDAAuD;AAIvD,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,
|
|
1
|
+
{"version":3,"file":"startup-check-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/startup-check-strategy.ts"],"names":[],"mappings":";;;AACA,sCAA+C;AAC/C,4DAAiE;AACjE,mDAAuD;AAIvD,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,gBAAgB,IAAI,CAAC;YAC5E,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,gBAAgB,CACtB,CAAC;QAEF,IAAI,aAAa,YAAY,KAAK,EAAE,CAAC;YACnC,MAAM,aAAa,CAAC;QACtB,CAAC;aAAM,IAAI,aAAa,KAAK,MAAM,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,iCAAiC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;CACF;AA3BD,oDA2BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"port-check.js","sourceRoot":"","sources":["../../../src/wait-strategies/utils/port-check.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAC7B,yCAAmC;AAOnC,MAAa,aAAa;IACK;IAA7B,YAA6B,MAA8B;QAA9B,WAAM,GAAN,MAAM,CAAwB;IAAG,CAAC;IAExD,OAAO,CAAC,IAAY;QACzB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,MAAM,GAAG,IAAI,YAAM,EAAE,CAAC;YAC5B,MAAM;iBACH,UAAU,CAAC,IAAI,CAAC;iBAChB,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBAChB,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC,CAAC;iBACD,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;gBAClB,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC,CAAC;iBACD,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE;gBAC1D,MAAM,CAAC,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAtBD,sCAsBC;AAED,MAAa,iBAAiB;IAKT;IACA;IALX,YAAY,GAAG,KAAK,CAAC;IACZ,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IAEpD,YACmB,MAA8B,EAC9B,SAA8B;QAD9B,WAAM,GAAN,MAAM,CAAwB;QAC9B,cAAS,GAAT,SAAS,CAAqB;IAC9C,CAAC;IAEG,KAAK,CAAC,OAAO,CAAC,IAAY;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG;YACf,CAAC,SAAS,EAAE,IAAI,EAAE,oDAAoD,OAAO,EAAE,CAAC;YAChF,CAAC,SAAS,EAAE,IAAI,EAAE,yBAAyB,IAAI,EAAE,CAAC;YAClD,CAAC,WAAW,EAAE,IAAI,EAAE,uBAAuB,IAAI,EAAE,CAAC;SACnD,CAAC;QAEF,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CACtC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAC/F,CAAC;QACF,MAAM,OAAO,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC;QAEvE,sEAAsE;QACtE,8FAA8F;QAC9F,yEAAyE;QACzE,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,GAAG,IAAI,MAAM,CAAC,QAAQ,KAAK,GAAG,CAAC,CAAC;QACxG,IAAI,CAAC,OAAO,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;
|
|
1
|
+
{"version":3,"file":"port-check.js","sourceRoot":"","sources":["../../../src/wait-strategies/utils/port-check.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wait-for-container.js","sourceRoot":"","sources":["../../src/wait-strategies/wait-for-container.ts"],"names":[],"mappings":";;;AACA,sCAAgC;AAKzB,MAAM,gBAAgB,GAAG,KAAK,EACnC,MAA8B,EAC9B,SAAoB,EACpB,YAA0B,EAC1B,UAAsB,EACtB,SAAgB,EACD,EAAE;IACjB,YAAG,CAAC,KAAK,CAAC,sCAAsC,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IAEjF,IAAI;
|
|
1
|
+
{"version":3,"file":"wait-for-container.js","sourceRoot":"","sources":["../../src/wait-strategies/wait-for-container.ts"],"names":[],"mappings":";;;AACA,sCAAgC;AAKzB,MAAM,gBAAgB,GAAG,KAAK,EACnC,MAA8B,EAC9B,SAAoB,EACpB,YAA0B,EAC1B,UAAsB,EACtB,SAAgB,EACD,EAAE;IACjB,YAAG,CAAC,KAAK,CAAC,sCAAsC,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IAEjF,IAAI,CAAC;QACH,MAAM,YAAY,CAAC,cAAc,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QACpE,YAAG,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,YAAG,CAAC,KAAK,CAAC,iCAAiC,GAAG,EAAE,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QACjF,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;YACvD,MAAM,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QACpE,CAAC;QAAC,OAAO,OAAO,EAAE,CAAC;YACjB,YAAG,CAAC,KAAK,CAAC,yDAAyD,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/G,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAtBW,QAAA,gBAAgB,oBAsB3B"}
|
|
@@ -2,15 +2,15 @@ import Dockerode from "dockerode";
|
|
|
2
2
|
import { BoundPorts } from "../utils/bound-ports";
|
|
3
3
|
export interface WaitStrategy {
|
|
4
4
|
waitUntilReady(container: Dockerode.Container, boundPorts: BoundPorts, startTime?: Date): Promise<void>;
|
|
5
|
-
withStartupTimeout(
|
|
5
|
+
withStartupTimeout(startupTimeoutMs: number): WaitStrategy;
|
|
6
6
|
isStartupTimeoutSet(): boolean;
|
|
7
7
|
getStartupTimeout(): number;
|
|
8
8
|
}
|
|
9
9
|
export declare abstract class AbstractWaitStrategy implements WaitStrategy {
|
|
10
|
-
protected
|
|
10
|
+
protected startupTimeoutMs: number;
|
|
11
11
|
private startupTimeoutSet;
|
|
12
12
|
abstract waitUntilReady(container: Dockerode.Container, boundPorts: BoundPorts, startTime?: Date): Promise<void>;
|
|
13
|
-
withStartupTimeout(
|
|
13
|
+
withStartupTimeout(startupTimeoutMs: number): this;
|
|
14
14
|
isStartupTimeoutSet(): boolean;
|
|
15
15
|
getStartupTimeout(): number;
|
|
16
16
|
}
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AbstractWaitStrategy = void 0;
|
|
4
4
|
class AbstractWaitStrategy {
|
|
5
|
-
|
|
5
|
+
startupTimeoutMs = 60_000;
|
|
6
6
|
startupTimeoutSet = false;
|
|
7
|
-
withStartupTimeout(
|
|
8
|
-
this.
|
|
7
|
+
withStartupTimeout(startupTimeoutMs) {
|
|
8
|
+
this.startupTimeoutMs = startupTimeoutMs;
|
|
9
9
|
this.startupTimeoutSet = true;
|
|
10
10
|
return this;
|
|
11
11
|
}
|
|
@@ -13,7 +13,7 @@ class AbstractWaitStrategy {
|
|
|
13
13
|
return this.startupTimeoutSet;
|
|
14
14
|
}
|
|
15
15
|
getStartupTimeout() {
|
|
16
|
-
return this.
|
|
16
|
+
return this.startupTimeoutMs;
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
exports.AbstractWaitStrategy = AbstractWaitStrategy;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wait-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/wait-strategy.ts"],"names":[],"mappings":";;;AAaA,MAAsB,oBAAoB;IAC9B,
|
|
1
|
+
{"version":3,"file":"wait-strategy.js","sourceRoot":"","sources":["../../src/wait-strategies/wait-strategy.ts"],"names":[],"mappings":";;;AAaA,MAAsB,oBAAoB;IAC9B,gBAAgB,GAAG,MAAM,CAAC;IAC5B,iBAAiB,GAAG,KAAK,CAAC;IAQ3B,kBAAkB,CAAC,gBAAwB;QAChD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,mBAAmB;QACxB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAEM,iBAAiB;QACtB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;CACF;AAvBD,oDAuBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "testcontainers",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "11.0.0",
|
|
4
4
|
"author": "Cristian Greco",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"keywords": [
|
|
@@ -31,23 +31,23 @@
|
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@balena/dockerignore": "^1.0.2",
|
|
34
|
-
"@types/dockerode": "^3.3.
|
|
34
|
+
"@types/dockerode": "^3.3.39",
|
|
35
35
|
"archiver": "^7.0.1",
|
|
36
36
|
"async-lock": "^1.4.1",
|
|
37
37
|
"byline": "^5.0.0",
|
|
38
|
-
"debug": "^4.
|
|
39
|
-
"docker-compose": "^
|
|
40
|
-
"dockerode": "^4.0.
|
|
38
|
+
"debug": "^4.4.1",
|
|
39
|
+
"docker-compose": "^1.2.0",
|
|
40
|
+
"dockerode": "^4.0.6",
|
|
41
41
|
"get-port": "^7.1.0",
|
|
42
42
|
"proper-lockfile": "^4.1.2",
|
|
43
43
|
"properties-reader": "^2.3.0",
|
|
44
44
|
"ssh-remote-port-forward": "^1.0.4",
|
|
45
|
-
"tar-fs": "^3.0.
|
|
45
|
+
"tar-fs": "^3.0.9",
|
|
46
46
|
"tmp": "^0.2.3",
|
|
47
|
-
"undici": "^
|
|
47
|
+
"undici": "^7.10.0"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
|
-
"@types/archiver": "^6.0.
|
|
50
|
+
"@types/archiver": "^6.0.3",
|
|
51
51
|
"@types/async-lock": "^1.4.2",
|
|
52
52
|
"@types/byline": "^4.2.36",
|
|
53
53
|
"@types/debug": "^4.1.12",
|