testcontainers 8.0.0 → 8.1.0

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

@@ -0,0 +1,9 @@
+import Dockerode from "dockerode";
+import { Host } from "./types";
+import "../testcontainers-properties-file";
+declare type DockerClient = {
+    host: Host;
+    dockerode: Dockerode;
+};
+export declare const dockerClient: Promise<DockerClient>;
+export {};

package/dist/docker/docker-client.js

@@ -0,0 +1,150 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dockerClient = void 0;
+const dockerode_1 = __importDefault(require("dockerode"));
+const path_1 = __importDefault(require("path"));
+const logger_1 = require("../logger");
+const url_1 = require("url");
+const fs_1 = __importDefault(require("fs"));
+const run_in_container_1 = require("./functions/run-in-container");
+const log_system_diagnostics_1 = require("../log-system-diagnostics");
+require("../testcontainers-properties-file");
+const getDockerClient = () => __awaiter(void 0, void 0, void 0, function* () {
+    const strategies = [
+        new ConfigurationStrategy(),
+        new UnixSocketStrategy(),
+        new NpipeSocketStrategy(),
+    ];
+    for (const strategy of strategies) {
+        if (strategy.isApplicable()) {
+            logger_1.log.debug(`Found applicable Docker client strategy: ${strategy.getName()}`);
+            const dockerConfig = strategy.getDockerConfig();
+            const dockerode = new dockerode_1.default(createDockerodeOptions(dockerConfig));
+            logger_1.log.debug(`Testing Docker client strategy URI: ${dockerConfig.uri}`);
+            if (yield isDockerDaemonReachable(dockerode)) {
+                const host = yield resolveHost(dockerode, dockerConfig.uri);
+                logger_1.log.info(`Using Docker client strategy: ${strategy.getName()}, Docker host: ${host}`);
+                log_system_diagnostics_1.logSystemDiagnostics();
+                return { host, dockerode };
+            }
+            else {
+                logger_1.log.warn(`Docker client strategy ${strategy.getName()} is not reachable`);
+            }
+        }
+    }
+    throw new Error("No Docker client strategy found");
+});
+const createDockerodeOptions = (dockerConfig) => {
+    const dockerOptions = {};
+    if (dockerConfig.isSocket) {
+        dockerOptions.socketPath = new url_1.URL(dockerConfig.uri).pathname;
+    }
+    else {
+        dockerOptions.host = dockerConfig.uri;
+    }
+    if (dockerConfig.ssl) {
+        dockerOptions.ca = dockerConfig.ssl.ca;
+        dockerOptions.cert = dockerConfig.ssl.cert;
+        dockerOptions.key = dockerConfig.ssl.key;
+    }
+    return dockerOptions;
+};
+const isDockerDaemonReachable = (dockerode) => __awaiter(void 0, void 0, void 0, function* () { return (yield dockerode.ping()).toString() === "OK"; });
+class ConfigurationStrategy {
+    getDockerConfig() {
+        const { DOCKER_HOST, DOCKER_TLS_VERIFY, DOCKER_CERT_PATH } = process.env;
+        return {
+            uri: DOCKER_HOST,
+            isSocket: false,
+            ssl: DOCKER_TLS_VERIFY === "1" && DOCKER_CERT_PATH !== undefined
+                ? {
+                    ca: path_1.default.resolve(DOCKER_CERT_PATH, "ca.pem"),
+                    cert: path_1.default.resolve(DOCKER_CERT_PATH, "cert.pem"),
+                    key: path_1.default.resolve(DOCKER_CERT_PATH, "key.pem"),
+                }
+                : undefined,
+        };
+    }
+    isApplicable() {
+        return process.env.DOCKER_HOST !== undefined;
+    }
+    getName() {
+        return "ConfigurationStrategy";
+    }
+}
+class UnixSocketStrategy {
+    getDockerConfig() {
+        return {
+            uri: "unix:///var/run/docker.sock",
+            isSocket: true,
+        };
+    }
+    isApplicable() {
+        return process.platform === "linux" || process.platform === "darwin";
+    }
+    getName() {
+        return "UnixSocketStrategy";
+    }
+}
+class NpipeSocketStrategy {
+    getDockerConfig() {
+        return {
+            uri: "npipe:////./pipe/docker_engine",
+            isSocket: true,
+        };
+    }
+    isApplicable() {
+        return process.platform === "win32";
+    }
+    getName() {
+        return "NpipeSocketStrategy";
+    }
+}
+const resolveHost = (dockerode, uri) => __awaiter(void 0, void 0, void 0, function* () {
+    if (process.env.TESTCONTAINERS_HOST_OVERRIDE !== undefined) {
+        return process.env.TESTCONTAINERS_HOST_OVERRIDE;
+    }
+    const { protocol, hostname } = new url_1.URL(uri);
+    switch (protocol) {
+        case "http:":
+        case "https:":
+        case "tcp:":
+            return hostname;
+        case "unix:":
+        case "npipe:": {
+            if (isInContainer()) {
+                const gateway = yield findGateway(dockerode);
+                if (gateway !== undefined) {
+                    return gateway;
+                }
+                const defaultGateway = yield findDefaultGateway(dockerode);
+                if (defaultGateway !== undefined) {
+                    return defaultGateway;
+                }
+            }
+            return "localhost";
+        }
+        default:
+            throw new Error(`Unsupported protocol: ${protocol}`);
+    }
+});
+const findGateway = (dockerode) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c;
+    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.default.existsSync("/.dockerenv");
+exports.dockerClient = getDockerClient();

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

