testcontainers 7.23.2 → 8.1.1

package/dist/docker/functions/network/create-network.js

@@ -11,12 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNetwork = void 0;
 const logger_1 = require("../../../logger");
-const dockerode_1 = require("../../dockerode");
+const docker_client_1 = require("../../docker-client");
 const create_labels_1 = require("../create-labels");
 const createNetwork = (options) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         logger_1.log.info(`Creating network ${options.name}`);
-        const network = yield dockerode_1.dockerode.createNetwork({
+        const { dockerode } = yield docker_client_1.dockerClient;
+        const network = yield dockerode.createNetwork({
             Name: options.name,
             CheckDuplicate: options.checkDuplicate,
             Driver: options.driver,

package/dist/docker/functions/network/remove-network.js

@@ -11,11 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeNetwork = void 0;
 const logger_1 = require("../../../logger");
-const dockerode_1 = require("../../dockerode");
+const docker_client_1 = require("../../docker-client");
 const removeNetwork = (id) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         logger_1.log.info(`Removing network ${id}`);
-        const network = dockerode_1.dockerode.getNetwork(id);
+        const { dockerode } = yield docker_client_1.dockerClient;
+        const network = dockerode.getNetwork(id);
         const { message } = yield network.remove();
         if (message) {
             logger_1.log.warn(message);

package/dist/docker/functions/run-in-container.d.ts

@@ -1,2 +1,3 @@
 import { Command } from "../types";
-export declare const runInContainer: (image: string, command: Command[]) => Promise<string | undefined>;
+import Dockerode from "dockerode";
+export declare const runInContainer: (dockerode: Dockerode, image: string, command: Command[]) => Promise<string | undefined>;

package/dist/docker/functions/run-in-container.js

@@ -12,17 +12,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runInContainer = void 0;
 const logger_1 = require("../../logger");
 const docker_image_name_1 = require("../../docker-image-name");
-const dockerode_1 = require("../dockerode");
 const pull_image_1 = require("./image/pull-image");
 const start_container_1 = require("./container/start-container");
 const attach_container_1 = require("./container/attach-container");
 const inspect_container_1 = require("./container/inspect-container");
-const runInContainer = (image, command) => __awaiter(void 0, void 0, void 0, function* () {
+const runInContainer = (dockerode, image, command) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const imageName = docker_image_name_1.DockerImageName.fromString(image);
         yield pull_image_1.pullImage({ imageName, force: false });
         logger_1.log.debug(`Creating container: ${image} with command: ${command.join(" ")}`);
-        const container = yield dockerode_1.dockerode.createContainer({ Image: image, Cmd: command, HostConfig: { AutoRemove: true } });
+        const container = yield dockerode.createContainer({ Image: image, Cmd: command, HostConfig: { AutoRemove: true } });
         logger_1.log.debug(`Attaching to container: ${container.id}`);
         const stream = yield attach_container_1.attachContainer(container);
         const promise = new Promise((resolve) => {

package/dist/docker/types.d.ts

@@ -28,6 +28,9 @@ export declare type ExtraHost = {
 };
 export declare type NetworkMode = string;
 export declare type ContainerName = string;
+export declare type Ports = {
+    [internalPort: number]: number;
+};
 export declare type AuthConfig = {
     username: string;
     password: string;

package/dist/docker-compose/default-docker-compose-options.d.ts

@@ -1,3 +1,3 @@
-import { IDockerComposeOptions } from "docker-compose";
+import { IDockerComposeOptions } from "./docker-compose";
 import { DockerComposeOptions } from "./docker-compose-options";
 export declare const defaultDockerComposeOptions: ({ env, ...options }: DockerComposeOptions) => Partial<IDockerComposeOptions>;

package/dist/docker-compose/docker-compose.d.ts

@@ -0,0 +1,3 @@
+import "../testcontainers-properties-file";
+export { upMany, upAll, down, stop, version } from "docker-compose";
+export type { IDockerComposeOptions } from "docker-compose";

package/dist/docker-compose/docker-compose.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.version = exports.stop = exports.down = exports.upAll = exports.upMany = void 0;
+require("../testcontainers-properties-file");
+var docker_compose_1 = require("docker-compose");
+Object.defineProperty(exports, "upMany", { enumerable: true, get: function () { return docker_compose_1.upMany; } });
+Object.defineProperty(exports, "upAll", { enumerable: true, get: function () { return docker_compose_1.upAll; } });
+Object.defineProperty(exports, "down", { enumerable: true, get: function () { return docker_compose_1.down; } });
+Object.defineProperty(exports, "stop", { enumerable: true, get: function () { return docker_compose_1.stop; } });
+Object.defineProperty(exports, "version", { enumerable: true, get: function () { return docker_compose_1.version; } });

package/dist/docker-compose/functions/docker-compose-down.js

@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dockerComposeDown = void 0;
-const docker_compose_1 = require("docker-compose");
 const logger_1 = require("../../logger");
 const default_docker_compose_options_1 = require("../default-docker-compose-options");
+const docker_compose_1 = require("../docker-compose");
 const dockerComposeDown = (options) => __awaiter(void 0, void 0, void 0, function* () {
     logger_1.log.info(`Downing DockerCompose environment`);
     try {

package/dist/docker-compose/functions/docker-compose-stop.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dockerComposeStop = void 0;
 const logger_1 = require("../../logger");
-const docker_compose_1 = require("docker-compose");
+const docker_compose_1 = require("../docker-compose");
 const default_docker_compose_options_1 = require("../default-docker-compose-options");
 const dockerComposeStop = (options) => __awaiter(void 0, void 0, void 0, function* () {
     logger_1.log.info(`Stopping DockerCompose environment`);

package/dist/docker-compose/functions/docker-compose-up.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dockerComposeUp = void 0;
 const logger_1 = require("../../logger");
-const docker_compose_1 = require("docker-compose");
+const docker_compose_1 = require("../docker-compose");
 const default_docker_compose_options_1 = require("../default-docker-compose-options");
 const docker_compose_down_1 = require("./docker-compose-down");
 const dockerComposeUp = (options, services) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/docker-compose-environment/docker-compose-environment.d.ts

@@ -20,7 +20,6 @@ export declare class DockerComposeEnvironment {
     withWaitStrategy(containerName: string, waitStrategy: WaitStrategy): this;
     withStartupTimeout(startupTimeout: number): this;
     up(services?: Array<string>): Promise<StartedDockerComposeEnvironment>;
-    private getBoundPorts;
     private waitForContainer;
     private getWaitStrategy;
 }

package/dist/docker-compose-environment/docker-compose-environment.js

@@ -20,7 +20,7 @@ const reaper_1 = require("../reaper");
 const uuid_1 = require("../uuid");
 const list_containers_1 = require("../docker/functions/container/list-containers");
 const get_container_1 = require("../docker/functions/container/get-container");
-const docker_host_1 = require("../docker/docker-host");
+const docker_client_1 = require("../docker/docker-client");
 const inspect_container_1 = require("../docker/functions/container/inspect-container");
 const container_logs_1 = require("../docker/functions/container/container-logs");
 const started_docker_compose_environment_1 = require("./started-docker-compose-environment");
@@ -80,10 +80,7 @@ class DockerComposeEnvironment {
                 commandOptions.push("--no-recreate");
             }
             const composeOptions = [];
-            this.profiles.forEach((profile) => {
-                composeOptions.push("--profile");
-                composeOptions.push(profile);
-            });
+            this.profiles.forEach((profile) => composeOptions.push("--profile", profile));
             yield docker_compose_up_1.dockerComposeUp(Object.assign(Object.assign({}, options), { commandOptions, composeOptions, env: this.env }), services);
             const startedContainers = (yield list_containers_1.listContainers()).filter((container) => container.Labels["com.docker.compose.project"] === this.projectName);
             const startedContainerNames = startedContainers.reduce((containerNames, startedContainer) => [
@@ -92,13 +89,13 @@ class DockerComposeEnvironment {
             ], []);
             logger_1.log.info(`Started the following containers: ${startedContainerNames.join(", ")}`);
             const startedGenericContainers = (yield Promise.all(startedContainers.map((startedContainer) => __awaiter(this, void 0, void 0, function* () {
-                const container = get_container_1.getContainerById(startedContainer.Id);
+                const container = yield get_container_1.getContainerById(startedContainer.Id);
                 const containerName = container_name_resolver_1.resolveContainerName(this.projectName, startedContainer.Names[0]);
                 (yield container_logs_1.containerLogs(container))
                     .on("data", (data) => logger_1.containerLog.trace(`${containerName}: ${data}`))
                     .on("err", (data) => logger_1.containerLog.error(`${containerName}: ${data}`));
                 const inspectResult = yield inspect_container_1.inspectContainer(container);
-                const boundPorts = this.getBoundPorts(startedContainer);
+                const boundPorts = bound_ports_1.BoundPorts.fromInspectResult(inspectResult);
                 try {
                     logger_1.log.info(`Waiting for container ${containerName} to be ready`);
                     yield this.waitForContainer(container, containerName, boundPorts);
@@ -114,7 +111,7 @@ class DockerComposeEnvironment {
                     }
                     throw err;
                 }
-                return new started_generic_container_1.StartedGenericContainer(container, yield docker_host_1.dockerHost, inspectResult, boundPorts, containerName);
+                return new started_generic_container_1.StartedGenericContainer(container, (yield docker_client_1.dockerClient).host, inspectResult, boundPorts, containerName);
             })))).reduce((map, startedGenericContainer) => {
                 const containerName = startedGenericContainer.getName();
                 return Object.assign(Object.assign({}, map), { [containerName]: startedGenericContainer });
@@ -123,14 +120,9 @@ class DockerComposeEnvironment {
             return new started_docker_compose_environment_1.StartedDockerComposeEnvironment(startedGenericContainers, Object.assign(Object.assign({}, options), { composeOptions, env: this.env }));
         });
     }
-    getBoundPorts(containerInfo) {
-        const boundPorts = new bound_ports_1.BoundPorts();
-        containerInfo.Ports.filter((port) => port.PublicPort !== undefined).forEach((port) => boundPorts.setBinding(port.PrivatePort, port.PublicPort));
-        return boundPorts;
-    }
     waitForContainer(container, containerName, boundPorts) {
         return __awaiter(this, void 0, void 0, function* () {
-            const waitStrategy = this.getWaitStrategy(yield docker_host_1.dockerHost, container, containerName);
+            const waitStrategy = this.getWaitStrategy((yield docker_client_1.dockerClient).host, container, containerName);
             yield waitStrategy.withStartupTimeout(this.startupTimeout).waitUntilReady(container, boundPorts);
         });
     }

package/dist/generic-container/generic-container.d.ts

@@ -6,7 +6,8 @@ import { PullPolicy } from "../pull-policy";
 import { StartedTestContainer, TestContainer } from "../test-container";
 import { WaitStrategy } from "../wait-strategy";
 import { Readable } from "stream";
-import { BindMode, BindMount, BuildContext, Command, ContainerName, Dir, Env, EnvKey, EnvValue, HealthCheck, NetworkMode, TmpFs } from "../docker/types";
+import { BindMode, BindMount, BuildContext, Command, ContainerName, Dir, Env, EnvKey, EnvValue, ExtraHost, HealthCheck, NetworkMode, TmpFs } from "../docker/types";
+import { InspectResult } from "../docker/functions/container/inspect-container";
 import { GenericContainerBuilder } from "./generic-container-builder";
 export declare class GenericContainer implements TestContainer {
     readonly image: string;
@@ -31,14 +32,18 @@ export declare class GenericContainer implements TestContainer {
     protected tarToCopy?: archiver.Archiver;
     private extraHosts;
     constructor(image: string);
+    protected preStart?(): Promise<void>;
     start(): Promise<StartedTestContainer>;
+    protected postStart?(container: StartedTestContainer, inspectResult: InspectResult, boundPorts: BoundPorts): Promise<void>;
     withCmd(cmd: Command[]): this;
     withName(name: ContainerName): this;
     withEnv(key: EnvKey, value: EnvValue): this;
     withTmpFs(tmpFs: TmpFs): this;
     withNetworkMode(networkMode: NetworkMode): this;
     withNetworkAliases(...networkAliases: string[]): this;
+    withExtraHosts(...extraHosts: ExtraHost[]): this;
     withExposedPorts(...ports: Port[]): this;
+    protected addExposedPorts(...ports: Port[]): this;
     withBindMount(source: Dir, target: Dir, bindMode?: BindMode): this;
     withHealthCheck(healthCheck: HealthCheck): this;
     withStartupTimeout(startupTimeout: number): this;
@@ -51,7 +56,6 @@ export declare class GenericContainer implements TestContainer {
     withCopyFileToContainer(sourcePath: string, containerPath: string): this;
     withCopyContentToContainer(content: string | Buffer | Readable, containerPath: string): this;
     protected getTarToCopy(): archiver.Archiver;
-    protected preCreate?(boundPorts: BoundPorts): Promise<void>;
     private waitForContainer;
     private getWaitStrategy;
 }

package/dist/generic-container/generic-container.js

@@ -14,8 +14,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenericContainer = void 0;
 const archiver_1 = __importDefault(require("archiver"));
+const bound_ports_1 = require("../bound-ports");
 const logger_1 = require("../logger");
-const port_binder_1 = require("../port-binder");
 const port_check_1 = require("../port-check");
 const pull_policy_1 = require("../pull-policy");
 const reaper_1 = require("../reaper");
@@ -26,7 +26,7 @@ const registry_auth_locator_1 = require("../registry-auth-locator");
 const pull_image_1 = require("../docker/functions/image/pull-image");
 const create_container_1 = require("../docker/functions/container/create-container");
 const connect_network_1 = require("../docker/functions/network/connect-network");
-const docker_host_1 = require("../docker/docker-host");
+const docker_client_1 = require("../docker/docker-client");
 const inspect_container_1 = require("../docker/functions/container/inspect-container");
 const start_container_1 = require("../docker/functions/container/start-container");
 const container_logs_1 = require("../docker/functions/container/container-logs");
@@ -61,12 +61,11 @@ class GenericContainer {
                 force: this.pullPolicy.shouldPull(),
                 authConfig: yield registry_auth_locator_1.getAuthConfig(this.imageName.registry),
             });
-            const boundPorts = yield new port_binder_1.PortBinder().bind(this.ports);
             if (!this.imageName.isReaper()) {
                 yield reaper_1.ReaperInstance.getInstance();
             }
-            if (this.preCreate) {
-                yield this.preCreate(boundPorts);
+            if (this.preStart) {
+                yield this.preStart();
             }
             if (!this.imageName.isHelperContainer() && port_forwarder_1.PortForwarderInstance.isRunning()) {
                 const portForwarder = yield port_forwarder_1.PortForwarderInstance.getInstance();
@@ -78,7 +77,7 @@ class GenericContainer {
                 cmd: this.cmd,
                 bindMounts: this.bindMounts,
                 tmpFs: this.tmpFs,
-                boundPorts,
+                exposedPorts: this.ports,
                 name: this.name,
                 networkMode: this.networkAliases.length > 0 ? undefined : this.networkMode,
                 healthCheck: this.healthCheck,
@@ -94,7 +93,11 @@ class GenericContainer {
                 const portForwarderNetworkId = portForwarder.getNetworkId();
                 const excludedNetworks = [portForwarderNetworkId, "none", "host"];
                 if (!this.networkMode || !excludedNetworks.includes(this.networkMode)) {
-                    yield connect_network_1.connectNetwork({ containerId: container.id, networkId: portForwarderNetworkId, networkAliases: [] });
+                    yield connect_network_1.connectNetwork({
+                        containerId: container.id,
+                        networkId: portForwarderNetworkId,
+                        networkAliases: [],
+                    });
                 }
             }
             if (this.networkMode && this.networkAliases.length > 0) {
@@ -114,8 +117,13 @@ class GenericContainer {
                 .on("data", (data) => logger_1.containerLog.trace(`${container.id}: ${data.trim()}`))
                 .on("err", (data) => logger_1.containerLog.error(`${container.id}: ${data.trim()}`));
             const inspectResult = yield inspect_container_1.inspectContainer(container);
+            const boundPorts = bound_ports_1.BoundPorts.fromInspectResult(inspectResult).filter(this.ports);
             yield this.waitForContainer(container, boundPorts);
-            return new started_generic_container_1.StartedGenericContainer(container, yield docker_host_1.dockerHost, inspectResult, boundPorts, inspectResult.name);
+            const startedContainer = new started_generic_container_1.StartedGenericContainer(container, (yield docker_client_1.dockerClient).host, inspectResult, boundPorts, inspectResult.name);
+            if (this.postStart) {
+                yield this.postStart(startedContainer, inspectResult, boundPorts);
+            }
+            return startedContainer;
         });
     }
     withCmd(cmd) {
@@ -142,10 +150,18 @@ class GenericContainer {
         this.networkAliases = networkAliases;
         return this;
     }
+    withExtraHosts(...extraHosts) {
+        this.extraHosts.push(...extraHosts);
+        return this;
+    }
     withExposedPorts(...ports) {
         this.ports = ports;
         return this;
     }
+    addExposedPorts(...ports) {
+        this.ports.push(...ports);
+        return this;
+    }
     withBindMount(source, target, bindMode = "rw") {
         this.bindMounts.push({ source, target, bindMode });
         return this;
@@ -199,7 +215,7 @@ class GenericContainer {
     waitForContainer(container, boundPorts) {
         return __awaiter(this, void 0, void 0, function* () {
             logger_1.log.debug(`Waiting for container to be ready: ${container.id}`);
-            const waitStrategy = this.getWaitStrategy(yield docker_host_1.dockerHost, container);
+            const waitStrategy = this.getWaitStrategy((yield docker_client_1.dockerClient).host, container);
             try {
                 yield waitStrategy.withStartupTimeout(this.startupTimeout).waitUntilReady(container, boundPorts);
                 logger_1.log.info("Container is ready");

package/dist/log-system-diagnostics.js

@@ -1,23 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -30,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logSystemDiagnostics = void 0;
 const logger_1 = require("./logger");
-const dockerCompose = __importStar(require("docker-compose"));
+const docker_compose_1 = require("./docker-compose/docker-compose");
 const get_info_1 = require("./docker/functions/get-info");
 const logSystemDiagnostics = () => __awaiter(void 0, void 0, void 0, function* () {
     const info = {
@@ -51,7 +32,7 @@ const getNodeInfo = () => {
 const getDockerComposeInfo = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
         return {
-            version: (yield dockerCompose.version()).data.version,
+            version: (yield docker_compose_1.version()).data.version,
         };
     }
     catch (err) {

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

@@ -1,34 +1,23 @@
 import { GenericContainer } from "../../generic-container/generic-container";
 import { BoundPorts } from "../../bound-ports";
-import { StartedNetwork } from "../../network";
 import { Port } from "../../port";
-import { StartedTestContainer, StoppedTestContainer } from "../..";
-import { StopOptions } from "../../test-container";
+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";
-export declare const ZK_IMAGE = "confluentinc/cp-zookeeper:5.5.4";
 export declare class KafkaContainer extends GenericContainer {
-    private readonly zooKeeperImage;
-    private readonly host;
     private readonly uuid;
     private readonly portGenerator;
     private isZooKeeperProvided;
     private zooKeeperHost?;
     private zooKeeperPort?;
-    private network?;
-    private zooKeeperContainer?;
-    constructor(image?: string, host?: Host, zooKeeperImage?: string);
+    constructor(image?: string);
     withZooKeeper(host: Host, port: Port): this;
-    protected preCreate(boundPorts: BoundPorts): Promise<void>;
+    protected preStart(): Promise<void>;
     start(): Promise<StartedKafkaContainer>;
+    protected postStart(container: StartedTestContainer, inspectResult: InspectResult, boundPorts: BoundPorts): Promise<void>;
 }
 export declare class StartedKafkaContainer extends AbstractStartedContainer {
-    private readonly network?;
-    private readonly zooKeeperContainer?;
-    private readonly zooKeeperPort?;
-    constructor(startedTestContainer: StartedTestContainer, network?: StartedNetwork | undefined, zooKeeperContainer?: StartedTestContainer | undefined, zooKeeperPort?: number | undefined);
-    stop(options?: Partial<StopOptions>): Promise<StoppedTestContainer>;
-    getZookeeperName(): string | undefined;
-    getZookeeperPort(): number | undefined;
+    constructor(startedTestContainer: StartedTestContainer);
 }

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

@@ -9,26 +9,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StartedKafkaContainer = exports.KafkaContainer = exports.ZK_IMAGE = exports.KAFKA_IMAGE = void 0;
+exports.StartedKafkaContainer = exports.KafkaContainer = exports.KAFKA_IMAGE = void 0;
 const generic_container_1 = require("../../generic-container/generic-container");
-const network_1 = require("../../network");
 const uuid_1 = require("../../uuid");
-const logger_1 = require("../../logger");
 const abstract_started_container_1 = require("../abstract-started-container");
 const port_generator_1 = require("../../port-generator");
-const docker_host_1 = require("../../docker/docker-host");
+const docker_client_1 = require("../../docker/docker-client");
 const KAFKA_PORT = 9093;
 const KAFKA_BROKER_PORT = 9092;
 exports.KAFKA_IMAGE = "confluentinc/cp-kafka:5.5.4";
-exports.ZK_IMAGE = "confluentinc/cp-zookeeper:5.5.4";
 class KafkaContainer extends generic_container_1.GenericContainer {
-    constructor(image = exports.KAFKA_IMAGE, host, zooKeeperImage = exports.ZK_IMAGE) {
+    constructor(image = exports.KAFKA_IMAGE) {
         super(image);
-        this.zooKeeperImage = zooKeeperImage;
         this.uuid = new uuid_1.RandomUuid();
         this.portGenerator = new port_generator_1.RandomUniquePortGenerator();
         this.isZooKeeperProvided = false;
-        this.host = host === undefined ? this.uuid.nextUuid() : host;
+        this.withExposedPorts(KAFKA_PORT)
+            .withStartupTimeout(180000)
+            .withEnv("KAFKA_LISTENERS", `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")
+            .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");
     }
     withZooKeeper(host, port) {
         this.isZooKeeperProvided = true;
@@ -36,10 +43,27 @@ class KafkaContainer extends generic_container_1.GenericContainer {
         this.zooKeeperPort = port;
         return this;
     }
-    preCreate(boundPorts) {
+    preStart() {
         return __awaiter(this, void 0, void 0, function* () {
-            const kafkaInternalPort = boundPorts.getBinding(KAFKA_PORT);
-            this.withEnv("KAFKA_ADVERTISED_LISTENERS", `PLAINTEXT://${this.host}:${KAFKA_BROKER_PORT},EXTERNAL_LISTENER://${yield docker_host_1.dockerHost}:${kafkaInternalPort}`);
+            const network = this.networkMode && this.networkAliases.length > 0 ? this.networkAliases[0] : "localhost";
+            this.withEnv("KAFKA_ADVERTISED_LISTENERS", `BROKER://${network}:${KAFKA_BROKER_PORT}`);
+            let command = "#!/bin/bash\n";
+            if (this.isZooKeeperProvided) {
+                this.withEnv("KAFKA_ZOOKEEPER_CONNECT", `${this.zooKeeperHost}:${this.zooKeeperPort}`);
+            }
+            else {
+                this.zooKeeperHost = this.uuid.nextUuid();
+                this.zooKeeperPort = yield this.portGenerator.generatePort();
+                this.addExposedPorts(this.zooKeeperPort);
+                this.withEnv("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";
+                command += "zookeeper-server-start zookeeper.properties &\n";
+            }
+            command += "echo '' > /etc/confluent/docker/ensure \n";
+            command += "/etc/confluent/docker/run \n";
+            this.withCmd(["sh", "-c", command]);
         });
     }
     start() {
@@ -47,71 +71,35 @@ class KafkaContainer extends generic_container_1.GenericContainer {
             start: { get: () => super.start }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            this.withName(this.host)
-                .withStartupTimeout(180000)
-                .withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "PLAINTEXT:PLAINTEXT,EXTERNAL_LISTENER:PLAINTEXT")
-                .withEnv("KAFKA_INTER_BROKER_LISTENER_NAME", "PLAINTEXT")
-                .withEnv("KAFKA_BROKER_ID", "1")
-                .withEnv("KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR", "1")
-                .withEnv("KAFKA_CONFLUENT_SUPPORT_METRICS_ENABLE", "false")
-                .withEnv("KAFKA_LISTENERS", `PLAINTEXT://0.0.0.0:${KAFKA_BROKER_PORT},EXTERNAL_LISTENER://0.0.0.0:${KAFKA_PORT}`);
-            let zooKeeperPort;
-            if (this.isZooKeeperProvided) {
-                this.withEnv("KAFKA_ZOOKEEPER_CONNECT", `${this.zooKeeperHost}:${this.zooKeeperPort}`);
-            }
-            else {
-                const zooKeeperHost = this.uuid.nextUuid();
-                zooKeeperPort = yield this.portGenerator.generatePort();
-                this.withEnv("KAFKA_ZOOKEEPER_CONNECT", `${zooKeeperHost}:${zooKeeperPort}`);
-                const zookeeperContainer = new generic_container_1.GenericContainer(this.zooKeeperImage)
-                    .withName(zooKeeperHost)
-                    .withEnv("ZOOKEEPER_CLIENT_PORT", zooKeeperPort.toString());
-                if (this.networkMode !== undefined) {
-                    zookeeperContainer.withNetworkMode(this.networkMode);
-                }
-                else {
-                    this.network = yield new network_1.Network().start();
-                    this.withNetworkMode(this.network.getName());
-                    zookeeperContainer.withNetworkMode(this.network.getName());
-                }
-                this.zooKeeperContainer = yield zookeeperContainer.start();
+            return new StartedKafkaContainer(yield _super.start.call(this));
+        });
+    }
+    postStart(container, inspectResult, boundPorts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const brokerAdvertisedListener = `BROKER://${inspectResult.hostname}:${KAFKA_BROKER_PORT}`;
+            const bootstrapServers = `PLAINTEXT://${(yield docker_client_1.dockerClient).host}:${boundPorts.getBinding(KAFKA_PORT)}`;
+            const { output, exitCode } = yield container.exec([
+                "kafka-configs",
+                "--alter",
+                "--bootstrap-server",
+                brokerAdvertisedListener,
+                "--entity-type",
+                "brokers",
+                "--entity-name",
+                this.env["KAFKA_BROKER_ID"],
+                "--add-config",
+                `advertised.listeners=[${bootstrapServers},${brokerAdvertisedListener}]`,
+            ]);
+            if (exitCode !== 0) {
+                throw new Error(`Kafka container configuration failed with exit code ${exitCode}: ${output}`);
             }
-            return new StartedKafkaContainer(yield _super.start.call(this), this.network, this.zooKeeperContainer, zooKeeperPort);
         });
     }
 }
 exports.KafkaContainer = KafkaContainer;
 class StartedKafkaContainer extends abstract_started_container_1.AbstractStartedContainer {
-    constructor(startedTestContainer, network, zooKeeperContainer, zooKeeperPort) {
+    constructor(startedTestContainer) {
         super(startedTestContainer);
-        this.network = network;
-        this.zooKeeperContainer = zooKeeperContainer;
-        this.zooKeeperPort = zooKeeperPort;
-    }
-    stop(options) {
-        const _super = Object.create(null, {
-            stop: { get: () => super.stop }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            logger_1.log.debug("Stopping Kafka container");
-            const stoppedContainer = yield _super.stop.call(this, options);
-            if (this.zooKeeperContainer) {
-                logger_1.log.debug("Stopping ZooKeeper container");
-                yield this.zooKeeperContainer.stop(options);
-            }
-            if (this.network) {
-                logger_1.log.debug("Stopping Kafka network");
-                yield this.network.stop();
-            }
-            return stoppedContainer;
-        });
-    }
-    getZookeeperName() {
-        var _a;
-        return (_a = this.zooKeeperContainer) === null || _a === void 0 ? void 0 : _a.getName();
-    }
-    getZookeeperPort() {
-        return this.zooKeeperPort;
     }
 }
 exports.StartedKafkaContainer = StartedKafkaContainer;

package/dist/port-forwarder.js

@@ -15,7 +15,7 @@ const logger_1 = require("./logger");
 const generic_container_1 = require("./generic-container/generic-container");
 const uuid_1 = require("./uuid");
 const session_id_1 = require("./docker/session-id");
-const docker_host_1 = require("./docker/docker-host");
+const docker_client_1 = require("./docker/docker-client");
 const images_1 = require("./images");
 class PortForwarder {
     constructor(sshConnection, container) {
@@ -66,7 +66,7 @@ class PortForwarderInstance {
                 `echo "${username}:$PASSWORD" | chpasswd && /usr/sbin/sshd -D -o PermitRootLogin=yes -o AddressFamily=inet -o GatewayPorts=yes`,
             ])
                 .start();
-            const host = yield docker_host_1.dockerHost;
+            const host = (yield docker_client_1.dockerClient).host;
             const port = container.getMappedPort(22);
             logger_1.log.debug(`Connecting to Port Forwarder on ${host}:${port}`);
             const connection = yield ssh_remote_port_forward_1.createSshConnection({ host, port, username, password });

package/dist/reaper.d.ts

@@ -8,6 +8,7 @@ export declare class ReaperInstance {
     static getInstance(): Promise<Reaper>;
     static stopInstance(): Promise<void>;
     private static isEnabled;
+    private static isPrivileged;
     private static createDisabledInstance;
     private static createRealInstance;
 }