testcontainers 8.16.0 → 9.0.0

package/dist/modules/mysql/mysql-container.js

@@ -15,7 +15,7 @@ const uuid_1 = require("../../uuid");
 const abstract_started_container_1 = require("../abstract-started-container");
 const MYSQL_PORT = 3306;
 class MySqlContainer extends generic_container_1.GenericContainer {
-    constructor(image = "mysql:8.0.26") {
+    constructor(image = "mysql:8.0.31") {
         super(image);
         this.database = "test";
         this.username = new uuid_1.RandomUuid().nextUuid();
@@ -44,10 +44,12 @@ class MySqlContainer extends generic_container_1.GenericContainer {
         });
         return __awaiter(this, void 0, void 0, function* () {
             this.withExposedPorts(...(this.hasExposedPorts ? this.ports : [MYSQL_PORT]))
-                .withEnv("MYSQL_DATABASE", this.database)
-                .withEnv("MYSQL_ROOT_PASSWORD", this.rootPassword)
-                .withEnv("MYSQL_USER", this.username)
-                .withEnv("MYSQL_PASSWORD", this.userPassword)
+                .withEnvironment({
+                MYSQL_DATABASE: this.database,
+                MYSQL_ROOT_PASSWORD: this.rootPassword,
+                MYSQL_USER: this.username,
+                MYSQL_PASSWORD: this.userPassword,
+            })
                 .withStartupTimeout(120000);
             return new StartedMySqlContainer(yield _super.start.call(this), this.database, this.username, this.userPassword, this.rootPassword);
         });

package/dist/modules/nats/nats-container.d.ts

@@ -4,7 +4,7 @@ import { AbstractStartedContainer } from "../abstract-started-container";
 export declare class NatsContainer extends GenericContainer {
     private args;
     constructor(image?: string);
-    withUser(user: string): this;
+    withUsername(user: string): this;
     withPass(pass: string): this;
     withArg(name: string, value: string): this;
     private static ensureDashInFrontOfArgumentName;

package/dist/modules/nats/nats-container.js

@@ -26,7 +26,7 @@ class NatsContainer extends generic_container_1.GenericContainer {
         this.args[USER_ARGUMENT_KEY] = new uuid_1.RandomUuid().nextUuid();
         this.args[PASS_ARGUMENT_KEY] = new uuid_1.RandomUuid().nextUuid();
     }
-    withUser(user) {
+    withUsername(user) {
         this.args[USER_ARGUMENT_KEY] = user;
         return this;
     }
@@ -64,7 +64,7 @@ class NatsContainer extends generic_container_1.GenericContainer {
                 }
                 return result;
             }
-            this.withCmd(buildCmdsFromArgs(this.args))
+            this.withCommand(buildCmdsFromArgs(this.args))
                 .withExposedPorts(...(this.hasExposedPorts ? this.ports : [CLIENT_PORT, ROUTING_PORT_FOR_CLUSTERING, HTTP_MANAGEMENT_PORT]))
                 .withWaitStrategy(wait_1.Wait.forLogMessage(new RegExp(".*Server is ready.*")))
                 .withStartupTimeout(120000);

package/dist/modules/neo4j/neo4j-container.js

@@ -17,7 +17,7 @@ const BOLT_PORT = 7687;
 const HTTP_PORT = 7474;
 const USERNAME = "neo4j";
 class Neo4jContainer extends __1.GenericContainer {
-    constructor(image = "neo4j:4.3.2") {
+    constructor(image = "neo4j:4.4.12") {
         super(image);
         this.password = new uuid_1.RandomUuid().nextUuid();
         this.apoc = false;
@@ -41,13 +41,19 @@ class Neo4jContainer extends __1.GenericContainer {
         return __awaiter(this, void 0, void 0, function* () {
             this.withExposedPorts(...(this.hasExposedPorts ? this.ports : [BOLT_PORT, HTTP_PORT]))
                 .withWaitStrategy(__1.Wait.forLogMessage("Started."))
-                .withEnv("NEO4J_AUTH", `${USERNAME}/${this.password}`)
+                .withEnvironment({ NEO4J_AUTH: `${USERNAME}/${this.password}` })
                 .withStartupTimeout(120000);
             if (this.apoc) {
-                this.withEnv("NEO4JLABS_PLUGINS", '["apoc"]').withEnv("NEO4J_dbms_security_procedures_unrestricted", "apoc.*");
+                this.withEnvironment({
+                    NEO4JLABS_PLUGINS: '["apoc"]',
+                    NEO4J_dbms_security_procedures_unrestricted: "apoc.*",
+                });
             }
             if (this.ttl) {
-                this.withEnv("NEO4J_apoc_ttl_enabled", "true").withEnv("NEO4J_apoc_ttl_schedule", this.ttl.toString());
+                this.withEnvironment({
+                    NEO4J_apoc_ttl_enabled: "true",
+                    NEO4J_apoc_ttl_schedule: this.ttl.toString(),
+                });
             }
             return new StartedNeo4jContainer(yield _super.start.call(this), this.password);
         });

package/dist/modules/postgresql/postgresql-container.d.ts

@@ -1,7 +1,6 @@
 import { GenericContainer } from "../../generic-container/generic-container";
 import { StartedTestContainer } from "../../test-container";
 import { AbstractStartedContainer } from "../abstract-started-container";
-import { Port } from "../../port";
 export declare class PostgreSqlContainer extends GenericContainer {
     private database;
     private username;
@@ -18,7 +17,7 @@ export declare class StartedPostgreSqlContainer extends AbstractStartedContainer
     private readonly password;
     private readonly port;
     constructor(startedTestContainer: StartedTestContainer, database: string, username: string, password: string);
-    getPort(): Port;
+    getPort(): number;
     getDatabase(): string;
     getUsername(): string;
     getPassword(): string;

package/dist/modules/postgresql/postgresql-container.js

@@ -39,9 +39,11 @@ class PostgreSqlContainer extends generic_container_1.GenericContainer {
         });
         return __awaiter(this, void 0, void 0, function* () {
             this.withExposedPorts(...(this.hasExposedPorts ? this.ports : [POSTGRES_PORT]))
-                .withEnv("POSTGRES_DB", this.database)
-                .withEnv("POSTGRES_USER", this.username)
-                .withEnv("POSTGRES_PASSWORD", this.password)
+                .withEnvironment({
+                POSTGRES_DB: this.database,
+                POSTGRES_USER: this.username,
+                POSTGRES_PASSWORD: this.password,
+            })
                 .withStartupTimeout(120000);
             return new StartedPostgreSqlContainer(yield _super.start.call(this), this.database, this.username, this.password);
         });

package/dist/port-binder.d.ts

@@ -1,8 +1,7 @@
 import { BoundPorts } from "./bound-ports";
-import { Port } from "./port";
 import { PortGenerator } from "./port-generator";
 export declare class PortBinder {
     private readonly portGenerator;
     constructor(portGenerator?: PortGenerator);
-    bind(ports: Port[]): Promise<BoundPorts>;
+    bind(ports: number[]): Promise<BoundPorts>;
 }

package/dist/port-check.d.ts

@@ -1,19 +1,17 @@
-import { Port } from "./port";
-import { Host } from "./docker/types";
 import Dockerode from "dockerode";
 export interface PortCheck {
-    isBound(port: Port): Promise<boolean>;
+    isBound(port: number): Promise<boolean>;
 }
 export declare class HostPortCheck implements PortCheck {
     private readonly host;
-    constructor(host: Host);
-    isBound(port: Port): Promise<boolean>;
+    constructor(host: string);
+    isBound(port: number): Promise<boolean>;
 }
 export declare class InternalPortCheck implements PortCheck {
     private readonly container;
     private isDistroless;
     private commandOutputs;
     constructor(container: Dockerode.Container);
-    isBound(port: Port): Promise<boolean>;
+    isBound(port: number): Promise<boolean>;
     private commandOutputsKey;
 }

package/dist/port-forwarder.d.ts

@@ -1,11 +1,10 @@
 import { SshConnection } from "ssh-remote-port-forward";
-import { Port } from "./port";
 import { StartedTestContainer } from "./test-container";
 export declare class PortForwarder {
     private readonly sshConnection;
     private readonly container;
     constructor(sshConnection: SshConnection, container: StartedTestContainer);
-    exposeHostPort(port: Port): Promise<void>;
+    exposeHostPort(port: number): Promise<void>;
     getNetworkId(): string;
     getIpAddress(): string;
     private getNetworkName;

package/dist/port-forwarder.js

@@ -62,8 +62,8 @@ class PortForwarderInstance {
             const container = yield new generic_container_1.GenericContainer(images_1.SSHD_IMAGE)
                 .withName(`testcontainers-port-forwarder-${session_id_1.sessionId}`)
                 .withExposedPorts(containerPort)
-                .withEnv("PASSWORD", password)
-                .withCmd([
+                .withEnvironment({ PASSWORD: password })
+                .withCommand([
                 "sh",
                 "-c",
                 `echo "${username}:$PASSWORD" | chpasswd && /usr/sbin/sshd -D -o PermitRootLogin=yes -o AddressFamily=inet -o GatewayPorts=yes`,

package/dist/port-generator.d.ts

@@ -1,16 +1,15 @@
-import { Port } from "./port";
 export interface PortGenerator {
-    generatePort(): Promise<Port>;
+    generatePort(): Promise<number>;
 }
 export declare class RandomUniquePortGenerator implements PortGenerator {
     private readonly portGenerator;
     private static readonly assignedPorts;
     constructor(portGenerator?: PortGenerator);
-    generatePort(): Promise<Port>;
+    generatePort(): Promise<number>;
 }
 export declare class FixedPortGenerator implements PortGenerator {
     private readonly ports;
     private portIndex;
-    constructor(ports: Port[]);
-    generatePort(): Promise<Port>;
+    constructor(ports: number[]);
+    generatePort(): Promise<number>;
 }

package/dist/port.d.ts

@@ -1,9 +1,7 @@
-export declare type Port = number;
-export declare type PortString = string;
 export declare type PortWithBinding = {
-    container: Port;
-    host: Port;
+    container: number;
+    host: number;
 };
-export declare type PortWithOptionalBinding = Port | PortWithBinding;
+export declare type PortWithOptionalBinding = number | PortWithBinding;
 export declare const getContainerPort: (port: PortWithOptionalBinding) => number;
 export declare const hasHostBinding: (port: PortWithOptionalBinding) => port is PortWithBinding;

package/dist/reaper.js

@@ -88,7 +88,7 @@ class ReaperInstance {
             const container = new generic_container_1.GenericContainer(images_1.REAPER_IMAGE)
                 .withName(`testcontainers-ryuk-${session_id_1.sessionId}`)
                 .withExposedPorts(containerPort)
-                .withBindMount(dockerSocket, "/var/run/docker.sock")
+                .withBindMounts([{ source: dockerSocket, target: "/var/run/docker.sock" }])
                 .withWaitStrategy(wait_1.Wait.forLogMessage(/.+ Started!/));
             if (this.isPrivileged()) {
                 container.withPrivilegedMode();

package/dist/test-container.d.ts

@@ -1,31 +1,33 @@
 /// <reference types="node" />
-import { Port, PortWithOptionalBinding } from "./port";
+import { PortWithOptionalBinding } from "./port";
 import { PullPolicy } from "./pull-policy";
 import { WaitStrategy } from "./wait-strategy";
 import { Readable } from "stream";
-import { BindMode, Command, ContainerName, Dir, EnvKey, EnvValue, ExecResult, ExtraHost, Host, Id, NetworkMode, TmpFs, Labels, Ulimits } from "./docker/types";
+import { ExecResult, ExtraHost, TmpFs, Labels, Ulimits, BindMount, FileToCopy, ContentToCopy, Environment } from "./docker/types";
+import { StartedNetwork } from "./network";
 export interface TestContainer {
     start(): Promise<StartedTestContainer>;
-    withEnv(key: EnvKey, value: EnvValue): this;
-    withCmd(cmd: Command[]): this;
+    withEnvironment(environment: Environment): this;
+    withCommand(command: string[]): this;
     withEntrypoint(entrypoint: string[]): this;
     withTmpFs(tmpFs: TmpFs): this;
     withUlimits(ulimits: Ulimits): this;
     withAddedCapabilities(...capabilities: string[]): this;
     withDroppedCapabilities(...capabilities: string[]): this;
     withExposedPorts(...ports: PortWithOptionalBinding[]): this;
-    withBindMount(source: Dir, target: Dir, bindMode: BindMode): this;
+    withBindMounts(bindMounts: BindMount[]): this;
     withWaitStrategy(waitStrategy: WaitStrategy): this;
     withStartupTimeout(startupTimeout: number): this;
-    withNetworkMode(networkMode: NetworkMode): this;
-    withExtraHosts(...extraHosts: ExtraHost[]): this;
+    withNetwork(network: StartedNetwork): this;
+    withNetworkMode(networkMode: string): this;
+    withExtraHosts(extraHosts: ExtraHost[]): this;
     withDefaultLogDriver(): this;
     withPrivilegedMode(): this;
     withUser(user: string): this;
     withPullPolicy(pullPolicy: PullPolicy): this;
     withReuse(): this;
-    withCopyFileToContainer(sourcePath: string, containerPath: string): this;
-    withCopyContentToContainer(content: string | Buffer | Readable, containerPath: string): this;
+    withCopyFilesToContainer(filesToCopy: FileToCopy[]): this;
+    withCopyContentToContainer(contentsToCopy: ContentToCopy[]): this;
 }
 export interface RestartOptions {
     timeout: number;
@@ -46,15 +48,15 @@ export interface ExecOptions {
 export interface StartedTestContainer {
     stop(options?: Partial<StopOptions>): Promise<StoppedTestContainer>;
     restart(options?: Partial<RestartOptions>): Promise<void>;
-    getHost(): Host;
-    getMappedPort(port: Port): Port;
-    getName(): ContainerName;
+    getHost(): string;
+    getMappedPort(port: number): number;
+    getName(): string;
     getLabels(): Labels;
-    getId(): Id;
+    getId(): string;
     getNetworkNames(): string[];
     getNetworkId(networkName: string): string;
     getIpAddress(networkName: string): string;
-    exec(command: Command[], options?: Partial<ExecOptions>): Promise<ExecResult>;
+    exec(command: string[], options?: Partial<ExecOptions>): Promise<ExecResult>;
     logs(): Promise<Readable>;
 }
 export interface StoppedTestContainer {

package/dist/test-containers.d.ts

@@ -1,4 +1,3 @@
-import { Port } from "./port";
 export declare class TestContainers {
-    static exposeHostPorts(...ports: Port[]): Promise<void>;
+    static exposeHostPorts(...ports: number[]): Promise<void>;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testcontainers",
   "author": "Cristian Greco",
-  "version": "8.16.0",
+  "version": "9.0.0",
   "main": "dist/index",
   "types": "dist/index",
   "keywords": [
@@ -24,22 +24,23 @@
   "scripts": {
     "prepare": "npm run build && husky install",
     "pre-commit": "lint-staged",
-    "build": "npm run clean && tsc",
+    "build": "npm run clean && tsc -p tsconfig.prod.json",
     "clean": "rimraf dist",
-    "test": "cross-env DEBUG=testcontainers jest --runInBand",
+    "test": "cross-env DEBUG=testcontainers,testcontainers:exec jest --runInBand",
     "format": "prettier --write package.json \"src/**/*.ts\"",
     "lint": "eslint --fix package.json \"src/**/*.ts\"",
-    "updateDeps": "npx npm-check-updates -u"
+    "updateDeps": "npx npm-check-updates -u",
+    "validateEngine": "npx ls-engines"
   },
   "dependencies": {
     "@balena/dockerignore": "^1.0.2",
     "@types/archiver": "^5.3.1",
-    "@types/dockerode": "^3.3.8",
+    "@types/dockerode": "^3.3.12",
     "archiver": "^5.3.1",
     "byline": "^5.0.0",
     "debug": "^4.3.4",
     "docker-compose": "^0.23.17",
-    "dockerode": "^3.3.1",
+    "dockerode": "^3.3.4",
     "get-port": "^5.1.1",
     "properties-reader": "^2.2.0",
     "ssh-remote-port-forward": "^1.0.4",
@@ -49,33 +50,33 @@
     "@elastic/elasticsearch": "^7.17.0",
     "@types/byline": "^4.2.33",
     "@types/debug": "4.1.7",
-    "@types/jest": "^27.4.1",
-    "@types/node": "^17.0.25",
-    "@types/node-fetch": "^2.6.1",
+    "@types/jest": "^29.2.0",
+    "@types/node": "^18.11.7",
+    "@types/node-fetch": "^2.6.2",
     "@types/pg": "^8.6.5",
     "@types/properties-reader": "^2.1.1",
     "@types/tar-fs": "^2.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.19.0",
-    "@typescript-eslint/parser": "^5.19.0",
-    "arangojs": "^7.7.0",
+    "@typescript-eslint/eslint-plugin": "^5.41.0",
+    "@typescript-eslint/parser": "^5.41.0",
+    "arangojs": "^8.0.0",
     "cross-env": "^7.0.3",
-    "eslint": "^8.13.0",
+    "eslint": "^8.26.0",
     "eslint-config-prettier": "^8.5.0",
-    "husky": "^7.0.4",
-    "jest": "^27.5.1",
-    "kafkajs": "^1.16.0",
-    "lint-staged": "^12.3.8",
+    "husky": "^8.0.1",
+    "jest": "^29.2.2",
+    "kafkajs": "^2.2.2",
+    "lint-staged": "^13.0.3",
     "mysql2": "^2.3.3",
-    "mongoose": "^5.13.15",
-    "nats": "^2.7.1",
-    "neo4j-driver": "^4.4.5",
+    "mongoose": "^6.7.0",
+    "nats": "^2.8.0",
+    "neo4j-driver": "^5.2.0",
     "node-fetch": "^2.6.7",
-    "pg": "^8.7.3",
-    "prettier": "^2.6.2",
+    "pg": "^8.8.0",
+    "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
-    "ts-jest": "^27.1.4",
-    "ts-node": "^10.7.0",
-    "typescript": "^4.6.3",
+    "ts-jest": "^29.0.3",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.8.4",
     "wait-for-expect": "^3.0.2"
   },
   "lint-staged": {
@@ -83,5 +84,8 @@
       "prettier --write",
       "eslint --fix"
     ]
+  },
+  "engines": {
+    "node": ">= 10.16"
   }
 }