testcontainers 10.2.2 → 10.3.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/container-runtime/clients/container/container-client.d.ts +2 -4
- package/build/container-runtime/clients/container/docker-container-client.d.ts +2 -4
- package/build/container-runtime/clients/container/docker-container-client.js +16 -6
- package/build/container-runtime/clients/container/docker-container-client.js.map +1 -1
- package/build/container-runtime/clients/container/podman-container-client.d.ts +2 -4
- package/build/container-runtime/clients/container/podman-container-client.js +19 -6
- package/build/container-runtime/clients/container/podman-container-client.js.map +1 -1
- package/build/container-runtime/clients/container/types.d.ts +9 -0
- package/build/container-runtime/image-name.d.ts +1 -0
- package/build/container-runtime/image-name.js +10 -0
- package/build/container-runtime/image-name.js.map +1 -1
- package/build/generic-container/abstract-started-container.d.ts +5 -3
- package/build/generic-container/abstract-started-container.js +4 -4
- package/build/generic-container/abstract-started-container.js.map +1 -1
- package/build/generic-container/started-generic-container.d.ts +5 -3
- package/build/generic-container/started-generic-container.js +4 -4
- package/build/generic-container/started-generic-container.js.map +1 -1
- package/build/index.d.ts +3 -2
- package/build/index.js +8 -4
- package/build/index.js.map +1 -1
- package/build/test-container.d.ts +5 -3
- package/build/types.d.ts +5 -0
- package/build/version.d.ts +1 -1
- package/build/version.js +1 -1
- package/package.json +1 -1
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
import Dockerode, { Container, ContainerCreateOptions, ContainerInfo, ContainerInspectInfo, ContainerLogsOptions, Network } from "dockerode";
|
|
4
4
|
import { Readable } from "stream";
|
|
5
|
-
import { ExecResult } from "./types";
|
|
5
|
+
import { ExecOptions, ExecResult } from "./types";
|
|
6
6
|
export interface ContainerClient {
|
|
7
7
|
dockerode: Dockerode;
|
|
8
8
|
getById(id: string): Container;
|
|
@@ -18,9 +18,7 @@ export interface ContainerClient {
|
|
|
18
18
|
}): Promise<void>;
|
|
19
19
|
attach(container: Container): Promise<Readable>;
|
|
20
20
|
logs(container: Container, opts?: ContainerLogsOptions): Promise<Readable>;
|
|
21
|
-
exec(container: Container, command: string[], opts?:
|
|
22
|
-
log: boolean;
|
|
23
|
-
}): Promise<ExecResult>;
|
|
21
|
+
exec(container: Container, command: string[], opts?: Partial<ExecOptions>): Promise<ExecResult>;
|
|
24
22
|
restart(container: Container, opts?: {
|
|
25
23
|
timeout: number;
|
|
26
24
|
}): Promise<void>;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
import Dockerode, { Container, ContainerCreateOptions, ContainerInfo, ContainerInspectInfo, ContainerLogsOptions, Network } from "dockerode";
|
|
4
4
|
import { Readable } from "stream";
|
|
5
|
-
import { ExecResult } from "./types";
|
|
5
|
+
import { ExecOptions, ExecResult } from "./types";
|
|
6
6
|
import { ContainerClient } from "./container-client";
|
|
7
7
|
export declare class DockerContainerClient implements ContainerClient {
|
|
8
8
|
readonly dockerode: Dockerode;
|
|
@@ -20,9 +20,7 @@ export declare class DockerContainerClient implements ContainerClient {
|
|
|
20
20
|
}): Promise<void>;
|
|
21
21
|
attach(container: Container): Promise<Readable>;
|
|
22
22
|
logs(container: Container, opts?: ContainerLogsOptions): Promise<Readable>;
|
|
23
|
-
exec(container: Container, command: string[], opts?:
|
|
24
|
-
log: boolean;
|
|
25
|
-
}): Promise<ExecResult>;
|
|
23
|
+
exec(container: Container, command: string[], opts?: Partial<ExecOptions>): Promise<ExecResult>;
|
|
26
24
|
restart(container: Container, opts?: {
|
|
27
25
|
timeout: number;
|
|
28
26
|
}): Promise<void>;
|
|
@@ -172,16 +172,26 @@ class DockerContainerClient {
|
|
|
172
172
|
}
|
|
173
173
|
}
|
|
174
174
|
async exec(container, command, opts) {
|
|
175
|
+
const execOptions = {
|
|
176
|
+
Cmd: command,
|
|
177
|
+
AttachStdout: true,
|
|
178
|
+
AttachStderr: true,
|
|
179
|
+
};
|
|
180
|
+
if (opts?.env !== undefined) {
|
|
181
|
+
execOptions.Env = Object.entries(opts.env).map(([key, value]) => `${key}=${value}`);
|
|
182
|
+
}
|
|
183
|
+
if (opts?.workingDir !== undefined) {
|
|
184
|
+
execOptions.WorkingDir = opts.workingDir;
|
|
185
|
+
}
|
|
186
|
+
if (opts?.user !== undefined) {
|
|
187
|
+
execOptions.User = opts.user;
|
|
188
|
+
}
|
|
175
189
|
const chunks = [];
|
|
176
190
|
try {
|
|
177
191
|
if (opts?.log) {
|
|
178
192
|
common_1.log.debug(`Execing container with command "${command.join(" ")}"...`, { containerId: container.id });
|
|
179
193
|
}
|
|
180
|
-
const exec = await container.exec(
|
|
181
|
-
Cmd: command,
|
|
182
|
-
AttachStdout: true,
|
|
183
|
-
AttachStderr: true,
|
|
184
|
-
});
|
|
194
|
+
const exec = await container.exec(execOptions);
|
|
185
195
|
const stream = await exec.start({ stdin: true, Detach: false, Tty: true });
|
|
186
196
|
if (opts?.log && common_1.execLog.enabled()) {
|
|
187
197
|
(0, byline_1.default)(stream).on("data", (line) => common_1.execLog.trace(line, { containerId: container.id }));
|
|
@@ -193,7 +203,7 @@ class DockerContainerClient {
|
|
|
193
203
|
});
|
|
194
204
|
stream.destroy();
|
|
195
205
|
const inspectResult = await exec.inspect();
|
|
196
|
-
const exitCode = inspectResult.ExitCode
|
|
206
|
+
const exitCode = inspectResult.ExitCode ?? -1;
|
|
197
207
|
const output = chunks.join("");
|
|
198
208
|
if (opts?.log) {
|
|
199
209
|
common_1.log.debug(`Execed container with command "${command.join(" ")}"...`, { containerId: container.id });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-container-client.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/container/docker-container-client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"docker-container-client.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/container/docker-container-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { Container } from "dockerode";
|
|
2
|
-
import { ExecResult } from "./types";
|
|
2
|
+
import { ExecOptions, ExecResult } from "./types";
|
|
3
3
|
import { DockerContainerClient } from "./docker-container-client";
|
|
4
4
|
export declare class PodmanContainerClient extends DockerContainerClient {
|
|
5
|
-
exec(container: Container, command: string[], opts?:
|
|
6
|
-
log: boolean;
|
|
7
|
-
}): Promise<ExecResult>;
|
|
5
|
+
exec(container: Container, command: string[], opts?: Partial<ExecOptions>): Promise<ExecResult>;
|
|
8
6
|
}
|
|
@@ -9,13 +9,26 @@ const docker_container_client_1 = require("./docker-container-client");
|
|
|
9
9
|
const common_1 = require("../../../common");
|
|
10
10
|
class PodmanContainerClient extends docker_container_client_1.DockerContainerClient {
|
|
11
11
|
async exec(container, command, opts) {
|
|
12
|
+
const execOptions = {
|
|
13
|
+
Cmd: command,
|
|
14
|
+
AttachStdout: true,
|
|
15
|
+
AttachStderr: true,
|
|
16
|
+
};
|
|
17
|
+
if (opts?.env !== undefined) {
|
|
18
|
+
execOptions.Env = Object.entries(opts.env).map(([key, value]) => `${key}=${value}`);
|
|
19
|
+
}
|
|
20
|
+
if (opts?.workingDir !== undefined) {
|
|
21
|
+
execOptions.WorkingDir = opts.workingDir;
|
|
22
|
+
}
|
|
23
|
+
if (opts?.user !== undefined) {
|
|
24
|
+
execOptions.User = opts.user;
|
|
25
|
+
}
|
|
12
26
|
const chunks = [];
|
|
13
27
|
try {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
});
|
|
28
|
+
if (opts?.log) {
|
|
29
|
+
common_1.log.debug(`Execing container with command "${command.join(" ")}"...`, { containerId: container.id });
|
|
30
|
+
}
|
|
31
|
+
const exec = await container.exec(execOptions);
|
|
19
32
|
const stream = await this.demuxStream(container.id, await exec.start({ stdin: true, Detach: false, Tty: true }));
|
|
20
33
|
if (opts?.log && common_1.execLog.enabled()) {
|
|
21
34
|
(0, byline_1.default)(stream).on("data", (line) => common_1.execLog.trace(line, { containerId: container.id }));
|
|
@@ -27,7 +40,7 @@ class PodmanContainerClient extends docker_container_client_1.DockerContainerCli
|
|
|
27
40
|
});
|
|
28
41
|
stream.destroy();
|
|
29
42
|
const inspectResult = await exec.inspect();
|
|
30
|
-
const exitCode = inspectResult.ExitCode
|
|
43
|
+
const exitCode = inspectResult.ExitCode ?? -1;
|
|
31
44
|
const output = chunks.join("");
|
|
32
45
|
return { output, exitCode };
|
|
33
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"podman-container-client.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/container/podman-container-client.ts"],"names":[],"mappings":";;;;;;AAEA,oDAA4B;AAC5B,uEAAkE;AAClE,4CAA+C;AAE/C,MAAa,qBAAsB,SAAQ,+CAAqB;IACrD,KAAK,CAAC,IAAI,CAAC,SAAoB,EAAE,OAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"podman-container-client.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/container/podman-container-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ export declare class ImageName {
|
|
|
3
3
|
readonly image: string;
|
|
4
4
|
readonly tag: string;
|
|
5
5
|
readonly string: string;
|
|
6
|
+
private static readonly hexRE;
|
|
6
7
|
constructor(registry: string | undefined, image: string, tag: string);
|
|
7
8
|
equals(other: ImageName): boolean;
|
|
8
9
|
static fromString(string: string): ImageName;
|
|
@@ -6,6 +6,7 @@ class ImageName {
|
|
|
6
6
|
image;
|
|
7
7
|
tag;
|
|
8
8
|
string;
|
|
9
|
+
static hexRE = /^[0-9a-f]{64}$/i;
|
|
9
10
|
constructor(registry, image, tag) {
|
|
10
11
|
this.registry = registry;
|
|
11
12
|
this.image = image;
|
|
@@ -18,6 +19,15 @@ class ImageName {
|
|
|
18
19
|
this.string = `${this.registry}/${this.image}:${this.tag}`;
|
|
19
20
|
}
|
|
20
21
|
}
|
|
22
|
+
else if (this.tag === "latest" && ImageName.hexRE.test(this.image)) {
|
|
23
|
+
// 64 byte hex string. This refers to an image sha256 directly.
|
|
24
|
+
// Do not put the tag as the docker does not accept it.
|
|
25
|
+
// It will fail with:
|
|
26
|
+
//
|
|
27
|
+
// invalid repository name (<image>), cannot specify 64-byte hexadecimal strings.
|
|
28
|
+
//
|
|
29
|
+
this.string = this.image;
|
|
30
|
+
}
|
|
21
31
|
else if (this.tag.startsWith("sha256:")) {
|
|
22
32
|
this.string = `${this.image}@${this.tag}`;
|
|
23
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image-name.js","sourceRoot":"","sources":["../../src/container-runtime/image-name.ts"],"names":[],"mappings":";;;AAAA,MAAa,SAAS;
|
|
1
|
+
{"version":3,"file":"image-name.js","sourceRoot":"","sources":["../../src/container-runtime/image-name.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
import { RestartOptions, StartedTestContainer, StopOptions, StoppedTestContainer } from "../test-container";
|
|
4
|
-
import { ContentToCopy, DirectoryToCopy, ExecResult, FileToCopy, Labels } from "../types";
|
|
4
|
+
import { ContentToCopy, DirectoryToCopy, ExecOptions, ExecResult, FileToCopy, Labels } from "../types";
|
|
5
5
|
import { Readable } from "stream";
|
|
6
6
|
export declare class AbstractStartedContainer implements StartedTestContainer {
|
|
7
7
|
protected readonly startedTestContainer: StartedTestContainer;
|
|
@@ -23,6 +23,8 @@ export declare class AbstractStartedContainer implements StartedTestContainer {
|
|
|
23
23
|
copyDirectoriesToContainer(directoriesToCopy: DirectoryToCopy[]): Promise<void>;
|
|
24
24
|
copyContentToContainer(contentsToCopy: ContentToCopy[]): Promise<void>;
|
|
25
25
|
copyArchiveFromContainer(path: string): Promise<NodeJS.ReadableStream>;
|
|
26
|
-
exec(command: string | string[]): Promise<ExecResult>;
|
|
27
|
-
logs(
|
|
26
|
+
exec(command: string | string[], opts?: Partial<ExecOptions>): Promise<ExecResult>;
|
|
27
|
+
logs(opts?: {
|
|
28
|
+
since?: number;
|
|
29
|
+
}): Promise<Readable>;
|
|
28
30
|
}
|
|
@@ -58,11 +58,11 @@ class AbstractStartedContainer {
|
|
|
58
58
|
copyArchiveFromContainer(path) {
|
|
59
59
|
return this.startedTestContainer.copyArchiveFromContainer(path);
|
|
60
60
|
}
|
|
61
|
-
exec(command) {
|
|
62
|
-
return this.startedTestContainer.exec(command);
|
|
61
|
+
exec(command, opts) {
|
|
62
|
+
return this.startedTestContainer.exec(command, opts);
|
|
63
63
|
}
|
|
64
|
-
logs() {
|
|
65
|
-
return this.startedTestContainer.logs();
|
|
64
|
+
logs(opts) {
|
|
65
|
+
return this.startedTestContainer.logs(opts);
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
68
|
exports.AbstractStartedContainer = AbstractStartedContainer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-started-container.js","sourceRoot":"","sources":["../../src/generic-container/abstract-started-container.ts"],"names":[],"mappings":";;;AAIA,MAAa,wBAAwB;IACJ;IAA/B,YAA+B,oBAA0C;QAA1C,yBAAoB,GAApB,oBAAoB,CAAsB;IAAG,CAAC;IAItE,KAAK,CAAC,IAAI,CAAC,OAA8B;QAC9C,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1B,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;SAChC;QAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEjE,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACzB,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;SAC/B;QAED,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAIM,KAAK,CAAC,OAAO,CAAC,OAAiC;QACpD,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC;IAC7C,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,CAAC;IACxD,CAAC;IAEM,aAAa,CAAC,IAAY;QAC/B,OAAO,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC;IAC7C,CAAC;IAEM,SAAS;QACd,OAAO,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,CAAC;IAC/C,CAAC;IAEM,KAAK;QACV,OAAO,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAC;IAC3C,CAAC;IAEM,eAAe;QACpB,OAAO,IAAI,CAAC,oBAAoB,CAAC,eAAe,EAAE,CAAC;IACrD,CAAC;IAEM,YAAY,CAAC,WAAmB;QACrC,OAAO,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;IAEM,YAAY,CAAC,WAAmB;QACrC,OAAO,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,WAAyB;QACzD,OAAO,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;IACrE,CAAC;IAEM,KAAK,CAAC,0BAA0B,CAAC,iBAAoC;QAC1E,OAAO,IAAI,CAAC,oBAAoB,CAAC,0BAA0B,CAAC,iBAAiB,CAAC,CAAC;IACjF,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,cAA+B;QACjE,OAAO,IAAI,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAC;IAC1E,CAAC;IAEM,wBAAwB,CAAC,IAAY;QAC1C,OAAO,IAAI,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;IAClE,CAAC;IAEM,IAAI,CAAC,OAA0B;
|
|
1
|
+
{"version":3,"file":"abstract-started-container.js","sourceRoot":"","sources":["../../src/generic-container/abstract-started-container.ts"],"names":[],"mappings":";;;AAIA,MAAa,wBAAwB;IACJ;IAA/B,YAA+B,oBAA0C;QAA1C,yBAAoB,GAApB,oBAAoB,CAAsB;IAAG,CAAC;IAItE,KAAK,CAAC,IAAI,CAAC,OAA8B;QAC9C,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1B,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;SAChC;QAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEjE,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACzB,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;SAC/B;QAED,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAIM,KAAK,CAAC,OAAO,CAAC,OAAiC;QACpD,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC;IAC7C,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,CAAC;IACxD,CAAC;IAEM,aAAa,CAAC,IAAY;QAC/B,OAAO,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC;IAC7C,CAAC;IAEM,SAAS;QACd,OAAO,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,CAAC;IAC/C,CAAC;IAEM,KAAK;QACV,OAAO,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAC;IAC3C,CAAC;IAEM,eAAe;QACpB,OAAO,IAAI,CAAC,oBAAoB,CAAC,eAAe,EAAE,CAAC;IACrD,CAAC;IAEM,YAAY,CAAC,WAAmB;QACrC,OAAO,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;IAEM,YAAY,CAAC,WAAmB;QACrC,OAAO,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,WAAyB;QACzD,OAAO,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;IACrE,CAAC;IAEM,KAAK,CAAC,0BAA0B,CAAC,iBAAoC;QAC1E,OAAO,IAAI,CAAC,oBAAoB,CAAC,0BAA0B,CAAC,iBAAiB,CAAC,CAAC;IACjF,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,cAA+B;QACjE,OAAO,IAAI,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAC;IAC1E,CAAC;IAEM,wBAAwB,CAAC,IAAY;QAC1C,OAAO,IAAI,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;IAClE,CAAC;IAEM,IAAI,CAAC,OAA0B,EAAE,IAA2B;QACjE,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC;IAEM,IAAI,CAAC,IAAyB;QACnC,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;CACF;AApFD,4DAoFC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
import { RestartOptions, StartedTestContainer, StopOptions, StoppedTestContainer } from "../test-container";
|
|
4
4
|
import Dockerode, { ContainerInspectInfo } from "dockerode";
|
|
5
|
-
import { ContentToCopy, DirectoryToCopy, ExecResult, FileToCopy, Labels } from "../types";
|
|
5
|
+
import { ContentToCopy, DirectoryToCopy, ExecOptions, ExecResult, FileToCopy, Labels } from "../types";
|
|
6
6
|
import { Readable } from "stream";
|
|
7
7
|
import { WaitStrategy } from "../wait-strategies/wait-strategy";
|
|
8
8
|
import { BoundPorts } from "../utils/bound-ports";
|
|
@@ -35,6 +35,8 @@ export declare class StartedGenericContainer implements StartedTestContainer {
|
|
|
35
35
|
copyDirectoriesToContainer(directoriesToCopy: DirectoryToCopy[]): Promise<void>;
|
|
36
36
|
copyContentToContainer(contentsToCopy: ContentToCopy[]): Promise<void>;
|
|
37
37
|
copyArchiveFromContainer(path: string): Promise<NodeJS.ReadableStream>;
|
|
38
|
-
exec(command: string | string[]): Promise<ExecResult>;
|
|
39
|
-
logs(
|
|
38
|
+
exec(command: string | string[], opts?: Partial<ExecOptions>): Promise<ExecResult>;
|
|
39
|
+
logs(opts?: {
|
|
40
|
+
since?: number;
|
|
41
|
+
}): Promise<Readable>;
|
|
40
42
|
}
|
|
@@ -143,18 +143,18 @@ class StartedGenericContainer {
|
|
|
143
143
|
common_1.log.debug(`Copied archive "${path}" from container`, { containerId: this.container.id });
|
|
144
144
|
return stream;
|
|
145
145
|
}
|
|
146
|
-
async exec(command) {
|
|
146
|
+
async exec(command, opts) {
|
|
147
147
|
const commandArr = Array.isArray(command) ? command : command.split(" ");
|
|
148
148
|
const commandStr = commandArr.join(" ");
|
|
149
149
|
const client = await (0, container_runtime_1.getContainerRuntimeClient)();
|
|
150
150
|
common_1.log.debug(`Executing command "${commandStr}"...`, { containerId: this.container.id });
|
|
151
|
-
const output = await client.container.exec(this.container, commandArr);
|
|
151
|
+
const output = await client.container.exec(this.container, commandArr, opts);
|
|
152
152
|
common_1.log.debug(`Executed command "${commandStr}"...`, { containerId: this.container.id });
|
|
153
153
|
return output;
|
|
154
154
|
}
|
|
155
|
-
async logs() {
|
|
155
|
+
async logs(opts) {
|
|
156
156
|
const client = await (0, container_runtime_1.getContainerRuntimeClient)();
|
|
157
|
-
return client.container.logs(this.container);
|
|
157
|
+
return client.container.logs(this.container, opts);
|
|
158
158
|
}
|
|
159
159
|
}
|
|
160
160
|
exports.StartedGenericContainer = StartedGenericContainer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"started-generic-container.js","sourceRoot":"","sources":["../../src/generic-container/started-generic-container.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"started-generic-container.js","sourceRoot":"","sources":["../../src/generic-container/started-generic-container.ts"],"names":[],"mappings":"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"}
|
package/build/index.d.ts
CHANGED
|
@@ -2,6 +2,8 @@ export { TestContainer, StartedTestContainer, StoppedTestContainer, StopOptions,
|
|
|
2
2
|
export { GenericContainer } from "./generic-container/generic-container";
|
|
3
3
|
export { GenericContainerBuilder, BuildOptions } from "./generic-container/generic-container-builder";
|
|
4
4
|
export { TestContainers } from "./test-containers";
|
|
5
|
+
export { ContainerRuntimeClient, getContainerRuntimeClient, ImageName } from "./container-runtime";
|
|
6
|
+
export { Uuid, RandomUuid, log } from "./common";
|
|
5
7
|
export { DockerComposeEnvironment } from "./docker-compose-environment/docker-compose-environment";
|
|
6
8
|
export { StartedDockerComposeEnvironment } from "./docker-compose-environment/started-docker-compose-environment";
|
|
7
9
|
export { StoppedDockerComposeEnvironment } from "./docker-compose-environment/stopped-docker-compose-environment";
|
|
@@ -10,7 +12,6 @@ export { Network, StartedNetwork, StoppedNetwork } from "./network/network";
|
|
|
10
12
|
export { Wait } from "./wait-strategies/wait";
|
|
11
13
|
export { StartupCheckStrategy, StartupStatus } from "./wait-strategies/startup-check-strategy";
|
|
12
14
|
export { PullPolicy, ImagePullPolicy } from "./utils/pull-policy";
|
|
13
|
-
export { InspectResult, Content, ExecResult } from "./types";
|
|
15
|
+
export { InspectResult, Content, ExecOptions, ExecResult } from "./types";
|
|
14
16
|
export { AbstractStartedContainer } from "./generic-container/abstract-started-container";
|
|
15
17
|
export { AbstractStoppedContainer } from "./generic-container/abstract-stopped-container";
|
|
16
|
-
export { Uuid, RandomUuid, log } from "./common";
|
package/build/index.js
CHANGED
|
@@ -1,12 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.AbstractStoppedContainer = exports.AbstractStartedContainer = exports.PullPolicy = exports.StartupCheckStrategy = exports.Wait = exports.StoppedNetwork = exports.StartedNetwork = exports.Network = exports.DownedDockerComposeEnvironment = exports.StoppedDockerComposeEnvironment = exports.StartedDockerComposeEnvironment = exports.DockerComposeEnvironment = exports.log = exports.RandomUuid = exports.ImageName = exports.getContainerRuntimeClient = exports.ContainerRuntimeClient = exports.TestContainers = exports.GenericContainerBuilder = exports.GenericContainer = void 0;
|
|
4
4
|
var generic_container_1 = require("./generic-container/generic-container");
|
|
5
5
|
Object.defineProperty(exports, "GenericContainer", { enumerable: true, get: function () { return generic_container_1.GenericContainer; } });
|
|
6
6
|
var generic_container_builder_1 = require("./generic-container/generic-container-builder");
|
|
7
7
|
Object.defineProperty(exports, "GenericContainerBuilder", { enumerable: true, get: function () { return generic_container_builder_1.GenericContainerBuilder; } });
|
|
8
8
|
var test_containers_1 = require("./test-containers");
|
|
9
9
|
Object.defineProperty(exports, "TestContainers", { enumerable: true, get: function () { return test_containers_1.TestContainers; } });
|
|
10
|
+
var container_runtime_1 = require("./container-runtime");
|
|
11
|
+
Object.defineProperty(exports, "ContainerRuntimeClient", { enumerable: true, get: function () { return container_runtime_1.ContainerRuntimeClient; } });
|
|
12
|
+
Object.defineProperty(exports, "getContainerRuntimeClient", { enumerable: true, get: function () { return container_runtime_1.getContainerRuntimeClient; } });
|
|
13
|
+
Object.defineProperty(exports, "ImageName", { enumerable: true, get: function () { return container_runtime_1.ImageName; } });
|
|
14
|
+
var common_1 = require("./common");
|
|
15
|
+
Object.defineProperty(exports, "RandomUuid", { enumerable: true, get: function () { return common_1.RandomUuid; } });
|
|
16
|
+
Object.defineProperty(exports, "log", { enumerable: true, get: function () { return common_1.log; } });
|
|
10
17
|
var docker_compose_environment_1 = require("./docker-compose-environment/docker-compose-environment");
|
|
11
18
|
Object.defineProperty(exports, "DockerComposeEnvironment", { enumerable: true, get: function () { return docker_compose_environment_1.DockerComposeEnvironment; } });
|
|
12
19
|
var started_docker_compose_environment_1 = require("./docker-compose-environment/started-docker-compose-environment");
|
|
@@ -29,7 +36,4 @@ var abstract_started_container_1 = require("./generic-container/abstract-started
|
|
|
29
36
|
Object.defineProperty(exports, "AbstractStartedContainer", { enumerable: true, get: function () { return abstract_started_container_1.AbstractStartedContainer; } });
|
|
30
37
|
var abstract_stopped_container_1 = require("./generic-container/abstract-stopped-container");
|
|
31
38
|
Object.defineProperty(exports, "AbstractStoppedContainer", { enumerable: true, get: function () { return abstract_stopped_container_1.AbstractStoppedContainer; } });
|
|
32
|
-
var common_1 = require("./common");
|
|
33
|
-
Object.defineProperty(exports, "RandomUuid", { enumerable: true, get: function () { return common_1.RandomUuid; } });
|
|
34
|
-
Object.defineProperty(exports, "log", { enumerable: true, get: function () { return common_1.log; } });
|
|
35
39
|
//# sourceMappingURL=index.js.map
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAOA,2EAAyE;AAAhE,qHAAA,gBAAgB,OAAA;AACzB,2FAAsG;AAA7F,oIAAA,uBAAuB,OAAA;AAChC,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAOA,2EAAyE;AAAhE,qHAAA,gBAAgB,OAAA;AACzB,2FAAsG;AAA7F,oIAAA,uBAAuB,OAAA;AAChC,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AACvB,yDAAmG;AAA1F,2HAAA,sBAAsB,OAAA;AAAE,8HAAA,yBAAyB,OAAA;AAAE,8GAAA,SAAS,OAAA;AACrE,mCAAiD;AAAlC,oGAAA,UAAU,OAAA;AAAE,6FAAA,GAAG,OAAA;AAE9B,sGAAmG;AAA1F,sIAAA,wBAAwB,OAAA;AACjC,sHAAkH;AAAzG,qJAAA,+BAA+B,OAAA;AACxC,sHAAkH;AAAzG,qJAAA,+BAA+B,OAAA;AACxC,oHAAgH;AAAvG,mJAAA,8BAA8B,OAAA;AAEvC,6CAA4E;AAAnE,kGAAA,OAAO,OAAA;AAAE,yGAAA,cAAc,OAAA;AAAE,yGAAA,cAAc,OAAA;AAEhD,+CAA8C;AAArC,4FAAA,IAAI,OAAA;AACb,mFAA+F;AAAtF,8HAAA,oBAAoB,OAAA;AAC7B,mDAAkE;AAAzD,yGAAA,UAAU,OAAA;AAGnB,6FAA0F;AAAjF,sIAAA,wBAAwB,OAAA;AACjC,6FAA0F;AAAjF,sIAAA,wBAAwB,OAAA"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
import { WaitStrategy } from "./wait-strategies/wait-strategy";
|
|
4
4
|
import { Readable } from "stream";
|
|
5
|
-
import { BindMount, ContentToCopy, DirectoryToCopy, Environment, ExecResult, ExtraHost, FileToCopy, Labels, ResourcesQuota, TmpFs, Ulimits } from "./types";
|
|
5
|
+
import { BindMount, ContentToCopy, DirectoryToCopy, Environment, ExecOptions, ExecResult, ExtraHost, FileToCopy, Labels, ResourcesQuota, TmpFs, Ulimits } from "./types";
|
|
6
6
|
import { StartedNetwork } from "./network/network";
|
|
7
7
|
import { PortWithOptionalBinding } from "./utils/port";
|
|
8
8
|
import { ImagePullPolicy } from "./utils/pull-policy";
|
|
@@ -59,8 +59,10 @@ export interface StartedTestContainer {
|
|
|
59
59
|
copyDirectoriesToContainer(directoriesToCopy: DirectoryToCopy[]): Promise<void>;
|
|
60
60
|
copyFilesToContainer(filesToCopy: FileToCopy[]): Promise<void>;
|
|
61
61
|
copyContentToContainer(contentsToCopy: ContentToCopy[]): Promise<void>;
|
|
62
|
-
exec(command: string | string[]): Promise<ExecResult>;
|
|
63
|
-
logs(
|
|
62
|
+
exec(command: string | string[], opts?: Partial<ExecOptions>): Promise<ExecResult>;
|
|
63
|
+
logs(opts?: {
|
|
64
|
+
since?: number;
|
|
65
|
+
}): Promise<Readable>;
|
|
64
66
|
}
|
|
65
67
|
export interface StoppedTestContainer {
|
|
66
68
|
getId(): string;
|
package/build/types.d.ts
CHANGED
|
@@ -88,6 +88,11 @@ export type RegistryConfig = {
|
|
|
88
88
|
export type BuildArgs = {
|
|
89
89
|
[key in string]: string;
|
|
90
90
|
};
|
|
91
|
+
export type ExecOptions = {
|
|
92
|
+
workingDir: string;
|
|
93
|
+
user: string;
|
|
94
|
+
env: Environment;
|
|
95
|
+
};
|
|
91
96
|
export type ExecResult = {
|
|
92
97
|
output: string;
|
|
93
98
|
exitCode: number;
|
package/build/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const LIB_VERSION = "10.
|
|
1
|
+
export declare const LIB_VERSION = "10.3.0";
|
package/build/version.js
CHANGED