testcontainers 11.0.2 → 11.1.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.
@@ -25,6 +25,7 @@ function defaultComposeOptions(environment, options) {
25
25
  COMPOSE_PROJECT_NAME: options.projectName,
26
26
  ...{ ...environment, ...options.environment },
27
27
  },
28
+ executable: options.executable,
28
29
  };
29
30
  }
30
31
  //# sourceMappingURL=default-compose-options.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"default-compose-options.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/compose/default-compose-options.ts"],"names":[],"mappings":";;AAKA,sDA2BC;AA/BD,2BAAyB;AACzB,4CAA+D;AAG/D,SAAgB,qBAAqB,CACnC,WAA8B,EAC9B,OAAuB;IAEvB,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,mBAAU,CAAC;IAEzC,OAAO;QACL,GAAG,EAAE,KAAK;QACV,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE;YACrB,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE;gBACR,KAAK;qBACF,QAAQ,EAAE;qBACV,KAAK,CAAC,QAAG,CAAC;qBACV,MAAM,CAAC,yBAAgB,CAAC;qBACxB,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YAC/C,CAAC;YACH,CAAC,CAAC,SAAS;QACb,GAAG,EAAE,OAAO,CAAC,QAAQ;QACrB,MAAM,EAAE,OAAO,CAAC,KAAK;QACrB,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,GAAG,EAAE;YACH,GAAG,OAAO,CAAC,GAAG;YACd,oBAAoB,EAAE,OAAO,CAAC,WAAW;YACzC,GAAG,EAAE,GAAG,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE;SAC9C;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"default-compose-options.js","sourceRoot":"","sources":["../../../../src/container-runtime/clients/compose/default-compose-options.ts"],"names":[],"mappings":";;AAKA,sDA4BC;AAhCD,2BAAyB;AACzB,4CAA+D;AAG/D,SAAgB,qBAAqB,CACnC,WAA8B,EAC9B,OAAuB;IAEvB,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,mBAAU,CAAC;IAEzC,OAAO;QACL,GAAG,EAAE,KAAK;QACV,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE;YACrB,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE;gBACR,KAAK;qBACF,QAAQ,EAAE;qBACV,KAAK,CAAC,QAAG,CAAC;qBACV,MAAM,CAAC,yBAAgB,CAAC;qBACxB,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YAC/C,CAAC;YACH,CAAC,CAAC,SAAS;QACb,GAAG,EAAE,OAAO,CAAC,QAAQ;QACrB,MAAM,EAAE,OAAO,CAAC,KAAK;QACrB,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,GAAG,EAAE;YACH,GAAG,OAAO,CAAC,GAAG;YACd,oBAAoB,EAAE,OAAO,CAAC,WAAW;YACzC,GAAG,EAAE,GAAG,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE;SAC9C;QACD,UAAU,EAAE,OAAO,CAAC,UAAU;KAC/B,CAAC;AACJ,CAAC"}
@@ -7,6 +7,16 @@ export type ComposeOptions = {
7
7
  composeOptions?: string[];
8
8
  environment?: NodeJS.ProcessEnv;
9
9
  logger?: Logger;
10
+ executable?: ComposeExecutableOptions;
11
+ };
12
+ export type ComposeExecutableOptions = {
13
+ executablePath: string;
14
+ options?: string[] | (string | string[])[];
15
+ standalone?: never;
16
+ } | {
17
+ executablePath?: string;
18
+ options?: never;
19
+ standalone: true;
10
20
  };
