testcontainers 8.15.0 → 9.0.0

package/dist/logger.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.containerLog = exports.log = exports.FakeLogger = void 0;
+exports.execLog = exports.containerLog = exports.log = exports.FakeLogger = void 0;
 const debug_1 = __importDefault(require("debug"));
 class DebugLogger {
     constructor(namespace) {
@@ -52,3 +52,4 @@ class FakeLogger {
 exports.FakeLogger = FakeLogger;
 exports.log = new DebugLogger("testcontainers");
 exports.containerLog = new DebugLogger("testcontainers:containers");
+exports.execLog = new DebugLogger("testcontainers:exec");

package/dist/modules/abstract-started-container.d.ts

@@ -1,21 +1,20 @@
 /// <reference types="node" />
 import { RestartOptions, StartedTestContainer, StopOptions, StoppedTestContainer } from "../test-container";
-import { Port } from "../port";
-import { ContainerName, Host, Id, Command, ExecResult, Labels } from "../docker/types";
+import { ExecResult, Labels } from "../docker/types";
 import { Readable } from "stream";
 export declare class AbstractStartedContainer {
     protected readonly startedTestContainer: StartedTestContainer;
     constructor(startedTestContainer: 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[]): Promise<ExecResult>;
+    exec(command: string[]): Promise<ExecResult>;
     logs(): Promise<Readable>;
 }

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

@@ -16,7 +16,7 @@ const abstract_started_container_1 = require("../abstract-started-container");
 const ARANGODB_PORT = 8529;
 const USERNAME = "root";
 class ArangoDBContainer extends __1.GenericContainer {
-    constructor(image = "arangodb:3.7.13", password = new uuid_1.RandomUuid().nextUuid()) {
+    constructor(image = "arangodb:3.10.0", password = new uuid_1.RandomUuid().nextUuid()) {
         super(image);
         this.password = password;
     }
@@ -31,7 +31,7 @@ class ArangoDBContainer extends __1.GenericContainer {
         return __awaiter(this, void 0, void 0, function* () {
             this.withExposedPorts(...(this.hasExposedPorts ? this.ports : [ARANGODB_PORT]))
                 .withWaitStrategy(__1.Wait.forLogMessage("Have fun!"))
-                .withEnv("ARANGO_ROOT_PASSWORD", this.password)
+                .withEnvironment({ ARANGO_ROOT_PASSWORD: this.password })
                 .withStartupTimeout(120000);
             return new StartedArangoContainer(yield _super.start.call(this), this.password);
         });

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

@@ -14,7 +14,7 @@ const __1 = require("../..");
 const abstract_started_container_1 = require("../abstract-started-container");
 const ELASTIC_SEARCH_HTTP_PORT = 9200;
 class ElasticsearchContainer extends __1.GenericContainer {
-    constructor(image = "docker.elastic.co/elasticsearch/elasticsearch:7.9.2") {
+    constructor(image = "elasticsearch:7.17.7") {
         super(image);
     }
     start() {
@@ -23,7 +23,7 @@ class ElasticsearchContainer extends __1.GenericContainer {
         });
         return __awaiter(this, void 0, void 0, function* () {
             this.withExposedPorts(...(this.hasExposedPorts ? this.ports : [ELASTIC_SEARCH_HTTP_PORT]))
-                .withEnv("discovery.type", "single-node")
+                .withEnvironment({ "discovery.type": "single-node" })
                 .withStartupTimeout(120000);
             return new StartedElasticsearchContainer(yield _super.start.call(this));
         });

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

@@ -1,11 +1,10 @@
 import { GenericContainer } from "../../generic-container/generic-container";
 import { BoundPorts } from "../../bound-ports";
-import { Port } from "../../port";
 import { StartedTestContainer } from "../..";
 import { AbstractStartedContainer } from "../abstract-started-container";
-import { Host } from "../../docker/types";
 import { InspectResult } from "../../docker/functions/container/inspect-container";
-export declare const KAFKA_IMAGE = "confluentinc/cp-kafka:5.5.4";
+import { Content } from "../../docker/types";
+export declare const KAFKA_IMAGE = "confluentinc/cp-kafka:7.2.2";
 interface SaslSslListenerOptions {
     sasl: SaslOptions;
     port: number;
@@ -21,7 +20,7 @@ interface User {
     password: string;
 }
 interface PKCS12CertificateStore {
-    content: Parameters<GenericContainer["withCopyContentToContainer"]>[0];
+    content: Content;
     passphrase: string;
 }
 export declare class KafkaContainer extends GenericContainer {
@@ -31,7 +30,7 @@ export declare class KafkaContainer extends GenericContainer {
     private zooKeeperPort?;
     private saslSslConfig?;
     constructor(image?: string);
-    withZooKeeper(host: Host, port: Port): this;
+    withZooKeeper(host: string, port: number): this;
     withSaslSslListener(options: SaslSslListenerOptions): this;
     protected preStart(): Promise<void>;
     start(): Promise<StartedKafkaContainer>;

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

@@ -16,23 +16,23 @@ const abstract_started_container_1 = require("../abstract-started-container");
 const KAFKA_PORT = 9093;
 const KAFKA_BROKER_PORT = 9092;
 const DEFAULT_ZOOKEEPER_PORT = 2181;
-exports.KAFKA_IMAGE = "confluentinc/cp-kafka:5.5.4";
+exports.KAFKA_IMAGE = "confluentinc/cp-kafka:7.2.2";
 class KafkaContainer extends generic_container_1.GenericContainer {
     constructor(image = exports.KAFKA_IMAGE) {
         super(image);
         this.uuid = new uuid_1.RandomUuid();
         this.isZooKeeperProvided = false;
-        this.withExposedPorts(KAFKA_PORT)
-            .withStartupTimeout(180000)
-            .withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "BROKER:PLAINTEXT,PLAINTEXT:PLAINTEXT")
-            .withEnv("KAFKA_INTER_BROKER_LISTENER_NAME", "BROKER")
-            .withEnv("KAFKA_BROKER_ID", "1")
-            .withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", "1")
-            .withEnv("KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS", "1")
-            .withEnv("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", "1")
-            .withEnv("KAFKA_LOG_FLUSH_INTERVAL_MESSAGES", "9223372036854775807")
-            .withEnv("KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS", "0")
-            .withEnv("KAFKA_CONFLUENT_SUPPORT_METRICS_ENABLE", "false");
+        this.withExposedPorts(KAFKA_PORT).withStartupTimeout(180000).withEnvironment({
+            KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "BROKER:PLAINTEXT,PLAINTEXT:PLAINTEXT",
+            KAFKA_INTER_BROKER_LISTENER_NAME: "BROKER",
+            KAFKA_BROKER_ID: "1",
+            KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: "1",
+            KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS: "1",
+            KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: "1",
+            KAFKA_LOG_FLUSH_INTERVAL_MESSAGES: "9223372036854775807",
+            KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: "0",
+            KAFKA_CONFLUENT_SUPPORT_METRICS_ENABLE: "false",
+        });
     }
     withZooKeeper(host, port) {
         this.isZooKeeperProvided = true;
@@ -47,7 +47,7 @@ class KafkaContainer extends generic_container_1.GenericContainer {
     preStart() {
         return __awaiter(this, void 0, void 0, function* () {
             const network = this.networkMode && this.networkAliases.length > 0 ? this.networkAliases[0] : "localhost";
-            this.withEnv("KAFKA_ADVERTISED_LISTENERS", `BROKER://${network}:${KAFKA_BROKER_PORT}`);
+            this.withEnvironment({ KAFKA_ADVERTISED_LISTENERS: `BROKER://${network}:${KAFKA_BROKER_PORT}` });
             if (this.saslSslConfig) {
                 this.addPlaintextAndSecureListener(this.saslSslConfig);
             }
@@ -56,13 +56,13 @@ class KafkaContainer extends generic_container_1.GenericContainer {
             }
             let command = "#!/bin/bash\n";
             if (this.isZooKeeperProvided) {
-                this.withEnv("KAFKA_ZOOKEEPER_CONNECT", `${this.zooKeeperHost}:${this.zooKeeperPort}`);
+                this.withEnvironment({ KAFKA_ZOOKEEPER_CONNECT: `${this.zooKeeperHost}:${this.zooKeeperPort}` });
             }
             else {
                 this.zooKeeperHost = this.uuid.nextUuid();
                 this.zooKeeperPort = DEFAULT_ZOOKEEPER_PORT;
-                this.addExposedPorts(this.zooKeeperPort);
-                this.withEnv("KAFKA_ZOOKEEPER_CONNECT", `localhost:${this.zooKeeperPort}`);
+                this.withExposedPorts(this.zooKeeperPort);
+                this.withEnvironment({ KAFKA_ZOOKEEPER_CONNECT: `localhost:${this.zooKeeperPort}` });
                 command += "echo 'clientPort=" + this.zooKeeperPort + "' > zookeeper.properties\n";
                 command += "echo 'dataDir=/var/lib/zookeeper/data' >> zookeeper.properties\n";
                 command += "echo 'dataLogDir=/var/lib/zookeeper/log' >> zookeeper.properties\n";
@@ -70,7 +70,7 @@ class KafkaContainer extends generic_container_1.GenericContainer {
             }
             command += "echo '' > /etc/confluent/docker/ensure \n";
             command += "/etc/confluent/docker/run \n";
-            this.withCmd(["sh", "-c", command]);
+            this.withCommand(["sh", "-c", command]);
         });
     }
     start() {
@@ -90,25 +90,32 @@ class KafkaContainer extends generic_container_1.GenericContainer {
         });
     }
     addPlaintextAndSecureListener({ port, sasl, keystore, truststore }) {
-        this.withEnv("KAFKA_LISTENERS", `SECURE://0.0.0.0:${port},PLAINTEXT://0.0.0.0:${KAFKA_PORT},BROKER://0.0.0.0:${KAFKA_BROKER_PORT}`)
-            .withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "BROKER:PLAINTEXT,PLAINTEXT:PLAINTEXT,SECURE:SASL_SSL")
-            .withEnv("KAFKA_SSL_PROTOCOL", "TLSv1.2")
-            .withCopyContentToContainer(keystore.content, "/etc/kafka/secrets/server.keystore.pfx")
-            .withEnv("KAFKA_SSL_KEYSTORE_LOCATION", "/etc/kafka/secrets/server.keystore.pfx")
-            .withEnv("KAFKA_SSL_KEYSTORE_PASSWORD", keystore.passphrase)
-            .withEnv("KAFKA_SSL_KEYSTORE_TYPE", "PKCS12")
-            .withEnv("KAFKA_SASL_ENABLED_MECHANISMS", sasl.mechanism)
-            .withEnv(`KAFKA_LISTENER_NAME_SECURE_${sasl.mechanism}_SASL_JAAS_CONFIG`, "org.apache.kafka.common.security.scram.ScramLoginModule required;")
-            .addExposedPorts(KAFKA_PORT, port);
+        this.withEnvironment({
+            KAFKA_LISTENERS: `SECURE://0.0.0.0:${port},PLAINTEXT://0.0.0.0:${KAFKA_PORT},BROKER://0.0.0.0:${KAFKA_BROKER_PORT}`,
+            KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "BROKER:PLAINTEXT,PLAINTEXT:PLAINTEXT,SECURE:SASL_SSL",
+            KAFKA_SSL_PROTOCOL: "TLSv1.2",
+            KAFKA_SSL_KEYSTORE_LOCATION: "/etc/kafka/secrets/server.keystore.pfx",
+            KAFKA_SSL_KEYSTORE_PASSWORD: keystore.passphrase,
+            KAFKA_SSL_KEYSTORE_TYPE: "PKCS12",
+            KAFKA_SASL_ENABLED_MECHANISMS: sasl.mechanism,
+            [`KAFKA_LISTENER_NAME_SECURE_${sasl.mechanism}_SASL_JAAS_CONFIG`]: "org.apache.kafka.common.security.scram.ScramLoginModule required;",
+        })
+            .withCopyContentToContainer([{ content: keystore.content, target: "/etc/kafka/secrets/server.keystore.pfx" }])
+            .withExposedPorts(KAFKA_PORT, port);
         if (truststore) {
-            this.withCopyContentToContainer(truststore.content, "/etc/kafka/secrets/server.truststore.pfx")
-                .withEnv("KAFKA_SSL_TRUSTSTORE_LOCATION", "/etc/kafka/secrets/server.truststore.pfx")
-                .withEnv("KAFKA_SSL_TRUSTSTORE_PASSWORD", truststore.passphrase)
-                .withEnv("KAFKA_SSL_TRUSTSTORE_TYPE", "PKCS12");
+            this.withCopyContentToContainer([
+                { content: truststore.content, target: "/etc/kafka/secrets/server.truststore.pfx" },
+            ]).withEnvironment({
+                KAFKA_SSL_TRUSTSTORE_LOCATION: "/etc/kafka/secrets/server.truststore.pfx",
+                KAFKA_SSL_TRUSTSTORE_PASSWORD: truststore.passphrase,
+                KAFKA_SSL_TRUSTSTORE_TYPE: "PKCS12",
+            });
         }
     }
     addPlaintextListener() {
-        this.withEnv("KAFKA_LISTENERS", `PLAINTEXT://0.0.0.0:${KAFKA_PORT},BROKER://0.0.0.0:${KAFKA_BROKER_PORT}`).addExposedPorts(KAFKA_PORT);
+        this.withEnvironment({
+            KAFKA_LISTENERS: `PLAINTEXT://0.0.0.0:${KAFKA_PORT},BROKER://0.0.0.0:${KAFKA_BROKER_PORT}`,
+        }).withExposedPorts(KAFKA_PORT);
     }
     updateAdvertisedListeners(container, inspectResult, boundPorts) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -125,7 +132,7 @@ class KafkaContainer extends generic_container_1.GenericContainer {
                 "--entity-type",
                 "brokers",
                 "--entity-name",
-                this.env["KAFKA_BROKER_ID"],
+                this.environment["KAFKA_BROKER_ID"],
                 "--add-config",
                 `advertised.listeners=[${bootstrapServers},${brokerAdvertisedListener}]`,
             ]);
@@ -142,7 +149,7 @@ class KafkaContainer extends generic_container_1.GenericContainer {
                 // At the time of writing kafka-configs displays a warning stating that the 'zookeeper' flag is deprecated in favor of 'bootstrap-server'.
                 // Unfortunately, 'bootstrap-server' can only be used to set quotas and not to create a user.
                 "--zookeeper",
-                this.env["KAFKA_ZOOKEEPER_CONNECT"],
+                this.environment["KAFKA_ZOOKEEPER_CONNECT"],
                 "--entity-type",
                 "users",
                 "--entity-name",

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

@@ -26,7 +26,7 @@ class MongoDBContainer extends generic_container_1.GenericContainer {
         });
         return __awaiter(this, void 0, void 0, function* () {
             this.withExposedPorts(MONGODB_PORT)
-                .withCmd(["--replSet", "rs0"])
+                .withCommand(["--replSet", "rs0"])
                 .withWaitStrategy(wait_1.Wait.forLogMessage(new RegExp(".*waiting for connections.*", "i")))
                 .withStartupTimeout(120000);
             return new StartedMongoDBContainer(yield _super.start.call(this));

package/dist/modules/mysql/mysql-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 MySqlContainer extends GenericContainer {
     private database;
     private username;
@@ -21,7 +20,7 @@ export declare class StartedMySqlContainer extends AbstractStartedContainer {
     private readonly rootPassword;
     private readonly port;
     constructor(startedTestContainer: StartedTestContainer, database: string, username: string, userPassword: string, rootPassword: string);
-    getPort(): Port;
+    getPort(): number;
     getDatabase(): string;
     getUsername(): string;
     getUserPassword(): string;

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-check.js

@@ -52,7 +52,7 @@ class InternalPortCheck {
                 ["/bin/sh", "-c", `nc -vz -w 1 localhost ${port}`],
                 ["/bin/bash", "-c", `</dev/tcp/localhost/${port}`],
             ];
-            const commandResults = yield Promise.all(commands.map((command) => (0, exec_container_1.execContainer)(this.container, command, { stdin: true, detach: false, tty: true })));
+            const commandResults = yield Promise.all(commands.map((command) => (0, exec_container_1.execContainer)(this.container, command, { stdin: true, detach: false, tty: true }, false)));
             const isBound = commandResults.some((result) => result.exitCode === 0);
             if (!isBound) {
                 const shellExists = commandResults.some((result) => result.exitCode !== 126);

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,27 +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 } 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;
@@ -30,6 +36,10 @@ export interface StopOptions {
     timeout: number;
     removeVolumes: boolean;
 }
+export interface DockerComposeDownOptions {
+    timeout: number;
+    removeVolumes: boolean;
+}
 export interface ExecOptions {
     tty: boolean;
     detach: boolean;
@@ -38,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>;
 }