testcontainers 10.21.0 → 10.22.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/build/docker-compose-environment/docker-compose-environment.js +1 -1
- package/build/docker-compose-environment/docker-compose-environment.js.map +1 -1
- package/build/generic-container/generic-container-builder.d.ts +2 -0
- package/build/generic-container/generic-container-builder.js +6 -0
- package/build/generic-container/generic-container-builder.js.map +1 -1
- package/build/generic-container/generic-container.d.ts +2 -0
- package/build/generic-container/generic-container.js +7 -2
- package/build/generic-container/generic-container.js.map +1 -1
- package/build/generic-container/started-generic-container.d.ts +2 -1
- package/build/generic-container/started-generic-container.js +4 -2
- package/build/generic-container/started-generic-container.js.map +1 -1
- package/build/port-forwarder/port-forwarder.js +7 -1
- package/build/port-forwarder/port-forwarder.js.map +1 -1
- package/build/reaper/reaper.d.ts +1 -0
- package/build/reaper/reaper.js +20 -8
- package/build/reaper/reaper.js.map +1 -1
- package/build/test-container.d.ts +1 -0
- package/build/utils/labels.d.ts +1 -0
- package/build/utils/labels.js +2 -1
- package/build/utils/labels.js.map +1 -1
- package/build/utils/port-generator.js +25 -8
- package/build/utils/port-generator.js.map +1 -1
- package/build/version.d.ts +1 -1
- package/build/version.js +1 -1
- package/build/wait-strategies/utils/port-check.d.ts +1 -1
- package/build/wait-strategies/utils/port-check.js +18 -19
- package/build/wait-strategies/utils/port-check.js.map +1 -1
- package/package.json +5 -5
|
@@ -131,7 +131,7 @@ class DockerComposeEnvironment {
|
|
|
131
131
|
}
|
|
132
132
|
throw err;
|
|
133
133
|
}
|
|
134
|
-
return new started_generic_container_1.StartedGenericContainer(container, client.info.containerRuntime.host, inspectResult, boundPorts, containerName, waitStrategy);
|
|
134
|
+
return new started_generic_container_1.StartedGenericContainer(container, client.info.containerRuntime.host, inspectResult, boundPorts, containerName, waitStrategy, true);
|
|
135
135
|
}))).reduce((map, startedGenericContainer) => {
|
|
136
136
|
const containerName = startedGenericContainer.getName();
|
|
137
137
|
return { ...map, [containerName]: startedGenericContainer };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-compose-environment.js","sourceRoot":"","sources":["../../src/docker-compose-environment/docker-compose-environment.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"docker-compose-environment.js","sourceRoot":"","sources":["../../src/docker-compose-environment/docker-compose-environment.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,12 +12,14 @@ export declare class GenericContainerBuilder {
|
|
|
12
12
|
private buildArgs;
|
|
13
13
|
private pullPolicy;
|
|
14
14
|
private cache;
|
|
15
|
+
private buildkit;
|
|
15
16
|
private target?;
|
|
16
17
|
private platform?;
|
|
17
18
|
constructor(context: string, dockerfileName: string, uuid?: Uuid);
|
|
18
19
|
withBuildArgs(buildArgs: BuildArgs): GenericContainerBuilder;
|
|
19
20
|
withPullPolicy(pullPolicy: ImagePullPolicy): this;
|
|
20
21
|
withCache(cache: boolean): this;
|
|
22
|
+
withBuildkit(): this;
|
|
21
23
|
withPlatform(platform: string): this;
|
|
22
24
|
withTarget(target: string): this;
|
|
23
25
|
build(image?: string, options?: BuildOptions): Promise<GenericContainer>;
|
|
@@ -19,6 +19,7 @@ class GenericContainerBuilder {
|
|
|
19
19
|
buildArgs = {};
|
|
20
20
|
pullPolicy = pull_policy_1.PullPolicy.defaultPolicy();
|
|
21
21
|
cache = true;
|
|
22
|
+
buildkit = false;
|
|
22
23
|
target;
|
|
23
24
|
platform;
|
|
24
25
|
constructor(context, dockerfileName, uuid = new common_1.RandomUuid()) {
|
|
@@ -38,6 +39,10 @@ class GenericContainerBuilder {
|
|
|
38
39
|
this.cache = cache;
|
|
39
40
|
return this;
|
|
40
41
|
}
|
|
42
|
+
withBuildkit() {
|
|
43
|
+
this.buildkit = true;
|
|
44
|
+
return this;
|
|
45
|
+
}
|
|
41
46
|
withPlatform(platform) {
|
|
42
47
|
this.platform = platform;
|
|
43
48
|
return this;
|
|
@@ -67,6 +72,7 @@ class GenericContainerBuilder {
|
|
|
67
72
|
labels,
|
|
68
73
|
target: this.target,
|
|
69
74
|
platform: this.platform,
|
|
75
|
+
version: this.buildkit ? "2" : "1",
|
|
70
76
|
};
|
|
71
77
|
if (this.pullPolicy.shouldPull()) {
|
|
72
78
|
buildOptions.pull = "true";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generic-container-builder.js","sourceRoot":"","sources":["../../src/generic-container/generic-container-builder.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AACxB,sCAAkD;AAClD,4DAA2F;AAC3F,6CAA6C;AAE7C,kEAAiE;AACjE,4CAAgF;AAChF,sDAAmE;AACnE,2DAAuD;AAMvD,MAAa,uBAAuB;
|
|
1
|
+
{"version":3,"file":"generic-container-builder.js","sourceRoot":"","sources":["../../src/generic-container/generic-container-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ export declare class GenericContainer implements TestContainer {
|
|
|
19
19
|
protected environment: Record<string, string>;
|
|
20
20
|
protected exposedPorts: PortWithOptionalBinding[];
|
|
21
21
|
protected reuse: boolean;
|
|
22
|
+
protected autoRemove: boolean;
|
|
22
23
|
protected networkMode?: string;
|
|
23
24
|
protected networkAliases: string[];
|
|
24
25
|
protected pullPolicy: ImagePullPolicy;
|
|
@@ -64,6 +65,7 @@ export declare class GenericContainer implements TestContainer {
|
|
|
64
65
|
withPrivilegedMode(): this;
|
|
65
66
|
withUser(user: string): this;
|
|
66
67
|
withReuse(): this;
|
|
68
|
+
withAutoRemove(autoRemove: boolean): this;
|
|
67
69
|
withPullPolicy(pullPolicy: ImagePullPolicy): this;
|
|
68
70
|
withIpcMode(ipcMode: string): this;
|
|
69
71
|
withCopyFilesToContainer(filesToCopy: FileToCopy[]): this;
|
|
@@ -33,6 +33,7 @@ class GenericContainer {
|
|
|
33
33
|
environment = {};
|
|
34
34
|
exposedPorts = [];
|
|
35
35
|
reuse = false;
|
|
36
|
+
autoRemove = true;
|
|
36
37
|
networkMode;
|
|
37
38
|
networkAliases = [];
|
|
38
39
|
pullPolicy = pull_policy_1.PullPolicy.defaultPolicy();
|
|
@@ -110,7 +111,7 @@ class GenericContainer {
|
|
|
110
111
|
this.waitStrategy.withStartupTimeout(this.startupTimeout);
|
|
111
112
|
}
|
|
112
113
|
await (0, wait_for_container_1.waitForContainer)(client, container, this.waitStrategy, boundPorts);
|
|
113
|
-
return new started_generic_container_1.StartedGenericContainer(container, client.info.containerRuntime.host, inspectResult, boundPorts, inspectResult.Name, this.waitStrategy);
|
|
114
|
+
return new started_generic_container_1.StartedGenericContainer(container, client.info.containerRuntime.host, inspectResult, boundPorts, inspectResult.Name, this.waitStrategy, this.autoRemove);
|
|
114
115
|
}
|
|
115
116
|
async startContainer(client) {
|
|
116
117
|
const container = await client.container.create({ ...this.createOpts, HostConfig: this.hostConfig });
|
|
@@ -155,7 +156,7 @@ class GenericContainer {
|
|
|
155
156
|
await this.containerStarting(mappedInspectResult, false);
|
|
156
157
|
}
|
|
157
158
|
await (0, wait_for_container_1.waitForContainer)(client, container, this.waitStrategy, boundPorts);
|
|
158
|
-
const startedContainer = new started_generic_container_1.StartedGenericContainer(container, client.info.containerRuntime.host, inspectResult, boundPorts, inspectResult.Name, this.waitStrategy);
|
|
159
|
+
const startedContainer = new started_generic_container_1.StartedGenericContainer(container, client.info.containerRuntime.host, inspectResult, boundPorts, inspectResult.Name, this.waitStrategy, this.autoRemove);
|
|
159
160
|
if (this.containerStarted) {
|
|
160
161
|
await this.containerStarted(startedContainer, mappedInspectResult, false);
|
|
161
162
|
}
|
|
@@ -323,6 +324,10 @@ class GenericContainer {
|
|
|
323
324
|
this.reuse = true;
|
|
324
325
|
return this;
|
|
325
326
|
}
|
|
327
|
+
withAutoRemove(autoRemove) {
|
|
328
|
+
this.autoRemove = autoRemove;
|
|
329
|
+
return this;
|
|
330
|
+
}
|
|
326
331
|
withPullPolicy(pullPolicy) {
|
|
327
332
|
this.pullPolicy = pullPolicy;
|
|
328
333
|
return this;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generic-container.js","sourceRoot":"","sources":["../../src/generic-container/generic-container.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"generic-container.js","sourceRoot":"","sources":["../../src/generic-container/generic-container.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,9 +13,10 @@ export declare class StartedGenericContainer implements StartedTestContainer {
|
|
|
13
13
|
private boundPorts;
|
|
14
14
|
private readonly name;
|
|
15
15
|
private readonly waitStrategy;
|
|
16
|
+
private readonly autoRemove;
|
|
16
17
|
private stoppedContainer?;
|
|
17
18
|
private stopContainerLock;
|
|
18
|
-
constructor(container: Dockerode.Container, host: string, inspectResult: ContainerInspectInfo, boundPorts: BoundPorts, name: string, waitStrategy: WaitStrategy);
|
|
19
|
+
constructor(container: Dockerode.Container, host: string, inspectResult: ContainerInspectInfo, boundPorts: BoundPorts, name: string, waitStrategy: WaitStrategy, autoRemove: boolean);
|
|
19
20
|
protected containerIsStopping?(): Promise<void>;
|
|
20
21
|
stop(options?: Partial<StopOptions>): Promise<StoppedTestContainer>;
|
|
21
22
|
/**
|
|
@@ -21,15 +21,17 @@ class StartedGenericContainer {
|
|
|
21
21
|
boundPorts;
|
|
22
22
|
name;
|
|
23
23
|
waitStrategy;
|
|
24
|
+
autoRemove;
|
|
24
25
|
stoppedContainer;
|
|
25
26
|
stopContainerLock = new async_lock_1.default();
|
|
26
|
-
constructor(container, host, inspectResult, boundPorts, name, waitStrategy) {
|
|
27
|
+
constructor(container, host, inspectResult, boundPorts, name, waitStrategy, autoRemove) {
|
|
27
28
|
this.container = container;
|
|
28
29
|
this.host = host;
|
|
29
30
|
this.inspectResult = inspectResult;
|
|
30
31
|
this.boundPorts = boundPorts;
|
|
31
32
|
this.name = name;
|
|
32
33
|
this.waitStrategy = waitStrategy;
|
|
34
|
+
this.autoRemove = autoRemove;
|
|
33
35
|
}
|
|
34
36
|
async stop(options = {}) {
|
|
35
37
|
return this.stopContainerLock.acquire("stop", async () => {
|
|
@@ -90,7 +92,7 @@ class StartedGenericContainer {
|
|
|
90
92
|
if (this.containerIsStopping) {
|
|
91
93
|
await this.containerIsStopping();
|
|
92
94
|
}
|
|
93
|
-
const resolvedOptions = { remove:
|
|
95
|
+
const resolvedOptions = { remove: this.autoRemove, timeout: 0, removeVolumes: true, ...options };
|
|
94
96
|
await client.container.stop(this.container, { timeout: resolvedOptions.timeout });
|
|
95
97
|
if (resolvedOptions.remove) {
|
|
96
98
|
await client.container.remove(this.container, { removeVolumes: resolvedOptions.removeVolumes });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"started-generic-container.js","sourceRoot":"","sources":["../../src/generic-container/started-generic-container.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAChC,4DAAmC;AAGnC,sCAA8C;AAC9C,4DAAyF;AACzF,6CAA6C;AAG7C,sDAAkD;AAClD,4CAAkE;AAClE,oEAA+D;AAC/D,8EAAyE;AAEzE,2EAAsE;AAEtE,MAAa,uBAAuB;IAKf;IACA;IACT;IACA;IACS;IACA;
|
|
1
|
+
{"version":3,"file":"started-generic-container.js","sourceRoot":"","sources":["../../src/generic-container/started-generic-container.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,7 +77,13 @@ class PortForwarderInstance {
|
|
|
77
77
|
throw new Error("Expected PortForwarder to map exposed port 22");
|
|
78
78
|
}
|
|
79
79
|
common_1.log.debug(`Connecting to Port Forwarder on "${host}:${port}"...`);
|
|
80
|
-
const connection = await (0, ssh_remote_port_forward_1.createSshConnection)({
|
|
80
|
+
const connection = await (0, ssh_remote_port_forward_1.createSshConnection)({
|
|
81
|
+
host,
|
|
82
|
+
port,
|
|
83
|
+
username: "root",
|
|
84
|
+
password: "root",
|
|
85
|
+
readyTimeout: 100000,
|
|
86
|
+
});
|
|
81
87
|
common_1.log.debug(`Connected to Port Forwarder on "${host}:${port}"`);
|
|
82
88
|
connection.unref();
|
|
83
89
|
const containerId = container.Id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"port-forwarder.js","sourceRoot":"","sources":["../../src/port-forwarder/port-forwarder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"port-forwarder.js","sourceRoot":"","sources":["../../src/port-forwarder/port-forwarder.ts"],"names":[],"mappings":"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"}
|
package/build/reaper/reaper.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { ContainerRuntimeClient } from "../container-runtime";
|
|
|
2
2
|
export declare const REAPER_IMAGE: string;
|
|
3
3
|
export interface Reaper {
|
|
4
4
|
sessionId: string;
|
|
5
|
+
containerId: string;
|
|
5
6
|
addSession(sessionId: string): void;
|
|
6
7
|
addComposeProject(projectName: string): void;
|
|
7
8
|
}
|
package/build/reaper/reaper.js
CHANGED
|
@@ -18,9 +18,9 @@ async function getReaper(client) {
|
|
|
18
18
|
}
|
|
19
19
|
reaper = await (0, common_1.withFileLock)("testcontainers-node.lock", async () => {
|
|
20
20
|
const reaperContainer = await findReaperContainer(client);
|
|
21
|
-
sessionId = reaperContainer?.Labels[
|
|
21
|
+
sessionId = reaperContainer?.Labels[labels_1.LABEL_TESTCONTAINERS_SESSION_ID] ?? new common_1.RandomUuid().nextUuid();
|
|
22
22
|
if (process.env.TESTCONTAINERS_RYUK_DISABLED === "true") {
|
|
23
|
-
return new DisabledReaper(sessionId);
|
|
23
|
+
return new DisabledReaper(sessionId, "");
|
|
24
24
|
}
|
|
25
25
|
else if (reaperContainer) {
|
|
26
26
|
return await useExistingReaper(reaperContainer, sessionId, client.info.containerRuntime.host);
|
|
@@ -35,7 +35,9 @@ async function getReaper(client) {
|
|
|
35
35
|
exports.getReaper = getReaper;
|
|
36
36
|
async function findReaperContainer(client) {
|
|
37
37
|
const containers = await client.container.list();
|
|
38
|
-
return containers.find((container) => container.State === "running" &&
|
|
38
|
+
return containers.find((container) => container.State === "running" &&
|
|
39
|
+
container.Labels[labels_1.LABEL_TESTCONTAINERS_RYUK] === "true" &&
|
|
40
|
+
container.Labels["TESTCONTAINERS_RYUK_TEST_LABEL"] !== "true");
|
|
39
41
|
}
|
|
40
42
|
async function useExistingReaper(reaperContainer, sessionId, host) {
|
|
41
43
|
common_1.log.debug(`Reusing existing Reaper for session "${sessionId}"...`);
|
|
@@ -44,7 +46,7 @@ async function useExistingReaper(reaperContainer, sessionId, host) {
|
|
|
44
46
|
throw new Error("Expected Reaper to map exposed port 8080");
|
|
45
47
|
}
|
|
46
48
|
const socket = await connectToReaperSocket(host, reaperPort, reaperContainer.Id);
|
|
47
|
-
return new RyukReaper(sessionId, socket);
|
|
49
|
+
return new RyukReaper(sessionId, reaperContainer.Id, socket);
|
|
48
50
|
}
|
|
49
51
|
async function createNewReaper(sessionId, remoteSocketPath) {
|
|
50
52
|
common_1.log.debug(`Creating new Reaper for session "${sessionId}" with socket path "${remoteSocketPath}"...`);
|
|
@@ -56,12 +58,18 @@ async function createNewReaper(sessionId, remoteSocketPath) {
|
|
|
56
58
|
.withBindMounts([{ source: remoteSocketPath, target: "/var/run/docker.sock" }])
|
|
57
59
|
.withLabels({ [labels_1.LABEL_TESTCONTAINERS_SESSION_ID]: sessionId })
|
|
58
60
|
.withWaitStrategy(wait_1.Wait.forLogMessage(/.*Started.*/));
|
|
59
|
-
if (process.env
|
|
61
|
+
if (process.env["TESTCONTAINERS_RYUK_VERBOSE"]) {
|
|
62
|
+
container.withEnvironment({ RYUK_VERBOSE: process.env["TESTCONTAINERS_RYUK_VERBOSE"] });
|
|
63
|
+
}
|
|
64
|
+
if (process.env["TESTCONTAINERS_RYUK_PRIVILEGED"] === "true") {
|
|
60
65
|
container.withPrivilegedMode();
|
|
61
66
|
}
|
|
67
|
+
if (process.env["TESTCONTAINERS_RYUK_TEST_LABEL"] === "true") {
|
|
68
|
+
container.withLabels({ TESTCONTAINERS_RYUK_TEST_LABEL: "true" });
|
|
69
|
+
}
|
|
62
70
|
const startedContainer = await container.start();
|
|
63
71
|
const socket = await connectToReaperSocket(startedContainer.getHost(), startedContainer.getMappedPort(8080), startedContainer.getId());
|
|
64
|
-
return new RyukReaper(sessionId, socket);
|
|
72
|
+
return new RyukReaper(sessionId, startedContainer.getId(), socket);
|
|
65
73
|
}
|
|
66
74
|
async function connectToReaperSocket(host, port, containerId) {
|
|
67
75
|
const retryResult = await new common_1.IntervalRetry(1000).retryUntil((attempt) => {
|
|
@@ -100,9 +108,11 @@ async function connectToReaperSocket(host, port, containerId) {
|
|
|
100
108
|
}
|
|
101
109
|
class RyukReaper {
|
|
102
110
|
sessionId;
|
|
111
|
+
containerId;
|
|
103
112
|
socket;
|
|
104
|
-
constructor(sessionId, socket) {
|
|
113
|
+
constructor(sessionId, containerId, socket) {
|
|
105
114
|
this.sessionId = sessionId;
|
|
115
|
+
this.containerId = containerId;
|
|
106
116
|
this.socket = socket;
|
|
107
117
|
}
|
|
108
118
|
addComposeProject(projectName) {
|
|
@@ -114,8 +124,10 @@ class RyukReaper {
|
|
|
114
124
|
}
|
|
115
125
|
class DisabledReaper {
|
|
116
126
|
sessionId;
|
|
117
|
-
|
|
127
|
+
containerId;
|
|
128
|
+
constructor(sessionId, containerId) {
|
|
118
129
|
this.sessionId = sessionId;
|
|
130
|
+
this.containerId = containerId;
|
|
119
131
|
}
|
|
120
132
|
addComposeProject() { }
|
|
121
133
|
addSession() { }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reaper.js","sourceRoot":"","sources":["../../src/reaper/reaper.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAC7B,sCAAyE;AACzE,4DAAyE;AACzE,8EAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"reaper.js","sourceRoot":"","sources":["../../src/reaper/reaper.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,7 @@ export interface TestContainer {
|
|
|
28
28
|
withUser(user: string): this;
|
|
29
29
|
withPullPolicy(pullPolicy: ImagePullPolicy): this;
|
|
30
30
|
withReuse(): this;
|
|
31
|
+
withAutoRemove(autoRemove: boolean): this;
|
|
31
32
|
withCopyFilesToContainer(filesToCopy: FileToCopy[]): this;
|
|
32
33
|
withCopyDirectoriesToContainer(directoriesToCopy: DirectoryToCopy[]): this;
|
|
33
34
|
withCopyContentToContainer(contentsToCopy: ContentToCopy[]): this;
|
package/build/utils/labels.d.ts
CHANGED
|
@@ -4,4 +4,5 @@ export declare const LABEL_TESTCONTAINERS_VERSION = "org.testcontainers.version"
|
|
|
4
4
|
export declare const LABEL_TESTCONTAINERS_SESSION_ID = "org.testcontainers.session-id";
|
|
5
5
|
export declare const LABEL_TESTCONTAINERS_SSHD = "org.testcontainers.sshd";
|
|
6
6
|
export declare const LABEL_TESTCONTAINERS_CONTAINER_HASH = "org.testcontainers.container-hash";
|
|
7
|
+
export declare const LABEL_TESTCONTAINERS_RYUK = "org.testcontainers.ryuk";
|
|
7
8
|
export declare function createLabels(): Record<string, string>;
|
package/build/utils/labels.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createLabels = exports.LABEL_TESTCONTAINERS_CONTAINER_HASH = exports.LABEL_TESTCONTAINERS_SSHD = exports.LABEL_TESTCONTAINERS_SESSION_ID = exports.LABEL_TESTCONTAINERS_VERSION = exports.LABEL_TESTCONTAINERS_LANG = exports.LABEL_TESTCONTAINERS = void 0;
|
|
3
|
+
exports.createLabels = exports.LABEL_TESTCONTAINERS_RYUK = exports.LABEL_TESTCONTAINERS_CONTAINER_HASH = exports.LABEL_TESTCONTAINERS_SSHD = exports.LABEL_TESTCONTAINERS_SESSION_ID = exports.LABEL_TESTCONTAINERS_VERSION = exports.LABEL_TESTCONTAINERS_LANG = exports.LABEL_TESTCONTAINERS = void 0;
|
|
4
4
|
const version_1 = require("../version");
|
|
5
5
|
exports.LABEL_TESTCONTAINERS = "org.testcontainers";
|
|
6
6
|
exports.LABEL_TESTCONTAINERS_LANG = "org.testcontainers.lang";
|
|
@@ -8,6 +8,7 @@ exports.LABEL_TESTCONTAINERS_VERSION = "org.testcontainers.version";
|
|
|
8
8
|
exports.LABEL_TESTCONTAINERS_SESSION_ID = "org.testcontainers.session-id";
|
|
9
9
|
exports.LABEL_TESTCONTAINERS_SSHD = "org.testcontainers.sshd";
|
|
10
10
|
exports.LABEL_TESTCONTAINERS_CONTAINER_HASH = "org.testcontainers.container-hash";
|
|
11
|
+
exports.LABEL_TESTCONTAINERS_RYUK = "org.testcontainers.ryuk";
|
|
11
12
|
function createLabels() {
|
|
12
13
|
return {
|
|
13
14
|
[exports.LABEL_TESTCONTAINERS]: "true",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"labels.js","sourceRoot":"","sources":["../../src/utils/labels.ts"],"names":[],"mappings":";;;AAAA,wCAAyC;AAE5B,QAAA,oBAAoB,GAAG,oBAAoB,CAAC;AAC5C,QAAA,yBAAyB,GAAG,yBAAyB,CAAC;AACtD,QAAA,4BAA4B,GAAG,4BAA4B,CAAC;AAC5D,QAAA,+BAA+B,GAAG,+BAA+B,CAAC;AAClE,QAAA,yBAAyB,GAAG,yBAAyB,CAAC;AACtD,QAAA,mCAAmC,GAAG,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"labels.js","sourceRoot":"","sources":["../../src/utils/labels.ts"],"names":[],"mappings":";;;AAAA,wCAAyC;AAE5B,QAAA,oBAAoB,GAAG,oBAAoB,CAAC;AAC5C,QAAA,yBAAyB,GAAG,yBAAyB,CAAC;AACtD,QAAA,4BAA4B,GAAG,4BAA4B,CAAC;AAC5D,QAAA,+BAA+B,GAAG,+BAA+B,CAAC;AAClE,QAAA,yBAAyB,GAAG,yBAAyB,CAAC;AACtD,QAAA,mCAAmC,GAAG,mCAAmC,CAAC;AAC1E,QAAA,yBAAyB,GAAG,yBAAyB,CAAC;AAEnE,SAAgB,YAAY;IAC1B,OAAO;QACL,CAAC,4BAAoB,CAAC,EAAE,MAAM;QAC9B,CAAC,iCAAyB,CAAC,EAAE,MAAM;QACnC,CAAC,oCAA4B,CAAC,EAAE,qBAAW;KAC5C,CAAC;AACJ,CAAC;AAND,oCAMC"}
|
|
@@ -1,16 +1,33 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
4
24
|
};
|
|
5
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
26
|
exports.FixedPortGenerator = exports.RandomUniquePortGenerator = void 0;
|
|
7
|
-
const get_port_1 = __importDefault(require("get-port"));
|
|
8
27
|
class RandomPortGenerator {
|
|
9
|
-
generatePort() {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
randomBetweenInclusive(min, max) {
|
|
13
|
-
return Math.floor(Math.random() * (max - min + 1) + min);
|
|
28
|
+
async generatePort() {
|
|
29
|
+
const { default: getPort } = await Promise.resolve().then(() => __importStar(require("get-port")));
|
|
30
|
+
return getPort();
|
|
14
31
|
}
|
|
15
32
|
}
|
|
16
33
|
class RandomUniquePortGenerator {
|
|
@@ -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,MAAM,mBAAmB;IAChB,KAAK,CAAC,YAAY;QACvB,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,wDAAa,UAAU,GAAC,CAAC;QACtD,OAAO,OAAO,EAAE,CAAC;IACnB,CAAC;CACF;AAED,MAAa,yBAAyB;IAGP;IAFrB,MAAM,CAAU,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;IAElD,YAA6B,gBAA+B,IAAI,mBAAmB,EAAE;QAAxD,kBAAa,GAAb,aAAa,CAA2C;IAAG,CAAC;IAElF,KAAK,CAAC,YAAY;QACvB,IAAI,IAAY,CAAC;QAEjB,GAAG;YACD,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC;SAChD,QAAQ,yBAAyB,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QAE5D,yBAAyB,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAElD,OAAO,IAAI,CAAC;IACd,CAAC;;AAfH,8DAgBC;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 = "10.
|
|
1
|
+
export declare const LIB_VERSION = "10.22.0";
|
package/build/version.js
CHANGED
|
@@ -12,7 +12,7 @@ export declare class InternalPortCheck implements PortCheck {
|
|
|
12
12
|
private readonly client;
|
|
13
13
|
private readonly container;
|
|
14
14
|
private isDistroless;
|
|
15
|
-
private commandOutputs;
|
|
15
|
+
private readonly commandOutputs;
|
|
16
16
|
constructor(client: ContainerRuntimeClient, container: Dockerode.Container);
|
|
17
17
|
isBound(port: number): Promise<boolean>;
|
|
18
18
|
private commandOutputsKey;
|
|
@@ -47,29 +47,28 @@ class InternalPortCheck {
|
|
|
47
47
|
];
|
|
48
48
|
const commandResults = await Promise.all(commands.map((command) => this.client.container.exec(this.container, command, { log: false })));
|
|
49
49
|
const isBound = commandResults.some((result) => result.exitCode === 0);
|
|
50
|
+
// https://www.gnu.org/software/bash/manual/html_node/Exit-Status.html
|
|
51
|
+
// If a command is not found, the child process created to execute it returns a status of 127.
|
|
52
|
+
// If a command is found but is not executable, the return status is 126.
|
|
53
|
+
const shellExists = commandResults.some((result) => result.exitCode !== 126 && result.exitCode !== 127);
|
|
54
|
+
if (!isBound && !shellExists && !this.isDistroless) {
|
|
55
|
+
this.isDistroless = true;
|
|
56
|
+
common_1.log.error(`The HostPortWaitStrategy will not work on a distroless image, use an alternate wait strategy`, {
|
|
57
|
+
containerId: this.container.id,
|
|
58
|
+
});
|
|
59
|
+
}
|
|
50
60
|
if (!isBound && common_1.log.enabled()) {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
61
|
+
commandResults
|
|
62
|
+
.map((result) => ({ ...result, output: result.output.trim() }))
|
|
63
|
+
.filter((result) => result.exitCode !== 126 && result.output.length > 0)
|
|
64
|
+
.forEach((result) => {
|
|
65
|
+
if (!this.commandOutputs.has(this.commandOutputsKey(result.output))) {
|
|
66
|
+
common_1.log.trace(`Port check result exit code ${result.exitCode}: ${result.output}`, {
|
|
56
67
|
containerId: this.container.id,
|
|
57
68
|
});
|
|
69
|
+
this.commandOutputs.add(this.commandOutputsKey(result.output));
|
|
58
70
|
}
|
|
59
|
-
}
|
|
60
|
-
else {
|
|
61
|
-
commandResults
|
|
62
|
-
.map((result) => ({ ...result, output: result.output.trim() }))
|
|
63
|
-
.filter((result) => result.exitCode !== 126 && result.output.length > 0)
|
|
64
|
-
.forEach((result) => {
|
|
65
|
-
if (!this.commandOutputs.has(this.commandOutputsKey(result.output))) {
|
|
66
|
-
common_1.log.trace(`Port check result exit code ${result.exitCode}: ${result.output}`, {
|
|
67
|
-
containerId: this.container.id,
|
|
68
|
-
});
|
|
69
|
-
this.commandOutputs.add(this.commandOutputsKey(result.output));
|
|
70
|
-
}
|
|
71
|
-
});
|
|
72
|
-
}
|
|
71
|
+
});
|
|
73
72
|
}
|
|
74
73
|
return isBound;
|
|
75
74
|
}
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"port-check.js","sourceRoot":"","sources":["../../../src/wait-strategies/utils/port-check.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "testcontainers",
|
|
3
|
-
"version": "10.
|
|
3
|
+
"version": "10.22.0",
|
|
4
4
|
"author": "Cristian Greco",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"keywords": [
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"homepage": "https://github.com/testcontainers/testcontainers-node#readme",
|
|
13
13
|
"repository": {
|
|
14
14
|
"type": "git",
|
|
15
|
-
"url": "https://github.com/testcontainers/testcontainers-node"
|
|
15
|
+
"url": "git+https://github.com/testcontainers/testcontainers-node.git"
|
|
16
16
|
},
|
|
17
17
|
"bugs": {
|
|
18
18
|
"url": "https://github.com/testcontainers/testcontainers-node/issues"
|
|
@@ -31,14 +31,14 @@
|
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@balena/dockerignore": "^1.0.2",
|
|
34
|
-
"@types/dockerode": "^3.3.
|
|
34
|
+
"@types/dockerode": "^3.3.35",
|
|
35
35
|
"archiver": "^7.0.1",
|
|
36
36
|
"async-lock": "^1.4.1",
|
|
37
37
|
"byline": "^5.0.0",
|
|
38
38
|
"debug": "^4.3.5",
|
|
39
39
|
"docker-compose": "^0.24.8",
|
|
40
|
-
"dockerode": "^
|
|
41
|
-
"get-port": "^
|
|
40
|
+
"dockerode": "^4.0.4",
|
|
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",
|