11
21
  export type ComposeDownOptions = {
12
22
  timeout: number;
@@ -1,6 +1,6 @@
1
1
  export { getAuthConfig } from "./auth/get-auth-config";
2
2
  export { ContainerRuntimeClient, getContainerRuntimeClient } from "./clients/client";
3
3
  export { parseComposeContainerName } from "./clients/compose/parse-compose-container-name";
4
- export { ComposeDownOptions, ComposeOptions } from "./clients/compose/types";
4
+ export { ComposeDownOptions, ComposeExecutableOptions, ComposeOptions } from "./clients/compose/types";
5
5
  export { HostIp } from "./clients/types";
6
6
  export { ImageName } from "./image-name";
@@ -1,4 +1,5 @@
1
1
  import { Uuid } from "../common";
2
+ import { ComposeOptions } from "../container-runtime";
2
3
  import { Environment } from "../types";
3
4
  import { ImagePullPolicy } from "../utils/pull-policy";
4
5
  import { WaitStrategy } from "../wait-strategies/wait-strategy";
@@ -16,6 +17,7 @@ export declare class DockerComposeEnvironment {
16
17
  private defaultWaitStrategy;
17
18
  private waitStrategy;
18
19
  private startupTimeoutMs?;
20
+ private clientOptions;
19
21
  constructor(composeFilePath: string, composeFiles: string | string[], uuid?: Uuid);
20
22
  withBuild(): this;
21
23
  withEnvironment(environment: Environment): this;
@@ -27,5 +29,6 @@ export declare class DockerComposeEnvironment {
27
29
  withWaitStrategy(containerName: string, waitStrategy: WaitStrategy): this;
28
30
  withStartupTimeout(startupTimeoutMs: number): this;
29
31
  withProjectName(projectName: string): this;
32
+ withClientOptions(options: Partial<Omit<ComposeOptions, "filePath" | "files" | "projectName" | "environment">>): this;
30
33
  up(services?: Array<string>): Promise<StartedDockerComposeEnvironment>;
31
34
  }
@@ -24,6 +24,7 @@ class DockerComposeEnvironment {
24
24
  defaultWaitStrategy = wait_1.Wait.forListeningPorts();
25
25
  waitStrategy = {};
26
26
  startupTimeoutMs;
27
+ clientOptions = {};
27
28
  constructor(composeFilePath, composeFiles, uuid = new common_1.RandomUuid()) {
28
29
  this.composeFilePath = composeFilePath;
29
30
  this.composeFiles = composeFiles;
@@ -70,24 +71,30 @@ class DockerComposeEnvironment {
70
71
  this.projectName = projectName;
71
72
  return this;
72
73
  }
74
+ withClientOptions(options) {
75
+ this.clientOptions = { ...this.clientOptions, ...options };
76
+ return this;
77
+ }
73
78
  async up(services) {
74
79
  common_1.log.info(`Starting DockerCompose environment "${this.projectName}"...`);
75
80
  const client = await (0, container_runtime_1.getContainerRuntimeClient)();
76
81
  const reaper = await (0, reaper_1.getReaper)(client);
77
82
  reaper.addComposeProject(this.projectName);
83
+ const { composeOptions: clientComposeOptions = [], commandOptions: clientCommandOptions = [], ...remainingClientOptions } = this.clientOptions;
78
84
  const options = {
85
+ ...remainingClientOptions,
79
86
  filePath: this.composeFilePath,
80
87
  files: this.composeFiles,
81
88
  projectName: this.projectName,
82
89
  };
83
- const commandOptions = [];
90
+ const commandOptions = [...clientCommandOptions];
84
91
  if (this.build) {
85
92
  commandOptions.push("--build");
86
93
  }
87
94
  if (!this.recreate) {
88
95
  commandOptions.push("--no-recreate");
89
96
  }
90
- const composeOptions = [];
97
+ const composeOptions = [...clientComposeOptions];
91
98
  if (this.environmentFile) {
92
99
  composeOptions.push("--env-file", this.environmentFile);
93
100
  }
@@ -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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"}
@@ -4,8 +4,8 @@ exports.inspectContainerUntilPortsExposed = inspectContainerUntilPortsExposed;
4
4
  const common_1 = require("../common");
5
5
  const map_inspect_result_1 = require("../utils/map-inspect-result");
6
6
  const port_1 = require("../utils/port");
7
- async function inspectContainerUntilPortsExposed(inspectFn, ports, containerId, timeout = 5000) {
8
- const result = await new common_1.IntervalRetry(100).retryUntil(async () => {
7
+ async function inspectContainerUntilPortsExposed(inspectFn, ports, containerId, timeout = 10_000) {
8
+ const result = await new common_1.IntervalRetry(250).retryUntil(async () => {
9
9
  const inspectResult = await inspectFn();
10
10
  const mappedInspectResult = (0, map_inspect_result_1.mapInspectResult)(inspectResult);
11
11
  return { inspectResult, mappedInspectResult };
@@ -1 +1 @@
1
- {"version":3,"file":"inspect-container-util-ports-exposed.js","sourceRoot":"","sources":["../../src/generic-container/inspect-container-util-ports-exposed.ts"],"names":[],"mappings":";;AAWA,8EA6BC;AAvCD,sCAA+C;AAE/C,oEAA+D;AAC/D,wCAA0E;AAOnE,KAAK,UAAU,iCAAiC,CACrD,SAA8C,EAC9C,KAAgC,EAChC,WAAmB,EACnB,OAAO,GAAG,IAAI;IAEd,MAAM,MAAM,GAAG,MAAM,IAAI,sBAAa,CAAgB,GAAG,CAAC,CAAC,UAAU,CACnE,KAAK,IAAI,EAAE;QACT,MAAM,aAAa,GAAG,MAAM,SAAS,EAAE,CAAC;QACxC,MAAM,mBAAmB,GAAG,IAAA,qCAAgB,EAAC,aAAa,CAAC,CAAC;QAC5D,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,CAAC;IAChD,CAAC,EACD,CAAC,EAAE,mBAAmB,EAAE,EAAE,EAAE,CAC1B,KAAK;SACF,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAA,uBAAgB,EAAC,WAAW,CAAC,CAAC;SACnD,KAAK,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,mBAAmB,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,EAC/E,GAAG,EAAE;QACH,MAAM,OAAO,GAAG,mDAAmD,CAAC;QACpE,YAAG,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;QACpC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC,EACD,OAAO,CACR,CAAC;IAEF,IAAI,MAAM,YAAY,KAAK,EAAE,CAAC;QAC5B,MAAM,MAAM,CAAC;IACf,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
1
+ {"version":3,"file":"inspect-container-util-ports-exposed.js","sourceRoot":"","sources":["../../src/generic-container/inspect-container-util-ports-exposed.ts"],"names":[],"mappings":";;AAWA,8EA6BC;AAvCD,sCAA+C;AAE/C,oEAA+D;AAC/D,wCAA0E;AAOnE,KAAK,UAAU,iCAAiC,CACrD,SAA8C,EAC9C,KAAgC,EAChC,WAAmB,EACnB,OAAO,GAAG,MAAM;IAEhB,MAAM,MAAM,GAAG,MAAM,IAAI,sBAAa,CAAgB,GAAG,CAAC,CAAC,UAAU,CACnE,KAAK,IAAI,EAAE;QACT,MAAM,aAAa,GAAG,MAAM,SAAS,EAAE,CAAC;QACxC,MAAM,mBAAmB,GAAG,IAAA,qCAAgB,EAAC,aAAa,CAAC,CAAC;QAC5D,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,CAAC;IAChD,CAAC,EACD,CAAC,EAAE,mBAAmB,EAAE,EAAE,EAAE,CAC1B,KAAK;SACF,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAA,uBAAgB,EAAC,WAAW,CAAC,CAAC;SACnD,KAAK,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,mBAAmB,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,EAC/E,GAAG,EAAE;QACH,MAAM,OAAO,GAAG,mDAAmD,CAAC;QACpE,YAAG,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;QACpC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC,EACD,OAAO,CACR,CAAC;IAEF,IAAI,MAAM,YAAY,KAAK,EAAE,CAAC;QAC5B,MAAM,MAAM,CAAC;IACf,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
@@ -1 +1 @@
1
- export declare const LIB_VERSION = "11.0.2";
1
+ export declare const LIB_VERSION = "11.1.0";
package/build/version.js CHANGED
@@ -1,5 +1,5 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.LIB_VERSION = void 0;
4
- exports.LIB_VERSION = "11.0.2";
4
+ exports.LIB_VERSION = "11.1.0";
5
5
  //# sourceMappingURL=version.js.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "testcontainers",
3
- "version": "11.0.2",
3
+ "version": "11.1.0",
4
4
  "author": "Cristian Greco",
5
5
  "license": "MIT",
6
6
  "keywords": [
@@ -37,7 +37,7 @@
37
37
  "byline": "^5.0.0",
38
38
  "debug": "^4.4.1",
39
39
  "docker-compose": "^1.2.0",
40
- "dockerode": "^4.0.6",
40
+ "dockerode": "^4.0.7",
41
41
  "get-port": "^7.1.0",
42
42
  "proper-lockfile": "^4.1.2",
43
43
  "properties-reader": "^2.3.0",