testcontainers 8.6.2-beta.0 → 8.7.2

package/README.md

@@ -243,6 +243,19 @@ const container = await new GenericContainer("alpine")
   .start();
 ```
 
+Creating a container with labels:
+
+```javascript
+const { GenericContainer } = require("testcontainers");
+
+const container = await new GenericContainer("alpine")
+  .withLabels({
+    label1: "value1",
+    label2: "value2",
+  })
+  .start();
+```
+
 Creating a container with a custom health check command. Note that `interval`, `timeout`, `retries` and `startPeriod` are optional; the values will be inherited from the image or parent image if omitted. Also note that the wait strategy should be set to `Wait.forHealthCheck()` for this option to take effect:
 
 ```javascript

package/dist/bound-ports.js

@@ -21,7 +21,7 @@ class BoundPorts {
     }
     filter(ports) {
         const boundPorts = new BoundPorts();
-        const containerPorts = ports.map((port) => port_1.getContainerPort(port));
+        const containerPorts = ports.map((port) => (0, port_1.getContainerPort)(port));
         for (const [internalPort, hostPort] of this.iterator()) {
             if (containerPorts.includes(internalPort)) {
                 boundPorts.setBinding(internalPort, hostPort);

package/dist/docker/docker-client.js

@@ -35,7 +35,7 @@ const getDockerClient = () => __awaiter(void 0, void 0, void 0, function* () {
             if (yield isDockerDaemonReachable(dockerode)) {
                 const host = yield resolveHost(dockerode, uri);
                 logger_1.log.info(`Using Docker client strategy: ${strategy.getName()}, Docker host: ${host}`);
-                log_system_diagnostics_1.logSystemDiagnostics();
+                (0, log_system_diagnostics_1.logSystemDiagnostics)();
                 return { host, dockerode };
             }
             else {
@@ -148,6 +148,6 @@ const findGateway = (dockerode) => __awaiter(void 0, void 0, void 0, function* (
     const inspectResult = yield dockerode.getNetwork("bridge").inspect();
     return (_c = (_b = (_a = inspectResult === null || inspectResult === void 0 ? void 0 : inspectResult.IPAM) === null || _a === void 0 ? void 0 : _a.Config) === null || _b === void 0 ? void 0 : _b.find((config) => config.Gateway !== undefined)) === null || _c === void 0 ? void 0 : _c.Gateway;
 });
-const findDefaultGateway = (dockerode) => __awaiter(void 0, void 0, void 0, function* () { return run_in_container_1.runInContainer(dockerode, "alpine:3.5", ["sh", "-c", "ip route|awk '/default/ { print $3 }'"]); });
-const isInContainer = () => fs_1.existsSync("/.dockerenv");
+const findDefaultGateway = (dockerode) => __awaiter(void 0, void 0, void 0, function* () { return (0, run_in_container_1.runInContainer)(dockerode, "alpine:3.14", ["sh", "-c", "ip route|awk '/default/ { print $3 }'"]); });
+const isInContainer = () => (0, fs_1.existsSync)("/.dockerenv");
 exports.dockerClient = getDockerClient();

package/dist/docker/functions/container/attach-container.js

@@ -15,7 +15,7 @@ const logger_1 = require("../../../logger");
 const attachContainer = (container) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const stream = (yield container.attach({ stream: true, stdout: true, stderr: true }));
-        return demux_stream_1.demuxStream(stream);
+        return (0, demux_stream_1.demuxStream)(stream);
     }
     catch (err) {
         logger_1.log.error(`Failed to attach to container ${container.id}: ${err}`);

package/dist/docker/functions/container/container-logs.js

@@ -21,7 +21,7 @@ const containerLogs = (container) => __awaiter(void 0, void 0, void 0, function*
         };
         const stream = (yield container.logs(options));
         stream.socket.unref();
-        return demux_stream_1.demuxStream(stream);
+        return (0, demux_stream_1.demuxStream)(stream);
     }
     catch (err) {
         logger_1.log.error(`Failed to get container logs: ${err}`);

package/dist/docker/functions/container/create-container.d.ts

@@ -1,8 +1,7 @@
 import { DockerImageName } from "../../../docker-image-name";
 import Dockerode from "dockerode";
 import { PortWithOptionalBinding } from "../../../port";
-import { Labels } from "../create-labels";
-import { BindMount, Command, ContainerName, Env, ExtraHost, HealthCheck, NetworkMode, TmpFs } from "../../types";
+import { BindMount, Command, ContainerName, Env, ExtraHost, HealthCheck, Labels, NetworkMode, TmpFs } from "../../types";
 export declare type CreateContainerOptions = {
     imageName: DockerImageName;
     env: Env;

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

@@ -25,7 +25,7 @@ const createContainer = (options) => __awaiter(void 0, void 0, void 0, function*
             Env: getEnv(options.env),
             ExposedPorts: getExposedPorts(options.exposedPorts),
             Cmd: options.cmd,
-            Labels: create_labels_1.createLabels(options.reusable, options.imageName, options.labels),
+            Labels: (0, create_labels_1.createLabels)(options.reusable, options.imageName, options.labels),
             // @ts-ignore
             Healthcheck: getHealthCheck(options.healthCheck),
             HostConfig: {
@@ -51,7 +51,7 @@ const getEnv = (env) => Object.entries(env).reduce((dockerodeEnvironment, [key,
 const getExposedPorts = (exposedPorts) => {
     const dockerodeExposedPorts = {};
     for (const exposedPort of exposedPorts) {
-        dockerodeExposedPorts[port_1.getContainerPort(exposedPort).toString()] = {};
+        dockerodeExposedPorts[(0, port_1.getContainerPort)(exposedPort).toString()] = {};
     }
     return dockerodeExposedPorts;
 };
@@ -61,7 +61,7 @@ const getExtraHosts = (extraHosts) => {
 const getPortBindings = (exposedPorts) => {
     const dockerodePortBindings = {};
     for (const exposedPort of exposedPorts) {
-        if (port_1.hasHostBinding(exposedPort)) {
+        if ((0, port_1.hasHostBinding)(exposedPort)) {
             dockerodePortBindings[exposedPort.container] = [{ HostPort: exposedPort.host.toString() }];
         }
         else {

package/dist/docker/functions/container/get-container.js

@@ -38,7 +38,7 @@ const getContainerByHash = (hash) => __awaiter(void 0, void 0, void 0, function*
             return undefined;
         }
         else {
-            return yield exports.getContainerById(containers[0].Id);
+            return yield (0, exports.getContainerById)(containers[0].Id);
         }
     }
     catch (err) {

package/dist/docker/functions/container/inspect-container.d.ts

@@ -1,4 +1,4 @@
-import { ContainerName, HealthCheckStatus, NetworkSettings, Ports } from "../../types";
+import { ContainerName, HealthCheckStatus, Labels, NetworkSettings, Ports } from "../../types";
 import Dockerode from "dockerode";
 export declare type InspectResult = {
     name: ContainerName;
@@ -12,5 +12,6 @@ export declare type InspectResult = {
         status: string;
         running: boolean;
     };
+    labels: Labels;
 };
 export declare const inspectContainer: (container: Dockerode.Container) => Promise<InspectResult>;

package/dist/docker/functions/container/inspect-container.js

@@ -21,6 +21,7 @@ const inspectContainer = (container) => __awaiter(void 0, void 0, void 0, functi
             healthCheckStatus: getHealthCheckStatus(inspectResult),
             networkSettings: getNetworkSettings(inspectResult),
             state: { status: inspectResult.State.Status, running: inspectResult.State.Running },
+            labels: inspectResult.Config.Labels,
         };
     }
     catch (err) {

package/dist/docker/functions/create-labels.d.ts

@@ -1,5 +1,3 @@
 import { DockerImageName } from "../../docker-image-name";
-export declare type Labels = {
-    [key: string]: string;
-};
+import { Labels } from "../types";
 export declare const createLabels: (reusable: boolean, dockerImageName?: DockerImageName | undefined, extraLabels?: Labels) => Labels;

package/dist/docker/functions/image/build-image.js

@@ -42,11 +42,11 @@ const buildImage = (options) => __awaiter(void 0, void 0, void 0, function* () {
             dockerfile: options.dockerfileName,
             buildargs: options.buildArgs,
             t: options.imageName.toString(),
-            labels: create_labels_1.createLabels(false, options.imageName),
+            labels: (0, create_labels_1.createLabels)(false, options.imageName),
             registryconfig: options.registryConfig,
             pull: options.pullPolicy.shouldPull() ? "any" : undefined,
         })
-            .then((stream) => byline_1.default(stream))
+            .then((stream) => (0, byline_1.default)(stream))
             .then((stream) => {
             stream.setEncoding("utf-8");
             stream.on("data", (line) => logger_1.log.trace(`${options.imageName.toString()}: ${line}`));
@@ -61,10 +61,10 @@ const buildImage = (options) => __awaiter(void 0, void 0, void 0, function* () {
 exports.buildImage = buildImage;
 const createIsDockerIgnoredFunction = (context) => __awaiter(void 0, void 0, void 0, function* () {
     const dockerIgnoreFilePath = path_1.default.join(context, ".dockerignore");
-    if (!fs_1.existsSync(dockerIgnoreFilePath)) {
+    if (!(0, fs_1.existsSync)(dockerIgnoreFilePath)) {
         return () => false;
     }
-    const instance = dockerignore_1.default({ ignorecase: false });
+    const instance = (0, dockerignore_1.default)({ ignorecase: false });
     const dockerIgnorePatterns = yield fs_1.promises.readFile(dockerIgnoreFilePath, { encoding: "utf-8" });
     instance.add(dockerIgnorePatterns);
     const filter = instance.createFilter();

package/dist/docker/functions/image/image-exists.js

@@ -12,6 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.imageExists = void 0;
 const list_images_1 = require("./list-images");
 const imageExists = (imageName) => __awaiter(void 0, void 0, void 0, function* () {
-    return (yield list_images_1.listImages()).some((image) => image.equals(imageName));
+    return (yield (0, list_images_1.listImages)()).some((image) => image.equals(imageName));
 });
 exports.imageExists = imageExists;

package/dist/docker/functions/image/pull-image.js

@@ -16,7 +16,7 @@ const docker_client_1 = require("../../docker-client");
 const image_exists_1 = require("./image-exists");
 const pullImage = (options) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        if ((yield image_exists_1.imageExists(options.imageName)) && !options.force) {
+        if ((yield (0, image_exists_1.imageExists)(options.imageName)) && !options.force) {
             logger_1.log.debug(`Not pulling image as it already exists: ${options.imageName}`);
             return;
         }

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

@@ -26,7 +26,7 @@ const createNetwork = (options) => __awaiter(void 0, void 0, void 0, function* (
             Ingress: options.ingress,
             EnableIPv6: options.enableIPv6,
             Options: options.options,
-            Labels: Object.assign(Object.assign({}, options.labels), create_labels_1.createLabels(false)),
+            Labels: Object.assign(Object.assign({}, options.labels), (0, create_labels_1.createLabels)(false)),
         });
         return network.id;
     }

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

@@ -19,14 +19,14 @@ const inspect_container_1 = require("./container/inspect-container");
 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 });
+        yield (0, pull_image_1.pullImage)({ imageName, force: false });
         logger_1.log.debug(`Creating container: ${image} with command: ${command.join(" ")}`);
         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 stream = yield (0, attach_container_1.attachContainer)(container);
         const promise = new Promise((resolve) => {
             const interval = setInterval(() => __awaiter(void 0, void 0, void 0, function* () {
-                const inspect = yield inspect_container_1.inspectContainer(container);
+                const inspect = yield (0, inspect_container_1.inspectContainer)(container);
                 if (inspect.state.status === "exited") {
                     clearInterval(interval);
                     stream.destroy();
@@ -40,7 +40,7 @@ const runInContainer = (dockerode, image, command) => __awaiter(void 0, void 0,
             });
         });
         logger_1.log.debug(`Starting container: ${container.id}`);
-        yield start_container_1.startContainer(container);
+        yield (0, start_container_1.startContainer)(container);
         logger_1.log.debug(`Waiting for container output: ${container.id}`);
         const output = yield promise;
         if (output.length === 0) {

package/dist/docker/pull-stream-parser.js

@@ -14,7 +14,7 @@ class PullStreamParser {
         const messagesById = new Map();
         const statusesById = new Map();
         return new Promise((resolve) => {
-            byline_1.default(stream).on("data", (line) => {
+            (0, byline_1.default)(stream).on("data", (line) => {
                 try {
                     const json = JSON.parse(line);
                     const { id, status } = json;

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 Labels = {
+    [key: string]: string;
+};
 export declare type Ports = {
     [internalPort: number]: number;
 };

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

@@ -16,7 +16,7 @@ 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 {
-        yield docker_compose_1.down(Object.assign(Object.assign({}, default_docker_compose_options_1.defaultDockerComposeOptions(options)), { commandOptions: ["-v"] }));
+        yield (0, docker_compose_1.down)(Object.assign(Object.assign({}, (0, default_docker_compose_options_1.defaultDockerComposeOptions)(options)), { commandOptions: ["-v"] }));
         logger_1.log.info(`Downed DockerCompose environment`);
     }
     catch (err) {

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

@@ -16,7 +16,7 @@ const default_docker_compose_options_1 = require("../default-docker-compose-opti
 const dockerComposeStop = (options) => __awaiter(void 0, void 0, void 0, function* () {
     logger_1.log.info(`Stopping DockerCompose environment`);
     try {
-        yield docker_compose_1.stop(default_docker_compose_options_1.defaultDockerComposeOptions(options));
+        yield (0, docker_compose_1.stop)((0, default_docker_compose_options_1.defaultDockerComposeOptions)(options));
         logger_1.log.info(`Stopped DockerCompose environment`);
     }
     catch (err) {

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

@@ -18,10 +18,10 @@ const dockerComposeUp = (options, services) => __awaiter(void 0, void 0, void 0,
     logger_1.log.info(`Upping DockerCompose environment`);
     try {
         if (services) {
-            yield docker_compose_1.upMany(services, default_docker_compose_options_1.defaultDockerComposeOptions(options));
+            yield (0, docker_compose_1.upMany)(services, (0, default_docker_compose_options_1.defaultDockerComposeOptions)(options));
         }
         else {
-            yield docker_compose_1.upAll(default_docker_compose_options_1.defaultDockerComposeOptions(options));
+            yield (0, docker_compose_1.upAll)((0, default_docker_compose_options_1.defaultDockerComposeOptions)(options));
         }
         logger_1.log.info(`Upped DockerCompose environment`);
     }
@@ -29,7 +29,7 @@ const dockerComposeUp = (options, services) => __awaiter(void 0, void 0, void 0,
         const errorMessage = err.err || err.message || err;
         logger_1.log.error(`Failed to up DockerCompose environment: ${errorMessage}`);
         try {
-            yield docker_compose_down_1.dockerComposeDown(options);
+            yield (0, docker_compose_down_1.dockerComposeDown)(options);
         }
         catch (_a) {
             logger_1.log.warn(`Failed to down DockerCompose environment after failed up`);

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

@@ -89,20 +89,20 @@ class DockerComposeEnvironment {
                 composeOptions.push("--env-file", this.envFile);
             }
             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);
+            yield (0, docker_compose_up_1.dockerComposeUp)(Object.assign(Object.assign({}, options), { commandOptions, composeOptions, env: this.env }), services);
+            const startedContainers = (yield (0, list_containers_1.listContainers)()).filter((container) => container.Labels["com.docker.compose.project"] === this.projectName);
             const startedContainerNames = startedContainers.reduce((containerNames, startedContainer) => [
                 ...containerNames,
                 startedContainer.Names.join(", "),
             ], []);
             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 = 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))
+                const container = yield (0, get_container_1.getContainerById)(startedContainer.Id);
+                const containerName = (0, container_name_resolver_1.resolveContainerName)(this.projectName, startedContainer.Names[0]);
+                (yield (0, 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 inspectResult = yield (0, inspect_container_1.inspectContainer)(container);
                 const boundPorts = bound_ports_1.BoundPorts.fromInspectResult(inspectResult);
                 try {
                     logger_1.log.info(`Waiting for container ${containerName} to be ready`);
@@ -112,7 +112,7 @@ class DockerComposeEnvironment {
                 catch (err) {
                     logger_1.log.error(`Container ${containerName} failed to be ready: ${err}`);
                     try {
-                        yield docker_compose_down_1.dockerComposeDown(options);
+                        yield (0, docker_compose_down_1.dockerComposeDown)(options);
                     }
                     catch (_a) {
                         logger_1.log.warn(`Failed to stop DockerCompose environment after failed up`);

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

@@ -22,13 +22,13 @@ class StartedDockerComposeEnvironment {
     }
     stop() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield docker_compose_stop_1.dockerComposeStop(this.options);
+            yield (0, docker_compose_stop_1.dockerComposeStop)(this.options);
             return new stopped_docker_compose_environment_1.StoppedDockerComposeEnvironment(this.options);
         });
     }
     down() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield docker_compose_down_1.dockerComposeDown(this.options);
+            yield (0, docker_compose_down_1.dockerComposeDown)(this.options);
             return new downed_docker_compose_environment_1.DownedDockerComposeEnvironment();
         });
     }

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

@@ -18,7 +18,7 @@ class StoppedDockerComposeEnvironment {
     }
     down() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield docker_compose_down_1.dockerComposeDown(this.options);
+            yield (0, docker_compose_down_1.dockerComposeDown)(this.options);
             return new downed_docker_compose_environment_1.DownedDockerComposeEnvironment();
         });
     }

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

@@ -46,9 +46,9 @@ class GenericContainerBuilder {
             yield reaper_1.ReaperInstance.getInstance();
             const dockerfile = path_1.default.resolve(this.context, this.dockerfileName);
             logger_1.log.debug(`Preparing to build Dockerfile: ${dockerfile}`);
-            const imageNames = yield dockerfile_parser_1.getDockerfileImages(dockerfile);
+            const imageNames = yield (0, dockerfile_parser_1.getDockerfileImages)(dockerfile);
             const registryConfig = yield this.getRegistryConfig(imageNames);
-            yield build_image_1.buildImage({
+            yield (0, build_image_1.buildImage)({
                 imageName: imageName,
                 context: this.context,
                 dockerfileName: this.dockerfileName,
@@ -57,7 +57,7 @@ class GenericContainerBuilder {
                 registryConfig,
             });
             const container = new generic_container_1.GenericContainer(imageName.toString());
-            if (!(yield image_exists_1.imageExists(imageName))) {
+            if (!(yield (0, image_exists_1.imageExists)(imageName))) {
                 throw new Error("Failed to build image");
             }
             return Promise.resolve(container);
@@ -67,7 +67,7 @@ class GenericContainerBuilder {
         return __awaiter(this, void 0, void 0, function* () {
             const authConfigs = [];
             yield Promise.all(imageNames.map((imageName) => __awaiter(this, void 0, void 0, function* () {
-                const authConfig = yield registry_auth_locator_1.getAuthConfig(imageName.registry);
+                const authConfig = yield (0, registry_auth_locator_1.getAuthConfig)(imageName.registry);
                 if (authConfig !== undefined) {
                     authConfigs.push(authConfig);
                 }

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

@@ -6,7 +6,7 @@ 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, ExtraHost, HealthCheck, NetworkMode, TmpFs } from "../docker/types";
+import { BindMode, BindMount, BuildContext, Command, ContainerName, Dir, Env, EnvKey, EnvValue, ExtraHost, HealthCheck, NetworkMode, TmpFs, Labels } from "../docker/types";
 import { InspectResult } from "../docker/functions/container/inspect-container";
 import { GenericContainerBuilder } from "./generic-container-builder";
 export declare class GenericContainer implements TestContainer {
@@ -20,6 +20,7 @@ export declare class GenericContainer implements TestContainer {
     protected cmd: Command[];
     protected bindMounts: BindMount[];
     protected name?: ContainerName;
+    protected labels: Labels;
     protected tmpFs: TmpFs;
     protected healthCheck?: HealthCheck;
     protected waitStrategy?: WaitStrategy;
@@ -40,6 +41,7 @@ export declare class GenericContainer implements TestContainer {
     protected postStart?(container: StartedTestContainer, inspectResult: InspectResult, boundPorts: BoundPorts): Promise<void>;
     withCmd(cmd: Command[]): this;
     withName(name: ContainerName): this;
+    withLabels(labels: Labels): this;
     withEnv(key: EnvKey, value: EnvValue): this;
     withTmpFs(tmpFs: TmpFs): this;
     withNetworkMode(networkMode: NetworkMode): this;

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

@@ -46,6 +46,7 @@ class GenericContainer {
         this.ports = [];
         this.cmd = [];
         this.bindMounts = [];
+        this.labels = {};
         this.tmpFs = {};
         this.startupTimeout = 60000;
         this.useDefaultLogDriver = false;
@@ -60,10 +61,10 @@ class GenericContainer {
     }
     start() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield pull_image_1.pullImage({
+            yield (0, pull_image_1.pullImage)({
                 imageName: this.imageName,
                 force: this.pullPolicy.shouldPull(),
-                authConfig: yield registry_auth_locator_1.getAuthConfig(this.imageName.registry),
+                authConfig: yield (0, registry_auth_locator_1.getAuthConfig)(this.imageName.registry),
             });
             if (!this.imageName.isReaper()) {
                 yield reaper_1.ReaperInstance.getInstance();
@@ -83,6 +84,7 @@ class GenericContainer {
                 tmpFs: this.tmpFs,
                 exposedPorts: this.ports,
                 name: this.name,
+                labels: this.labels,
                 reusable: this.reuse,
                 networkMode: this.networkAliases.length > 0 ? undefined : this.networkMode,
                 healthCheck: this.healthCheck,
@@ -94,10 +96,10 @@ class GenericContainer {
                 user: this.user,
             };
             if (this.reuse) {
-                const containerHash = hash_1.hash(JSON.stringify(createContainerOptions));
+                const containerHash = (0, hash_1.hash)(JSON.stringify(createContainerOptions));
                 createContainerOptions.labels = { [labels_1.LABEL_CONTAINER_HASH]: containerHash };
                 logger_1.log.debug(`Container reuse has been enabled, hash: ${containerHash}`);
-                const container = yield get_container_1.getContainerByHash(containerHash);
+                const container = yield (0, get_container_1.getContainerByHash)(containerHash);
                 if (container !== undefined) {
                     logger_1.log.debug(`Found container to reuse with hash: ${containerHash}`);
                     return this.reuseContainer(container);
@@ -114,7 +116,7 @@ class GenericContainer {
     }
     reuseContainer(startedContainer) {
         return __awaiter(this, void 0, void 0, function* () {
-            const inspectResult = yield inspect_container_1.inspectContainer(startedContainer);
+            const inspectResult = yield (0, inspect_container_1.inspectContainer)(startedContainer);
             const boundPorts = bound_ports_1.BoundPorts.fromInspectResult(inspectResult).filter(this.ports);
             yield this.waitForContainer(startedContainer, boundPorts);
             return new started_generic_container_1.StartedGenericContainer(startedContainer, (yield docker_client_1.dockerClient).host, inspectResult, boundPorts, inspectResult.name);
@@ -122,13 +124,13 @@ class GenericContainer {
     }
     startContainer(createContainerOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            const container = yield create_container_1.createContainer(createContainerOptions);
+            const container = yield (0, create_container_1.createContainer)(createContainerOptions);
             if (!this.imageName.isHelperContainer() && port_forwarder_1.PortForwarderInstance.isRunning()) {
                 const portForwarder = yield port_forwarder_1.PortForwarderInstance.getInstance();
                 const portForwarderNetworkId = portForwarder.getNetworkId();
                 const excludedNetworks = [portForwarderNetworkId, "none", "host"];
                 if (!this.networkMode || !excludedNetworks.includes(this.networkMode)) {
-                    yield connect_network_1.connectNetwork({
+                    yield (0, connect_network_1.connectNetwork)({
                         containerId: container.id,
                         networkId: portForwarderNetworkId,
                         networkAliases: [],
@@ -136,7 +138,7 @@ class GenericContainer {
                 }
             }
             if (this.networkMode && this.networkAliases.length > 0) {
-                yield connect_network_1.connectNetwork({
+                yield (0, connect_network_1.connectNetwork)({
                     containerId: container.id,
                     networkId: this.networkMode,
                     networkAliases: this.networkAliases,
@@ -144,14 +146,14 @@ class GenericContainer {
             }
             if (this.tarToCopy) {
                 yield this.tarToCopy.finalize();
-                yield put_container_archive_1.putContainerArchive({ container, stream: this.tarToCopy, containerPath: "/" });
+                yield (0, put_container_archive_1.putContainerArchive)({ container, stream: this.tarToCopy, containerPath: "/" });
             }
             logger_1.log.info(`Starting container ${this.imageName} with ID: ${container.id}`);
-            yield start_container_1.startContainer(container);
-            (yield container_logs_1.containerLogs(container))
+            yield (0, start_container_1.startContainer)(container);
+            (yield (0, container_logs_1.containerLogs)(container))
                 .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 inspectResult = yield (0, inspect_container_1.inspectContainer)(container);
             const boundPorts = bound_ports_1.BoundPorts.fromInspectResult(inspectResult).filter(this.ports);
             yield this.waitForContainer(container, boundPorts);
             const startedContainer = new started_generic_container_1.StartedGenericContainer(container, (yield docker_client_1.dockerClient).host, inspectResult, boundPorts, inspectResult.name);
@@ -169,6 +171,10 @@ class GenericContainer {
         this.name = name;
         return this;
     }
+    withLabels(labels) {
+        this.labels = Object.assign({}, labels);
+        return this;
+    }
     withEnv(key, value) {
         this.env[key] = value;
         return this;
@@ -247,7 +253,7 @@ class GenericContainer {
     }
     getTarToCopy() {
         if (!this.tarToCopy) {
-            this.tarToCopy = archiver_1.default("tar");
+            this.tarToCopy = (0, archiver_1.default)("tar");
         }
         return this.tarToCopy;
     }
@@ -262,8 +268,8 @@ class GenericContainer {
             catch (err) {
                 logger_1.log.error(`Container failed to be ready: ${err}`);
                 try {
-                    yield stop_container_1.stopContainer(container, { timeout: 0 });
-                    yield remove_container_1.removeContainer(container, { removeVolumes: true });
+                    yield (0, stop_container_1.stopContainer)(container, { timeout: 0 });
+                    yield (0, remove_container_1.removeContainer)(container, { removeVolumes: true });
                 }
                 catch (stopErr) {
                     logger_1.log.error(`Failed to stop container after it failed to be ready: ${stopErr}`);

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { StartedTestContainer, StopOptions, StoppedTestContainer } from "../test-container";
 import Dockerode from "dockerode";
-import { Command, ContainerName, ExecResult, Host, Id as ContainerId } from "../docker/types";
+import { Command, ContainerName, ExecResult, Host, Id as ContainerId, Labels } from "../docker/types";
 import { InspectResult } from "../docker/functions/container/inspect-container";
 import { BoundPorts } from "../bound-ports";
 import { Port } from "../port";
@@ -19,6 +19,7 @@ export declare class StartedGenericContainer implements StartedTestContainer {
     getMappedPort(port: Port): Port;
     getId(): ContainerId;
     getName(): ContainerName;
+    getLabels(): Labels;
     getNetworkNames(): string[];
     getNetworkId(networkName: string): string;
     getIpAddress(networkName: string): string;

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

@@ -33,8 +33,8 @@ class StartedGenericContainer {
         return __awaiter(this, void 0, void 0, function* () {
             logger_1.log.info(`Stopping container with ID: ${this.container.id}`);
             const resolvedOptions = Object.assign({ timeout: 0, removeVolumes: true }, options);
-            yield stop_container_1.stopContainer(this.container, { timeout: resolvedOptions.timeout });
-            yield remove_container_1.removeContainer(this.container, { removeVolumes: resolvedOptions.removeVolumes });
+            yield (0, stop_container_1.stopContainer)(this.container, { timeout: resolvedOptions.timeout });
+            yield (0, remove_container_1.removeContainer)(this.container, { removeVolumes: resolvedOptions.removeVolumes });
             return new stopped_generic_container_1.StoppedGenericContainer();
         });
     }
@@ -50,6 +50,9 @@ class StartedGenericContainer {
     getName() {
         return this.name;
     }
+    getLabels() {
+        return this.inspectResult.labels;
+    }
     getNetworkNames() {
         return Object.keys(this.inspectResult.networkSettings);
     }
@@ -60,10 +63,10 @@ class StartedGenericContainer {
         return this.inspectResult.networkSettings[networkName].ipAddress;
     }
     exec(command) {
-        return exec_container_1.execContainer(this.container, command);
+        return (0, exec_container_1.execContainer)(this.container, command);
     }
     logs() {
-        return container_logs_1.containerLogs(this.container);
+        return (0, container_logs_1.containerLogs)(this.container);
     }
 }
 exports.StartedGenericContainer = StartedGenericContainer;

package/dist/log-system-diagnostics.js

@@ -16,7 +16,7 @@ const get_info_1 = require("./docker/functions/get-info");
 const logSystemDiagnostics = () => __awaiter(void 0, void 0, void 0, function* () {
     const info = {
         node: getNodeInfo(),
-        docker: yield get_info_1.getDockerInfo(),
+        docker: yield (0, get_info_1.getDockerInfo)(),
         dockerCompose: yield getDockerComposeInfo(),
     };
     logger_1.log.debug(`System diagnostics: ${JSON.stringify(info)}`);
@@ -32,7 +32,7 @@ const getNodeInfo = () => {
 const getDockerComposeInfo = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
         return {
-            version: (yield docker_compose_1.version()).data.version,
+            version: (yield (0, docker_compose_1.version)()).data.version,
         };
     }
     catch (err) {

package/dist/logger.js

@@ -7,7 +7,7 @@ exports.containerLog = exports.log = exports.FakeLogger = void 0;
 const debug_1 = __importDefault(require("debug"));
 class DebugLogger {
     constructor(namespace) {
-        this.logger = debug_1.default(namespace);
+        this.logger = (0, debug_1.default)(namespace);
     }
     trace(message) {
         this.logger(`TRACE ${message}`);

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { StartedTestContainer, StopOptions, StoppedTestContainer } from "../test-container";
 import { Port } from "../port";
-import { ContainerName, Host, Id, Command, ExecResult } from "../docker/types";
+import { ContainerName, Host, Id, Command, ExecResult, Labels } from "../docker/types";
 import { Readable } from "stream";
 export declare class AbstractStartedContainer {
     protected readonly startedTestContainer: StartedTestContainer;
@@ -10,6 +10,7 @@ export declare class AbstractStartedContainer {
     getHost(): Host;
     getMappedPort(port: Port): Port;
     getName(): ContainerName;
+    getLabels(): Labels;
     getId(): Id;
     getNetworkNames(): string[];
     getNetworkId(networkName: string): string;

package/dist/modules/abstract-started-container.js

@@ -17,6 +17,9 @@ class AbstractStartedContainer {
     getName() {
         return this.startedTestContainer.getName();
     }
+    getLabels() {
+        return this.startedTestContainer.getLabels();
+    }
     getId() {
         return this.startedTestContainer.getId();
     }

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

@@ -8,7 +8,6 @@ import { InspectResult } from "../../docker/functions/container/inspect-containe
 export declare const KAFKA_IMAGE = "confluentinc/cp-kafka:5.5.4";
 export declare class KafkaContainer extends GenericContainer {
     private readonly uuid;
-    private readonly portGenerator;
     private isZooKeeperProvided;
     private zooKeeperHost?;
     private zooKeeperPort?;

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

@@ -13,16 +13,15 @@ exports.StartedKafkaContainer = exports.KafkaContainer = exports.KAFKA_IMAGE = v
 const generic_container_1 = require("../../generic-container/generic-container");
 const uuid_1 = require("../../uuid");
 const abstract_started_container_1 = require("../abstract-started-container");
-const port_generator_1 = require("../../port-generator");
 const docker_client_1 = require("../../docker/docker-client");
 const KAFKA_PORT = 9093;
 const KAFKA_BROKER_PORT = 9092;
+const DEFAULT_ZOOKEEPER_PORT = 2181;
 exports.KAFKA_IMAGE = "confluentinc/cp-kafka:5.5.4";
 class KafkaContainer extends generic_container_1.GenericContainer {
     constructor(image = exports.KAFKA_IMAGE) {
         super(image);
         this.uuid = new uuid_1.RandomUuid();
-        this.portGenerator = new port_generator_1.RandomUniquePortGenerator();
         this.isZooKeeperProvided = false;
         this.withExposedPorts(KAFKA_PORT)
             .withStartupTimeout(180000)
@@ -53,7 +52,7 @@ class KafkaContainer extends generic_container_1.GenericContainer {
             }
             else {
                 this.zooKeeperHost = this.uuid.nextUuid();
-                this.zooKeeperPort = yield this.portGenerator.generatePort();
+                this.zooKeeperPort = DEFAULT_ZOOKEEPER_PORT;
                 this.addExposedPorts(this.zooKeeperPort);
                 this.withEnv("KAFKA_ZOOKEEPER_CONNECT", `localhost:${this.zooKeeperPort}`);
                 command += "echo 'clientPort=" + this.zooKeeperPort + "' > zookeeper.properties\n";

package/dist/network.js

@@ -22,7 +22,7 @@ class Network {
     start() {
         return __awaiter(this, void 0, void 0, function* () {
             yield reaper_1.ReaperInstance.getInstance();
-            const id = yield create_network_1.createNetwork(this.createNetworkOptions);
+            const id = yield (0, create_network_1.createNetwork)(this.createNetworkOptions);
             logger_1.log.info(`Started network with ID: ${id}`);
             return new StartedNetwork(id, this.createNetworkOptions);
         });
@@ -43,7 +43,7 @@ class StartedNetwork {
     stop() {
         return __awaiter(this, void 0, void 0, function* () {
             logger_1.log.info(`Stopping network with ID: ${this.id}`);
-            yield remove_network_1.removeNetwork(this.id);
+            yield (0, remove_network_1.removeNetwork)(this.id);
             return new StoppedNetwork();
         });
     }

package/dist/port-check.js

@@ -49,7 +49,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) => exec_container_1.execContainer(this.container, command)));
+            const commandResults = yield Promise.all(commands.map((command) => (0, exec_container_1.execContainer)(this.container, command)));
             return commandResults.some((result) => result.exitCode === 0);
         });
     }

package/dist/port-forwarder.js

@@ -69,7 +69,7 @@ class PortForwarderInstance {
             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 });
+            const connection = yield (0, ssh_remote_port_forward_1.createSshConnection)({ host, port, username, password });
             connection.unref();
             return new PortForwarder(connection, container);
         });

package/dist/port-generator.js

@@ -16,7 +16,7 @@ exports.FixedPortGenerator = exports.RandomUniquePortGenerator = void 0;
 const get_port_1 = __importDefault(require("get-port"));
 class RandomPortGenerator {
     generatePort() {
-        return get_port_1.default({ port: this.randomBetweenInclusive(10000, 65535) });
+        return (0, get_port_1.default)({ port: this.randomBetweenInclusive(10000, 65535) });
     }
     randomBetweenInclusive(min, max) {
         return Math.floor(Math.random() * (max - min + 1) + min);

package/dist/reaper.js

@@ -14,7 +14,6 @@ const net_1 = require("net");
 const logger_1 = require("./logger");
 const generic_container_1 = require("./generic-container/generic-container");
 const session_id_1 = require("./docker/session-id");
-const docker_client_1 = require("./docker/docker-client");
 const images_1 = require("./images");
 const port_1 = require("./port");
 const labels_1 = require("./labels");
@@ -93,7 +92,7 @@ class ReaperInstance {
             }
             const startedContainer = yield container.start();
             const containerId = startedContainer.getId();
-            const host = (yield docker_client_1.dockerClient).host;
+            const host = startedContainer.getHost();
             const port = startedContainer.getMappedPort(8080);
             logger_1.log.debug(`Connecting to Reaper ${containerId} on ${host}:${port}`);
             const socket = new net_1.Socket();
@@ -110,7 +109,7 @@ class ReaperInstance {
                 }
             });
             return new Promise((resolve) => {
-                socket.connect(port_1.getContainerPort(port), host, () => {
+                socket.connect((0, port_1.getContainerPort)(port), host, () => {
                     logger_1.log.debug(`Connected to Reaper ${containerId}`);
                     socket.write(`label=${labels_1.LABEL_SESSION_ID}=${session_id_1.sessionId}\r\n`);
                     const reaper = new RealReaper(startedContainer, socket);

package/dist/registry-auth-locator/credential-provider.js

@@ -38,7 +38,7 @@ class CredentialProvider {
     }
     listCredentials(providerName) {
         return new Promise((resolve, reject) => {
-            child_process_1.exec(`${providerName} list`, (err, stdout) => {
+            (0, child_process_1.exec)(`${providerName} list`, (err, stdout) => {
                 if (err) {
                     logger_1.log.error("An error occurred listing credentials");
                     return reject(err);
@@ -55,7 +55,7 @@ class CredentialProvider {
     }
     runCredentialProvider(registry, providerName) {
         return new Promise((resolve) => {
-            const sink = child_process_1.spawn(providerName, ["get"]);
+            const sink = (0, child_process_1.spawn)(providerName, ["get"]);
             const chunks = [];
             sink.stdout.on("data", (chunk) => chunks.push(chunk));
             sink.on("close", (code) => {

package/dist/registry-auth-locator/index.js

@@ -24,7 +24,7 @@ const DEFAULT_REGISTRY = "https://index.docker.io/v1/";
 const dockerConfigLocation = process.env.DOCKER_CONFIG || `${os_1.default.homedir()}/.docker`;
 const dockerConfigFile = path_1.default.resolve(dockerConfigLocation, "config.json");
 const readDockerConfig = () => __awaiter(void 0, void 0, void 0, function* () {
-    if (!fs_1.existsSync(dockerConfigFile)) {
+    if (!(0, fs_1.existsSync)(dockerConfigFile)) {
         return Promise.resolve({});
     }
     const buffer = yield fs_1.promises.readFile(dockerConfigFile);

package/dist/test-container.d.ts

@@ -3,7 +3,7 @@ import { Port, 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 } from "./docker/types";
+import { BindMode, Command, ContainerName, Dir, EnvKey, EnvValue, ExecResult, ExtraHost, Host, Id, NetworkMode, TmpFs, Labels } from "./docker/types";
 export interface TestContainer {
     start(): Promise<StartedTestContainer>;
     withEnv(key: EnvKey, value: EnvValue): this;
@@ -32,6 +32,7 @@ export interface StartedTestContainer {
     getHost(): Host;
     getMappedPort(port: Port): Port;
     getName(): ContainerName;
+    getLabels(): Labels;
     getId(): Id;
     getNetworkNames(): string[];
     getNetworkId(networkName: string): string;

package/dist/testcontainers-properties-file.js

@@ -8,11 +8,11 @@ const logger_1 = require("./logger");
 const os_1 = require("os");
 const fs_1 = require("fs");
 const properties_reader_1 = __importDefault(require("properties-reader"));
-const file = path_1.default.resolve(os_1.homedir(), ".testcontainers.properties");
-if (fs_1.existsSync(file)) {
+const file = path_1.default.resolve((0, os_1.homedir)(), ".testcontainers.properties");
+if ((0, fs_1.existsSync)(file)) {
     logger_1.log.debug("Found .testcontainers.properties file");
-    const string = fs_1.readFileSync(file, { encoding: "utf-8" });
-    const properties = properties_reader_1.default("").read(string);
+    const string = (0, fs_1.readFileSync)(file, { encoding: "utf-8" });
+    const properties = (0, properties_reader_1.default)("").read(string);
     const host = properties.get("docker.host");
     if (host !== null) {
         logger_1.log.debug(`Setting DOCKER_HOST to ${host}`);

package/dist/wait-strategy.js

@@ -75,7 +75,7 @@ class LogWaitStrategy extends AbstractWaitStrategy {
     waitUntilReady(container) {
         return __awaiter(this, void 0, void 0, function* () {
             logger_1.log.debug(`Waiting for log message "${this.message}"`);
-            const stream = yield container_logs_1.containerLogs(container);
+            const stream = yield (0, container_logs_1.containerLogs)(container);
             return new Promise((resolve, reject) => {
                 const startupTimeout = this.startupTimeout;
                 const timeout = setTimeout(() => {
@@ -98,7 +98,7 @@ class LogWaitStrategy extends AbstractWaitStrategy {
                         resolve();
                     }
                 };
-                byline_1.default(stream)
+                (0, byline_1.default)(stream)
                     .on("data", lineProcessor)
                     .on("err", lineProcessor)
                     .on("end", () => {
@@ -116,7 +116,7 @@ class HealthCheckWaitStrategy extends AbstractWaitStrategy {
         return __awaiter(this, void 0, void 0, function* () {
             logger_1.log.debug(`Waiting for health check`);
             const retryStrategy = new retry_strategy_1.IntervalRetryStrategy(100);
-            const status = yield retryStrategy.retryUntil(() => __awaiter(this, void 0, void 0, function* () { return (yield inspect_container_1.inspectContainer(container)).healthCheckStatus; }), (healthCheckStatus) => healthCheckStatus === "healthy" || healthCheckStatus === "unhealthy", () => {
+            const status = yield retryStrategy.retryUntil(() => __awaiter(this, void 0, void 0, function* () { return (yield (0, inspect_container_1.inspectContainer)(container)).healthCheckStatus; }), (healthCheckStatus) => healthCheckStatus === "healthy" || healthCheckStatus === "unhealthy", () => {
                 const timeout = this.startupTimeout;
                 throw new Error(`Health check not healthy after ${timeout}ms for ${container.id}`);
             }, this.startupTimeout);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testcontainers",
   "author": "Cristian Greco",
-  "version": "8.6.2-beta.0",
+  "version": "8.7.2",
   "main": "dist/index",
   "types": "dist/index",
   "keywords": [
@@ -33,9 +33,9 @@
   },
   "dependencies": {
     "@balena/dockerignore": "^1.0.2",
-    "@types/archiver": "^5.1.1",
-    "@types/dockerode": "^3.2.7",
-    "archiver": "^5.3.0",
+    "@types/archiver": "^5.3.1",
+    "@types/dockerode": "^3.3.8",
+    "archiver": "^5.3.1",
     "byline": "^5.0.0",
     "debug": "^4.3.4",
     "docker-compose": "^0.23.17",
@@ -46,34 +46,34 @@
     "tar-fs": "^2.1.1"
   },
   "devDependencies": {
-    "@elastic/elasticsearch": "^7.14.1",
+    "@elastic/elasticsearch": "^7.17.0",
     "@types/byline": "^4.2.33",
     "@types/debug": "4.1.7",
-    "@types/jest": "^27.0.3",
-    "@types/node": "^16.9.6",
-    "@types/node-fetch": "^2.5.12",
+    "@types/jest": "^27.4.1",
+    "@types/node": "^17.0.25",
+    "@types/node-fetch": "^2.6.1",
     "@types/pg": "^8.6.5",
     "@types/properties-reader": "^2.1.1",
     "@types/tar-fs": "^2.0.1",
-    "@typescript-eslint/eslint-plugin": "^4.31.2",
-    "@typescript-eslint/parser": "^4.31.2",
-    "arangojs": "^7.5.0",
+    "@typescript-eslint/eslint-plugin": "^5.19.0",
+    "@typescript-eslint/parser": "^5.19.0",
+    "arangojs": "^7.7.0",
     "cross-env": "^7.0.3",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.3.0",
+    "eslint": "^8.13.0",
+    "eslint-config-prettier": "^8.5.0",
     "husky": "^7.0.4",
-    "jest": "^27.2.5",
-    "kafkajs": "^1.15.0",
-    "lint-staged": "^11.1.4",
+    "jest": "^27.5.1",
+    "kafkajs": "^1.16.0",
+    "lint-staged": "^12.3.8",
     "mysql2": "^2.3.3",
-    "neo4j-driver": "^4.3.6",
+    "neo4j-driver": "^4.4.5",
     "node-fetch": "^2.6.7",
     "pg": "^8.7.3",
-    "prettier": "^2.4.1",
+    "prettier": "^2.6.2",
     "rimraf": "^3.0.2",
-    "ts-jest": "^27.0.7",
-    "ts-node": "^10.2.1",
-    "typescript": "^4.3.5",
+    "ts-jest": "^27.1.4",
+    "ts-node": "^10.7.0",
+    "typescript": "^4.6.3",
     "wait-for-expect": "^3.0.2"
   },
   "lint-staged": {