@@ -11,12 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createContainer = 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 createContainer = (options) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         logger_1.log.info(`Creating container for image: ${options.imageName}`);
-        return yield dockerode_1.dockerode.createContainer({
+        const { dockerode } = yield docker_client_1.dockerClient;
+        return yield dockerode.createContainer({
             name: options.name,
             User: options.user,
             Image: options.imageName.toString(),

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

@@ -1,3 +1,3 @@
 import Dockerode from "dockerode";
 import { Id } from "../../types";
-export declare const getContainerById: (id: Id) => Dockerode.Container;
+export declare const getContainerById: (id: Id) => Promise<Dockerode.Container>;

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

@@ -1,6 +1,18 @@
 "use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getContainerById = void 0;
-const dockerode_1 = require("../../dockerode");
-const getContainerById = (id) => dockerode_1.dockerode.getContainer(id);
+const docker_client_1 = require("../../docker-client");
+const getContainerById = (id) => __awaiter(void 0, void 0, void 0, function* () {
+    const { dockerode } = yield docker_client_1.dockerClient;
+    return dockerode.getContainer(id);
+});
 exports.getContainerById = getContainerById;

package/dist/docker/functions/container/list-containers.js

@@ -10,11 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listContainers = void 0;
-const dockerode_1 = require("../../dockerode");
+const docker_client_1 = require("../../docker-client");
 const logger_1 = require("../../../logger");
 const listContainers = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        return yield dockerode_1.dockerode.listContainers();
+        const { dockerode } = yield docker_client_1.dockerClient;
+        return yield dockerode.listContainers();
     }
     catch (err) {
         logger_1.log.error(`Failed to list containers: ${err}`);

package/dist/docker/functions/demux-stream.d.ts

@@ -1,2 +1,2 @@
 import { Readable } from "stream";
-export declare const demuxStream: (stream: Readable) => Readable;
+export declare const demuxStream: (stream: Readable) => Promise<Readable>;

package/dist/docker/functions/demux-stream.js

@@ -1,13 +1,23 @@
 "use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.demuxStream = void 0;
 const stream_1 = require("stream");
 const logger_1 = require("../../logger");
-const dockerode_1 = require("../dockerode");
-const demuxStream = (stream) => {
+const docker_client_1 = require("../docker-client");
+const demuxStream = (stream) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const demuxedStream = new stream_1.PassThrough({ autoDestroy: true, encoding: "utf-8" });
-        dockerode_1.dockerode.modem.demuxStream(stream, demuxedStream, demuxedStream);
+        const { dockerode } = yield docker_client_1.dockerClient;
+        dockerode.modem.demuxStream(stream, demuxedStream, demuxedStream);
         stream.on("end", () => demuxedStream.end());
         demuxedStream.on("close", () => {
             if (!stream.destroyed) {
@@ -20,5 +30,5 @@ const demuxStream = (stream) => {
         logger_1.log.error(`Failed to demux stream: ${err}`);
         throw err;
     }
-};
+});
 exports.demuxStream = demuxStream;

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

@@ -10,9 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDockerInfo = void 0;
-const dockerode_1 = require("../dockerode");
+const docker_client_1 = require("../docker-client");
 const getDockerInfo = () => __awaiter(void 0, void 0, void 0, function* () {
-    const info = yield dockerode_1.dockerode.info();
+    const { dockerode } = yield docker_client_1.dockerClient;
+    const info = yield dockerode.info();
     return {
         serverVersion: info.ServerVersion,
         operatingSystem: info.OperatingSystem,

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

@@ -18,14 +18,15 @@ const docker_ignore_1 = require("../../../docker-ignore");
 const tar_fs_1 = __importDefault(require("tar-fs"));
 const slash_1 = __importDefault(require("slash"));
 const byline_1 = __importDefault(require("byline"));
-const dockerode_1 = require("../../dockerode");
+const docker_client_1 = require("../../docker-client");
 const create_labels_1 = require("../create-labels");
 const buildImage = (options) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         logger_1.log.info(`Building image '${options.imageName.toString()}' with context '${options.context}'`);
         const dockerIgnoreFiles = yield docker_ignore_1.findDockerIgnoreFiles(options.context, options.dockerfileName);
         const tarStream = tar_fs_1.default.pack(options.context, { ignore: (name) => dockerIgnoreFiles.has(slash_1.default(name)) });
-        return new Promise((resolve) => dockerode_1.dockerode
+        const { dockerode } = yield docker_client_1.dockerClient;
+        return new Promise((resolve) => dockerode
             .buildImage(tarStream, {
             dockerfile: options.dockerfileName,
             buildargs: options.buildArgs,

package/dist/docker/functions/image/list-images.js

@@ -11,11 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listImages = void 0;
 const docker_image_name_1 = require("../../../docker-image-name");
-const dockerode_1 = require("../../dockerode");
+const docker_client_1 = require("../../docker-client");
 const logger_1 = require("../../../logger");
 const listImages = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const images = yield dockerode_1.dockerode.listImages();
+        const { dockerode } = yield docker_client_1.dockerClient;
+        const images = yield dockerode.listImages();
         return images.reduce((dockerImageNames, image) => {
             if (isDanglingImage(image)) {
                 return dockerImageNames;

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

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pullImage = void 0;
 const logger_1 = require("../../../logger");
 const pull_stream_parser_1 = require("../../pull-stream-parser");
-const dockerode_1 = require("../../dockerode");
+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 {
@@ -21,7 +21,8 @@ const pullImage = (options) => __awaiter(void 0, void 0, void 0, function* () {
             return;
         }
         logger_1.log.info(`Pulling image: ${options.imageName}`);
-        const stream = yield dockerode_1.dockerode.pull(options.imageName.toString(), { authconfig: options.authConfig });
+        const { dockerode } = yield docker_client_1.dockerClient;
+        const stream = yield dockerode.pull(options.imageName.toString(), { authconfig: options.authConfig });
         yield new pull_stream_parser_1.PullStreamParser(options.imageName, logger_1.log).consume(stream);
     }
     catch (err) {

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

@@ -11,11 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.connectNetwork = void 0;
 const logger_1 = require("../../../logger");
-const dockerode_1 = require("../../dockerode");
+const docker_client_1 = require("../../docker-client");
 const connectNetwork = (options) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         logger_1.log.info(`Connecting container ${options.containerId} to network ${options.networkId}`);
-        const network = dockerode_1.dockerode.getNetwork(options.networkId);
+        const { dockerode } = yield docker_client_1.dockerClient;
+        const network = dockerode.getNetwork(options.networkId);
         yield network.connect({ Container: options.containerId, EndpointConfig: { Aliases: options.networkAliases } });
     }
     catch (err) {

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-compose/docker-compose.d.ts

@@ -1,2 +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

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = exports.stop = exports.down = exports.upAll = exports.upMany = void 0;
-const testcontainers_properties_file_1 = require("../testcontainers-properties-file");
-testcontainers_properties_file_1.loadTestcontainersPropertiesFile();
+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; } });

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");
@@ -89,7 +89,7 @@ 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}`))
@@ -111,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 });
@@ -122,7 +122,7 @@ class DockerComposeEnvironment {
     }
     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.js

@@ -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");
@@ -119,7 +119,7 @@ class GenericContainer {
             const inspectResult = yield 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_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);
             }
@@ -215,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/modules/kafka/kafka-container.js

@@ -14,7 +14,7 @@ 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_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";
@@ -77,7 +77,7 @@ class KafkaContainer extends generic_container_1.GenericContainer {
     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_host_1.dockerHost}:${boundPorts.getBinding(KAFKA_PORT)}`;
+            const bootstrapServers = `PLAINTEXT://${(yield docker_client_1.dockerClient).host}:${boundPorts.getBinding(KAFKA_PORT)}`;
             const { output, exitCode } = yield container.exec([
                 "kafka-configs",
                 "--alter",

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

@@ -14,7 +14,7 @@ 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_host_1 = require("./docker/docker-host");
+const docker_client_1 = require("./docker/docker-client");
 const images_1 = require("./images");
 class RealReaper {
     constructor(container, socket) {
@@ -89,7 +89,7 @@ class ReaperInstance {
             }
             const startedContainer = yield container.start();
             const containerId = startedContainer.getId();
-            const host = yield docker_host_1.dockerHost;
+            const host = (yield docker_client_1.dockerClient).host;
             const port = startedContainer.getMappedPort(8080);
             logger_1.log.debug(`Connecting to Reaper ${containerId} on ${host}:${port}`);
             const socket = new net_1.Socket();

package/dist/testcontainers-properties-file.d.ts

@@ -1 +1 @@
-export declare const loadTestcontainersPropertiesFile: () => void;
+export {};

package/dist/testcontainers-properties-file.js

@@ -3,33 +3,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadTestcontainersPropertiesFile = void 0;
 const path_1 = __importDefault(require("path"));
 const logger_1 = require("./logger");
 const os_1 = require("os");
 const fs_1 = require("fs");
 const properties_reader_1 = __importDefault(require("properties-reader"));
-const loadTestcontainersPropertiesFile = () => {
-    const file = path_1.default.resolve(os_1.homedir(), ".testcontainers.properties");
-    if (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 host = properties.get("docker.host");
-        if (host !== null) {
-            logger_1.log.debug(`Setting DOCKER_HOST to ${host}`);
-            process.env.DOCKER_HOST = host;
-        }
-        const tlsVerify = properties.get("docker.tls.verify");
-        if (tlsVerify !== null) {
-            logger_1.log.debug(`Setting DOCKER_TLS_VERIFY to ${tlsVerify}`);
-            process.env.DOCKER_TLS_VERIFY = `${tlsVerify}`;
-        }
-        const certPath = properties.get("docker.cert.path");
-        if (certPath !== null) {
-            logger_1.log.debug(`Setting DOCKER_CERT_PATH to ${certPath}`);
-            process.env.DOCKER_CERT_PATH = certPath;
-        }
+const file = path_1.default.resolve(os_1.homedir(), ".testcontainers.properties");
+if (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 host = properties.get("docker.host");
+    if (host !== null) {
+        logger_1.log.debug(`Setting DOCKER_HOST to ${host}`);
+        process.env.DOCKER_HOST = host;
     }
-};
-exports.loadTestcontainersPropertiesFile = loadTestcontainersPropertiesFile;
+    const tlsVerify = properties.get("docker.tls.verify");
+    if (tlsVerify !== null) {
+        logger_1.log.debug(`Setting DOCKER_TLS_VERIFY to ${tlsVerify}`);
+        process.env.DOCKER_TLS_VERIFY = `${tlsVerify}`;
+    }
+    const certPath = properties.get("docker.cert.path");
+    if (certPath !== null) {
+        logger_1.log.debug(`Setting DOCKER_CERT_PATH to ${certPath}`);
+        process.env.DOCKER_CERT_PATH = certPath;
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testcontainers",
   "author": "Cristian Greco",
-  "version": "8.0.0",
+  "version": "8.1.0",
   "main": "dist/index",
   "types": "dist/index",
   "keywords": [

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

@@ -1 +0,0 @@
-export declare const dockerHost: Promise<string>;

package/dist/docker/docker-host.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.dockerHost = void 0;
-const log_system_diagnostics_1 = require("../log-system-diagnostics");
-const get_docker_host_1 = require("./get-docker-host");
-const dockerode_1 = require("./dockerode");
-exports.dockerHost = get_docker_host_1.getDockerHost(dockerode_1.dockerode);
-log_system_diagnostics_1.logSystemDiagnostics();

package/dist/docker/dockerode.d.ts

@@ -1,2 +0,0 @@
-import Dockerode from "dockerode";
-export declare const dockerode: Dockerode;

package/dist/docker/dockerode.js

@@ -1,10 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.dockerode = void 0;
-const dockerode_1 = __importDefault(require("dockerode"));
-const testcontainers_properties_file_1 = require("../testcontainers-properties-file");
-testcontainers_properties_file_1.loadTestcontainersPropertiesFile();
-exports.dockerode = new dockerode_1.default();

package/dist/docker/get-docker-host.d.ts

@@ -1,3 +0,0 @@
-import Dockerode from "dockerode";
-import { Host } from "./types";
-export declare const getDockerHost: (dockerode: Dockerode) => Promise<Host>;

package/dist/docker/get-docker-host.js

@@ -1,64 +0,0 @@
-"use strict";
-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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDockerHost = void 0;
-const logger_1 = require("../logger");
-const run_in_container_1 = require("./functions/run-in-container");
-const fs_1 = __importDefault(require("fs"));
-const url_1 = require("url");
-const DEFAULT_HOST = "localhost";
-const getDockerHost = (dockerode) => __awaiter(void 0, void 0, void 0, function* () {
-    for (const [hostStrategyName, hostStrategy] of Object.entries(hostStrategies(dockerode))) {
-        const result = yield hostStrategy();
-        if (result) {
-            const hostname = result === DEFAULT_HOST ? DEFAULT_HOST : new url_1.URL(result).hostname;
-            logger_1.log.info(`Docker host strategy ${hostStrategyName}: ${hostname}`);
-            return hostname;
-        }
-    }
-    logger_1.log.info(`Docker host strategy FALLBACK: ${DEFAULT_HOST}`);
-    return DEFAULT_HOST;
-});
-exports.getDockerHost = getDockerHost;
-const hostStrategies = (dockerode) => ({
-    DOCKER_HOST: () => __awaiter(void 0, void 0, void 0, function* () {
-        if (process.env.DOCKER_HOST) {
-            return process.env.DOCKER_HOST;
-        }
-    }),
-    MODEM: () => __awaiter(void 0, void 0, void 0, function* () { return dockerode.modem.host; }),
-    TESTCONTAINERS_HOST_OVERRIDE: () => __awaiter(void 0, void 0, void 0, function* () { return process.env["TESTCONTAINERS_HOST_OVERRIDE"]; }),
-    OUTSIDE_CONTAINER: () => __awaiter(void 0, void 0, void 0, function* () {
-        if (!isInContainer()) {
-            return DEFAULT_HOST;
-        }
-    }),
-    INSIDE_CONTAINER_NO_IPAM: () => __awaiter(void 0, void 0, void 0, function* () {
-        const network = yield dockerode.getNetwork("bridge").inspect();
-        if (!network.IPAM || !network.IPAM.Config) {
-            return DEFAULT_HOST;
-        }
-    }),
-    INSIDE_CONTAINER_IPAM: () => __awaiter(void 0, void 0, void 0, function* () {
-        const network = yield dockerode.getNetwork("bridge").inspect();
-        if (network.IPAM && network.IPAM.Config) {
-            const gateways = network.IPAM.Config.filter((config) => !!config.Gateway);
-            if (gateways.length > 0) {
-                return gateways[0].Gateway;
-            }
-        }
-    }),
-    CONTAINER_GATEWAY: () => __awaiter(void 0, void 0, void 0, function* () { return run_in_container_1.runInContainer("alpine:3.5", ["sh", "-c", "ip route|awk '/default/ { print $3 }'"]); }),
-});
-const isInContainer = () => fs_1.default.existsSync("/.dockerenv");