testcontainers 9.7.0 → 9.8.0-beta.1

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

@@ -11,11 +11,11 @@ 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 docker_client_1 = require("../../docker-client");
+const docker_client_1 = require("../../client/docker-client");
 const connectNetwork = (options) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         logger_1.log.info(`Connecting to network "${options.networkId}"...`, { containerId: options.containerId });
-        const { dockerode } = yield (0, docker_client_1.dockerClient)();
+        const { dockerode } = yield (0, docker_client_1.getDockerClient)();
         const network = dockerode.getNetwork(options.networkId);
         yield network.connect({ Container: options.containerId, EndpointConfig: { Aliases: options.networkAliases } });
         logger_1.log.info(`Connected to network "${options.networkId}"...`, { containerId: options.containerId });

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

@@ -11,12 +11,12 @@ 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 docker_client_1 = require("../../docker-client");
+const docker_client_1 = require("../../client/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 { dockerode } = yield (0, docker_client_1.dockerClient)();
+        const { dockerode } = yield (0, docker_client_1.getDockerClient)();
         const network = yield dockerode.createNetwork({
             Name: options.name,
             CheckDuplicate: options.checkDuplicate,

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

@@ -11,11 +11,11 @@ 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 docker_client_1 = require("../../docker-client");
+const docker_client_1 = require("../../client/docker-client");
 const removeNetwork = (id) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         logger_1.log.info(`Removing network "${id}"...`);
-        const { dockerode } = yield (0, docker_client_1.dockerClient)();
+        const { dockerode } = yield (0, docker_client_1.getDockerClient)();
         const network = dockerode.getNetwork(id);
         const { message } = yield network.remove();
         if (message) {

package/dist/src/docker/remote-docker-unix-socket-path.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+import { DockerClient } from "./client/docker-client";
+export declare const getRemoteDockerUnixSocketPath: (dockerClient: DockerClient, platform?: NodeJS.Platform, env?: NodeJS.ProcessEnv) => string;

package/dist/src/docker/remote-docker-unix-socket-path.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRemoteDockerUnixSocketPath = void 0;
+const getRemoteDockerUnixSocketPath = (dockerClient, platform = process.platform, env = process.env) => {
+    if (dockerClient.allowUserOverrides) {
+        if (env["TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE"] !== undefined) {
+            return env["TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE"];
+        }
+    }
+    let socketPath;
+    if (dockerClient.info.dockerInfo.operatingSystem === "Docker Desktop") {
+        socketPath = "/var/run/docker.sock";
+    }
+    else if (dockerClient.uri.startsWith("unix://")) {
+        socketPath = dockerClient.uri.replace("unix://", "");
+    }
+    else {
+        socketPath = "/var/run/docker.sock";
+    }
+    return platform === "win32" ? `/${socketPath}` : socketPath;
+};
+exports.getRemoteDockerUnixSocketPath = getRemoteDockerUnixSocketPath;

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

@@ -3,5 +3,5 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import Dockerode from "dockerode";
-import { Provider } from "./docker-client";
-export declare const resolveHost: (dockerode: Dockerode, provider: Provider, indexServerAddress: string, uri: string, env?: NodeJS.ProcessEnv) => Promise<string>;
+import { ContainerRuntime } from "./types";
+export declare const resolveHost: (dockerode: Dockerode, containerRuntime: ContainerRuntime, indexServerAddress: string, uri: string, allowUserOverrides: boolean, env?: NodeJS.ProcessEnv) => Promise<string>;

package/dist/src/docker/resolve-host.js

@@ -14,9 +14,11 @@ const url_1 = require("url");
 const logger_1 = require("../logger");
 const run_in_container_1 = require("./functions/run-in-container");
 const fs_1 = require("fs");
-const resolveHost = (dockerode, provider, indexServerAddress, uri, env = process.env) => __awaiter(void 0, void 0, void 0, function* () {
-    if (env.TESTCONTAINERS_HOST_OVERRIDE !== undefined) {
-        return env.TESTCONTAINERS_HOST_OVERRIDE;
+const resolveHost = (dockerode, containerRuntime, indexServerAddress, uri, allowUserOverrides, env = process.env) => __awaiter(void 0, void 0, void 0, function* () {
+    if (allowUserOverrides) {
+        if (env.TESTCONTAINERS_HOST_OVERRIDE !== undefined) {
+            return env.TESTCONTAINERS_HOST_OVERRIDE;
+        }
     }
     const { protocol, hostname } = new url_1.URL(uri);
     switch (protocol) {
@@ -27,7 +29,7 @@ const resolveHost = (dockerode, provider, indexServerAddress, uri, env = process
         case "unix:":
         case "npipe:": {
             if (isInContainer()) {
-                const networkName = provider === "podman" ? "podman" : "bridge";
+                const networkName = containerRuntime === "podman" ? "podman" : "bridge";
                 const gateway = yield findGateway(dockerode, networkName);
                 if (gateway !== undefined) {
                     return gateway;

package/dist/src/docker/types.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { Readable } from "stream";
+export type ContainerRuntime = "docker" | "podman";
 export type Environment = {
     [key in string]: string;
 };

package/dist/src/docker-compose/default-docker-compose-options.js

@@ -21,14 +21,14 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultDockerComposeOptions = void 0;
-const docker_client_1 = require("../docker/docker-client");
+const docker_client_1 = require("../docker/client/docker-client");
 const logger_1 = require("../logger");
 const os_1 = require("os");
 const type_guards_1 = require("../type-guards");
 const defaultDockerComposeOptions = (_a) => __awaiter(void 0, void 0, void 0, function* () {
     var _b;
     var { environment = {} } = _a, options = __rest(_a, ["environment"]);
-    const { composeEnvironment } = yield (0, docker_client_1.dockerClient)();
+    const { composeEnvironment } = yield (0, docker_client_1.getDockerClient)();
     const log = (_b = options.logger) !== null && _b !== void 0 ? _b : logger_1.composeLog;
     return {
         log: false,

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

@@ -18,7 +18,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_client_1 = require("../docker/docker-client");
+const docker_client_1 = require("../docker/client/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");
@@ -108,7 +108,7 @@ class DockerComposeEnvironment {
             const startedGenericContainers = (yield Promise.all(startedContainers.map((startedContainer) => __awaiter(this, void 0, void 0, function* () {
                 const container = yield (0, get_container_1.getContainerById)(startedContainer.Id);
                 const containerName = (0, container_name_resolver_1.resolveContainerName)(this.projectName, startedContainer.Names[0]);
-                const { host, hostIps } = yield (0, docker_client_1.dockerClient)();
+                const { host, hostIps } = yield (0, docker_client_1.getDockerClient)();
                 const inspectResult = yield (0, inspect_container_1.inspectContainer)(container);
                 const boundPorts = bound_ports_1.BoundPorts.fromInspectResult(hostIps, inspectResult);
                 const waitStrategy = this.waitStrategy[containerName]

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

@@ -23,7 +23,7 @@ const dockerfile_parser_1 = require("../dockerfile-parser");
 const build_image_1 = require("../docker/functions/image/build-image");
 const get_auth_config_1 = require("../registry-auth-locator/get-auth-config");
 const generic_container_1 = require("./generic-container");
-const docker_client_1 = require("../docker/docker-client");
+const docker_client_1 = require("../docker/client/docker-client");
 const image_exists_1 = require("../docker/functions/image/image-exists");
 class GenericContainerBuilder {
     constructor(context, dockerfileName, uuid = new uuid_1.RandomUuid()) {
@@ -54,8 +54,8 @@ class GenericContainerBuilder {
             const dockerfile = path_1.default.resolve(this.context, this.dockerfileName);
             logger_1.log.debug(`Preparing to build Dockerfile "${dockerfile}" as image "${imageName}"...`);
             const imageNames = yield (0, dockerfile_parser_1.getDockerfileImages)(dockerfile, this.buildArgs);
-            const { dockerode, indexServerAddress } = yield (0, docker_client_1.dockerClient)();
-            const registryConfig = yield this.getRegistryConfig(indexServerAddress, imageNames);
+            const { dockerode, info } = yield (0, docker_client_1.getDockerClient)();
+            const registryConfig = yield this.getRegistryConfig(info.dockerInfo.indexServerAddress, imageNames);
             yield (0, build_image_1.buildImage)({
                 imageName: imageName,
                 context: this.context,

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

@@ -24,7 +24,7 @@ const port_forwarder_1 = require("../port-forwarder");
 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_client_1 = require("../docker/docker-client");
+const docker_client_1 = require("../docker/client/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");
@@ -52,8 +52,8 @@ class GenericContainer {
     }
     start() {
         return __awaiter(this, void 0, void 0, function* () {
-            const { dockerode, indexServerAddress } = yield (0, docker_client_1.dockerClient)();
-            yield (0, pull_image_1.pullImage)(dockerode, indexServerAddress, {
+            const { dockerode, info } = yield (0, docker_client_1.getDockerClient)();
+            yield (0, pull_image_1.pullImage)(dockerode, info.dockerInfo.indexServerAddress, {
                 imageName: this.opts.imageName,
                 force: this.pullPolicy.shouldPull(),
             });
@@ -102,7 +102,7 @@ class GenericContainer {
     }
     reuseContainer(container) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { host, hostIps } = yield (0, docker_client_1.dockerClient)();
+            const { host, hostIps } = yield (0, docker_client_1.getDockerClient)();
             const inspectResult = yield (0, inspect_container_1.inspectContainer)(container);
             const boundPorts = bound_ports_1.BoundPorts.fromInspectResult(hostIps, inspectResult).filter(this.opts.exposedPorts);
             if (this.startupTimeout !== undefined) {
@@ -154,7 +154,7 @@ class GenericContainer {
             }
             yield (0, start_container_1.startContainer)(container);
             logger_1.log.info(`Started container for image "${this.opts.imageName}"`, { containerId: container.id });
-            const { host, hostIps } = yield (0, docker_client_1.dockerClient)();
+            const { host, hostIps } = yield (0, docker_client_1.getDockerClient)();
             const inspectResult = yield (0, inspect_container_1.inspectContainer)(container);
             const boundPorts = bound_ports_1.BoundPorts.fromInspectResult(hostIps, inspectResult).filter(this.opts.exposedPorts);
             if (this.startupTimeout !== undefined) {

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

@@ -23,7 +23,7 @@ const stopped_generic_container_1 = require("./stopped-generic-container");
 const stop_container_1 = require("../docker/functions/container/stop-container");
 const restart_container_1 = require("../docker/functions/container/restart-container");
 const wait_for_container_1 = require("../wait-for-container");
-const docker_client_1 = require("../docker/docker-client");
+const docker_client_1 = require("../docker/client/docker-client");
 const async_lock_1 = __importDefault(require("async-lock"));
 class StartedGenericContainer {
     constructor(container, host, inspectResult, boundPorts, name, waitStrategy) {
@@ -51,7 +51,7 @@ class StartedGenericContainer {
             const resolvedOptions = Object.assign({ timeout: 0 }, options);
             logger_1.log.info(`Restarting container...`, { containerId: this.container.id });
             yield (0, restart_container_1.restartContainer)(this.container, resolvedOptions);
-            const { hostIps } = yield (0, docker_client_1.dockerClient)();
+            const { hostIps } = yield (0, docker_client_1.getDockerClient)();
             this.inspectResult = yield (0, inspect_container_1.inspectContainer)(this.container);
             const startTime = this.inspectResult.state.startedAt;
             if (logger_1.containerLog.enabled()) {
@@ -109,9 +109,9 @@ class StartedGenericContainer {
     }
     exec(command) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { dockerode, provider } = yield (0, docker_client_1.dockerClient)();
+            const { dockerode, containerRuntime } = yield (0, docker_client_1.getDockerClient)();
             logger_1.log.debug(`Executing command "${command.join(" ")}"...`, { containerId: this.container.id });
-            const output = yield (0, exec_container_1.execContainer)(dockerode, provider, this.container, command);
+            const output = yield (0, exec_container_1.execContainer)(dockerode, containerRuntime, this.container, command);
             logger_1.log.debug(`Executed command "${command.join(" ")}"...`, { containerId: this.container.id });
             return output;
         });

package/dist/src/port-check.d.ts

@@ -1,5 +1,5 @@
 import Dockerode from "dockerode";
-import { Provider } from "./docker/docker-client";
+import { ContainerRuntime } from "./docker/types";
 export interface PortCheck {
     isBound(port: number): Promise<boolean>;
 }
@@ -10,11 +10,11 @@ export declare class HostPortCheck implements PortCheck {
 }
 export declare class InternalPortCheck implements PortCheck {
     private readonly dockerode;
-    private readonly provider;
+    private readonly containerRuntime;
     private readonly container;
     private isDistroless;
     private commandOutputs;
-    constructor(dockerode: Dockerode, provider: Provider, container: Dockerode.Container);
+    constructor(dockerode: Dockerode, containerRuntime: ContainerRuntime, container: Dockerode.Container);
     isBound(port: number): Promise<boolean>;
     private commandOutputsKey;
 }

package/dist/src/port-check.js

@@ -39,9 +39,9 @@ class HostPortCheck {
 }
 exports.HostPortCheck = HostPortCheck;
 class InternalPortCheck {
-    constructor(dockerode, provider, container) {
+    constructor(dockerode, containerRuntime, container) {
         this.dockerode = dockerode;
-        this.provider = provider;
+        this.containerRuntime = containerRuntime;
         this.container = container;
         this.isDistroless = false;
         this.commandOutputs = new Set();
@@ -54,7 +54,7 @@ class InternalPortCheck {
                 ["/bin/sh", "-c", `nc -vz -w 1 localhost ${port}`],
                 ["/bin/bash", "-c", `</dev/tcp/localhost/${port}`],
             ];
-            const commandResults = yield Promise.all(commands.map((command) => (0, exec_container_1.execContainer)(this.dockerode, this.provider, this.container, command, false)));
+            const commandResults = yield Promise.all(commands.map((command) => (0, exec_container_1.execContainer)(this.dockerode, this.containerRuntime, this.container, command, false)));
             const isBound = commandResults.some((result) => result.exitCode === 0);
             if (!isBound && logger_1.log.enabled()) {
                 const shellExists = commandResults.some((result) => result.exitCode !== 126);

package/dist/src/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_client_1 = require("./docker/docker-client");
+const docker_client_1 = require("./docker/client/docker-client");
 const images_1 = require("./images");
 class PortForwarder {
     constructor(sshConnection, container) {
@@ -70,7 +70,7 @@ class PortForwarderInstance {
                 `echo "${username}:$PASSWORD" | chpasswd && /usr/sbin/sshd -D -o PermitRootLogin=yes -o AddressFamily=inet -o GatewayPorts=yes -o AllowAgentForwarding=yes -o AllowTcpForwarding=yes -o KexAlgorithms=+diffie-hellman-group1-sha1 -o HostkeyAlgorithms=+ssh-rsa`,
             ])
                 .start();
-            const host = (yield (0, docker_client_1.dockerClient)()).host;
+            const host = (yield (0, docker_client_1.getDockerClient)()).host;
             const port = container.getMappedPort(22);
             logger_1.log.debug(`Connecting to Port Forwarder on "${host}:${port}"...`);
             const connection = yield (0, ssh_remote_port_forward_1.createSshConnection)({ host, port, username, password });

package/dist/src/reaper.js

@@ -19,8 +19,8 @@ const port_1 = require("./port");
 const labels_1 = require("./labels");
 const wait_1 = require("./wait-strategy/wait");
 const retry_strategy_1 = require("./retry-strategy");
-const get_remote_docker_unix_socket_path_1 = require("./docker/get-remote-docker-unix-socket-path");
-const docker_client_1 = require("./docker/docker-client");
+const remote_docker_unix_socket_path_1 = require("./docker/remote-docker-unix-socket-path");
+const docker_client_1 = require("./docker/client/docker-client");
 class RealReaper {
     constructor(container, socket) {
         this.container = container;
@@ -85,13 +85,15 @@ class ReaperInstance {
             const containerPort = process.env["TESTCONTAINERS_RYUK_PORT"]
                 ? { container: 8080, host: Number(process.env["TESTCONTAINERS_RYUK_PORT"]) }
                 : 8080;
-            logger_1.log.debug(`Creating new Reaper for session "${session_id_1.sessionId}"...`);
+            const dockerClient = yield (0, docker_client_1.getDockerClient)();
+            const remoteDockerUnixSocketPath = (0, remote_docker_unix_socket_path_1.getRemoteDockerUnixSocketPath)(dockerClient);
+            logger_1.log.debug(`Creating new Reaper for session "${session_id_1.sessionId}" with socket path "${remoteDockerUnixSocketPath}"...`);
             const container = new generic_container_1.GenericContainer(images_1.REAPER_IMAGE)
                 .withName(`testcontainers-ryuk-${session_id_1.sessionId}`)
                 .withExposedPorts(containerPort)
                 .withBindMounts([
                 {
-                    source: (0, get_remote_docker_unix_socket_path_1.getRemoteDockerUnixSocketPath)((yield (0, docker_client_1.dockerClient)()).uri),
+                    source: remoteDockerUnixSocketPath,
                     target: "/var/run/docker.sock",
                 },
             ])

package/dist/src/wait-strategy/host-port-wait-strategy.js

@@ -14,13 +14,13 @@ const port_check_1 = require("../port-check");
 const logger_1 = require("../logger");
 const retry_strategy_1 = require("../retry-strategy");
 const wait_strategy_1 = require("./wait-strategy");
-const docker_client_1 = require("../docker/docker-client");
+const docker_client_1 = require("../docker/client/docker-client");
 class HostPortWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
     waitUntilReady(container, boundPorts) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { dockerode, provider, host } = yield (0, docker_client_1.dockerClient)();
+            const { dockerode, containerRuntime, host } = yield (0, docker_client_1.getDockerClient)();
             const hostPortCheck = new port_check_1.HostPortCheck(host);
-            const internalPortCheck = new port_check_1.InternalPortCheck(dockerode, provider, container);
+            const internalPortCheck = new port_check_1.InternalPortCheck(dockerode, containerRuntime, container);
             yield Promise.all([
                 this.waitForHostPorts(hostPortCheck, container, boundPorts),
                 this.waitForInternalPorts(internalPortCheck, container, boundPorts),

package/dist/src/wait-strategy/http-wait-strategy.js

@@ -17,7 +17,7 @@ const wait_strategy_1 = require("./wait-strategy");
 const retry_strategy_1 = require("../retry-strategy");
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const https_1 = __importDefault(require("https"));
-const docker_client_1 = require("../docker/docker-client");
+const docker_client_1 = require("../docker/client/docker-client");
 const logger_1 = require("../logger");
 class HttpWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
     constructor(path, port) {
@@ -71,7 +71,7 @@ class HttpWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
     waitUntilReady(container, boundPorts) {
         return __awaiter(this, void 0, void 0, function* () {
             logger_1.log.debug(`Waiting for HTTP...`, { containerId: container.id });
-            const { host } = yield (0, docker_client_1.dockerClient)();
+            const { host } = yield (0, docker_client_1.getDockerClient)();
             yield new retry_strategy_1.IntervalRetryStrategy(this.readTimeout).retryUntil(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const url = `${this.protocol}://${host}:${boundPorts.getBinding(this.port)}${this.path}`;

package/dist/src/wait-strategy/shell-wait-strategy.js

@@ -14,7 +14,7 @@ const logger_1 = require("../logger");
 const wait_strategy_1 = require("./wait-strategy");
 const retry_strategy_1 = require("../retry-strategy");
 const exec_container_1 = require("../docker/functions/container/exec-container");
-const docker_client_1 = require("../docker/docker-client");
+const docker_client_1 = require("../docker/client/docker-client");
 class ShellWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
     constructor(command) {
         super();
@@ -23,9 +23,9 @@ class ShellWaitStrategy extends wait_strategy_1.AbstractWaitStrategy {
     waitUntilReady(container) {
         return __awaiter(this, void 0, void 0, function* () {
             logger_1.log.debug(`Waiting for successful shell command "${this.command}"...`, { containerId: container.id });
-            const { dockerode, provider } = yield (0, docker_client_1.dockerClient)();
+            const { dockerode, containerRuntime } = yield (0, docker_client_1.getDockerClient)();
             yield new retry_strategy_1.IntervalRetryStrategy(100).retryUntil(() => __awaiter(this, void 0, void 0, function* () {
-                const { exitCode } = yield (0, exec_container_1.execContainer)(dockerode, provider, container, ["/bin/sh", "-c", this.command], false);
+                const { exitCode } = yield (0, exec_container_1.execContainer)(dockerode, containerRuntime, container, ["/bin/sh", "-c", this.command], false);
                 return exitCode;
             }), (exitCode) => exitCode === 0, () => {
                 const message = `Shell command "${this.command}" not successful after ${this.startupTimeout}ms`;

package/dist/src/wait-strategy/startup-check-strategy.js

@@ -12,12 +12,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StartupCheckStrategy = void 0;
 const wait_strategy_1 = require("./wait-strategy");
 const retry_strategy_1 = require("../retry-strategy");
-const docker_client_1 = require("../docker/docker-client");
+const docker_client_1 = require("../docker/client/docker-client");
 const logger_1 = require("../logger");
 class StartupCheckStrategy extends wait_strategy_1.AbstractWaitStrategy {
     waitUntilReady(container) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { dockerode } = yield (0, docker_client_1.dockerClient)();
+            const { dockerode } = yield (0, docker_client_1.getDockerClient)();
             const startupStatus = yield new retry_strategy_1.IntervalRetryStrategy(1000).retryUntil(() => __awaiter(this, void 0, void 0, function* () { return yield this.checkStartupState(dockerode, container.id); }), (startupStatus) => startupStatus === "SUCCESS" || startupStatus === "FAIL", () => {
                 const message = `Container not accessible after ${this.startupTimeout}ms`;
                 logger_1.log.error(message, { containerId: container.id });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testcontainers",
   "author": "Cristian Greco",
-  "version": "9.7.0",
+  "version": "9.8.0-beta.1",
   "main": "dist/src/index",
   "types": "dist/src/index",
   "keywords": [

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

@@ -1,26 +0,0 @@
-/// <reference types="node" />
-import Dockerode from "dockerode";
-import { HostIps } from "./lookup-host-ips";
-export type Provider = "docker" | "podman";
-type DockerClient = {
-    uri: string;
-    provider: Provider;
-    host: string;
-    hostIps: HostIps;
-    dockerode: Dockerode;
-    indexServerAddress: string;
-    composeEnvironment: NodeJS.ProcessEnv;
-};
-export type DockerClientInit = {
-    uri: string;
-    dockerode: Dockerode;
-    composeEnvironment: NodeJS.ProcessEnv;
-};
-export interface DockerClientStrategy {
-    init?(): Promise<void>;
-    isApplicable(): boolean;
-    getDockerClient(): Promise<DockerClientInit>;
-    getName(): string;
-}
-export declare const dockerClient: () => Promise<DockerClient>;
-export {};

package/dist/src/docker/docker-client.js

@@ -1,156 +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.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 = require("fs");
-const session_id_1 = require("./session-id");
-const lookup_host_ips_1 = require("./lookup-host-ips");
-const system_info_1 = require("../system-info");
-const rootless_unix_socket_strategy_1 = require("./rootless-unix-socket-strategy");
-const stream_utils_1 = require("../stream-utils");
-const stream_1 = require("stream");
-const docker_client_config_1 = require("./docker-client-config");
-const resolve_host_1 = require("./resolve-host");
-const getDockerClient = () => __awaiter(void 0, void 0, void 0, function* () {
-    const strategies = [
-        new ConfigurationStrategy(),
-        new UnixSocketStrategy(),
-        new rootless_unix_socket_strategy_1.RootlessUnixSocketStrategy(),
-        new NpipeSocketStrategy(),
-    ];
-    for (const strategy of strategies) {
-        if (strategy.init) {
-            yield strategy.init();
-        }
-        if (strategy.isApplicable()) {
-            logger_1.log.debug(`Found Docker client strategy "${strategy.getName()}"`);
-            const { uri, dockerode, composeEnvironment } = yield strategy.getDockerClient();
-            logger_1.log.debug(`Testing Docker client strategy "${uri}"...`);
-            if (yield isDockerDaemonReachable(dockerode)) {
-                const indexServerAddress = (yield (0, system_info_1.getSystemInfo)(dockerode)).dockerInfo.indexServerAddress;
-                const provider = uri.includes("podman.sock") ? "podman" : "docker";
-                const host = yield (0, resolve_host_1.resolveHost)(dockerode, provider, indexServerAddress, uri);
-                const hostIps = yield (0, lookup_host_ips_1.lookupHostIps)(host);
-                logger_1.log.info(`Using Docker client strategy "${strategy.getName()}", Docker host "${host}" (${hostIps
-                    .map((hostIp) => hostIp.address)
-                    .join(", ")})`);
-                return { uri, provider, host, hostIps, dockerode, indexServerAddress, composeEnvironment };
-            }
-            else {
-                logger_1.log.warn(`Docker client strategy ${strategy.getName()} is not reachable`);
-            }
-        }
-    }
-    throw new Error("No Docker client strategy found");
-});
-const isDockerDaemonReachable = (dockerode) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const response = yield dockerode.ping();
-        return (yield (0, stream_utils_1.streamToString)(stream_1.Readable.from(response))) === "OK";
-    }
-    catch (err) {
-        logger_1.log.warn(`Docker daemon is not reachable: ${err}`);
-        return false;
-    }
-});
-class ConfigurationStrategy {
-    init() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.dockerConfig = yield (0, docker_client_config_1.getDockerClientConfig)();
-        });
-    }
-    getDockerClient() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { dockerHost, dockerTlsVerify, dockerCertPath } = this.dockerConfig;
-            const dockerOptions = { headers: { "x-tc-sid": session_id_1.sessionId } };
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            const { pathname, hostname, port } = new url_1.URL(dockerHost);
-            if (hostname !== "") {
-                dockerOptions.host = hostname;
-                dockerOptions.port = port;
-            }
-            else {
-                dockerOptions.socketPath = pathname;
-            }
-            if (dockerTlsVerify === "1" && dockerCertPath !== undefined) {
-                dockerOptions.ca = yield fs_1.promises.readFile(path_1.default.resolve(dockerCertPath, "ca.pem"));
-                dockerOptions.cert = yield fs_1.promises.readFile(path_1.default.resolve(dockerCertPath, "cert.pem"));
-                dockerOptions.key = yield fs_1.promises.readFile(path_1.default.resolve(dockerCertPath, "key.pem"));
-            }
-            return {
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                uri: dockerHost,
-                dockerode: new dockerode_1.default(dockerOptions),
-                composeEnvironment: {
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    DOCKER_HOST: dockerHost,
-                    DOCKER_TLS_VERIFY: dockerTlsVerify,
-                    DOCKER_CERT_PATH: dockerCertPath,
-                },
-            };
-        });
-    }
-    isApplicable() {
-        return this.dockerConfig.dockerHost !== undefined;
-    }
-    getName() {
-        return "ConfigurationStrategy";
-    }
-}
-class UnixSocketStrategy {
-    getDockerClient() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return {
-                uri: "unix:///var/run/docker.sock",
-                dockerode: new dockerode_1.default({ socketPath: "/var/run/docker.sock" }),
-                composeEnvironment: {},
-            };
-        });
-    }
-    isApplicable() {
-        return (process.platform === "linux" || process.platform === "darwin") && (0, fs_1.existsSync)("/var/run/docker.sock");
-    }
-    getName() {
-        return "UnixSocketStrategy";
-    }
-}
-class NpipeSocketStrategy {
-    getDockerClient() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return {
-                uri: "npipe:////./pipe/docker_engine",
-                dockerode: new dockerode_1.default({ socketPath: "//./pipe/docker_engine" }),
-                composeEnvironment: {},
-            };
-        });
-    }
-    isApplicable() {
-        return process.platform === "win32";
-    }
-    getName() {
-        return "NpipeSocketStrategy";
-    }
-}
-let _dockerClient;
-const dockerClient = () => {
-    if (!_dockerClient) {
-        _dockerClient = getDockerClient();
-    }
-    return _dockerClient;
-};
-exports.dockerClient = dockerClient;

package/dist/src/docker/get-remote-docker-unix-socket-path.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-export declare const getRemoteDockerUnixSocketPath: (uri: string, platform?: NodeJS.Platform, env?: NodeJS.ProcessEnv) => string;