testcontainers 10.19.0 → 10.21.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/common/logger.js.map +1 -1
- package/build/container-runtime/clients/compose/compose-client.js.map +1 -1
- package/build/container-runtime/clients/container/container-client.d.ts +2 -1
- package/build/container-runtime/clients/container/docker-container-client.d.ts +2 -1
- package/build/container-runtime/clients/container/docker-container-client.js +12 -0
- package/build/container-runtime/clients/container/docker-container-client.js.map +1 -1
- package/build/container-runtime/clients/container/types.d.ts +8 -0
- package/build/container-runtime/clients/container/types.js.map +1 -1
- package/build/container-runtime/clients/image/docker-image-client.d.ts +2 -1
- package/build/container-runtime/clients/image/docker-image-client.js +12 -0
- package/build/container-runtime/clients/image/docker-image-client.js.map +1 -1
- package/build/container-runtime/clients/image/image-client.d.ts +2 -1
- package/build/generic-container/abstract-started-container.d.ts +3 -1
- package/build/generic-container/abstract-started-container.js +6 -0
- package/build/generic-container/abstract-started-container.js.map +1 -1
- package/build/generic-container/generic-container.d.ts +3 -1
- package/build/generic-container/generic-container.js +8 -0
- package/build/generic-container/generic-container.js.map +1 -1
- package/build/generic-container/started-generic-container.d.ts +7 -1
- package/build/generic-container/started-generic-container.js +35 -0
- package/build/generic-container/started-generic-container.js.map +1 -1
- package/build/index.d.ts +2 -1
- package/build/index.js +3 -1
- package/build/index.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 +4 -1
- package/build/types.d.ts +14 -0
- package/build/version.d.ts +1 -1
- package/build/version.js +1 -1
- package/build/wait-strategies/log-wait-strategy.js.map +1 -1
- package/build/wait-strategies/utils/port-check.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/common/logger.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyC;AAOzC,MAAa,MAAM;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/common/logger.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyC;AAOzC,MAAa,MAAM;IAKE;IAJF,MAAM,CAAY;IAEnC,YACE,SAAiB,EACA,YAAY,IAAI;QAAhB,cAAS,GAAT,SAAS,CAAO;QAEjC,IAAI,CAAC,MAAM,GAAG,IAAA,eAAK,EAAC,SAAS,CAAC,CAAC;QAC/B,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE;YACnC,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC7C;IACH,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;IAC7B,CAAC;IAEM,KAAK,CAAC,OAAe,EAAE,OAAiB;QAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7D,CAAC;IAEM,KAAK,CAAC,OAAe,EAAE,OAAiB;QAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7D,CAAC;IAEM,IAAI,CAAC,OAAe,EAAE,OAAiB;QAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5D,CAAC;IAEM,IAAI,CAAC,OAAe,EAAE,OAAiB;QAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5D,CAAC;IAEM,KAAK,CAAC,OAAe,EAAE,OAAiB;QAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7D,CAAC;IAEO,aAAa,CAAC,OAAe,EAAE,KAAa,EAAE,OAAiB;QACrE,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,OAAO,EAAE,CAAC;IAC1F,CAAC;IAEO,aAAa,CAAC,OAAiB;QACrC,IAAI,GAAG,GAAG,EAAE,CAAC;QACb,IAAI,OAAO,EAAE,WAAW,EAAE;YACxB,GAAG,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC;SACrD;QACD,IAAI,OAAO,EAAE,SAAS,EAAE;YACtB,GAAG,IAAI,IAAI,OAAO,CAAC,SAAS,IAAI,CAAC;SAClC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AAnDD,wBAmDC;AAEY,QAAA,GAAG,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACnC,QAAA,YAAY,GAAG,IAAI,MAAM,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;AAC9D,QAAA,UAAU,GAAG,IAAI,MAAM,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;AACzD,QAAA,QAAQ,GAAG,IAAI,MAAM,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;AACrD,QAAA,OAAO,GAAG,IAAI,MAAM,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;AACnD,QAAA,OAAO,GAAG,IAAI,MAAM,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose-client.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/compose/compose-client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAsG;AACtG,4CAA+C;AAE/C,uEAAkE;AAW3D,KAAK,UAAU,gBAAgB,CAAC,WAA8B;IACnE,MAAM,IAAI,GAAG,MAAM,cAAc,EAAE,CAAC;IAEpC,QAAQ,IAAI,EAAE,aAAa,EAAE;QAC3B,KAAK,SAAS;YACZ,OAAO,IAAI,oBAAoB,EAAE,CAAC;QACpC,KAAK,IAAI;YACP,OAAO,IAAI,eAAe,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAChD,KAAK,IAAI;YACP,OAAO,IAAI,eAAe,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;KACjD;AACH,CAAC;AAXD,4CAWC;AAED,KAAK,UAAU,cAAc;IAC3B,IAAI;QACF,OAAO;YACL,OAAO,EAAE,CAAC,MAAM,mBAAe,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO;YACvD,aAAa,EAAE,IAAI;SACpB,CAAC;KACH;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI;YACF,OAAO;gBACL,OAAO,EAAE,CAAC,MAAM,wBAAe,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO;gBACvD,aAAa,EAAE,IAAI;aACpB,CAAC;SACH;QAAC,MAAM;YACN,OAAO,SAAS,CAAC;SAClB;KACF;AACH,CAAC;AAED,MAAM,eAAe;
|
|
1
|
+
{"version":3,"file":"compose-client.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/compose/compose-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -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 { ContainerStatus, ExecOptions, ExecResult } from "./types";
|
|
5
|
+
import { ContainerCommitOptions, ContainerStatus, ExecOptions, ExecResult } from "./types";
|
|
6
6
|
export interface ContainerClient {
|
|
7
7
|
dockerode: Dockerode;
|
|
8
8
|
getById(id: string): Container;
|
|
@@ -24,6 +24,7 @@ export interface ContainerClient {
|
|
|
24
24
|
restart(container: Container, opts?: {
|
|
25
25
|
timeout: number;
|
|
26
26
|
}): Promise<void>;
|
|
27
|
+
commit(container: Container, opts: ContainerCommitOptions): Promise<string>;
|
|
27
28
|
events(container: Container, eventNames: string[]): Promise<Readable>;
|
|
28
29
|
remove(container: Container, opts?: {
|
|
29
30
|
removeVolumes: boolean;
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
import Dockerode, { Container, ContainerCreateOptions, ContainerInfo, ContainerInspectInfo, ContainerLogsOptions, Network } from "dockerode";
|
|
4
4
|
import { Readable } from "stream";
|
|
5
5
|
import { ContainerClient } from "./container-client";
|
|
6
|
-
import { ContainerStatus, ExecOptions, ExecResult } from "./types";
|
|
6
|
+
import { ContainerCommitOptions, ContainerStatus, ExecOptions, ExecResult } from "./types";
|
|
7
7
|
export declare class DockerContainerClient implements ContainerClient {
|
|
8
8
|
readonly dockerode: Dockerode;
|
|
9
9
|
constructor(dockerode: Dockerode);
|
|
@@ -26,6 +26,7 @@ export declare class DockerContainerClient implements ContainerClient {
|
|
|
26
26
|
restart(container: Container, opts?: {
|
|
27
27
|
timeout: number;
|
|
28
28
|
}): Promise<void>;
|
|
29
|
+
commit(container: Container, opts: ContainerCommitOptions): Promise<string>;
|
|
29
30
|
remove(container: Container, opts?: {
|
|
30
31
|
removeVolumes: boolean;
|
|
31
32
|
}): Promise<void>;
|
|
@@ -240,6 +240,18 @@ class DockerContainerClient {
|
|
|
240
240
|
throw err;
|
|
241
241
|
}
|
|
242
242
|
}
|
|
243
|
+
async commit(container, opts) {
|
|
244
|
+
try {
|
|
245
|
+
common_1.log.debug(`Committing container...`, { containerId: container.id });
|
|
246
|
+
const { Id: imageId } = await container.commit(opts);
|
|
247
|
+
common_1.log.debug(`Committed container to image "${imageId}"`, { containerId: container.id });
|
|
248
|
+
return imageId;
|
|
249
|
+
}
|
|
250
|
+
catch (err) {
|
|
251
|
+
common_1.log.error(`Failed to commit container: ${err}`, { containerId: container.id });
|
|
252
|
+
throw err;
|
|
253
|
+
}
|
|
254
|
+
}
|
|
243
255
|
async remove(container, opts) {
|
|
244
256
|
try {
|
|
245
257
|
common_1.log.debug(`Removing container...`, { 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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"}
|
|
@@ -13,5 +13,13 @@ export type ExecResult = {
|
|
|
13
13
|
stderr: string;
|
|
14
14
|
exitCode: number;
|
|
15
15
|
};
|
|
16
|
+
export type ContainerCommitOptions = {
|
|
17
|
+
repo: string;
|
|
18
|
+
tag: string;
|
|
19
|
+
comment?: string;
|
|
20
|
+
author?: string;
|
|
21
|
+
pause?: boolean;
|
|
22
|
+
changes?: string;
|
|
23
|
+
};
|
|
16
24
|
export declare const CONTAINER_STATUSES: readonly ["created", "restarting", "running", "removing", "paused", "exited", "dead"];
|
|
17
25
|
export type ContainerStatus = (typeof CONTAINER_STATUSES)[number];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/container/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/container/types.ts"],"names":[],"mappings":";;;AAea,QAAA,kBAAkB,GAAG,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAU,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import Dockerode, { ImageBuildOptions } from "dockerode";
|
|
1
|
+
import Dockerode, { ImageBuildOptions, ImageInspectInfo } from "dockerode";
|
|
2
2
|
import { ImageName } from "../../image-name";
|
|
3
3
|
import { ImageClient } from "./image-client";
|
|
4
4
|
export declare class DockerImageClient implements ImageClient {
|
|
@@ -9,6 +9,7 @@ export declare class DockerImageClient implements ImageClient {
|
|
|
9
9
|
constructor(dockerode: Dockerode, indexServerAddress: string);
|
|
10
10
|
build(context: string, opts: ImageBuildOptions): Promise<void>;
|
|
11
11
|
private createIsDockerIgnoredFunction;
|
|
12
|
+
inspect(imageName: ImageName): Promise<ImageInspectInfo>;
|
|
12
13
|
exists(imageName: ImageName): Promise<boolean>;
|
|
13
14
|
pull(imageName: ImageName, opts?: {
|
|
14
15
|
force: boolean;
|
|
@@ -68,6 +68,18 @@ class DockerImageClient {
|
|
|
68
68
|
const filter = instance.createFilter();
|
|
69
69
|
return (aPath) => !filter(aPath);
|
|
70
70
|
}
|
|
71
|
+
async inspect(imageName) {
|
|
72
|
+
try {
|
|
73
|
+
common_1.log.debug(`Inspecting image: "${imageName.string}"...`);
|
|
74
|
+
const imageInfo = await this.dockerode.getImage(imageName.string).inspect();
|
|
75
|
+
common_1.log.debug(`Inspected image: "${imageName.string}"`);
|
|
76
|
+
return imageInfo;
|
|
77
|
+
}
|
|
78
|
+
catch (err) {
|
|
79
|
+
common_1.log.debug(`Failed to inspect image "${imageName.string}"`);
|
|
80
|
+
throw err;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
71
83
|
async exists(imageName) {
|
|
72
84
|
return this.imageExistsLock.acquire(imageName.string, async () => {
|
|
73
85
|
if (this.existingImages.has(imageName.string)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-image-client.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/image/docker-image-client.ts"],"names":[],"mappings":";;;;;;AAAA,wEAAgD;AAChD,4DAAmC;AACnC,oDAA4B;AAE5B,2BAAgD;AAChD,gDAAwB;AACxB,oDAAyB;AACzB,4CAAyD;AACzD,gEAA2D;AAI3D,MAAa,iBAAiB;
|
|
1
|
+
{"version":3,"file":"docker-image-client.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/image/docker-image-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ImageBuildOptions } from "dockerode";
|
|
1
|
+
import { ImageBuildOptions, ImageInspectInfo } from "dockerode";
|
|
2
2
|
import { ImageName } from "../../image-name";
|
|
3
3
|
export interface ImageClient {
|
|
4
4
|
build(context: string, opts: ImageBuildOptions): Promise<void>;
|
|
@@ -6,5 +6,6 @@ export interface ImageClient {
|
|
|
6
6
|
force: boolean;
|
|
7
7
|
platform: string | undefined;
|
|
8
8
|
}): Promise<void>;
|
|
9
|
+
inspect(imageName: ImageName): Promise<ImageInspectInfo>;
|
|
9
10
|
exists(imageName: ImageName): Promise<boolean>;
|
|
10
11
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
import { Readable } from "stream";
|
|
4
4
|
import { RestartOptions, StartedTestContainer, StopOptions, StoppedTestContainer } from "../test-container";
|
|
5
|
-
import { ContentToCopy, DirectoryToCopy, ExecOptions, ExecResult, FileToCopy, Labels } from "../types";
|
|
5
|
+
import { CommitOptions, ContentToCopy, DirectoryToCopy, ExecOptions, ExecResult, FileToCopy, Labels } from "../types";
|
|
6
6
|
export declare class AbstractStartedContainer implements StartedTestContainer {
|
|
7
7
|
protected readonly startedTestContainer: StartedTestContainer;
|
|
8
8
|
constructor(startedTestContainer: StartedTestContainer);
|
|
@@ -10,6 +10,7 @@ export declare class AbstractStartedContainer implements StartedTestContainer {
|
|
|
10
10
|
stop(options?: Partial<StopOptions>): Promise<StoppedTestContainer>;
|
|
11
11
|
protected containerStopped?(): Promise<void>;
|
|
12
12
|
restart(options?: Partial<RestartOptions>): Promise<void>;
|
|
13
|
+
commit(options: CommitOptions): Promise<string>;
|
|
13
14
|
getHost(): string;
|
|
14
15
|
getHostname(): string;
|
|
15
16
|
getFirstMappedPort(): number;
|
|
@@ -23,6 +24,7 @@ export declare class AbstractStartedContainer implements StartedTestContainer {
|
|
|
23
24
|
copyFilesToContainer(filesToCopy: FileToCopy[]): Promise<void>;
|
|
24
25
|
copyDirectoriesToContainer(directoriesToCopy: DirectoryToCopy[]): Promise<void>;
|
|
25
26
|
copyContentToContainer(contentsToCopy: ContentToCopy[]): Promise<void>;
|
|
27
|
+
copyArchiveToContainer(tar: Readable, target?: string): Promise<void>;
|
|
26
28
|
copyArchiveFromContainer(path: string): Promise<NodeJS.ReadableStream>;
|
|
27
29
|
exec(command: string | string[], opts?: Partial<ExecOptions>): Promise<ExecResult>;
|
|
28
30
|
logs(opts?: {
|
|
@@ -19,6 +19,9 @@ class AbstractStartedContainer {
|
|
|
19
19
|
async restart(options) {
|
|
20
20
|
return this.startedTestContainer.restart(options);
|
|
21
21
|
}
|
|
22
|
+
async commit(options) {
|
|
23
|
+
return this.startedTestContainer.commit(options);
|
|
24
|
+
}
|
|
22
25
|
getHost() {
|
|
23
26
|
return this.startedTestContainer.getHost();
|
|
24
27
|
}
|
|
@@ -58,6 +61,9 @@ class AbstractStartedContainer {
|
|
|
58
61
|
async copyContentToContainer(contentsToCopy) {
|
|
59
62
|
return this.startedTestContainer.copyContentToContainer(contentsToCopy);
|
|
60
63
|
}
|
|
64
|
+
copyArchiveToContainer(tar, target = "/") {
|
|
65
|
+
return this.startedTestContainer.copyArchiveToContainer(tar, target);
|
|
66
|
+
}
|
|
61
67
|
copyArchiveFromContainer(path) {
|
|
62
68
|
return this.startedTestContainer.copyArchiveFromContainer(path);
|
|
63
69
|
}
|
|
@@ -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,WAAW;QAChB,OAAO,IAAI,CAAC,oBAAoB,CAAC,WAAW,EAAE,CAAC;IACjD,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,IAAwC;QAClD,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"abstract-started-container.js","sourceRoot":"","sources":["../../src/generic-container/abstract-started-container.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { Readable } from "stream";
|
|
|
4
4
|
import { ImageName } from "../container-runtime";
|
|
5
5
|
import { StartedNetwork } from "../network/network";
|
|
6
6
|
import { StartedTestContainer, TestContainer } from "../test-container";
|
|
7
|
-
import { BindMount, ContentToCopy, DirectoryToCopy, Environment, ExtraHost, FileToCopy, HealthCheck, InspectResult, Labels, ResourcesQuota, TmpFs, Ulimits } from "../types";
|
|
7
|
+
import { ArchiveToCopy, BindMount, ContentToCopy, DirectoryToCopy, Environment, ExtraHost, FileToCopy, HealthCheck, InspectResult, Labels, ResourcesQuota, TmpFs, Ulimits } from "../types";
|
|
8
8
|
import { PortWithOptionalBinding } from "../utils/port";
|
|
9
9
|
import { ImagePullPolicy } from "../utils/pull-policy";
|
|
10
10
|
import { WaitStrategy } from "../wait-strategies/wait-strategy";
|
|
@@ -26,6 +26,7 @@ export declare class GenericContainer implements TestContainer {
|
|
|
26
26
|
protected filesToCopy: FileToCopy[];
|
|
27
27
|
protected directoriesToCopy: DirectoryToCopy[];
|
|
28
28
|
protected contentsToCopy: ContentToCopy[];
|
|
29
|
+
protected archivesToCopy: ArchiveToCopy[];
|
|
29
30
|
protected healthCheck?: HealthCheck;
|
|
30
31
|
constructor(image: string);
|
|
31
32
|
private isHelperContainer;
|
|
@@ -68,6 +69,7 @@ export declare class GenericContainer implements TestContainer {
|
|
|
68
69
|
withCopyFilesToContainer(filesToCopy: FileToCopy[]): this;
|
|
69
70
|
withCopyDirectoriesToContainer(directoriesToCopy: DirectoryToCopy[]): this;
|
|
70
71
|
withCopyContentToContainer(contentsToCopy: ContentToCopy[]): this;
|
|
72
|
+
withCopyArchivesToContainer(archivesToCopy: ArchiveToCopy[]): this;
|
|
71
73
|
withWorkingDir(workingDir: string): this;
|
|
72
74
|
withResourcesQuota({ memory, cpu }: ResourcesQuota): this;
|
|
73
75
|
withSharedMemorySize(bytes: number): this;
|
|
@@ -40,6 +40,7 @@ class GenericContainer {
|
|
|
40
40
|
filesToCopy = [];
|
|
41
41
|
directoriesToCopy = [];
|
|
42
42
|
contentsToCopy = [];
|
|
43
|
+
archivesToCopy = [];
|
|
43
44
|
healthCheck;
|
|
44
45
|
constructor(image) {
|
|
45
46
|
this.imageName = container_runtime_1.ImageName.fromString(image);
|
|
@@ -125,6 +126,9 @@ class GenericContainer {
|
|
|
125
126
|
archive.finalize();
|
|
126
127
|
await client.container.putArchive(container, archive, "/");
|
|
127
128
|
}
|
|
129
|
+
for (const archive of this.archivesToCopy) {
|
|
130
|
+
await client.container.putArchive(container, archive.tar, archive.target);
|
|
131
|
+
}
|
|
128
132
|
common_1.log.info(`Starting container for image "${this.createOpts.Image}"...`, { containerId: container.id });
|
|
129
133
|
if (this.containerCreated) {
|
|
130
134
|
await this.containerCreated(container.id);
|
|
@@ -339,6 +343,10 @@ class GenericContainer {
|
|
|
339
343
|
this.contentsToCopy = [...this.contentsToCopy, ...contentsToCopy];
|
|
340
344
|
return this;
|
|
341
345
|
}
|
|
346
|
+
withCopyArchivesToContainer(archivesToCopy) {
|
|
347
|
+
this.archivesToCopy = [...this.archivesToCopy, ...archivesToCopy];
|
|
348
|
+
return this;
|
|
349
|
+
}
|
|
342
350
|
withWorkingDir(workingDir) {
|
|
343
351
|
this.createOpts.WorkingDir = workingDir;
|
|
344
352
|
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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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
import Dockerode, { ContainerInspectInfo } from "dockerode";
|
|
4
4
|
import { Readable } from "stream";
|
|
5
5
|
import { RestartOptions, StartedTestContainer, StopOptions, StoppedTestContainer } from "../test-container";
|
|
6
|
-
import { ContentToCopy, DirectoryToCopy, ExecOptions, ExecResult, FileToCopy, Labels } from "../types";
|
|
6
|
+
import { CommitOptions, ContentToCopy, DirectoryToCopy, ExecOptions, ExecResult, FileToCopy, Labels } from "../types";
|
|
7
7
|
import { BoundPorts } from "../utils/bound-ports";
|
|
8
8
|
import { WaitStrategy } from "../wait-strategies/wait-strategy";
|
|
9
9
|
export declare class StartedGenericContainer implements StartedTestContainer {
|
|
@@ -18,6 +18,11 @@ export declare class StartedGenericContainer implements StartedTestContainer {
|
|
|
18
18
|
constructor(container: Dockerode.Container, host: string, inspectResult: ContainerInspectInfo, boundPorts: BoundPorts, name: string, waitStrategy: WaitStrategy);
|
|
19
19
|
protected containerIsStopping?(): Promise<void>;
|
|
20
20
|
stop(options?: Partial<StopOptions>): Promise<StoppedTestContainer>;
|
|
21
|
+
/**
|
|
22
|
+
* Construct the command(s) to apply changes to the container before committing it to an image.
|
|
23
|
+
*/
|
|
24
|
+
private getContainerCommitChangeCommands;
|
|
25
|
+
commit(options: CommitOptions): Promise<string>;
|
|
21
26
|
protected containerIsStopped?(): Promise<void>;
|
|
22
27
|
restart(options?: Partial<RestartOptions>): Promise<void>;
|
|
23
28
|
private stopContainer;
|
|
@@ -35,6 +40,7 @@ export declare class StartedGenericContainer implements StartedTestContainer {
|
|
|
35
40
|
copyFilesToContainer(filesToCopy: FileToCopy[]): Promise<void>;
|
|
36
41
|
copyDirectoriesToContainer(directoriesToCopy: DirectoryToCopy[]): Promise<void>;
|
|
37
42
|
copyContentToContainer(contentsToCopy: ContentToCopy[]): Promise<void>;
|
|
43
|
+
copyArchiveToContainer(tar: Readable, target?: string): Promise<void>;
|
|
38
44
|
copyArchiveFromContainer(path: string): Promise<NodeJS.ReadableStream>;
|
|
39
45
|
exec(command: string | string[], opts?: Partial<ExecOptions>): Promise<ExecResult>;
|
|
40
46
|
logs(opts?: {
|
|
@@ -8,7 +8,9 @@ const archiver_1 = __importDefault(require("archiver"));
|
|
|
8
8
|
const async_lock_1 = __importDefault(require("async-lock"));
|
|
9
9
|
const common_1 = require("../common");
|
|
10
10
|
const container_runtime_1 = require("../container-runtime");
|
|
11
|
+
const reaper_1 = require("../reaper/reaper");
|
|
11
12
|
const bound_ports_1 = require("../utils/bound-ports");
|
|
13
|
+
const labels_1 = require("../utils/labels");
|
|
12
14
|
const map_inspect_result_1 = require("../utils/map-inspect-result");
|
|
13
15
|
const wait_for_container_1 = require("../wait-strategies/wait-for-container");
|
|
14
16
|
const stopped_generic_container_1 = require("./stopped-generic-container");
|
|
@@ -38,6 +40,33 @@ class StartedGenericContainer {
|
|
|
38
40
|
return this.stoppedContainer;
|
|
39
41
|
});
|
|
40
42
|
}
|
|
43
|
+
/**
|
|
44
|
+
* Construct the command(s) to apply changes to the container before committing it to an image.
|
|
45
|
+
*/
|
|
46
|
+
async getContainerCommitChangeCommands(options) {
|
|
47
|
+
const { deleteOnExit, client } = options;
|
|
48
|
+
const changes = options.changes || [];
|
|
49
|
+
if (deleteOnExit) {
|
|
50
|
+
let sessionId = this.getLabels()[labels_1.LABEL_TESTCONTAINERS_SESSION_ID];
|
|
51
|
+
if (!sessionId) {
|
|
52
|
+
sessionId = await (0, reaper_1.getReaper)(client).then((reaper) => reaper.sessionId);
|
|
53
|
+
}
|
|
54
|
+
changes.push(`LABEL ${labels_1.LABEL_TESTCONTAINERS_SESSION_ID}=${sessionId}`);
|
|
55
|
+
}
|
|
56
|
+
else if (!deleteOnExit && this.getLabels()[labels_1.LABEL_TESTCONTAINERS_SESSION_ID]) {
|
|
57
|
+
// By default, commit will save the existing labels (including the session ID) to the new image. If
|
|
58
|
+
// deleteOnExit is false, we need to remove the session ID label.
|
|
59
|
+
changes.push(`LABEL ${labels_1.LABEL_TESTCONTAINERS_SESSION_ID}=`);
|
|
60
|
+
}
|
|
61
|
+
return changes.join("\n");
|
|
62
|
+
}
|
|
63
|
+
async commit(options) {
|
|
64
|
+
const client = await (0, container_runtime_1.getContainerRuntimeClient)();
|
|
65
|
+
const { deleteOnExit = true, changes, ...commitOpts } = options;
|
|
66
|
+
const changeCommands = await this.getContainerCommitChangeCommands({ deleteOnExit, changes, client });
|
|
67
|
+
const imageId = await client.container.commit(this.container, { ...commitOpts, changes: changeCommands });
|
|
68
|
+
return imageId;
|
|
69
|
+
}
|
|
41
70
|
async restart(options = {}) {
|
|
42
71
|
common_1.log.info(`Restarting container...`, { containerId: this.container.id });
|
|
43
72
|
const client = await (0, container_runtime_1.getContainerRuntimeClient)();
|
|
@@ -139,6 +168,12 @@ class StartedGenericContainer {
|
|
|
139
168
|
await client.container.putArchive(this.container, tar, "/");
|
|
140
169
|
common_1.log.debug(`Copied content to container`, { containerId: this.container.id });
|
|
141
170
|
}
|
|
171
|
+
async copyArchiveToContainer(tar, target = "/") {
|
|
172
|
+
common_1.log.debug(`Copying archive to container...`, { containerId: this.container.id });
|
|
173
|
+
const client = await (0, container_runtime_1.getContainerRuntimeClient)();
|
|
174
|
+
await client.container.putArchive(this.container, tar, target);
|
|
175
|
+
common_1.log.debug(`Copied archive to container`, { containerId: this.container.id });
|
|
176
|
+
}
|
|
142
177
|
async copyArchiveFromContainer(path) {
|
|
143
178
|
common_1.log.debug(`Copying archive "${path}" from container...`, { containerId: this.container.id });
|
|
144
179
|
const client = await (0, container_runtime_1.getContainerRuntimeClient)();
|
|
@@ -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,
|
|
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
|
@@ -12,10 +12,11 @@ export { Network, StartedNetwork, StoppedNetwork } from "./network/network";
|
|
|
12
12
|
export { getReaper } from "./reaper/reaper";
|
|
13
13
|
export { RestartOptions, StartedTestContainer, StopOptions, StoppedTestContainer, TestContainer, } from "./test-container";
|
|
14
14
|
export { TestContainers } from "./test-containers";
|
|
15
|
-
export { Content, ExecOptions, ExecResult, InspectResult } from "./types";
|
|
15
|
+
export { CommitOptions, Content, ExecOptions, ExecResult, InspectResult } from "./types";
|
|
16
16
|
export { BoundPorts } from "./utils/bound-ports";
|
|
17
17
|
export { LABEL_TESTCONTAINERS_SESSION_ID } from "./utils/labels";
|
|
18
18
|
export { getContainerPort, hasHostBinding, PortWithBinding, PortWithOptionalBinding } from "./utils/port";
|
|
19
|
+
export { PortGenerator, RandomUniquePortGenerator } from "./utils/port-generator";
|
|
19
20
|
export { ImagePullPolicy, PullPolicy } from "./utils/pull-policy";
|
|
20
21
|
export { HttpWaitStrategyOptions } from "./wait-strategies/http-wait-strategy";
|
|
21
22
|
export { StartupCheckStrategy, StartupStatus } from "./wait-strategies/startup-check-strategy";
|
package/build/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.waitForContainer = exports.Wait = exports.StartupCheckStrategy = exports.PullPolicy = exports.hasHostBinding = exports.getContainerPort = exports.LABEL_TESTCONTAINERS_SESSION_ID = exports.BoundPorts = exports.TestContainers = exports.getReaper = exports.StoppedNetwork = exports.StartedNetwork = exports.Network = exports.GenericContainerBuilder = exports.GenericContainer = exports.AbstractStoppedContainer = exports.AbstractStartedContainer = exports.StoppedDockerComposeEnvironment = exports.StartedDockerComposeEnvironment = exports.DownedDockerComposeEnvironment = exports.DockerComposeEnvironment = exports.ImageName = exports.getContainerRuntimeClient = exports.ContainerRuntimeClient = exports.RandomUuid = exports.log = exports.IntervalRetry = void 0;
|
|
3
|
+
exports.waitForContainer = exports.Wait = exports.StartupCheckStrategy = exports.PullPolicy = exports.RandomUniquePortGenerator = exports.hasHostBinding = exports.getContainerPort = exports.LABEL_TESTCONTAINERS_SESSION_ID = exports.BoundPorts = exports.TestContainers = exports.getReaper = exports.StoppedNetwork = exports.StartedNetwork = exports.Network = exports.GenericContainerBuilder = exports.GenericContainer = exports.AbstractStoppedContainer = exports.AbstractStartedContainer = exports.StoppedDockerComposeEnvironment = exports.StartedDockerComposeEnvironment = exports.DownedDockerComposeEnvironment = exports.DockerComposeEnvironment = exports.ImageName = exports.getContainerRuntimeClient = exports.ContainerRuntimeClient = exports.RandomUuid = exports.log = exports.IntervalRetry = void 0;
|
|
4
4
|
var common_1 = require("./common");
|
|
5
5
|
Object.defineProperty(exports, "IntervalRetry", { enumerable: true, get: function () { return common_1.IntervalRetry; } });
|
|
6
6
|
Object.defineProperty(exports, "log", { enumerable: true, get: function () { return common_1.log; } });
|
|
@@ -40,6 +40,8 @@ Object.defineProperty(exports, "LABEL_TESTCONTAINERS_SESSION_ID", { enumerable:
|
|
|
40
40
|
var port_1 = require("./utils/port");
|
|
41
41
|
Object.defineProperty(exports, "getContainerPort", { enumerable: true, get: function () { return port_1.getContainerPort; } });
|
|
42
42
|
Object.defineProperty(exports, "hasHostBinding", { enumerable: true, get: function () { return port_1.hasHostBinding; } });
|
|
43
|
+
var port_generator_1 = require("./utils/port-generator");
|
|
44
|
+
Object.defineProperty(exports, "RandomUniquePortGenerator", { enumerable: true, get: function () { return port_generator_1.RandomUniquePortGenerator; } });
|
|
43
45
|
var pull_policy_1 = require("./utils/pull-policy");
|
|
44
46
|
Object.defineProperty(exports, "PullPolicy", { enumerable: true, get: function () { return pull_policy_1.PullPolicy; } });
|
|
45
47
|
var startup_check_strategy_1 = require("./wait-strategies/startup-check-strategy");
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,mCAAuE;AAA9D,uGAAA,aAAa,OAAA;AAAE,6FAAA,GAAG,OAAA;AAAE,oGAAA,UAAU,OAAA;AACvC,yDAAmG;AAA1F,2HAAA,sBAAsB,OAAA;AAAE,8HAAA,yBAAyB,OAAA;AAAE,8GAAA,SAAS,OAAA;AACrE,sGAAmG;AAA1F,sIAAA,wBAAwB,OAAA;AACjC,oHAAgH;AAAvG,mJAAA,8BAA8B,OAAA;AACvC,sHAAkH;AAAzG,qJAAA,+BAA+B,OAAA;AACxC,sHAAkH;AAAzG,qJAAA,+BAA+B,OAAA;AACxC,6FAA0F;AAAjF,sIAAA,wBAAwB,OAAA;AACjC,6FAA0F;AAAjF,sIAAA,wBAAwB,OAAA;AACjC,2EAAyE;AAAhE,qHAAA,gBAAgB,OAAA;AACzB,2FAAsG;AAA/E,oIAAA,uBAAuB,OAAA;AAC9C,6CAA4E;AAAnE,kGAAA,OAAO,OAAA;AAAE,yGAAA,cAAc,OAAA;AAAE,yGAAA,cAAc,OAAA;AAChD,0CAA4C;AAAnC,mGAAA,SAAS,OAAA;AAQlB,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AAEvB,mDAAiD;AAAxC,yGAAA,UAAU,OAAA;AACnB,yCAAiE;AAAxD,yHAAA,+BAA+B,OAAA;AACxC,qCAA0G;AAAjG,wGAAA,gBAAgB,OAAA;AAAE,sGAAA,cAAc,OAAA;AACzC,mDAAkE;AAAxC,yGAAA,UAAU,OAAA;AAEpC,mFAA+F;AAAtF,8HAAA,oBAAoB,OAAA;AAC7B,+CAA8C;AAArC,4FAAA,IAAI,OAAA;AACb,2EAAwE;AAA/D,sHAAA,gBAAgB,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,mCAAuE;AAA9D,uGAAA,aAAa,OAAA;AAAE,6FAAA,GAAG,OAAA;AAAE,oGAAA,UAAU,OAAA;AACvC,yDAAmG;AAA1F,2HAAA,sBAAsB,OAAA;AAAE,8HAAA,yBAAyB,OAAA;AAAE,8GAAA,SAAS,OAAA;AACrE,sGAAmG;AAA1F,sIAAA,wBAAwB,OAAA;AACjC,oHAAgH;AAAvG,mJAAA,8BAA8B,OAAA;AACvC,sHAAkH;AAAzG,qJAAA,+BAA+B,OAAA;AACxC,sHAAkH;AAAzG,qJAAA,+BAA+B,OAAA;AACxC,6FAA0F;AAAjF,sIAAA,wBAAwB,OAAA;AACjC,6FAA0F;AAAjF,sIAAA,wBAAwB,OAAA;AACjC,2EAAyE;AAAhE,qHAAA,gBAAgB,OAAA;AACzB,2FAAsG;AAA/E,oIAAA,uBAAuB,OAAA;AAC9C,6CAA4E;AAAnE,kGAAA,OAAO,OAAA;AAAE,yGAAA,cAAc,OAAA;AAAE,yGAAA,cAAc,OAAA;AAChD,0CAA4C;AAAnC,mGAAA,SAAS,OAAA;AAQlB,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AAEvB,mDAAiD;AAAxC,yGAAA,UAAU,OAAA;AACnB,yCAAiE;AAAxD,yHAAA,+BAA+B,OAAA;AACxC,qCAA0G;AAAjG,wGAAA,gBAAgB,OAAA;AAAE,sGAAA,cAAc,OAAA;AACzC,yDAAkF;AAA1D,2HAAA,yBAAyB,OAAA;AACjD,mDAAkE;AAAxC,yGAAA,UAAU,OAAA;AAEpC,mFAA+F;AAAtF,8HAAA,oBAAoB,OAAA;AAC7B,+CAA8C;AAArC,4FAAA,IAAI,OAAA;AACb,2EAAwE;AAA/D,sHAAA,gBAAgB,OAAA"}
|
package/build/reaper/reaper.js
CHANGED
|
@@ -9,7 +9,7 @@ const labels_1 = require("../utils/labels");
|
|
|
9
9
|
const wait_1 = require("../wait-strategies/wait");
|
|
10
10
|
exports.REAPER_IMAGE = process.env["RYUK_CONTAINER_IMAGE"]
|
|
11
11
|
? container_runtime_1.ImageName.fromString(process.env["RYUK_CONTAINER_IMAGE"]).string
|
|
12
|
-
: container_runtime_1.ImageName.fromString("testcontainers/ryuk:0.
|
|
12
|
+
: container_runtime_1.ImageName.fromString("testcontainers/ryuk:0.11.0").string;
|
|
13
13
|
let reaper;
|
|
14
14
|
let sessionId;
|
|
15
15
|
async function getReaper(client) {
|
|
@@ -55,7 +55,7 @@ async function createNewReaper(sessionId, remoteSocketPath) {
|
|
|
55
55
|
: 8080)
|
|
56
56
|
.withBindMounts([{ source: remoteSocketPath, target: "/var/run/docker.sock" }])
|
|
57
57
|
.withLabels({ [labels_1.LABEL_TESTCONTAINERS_SESSION_ID]: sessionId })
|
|
58
|
-
.withWaitStrategy(wait_1.Wait.forLogMessage(
|
|
58
|
+
.withWaitStrategy(wait_1.Wait.forLogMessage(/.*Started.*/));
|
|
59
59
|
if (process.env.TESTCONTAINERS_RYUK_PRIVILEGED === "true") {
|
|
60
60
|
container.withPrivilegedMode();
|
|
61
61
|
}
|
|
@@ -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,4CAAkE;AAClE,kDAA+C;AAElC,QAAA,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;IAC7D,CAAC,CAAC,6BAAS,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,CAAC,MAAM;IAClE,CAAC,CAAC,6BAAS,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"reaper.js","sourceRoot":"","sources":["../../src/reaper/reaper.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
import { Readable } from "stream";
|
|
4
4
|
import { StartedNetwork } from "./network/network";
|
|
5
|
-
import { BindMount, ContentToCopy, DirectoryToCopy, Environment, ExecOptions, ExecResult, ExtraHost, FileToCopy, Labels, ResourcesQuota, TmpFs, Ulimits } from "./types";
|
|
5
|
+
import { ArchiveToCopy, BindMount, CommitOptions, ContentToCopy, DirectoryToCopy, Environment, ExecOptions, ExecResult, ExtraHost, FileToCopy, Labels, ResourcesQuota, TmpFs, Ulimits } from "./types";
|
|
6
6
|
import { PortWithOptionalBinding } from "./utils/port";
|
|
7
7
|
import { ImagePullPolicy } from "./utils/pull-policy";
|
|
8
8
|
import { WaitStrategy } from "./wait-strategies/wait-strategy";
|
|
@@ -31,6 +31,7 @@ export interface TestContainer {
|
|
|
31
31
|
withCopyFilesToContainer(filesToCopy: FileToCopy[]): this;
|
|
32
32
|
withCopyDirectoriesToContainer(directoriesToCopy: DirectoryToCopy[]): this;
|
|
33
33
|
withCopyContentToContainer(contentsToCopy: ContentToCopy[]): this;
|
|
34
|
+
withCopyArchivesToContainer(archivesToCopy: ArchiveToCopy[]): this;
|
|
34
35
|
withWorkingDir(workingDir: string): this;
|
|
35
36
|
withResourcesQuota(resourcesQuota: ResourcesQuota): this;
|
|
36
37
|
withSharedMemorySize(bytes: number): this;
|
|
@@ -48,6 +49,7 @@ export interface StopOptions {
|
|
|
48
49
|
export interface StartedTestContainer {
|
|
49
50
|
stop(options?: Partial<StopOptions>): Promise<StoppedTestContainer>;
|
|
50
51
|
restart(options?: Partial<RestartOptions>): Promise<void>;
|
|
52
|
+
commit(options: CommitOptions): Promise<string>;
|
|
51
53
|
getHost(): string;
|
|
52
54
|
getHostname(): string;
|
|
53
55
|
getFirstMappedPort(): number;
|
|
@@ -59,6 +61,7 @@ export interface StartedTestContainer {
|
|
|
59
61
|
getNetworkId(networkName: string): string;
|
|
60
62
|
getIpAddress(networkName: string): string;
|
|
61
63
|
copyArchiveFromContainer(path: string): Promise<NodeJS.ReadableStream>;
|
|
64
|
+
copyArchiveToContainer(tar: Readable, target?: string): Promise<void>;
|
|
62
65
|
copyDirectoriesToContainer(directoriesToCopy: DirectoryToCopy[]): Promise<void>;
|
|
63
66
|
copyFilesToContainer(filesToCopy: FileToCopy[]): Promise<void>;
|
|
64
67
|
copyContentToContainer(contentsToCopy: ContentToCopy[]): Promise<void>;
|
package/build/types.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
import { Readable } from "stream";
|
|
4
|
+
import { ContainerCommitOptions } from "./container-runtime/clients/container/types";
|
|
4
5
|
export type InspectResult = {
|
|
5
6
|
name: string;
|
|
6
7
|
hostname: string;
|
|
@@ -39,6 +40,10 @@ export type ContentToCopy = {
|
|
|
39
40
|
target: string;
|
|
40
41
|
mode?: number;
|
|
41
42
|
};
|
|
43
|
+
export type ArchiveToCopy = {
|
|
44
|
+
tar: Readable;
|
|
45
|
+
target: string;
|
|
46
|
+
};
|
|
42
47
|
export type TmpFs = {
|
|
43
48
|
[dir in string]: string;
|
|
44
49
|
};
|
|
@@ -99,6 +104,15 @@ export type ExecResult = {
|
|
|
99
104
|
stderr: string;
|
|
100
105
|
exitCode: number;
|
|
101
106
|
};
|
|
107
|
+
/**
|
|
108
|
+
* Options for committing a container to an image; see https://docs.docker.com/engine/reference/commandline/commit/
|
|
109
|
+
* @param deleteOnExit If true, the image will be cleaned up by reaper on exit
|
|
110
|
+
* @param changes Additional changes to apply to the container before committing it to an image (e.g. ["ENV TEST=true"])
|
|
111
|
+
*/
|
|
112
|
+
export type CommitOptions = Omit<ContainerCommitOptions, "changes"> & {
|
|
113
|
+
deleteOnExit?: boolean;
|
|
114
|
+
changes?: string[];
|
|
115
|
+
};
|
|
102
116
|
export type HealthCheckStatus = "none" | "starting" | "unhealthy" | "healthy";
|
|
103
117
|
export type NetworkSettings = {
|
|
104
118
|
networkId: string;
|
package/build/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const LIB_VERSION = "10.
|
|
1
|
+
export declare const LIB_VERSION = "10.21.0";
|
package/build/version.js
CHANGED
|
@@ -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;
|
|
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,cAAc,IAAI,CAAC;gBAC5F,YAAG,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;gBAClD,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAC7B,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YAExB,MAAM,YAAY,GAA8B,CAAC,IAAY,EAAE,EAAE;gBAC/D,IAAI,IAAI,CAAC,OAAO,YAAY,MAAM,EAAE;oBAClC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAChC;qBAAM;oBACL,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBACpC;YACH,CAAC,CAAC;YAEF,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE;gBACrC,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE;oBACtB,IAAI,EAAE,KAAK,KAAK,IAAI,CAAC,KAAK,EAAE;wBAC1B,MAAM,CAAC,OAAO,EAAE,CAAC;wBACjB,YAAY,CAAC,OAAO,CAAC,CAAC;wBACtB,YAAG,CAAC,KAAK,CAAC,4BAA4B,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;wBACvE,OAAO,EAAE,CAAC;qBACX;iBACF;YACH,CAAC,CAAC;YAEF,IAAA,gBAAM,EAAC,MAAM,CAAC;iBACX,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC;iBACzB,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC;iBACxB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACd,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,YAAY,CAAC,OAAO,CAAC,CAAC;gBACtB,MAAM,OAAO,GAAG,iCAAiC,IAAI,CAAC,OAAO,oBAAoB,CAAC;gBAClF,YAAG,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;gBAClD,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAC7B,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAnDD,0CAmDC"}
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"port-check.js","sourceRoot":"","sources":["../../../src/wait-strategies/utils/port-check.ts"],"names":[],"mappings":"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"}
|