testcontainers 9.6.0 → 9.8.0-beta.1

package/dist/src/docker/functions/container/exec-container.js

@@ -16,7 +16,7 @@ exports.execContainer = void 0;
 const logger_1 = require("../../../logger");
 const byline_1 = __importDefault(require("byline"));
 const demux_stream_1 = require("../demux-stream");
-const execContainer = (dockerode, provider, container, command, shouldLog = true) => __awaiter(void 0, void 0, void 0, function* () {
+const execContainer = (dockerode, containerRuntime, container, command, shouldLog = true) => __awaiter(void 0, void 0, void 0, function* () {
     const chunks = [];
     try {
         const exec = yield container.exec({
@@ -24,25 +24,27 @@ const execContainer = (dockerode, provider, container, command, shouldLog = true
             AttachStdout: true,
             AttachStderr: true,
         });
-        const stream = yield startExec(dockerode, provider, exec);
+        const stream = yield startExec(dockerode, containerRuntime, exec, container);
         stream.on("data", (chunk) => chunks.push(chunk));
         if (shouldLog && logger_1.execLog.enabled()) {
-            (0, byline_1.default)(stream).on("data", (line) => logger_1.execLog.trace(`${container.id}: ${line}`));
+            (0, byline_1.default)(stream).on("data", (line) => logger_1.execLog.trace(line, { containerId: container.id }));
         }
         const exitCode = yield waitForExec(exec, stream);
         stream.destroy();
         return { output: chunks.join(""), exitCode };
     }
     catch (err) {
-        logger_1.log.error(`Failed to exec container ${container.id} with command "${command.join(" ")}": ${err}. Container output: ${chunks.join("")}`);
+        logger_1.log.error(`Failed to exec container with command "${command.join(" ")}": ${err}: ${chunks.join("")}`, {
+            containerId: container.id,
+        });
         throw err;
     }
 });
 exports.execContainer = execContainer;
-const startExec = (dockerode, provider, exec) => __awaiter(void 0, void 0, void 0, function* () {
+const startExec = (dockerode, containerRuntime, exec, container) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const stream = yield exec.start({ stdin: true, Detach: false, Tty: true });
-        if (provider === "podman") {
+        if (containerRuntime === "podman") {
             return (0, demux_stream_1.demuxStream)(dockerode, stream);
         }
         else {
@@ -50,7 +52,7 @@ const startExec = (dockerode, provider, exec) => __awaiter(void 0, void 0, void
         }
     }
     catch (err) {
-        logger_1.log.error(`Failed to start exec: ${err}`);
+        logger_1.log.error(`Failed to start exec: ${err}`, { containerId: container.id });
         throw err;
     }
 });

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

@@ -10,12 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getContainerByHash = exports.getContainerById = void 0;
-const docker_client_1 = require("../../docker-client");
+const docker_client_1 = require("../../client/docker-client");
 const logger_1 = require("../../../logger");
 const labels_1 = require("../../../labels");
 const getContainerById = (id) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const { dockerode } = yield (0, docker_client_1.dockerClient)();
+        const { dockerode } = yield (0, docker_client_1.getDockerClient)();
         return dockerode.getContainer(id);
     }
     catch (err) {
@@ -26,7 +26,7 @@ const getContainerById = (id) => __awaiter(void 0, void 0, void 0, function* ()
 exports.getContainerById = getContainerById;
 const getContainerByHash = (hash) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const { dockerode } = yield (0, docker_client_1.dockerClient)();
+        const { dockerode } = yield (0, docker_client_1.getDockerClient)();
         const containers = yield dockerode.listContainers({
             limit: 1,
             filters: {
@@ -42,7 +42,7 @@ const getContainerByHash = (hash) => __awaiter(void 0, void 0, void 0, function*
         }
     }
     catch (err) {
-        logger_1.log.error(`Failed to get container by hash (${hash}): ${err}`);
+        logger_1.log.error(`Failed to get container by hash "${hash}": ${err}`);
         throw err;
     }
 });

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

@@ -31,7 +31,7 @@ const inspectContainer = (container) => __awaiter(void 0, void 0, void 0, functi
         };
     }
     catch (err) {
-        logger_1.log.error(`Failed to inspect container ${container.id}: ${err}`);
+        logger_1.log.error(`Failed to inspect container: ${err}`, { containerId: container.id });
         throw err;
     }
 });

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

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

package/dist/src/docker/functions/container/put-container-archive.js

@@ -19,7 +19,7 @@ const putContainerArchive = (options) => __awaiter(void 0, void 0, void 0, funct
         yield (0, stream_utils_1.streamToString)(stream_1.Readable.from(stream));
     }
     catch (err) {
-        logger_1.log.error(`Failed to put archive to container ${options.container.id}: ${err}`);
+        logger_1.log.error(`Failed to put archive to container: ${err}`, { containerId: options.container.id });
         throw err;
     }
 });

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

@@ -16,7 +16,7 @@ const removeContainer = (container, options) => __awaiter(void 0, void 0, void 0
         yield container.remove({ v: options.removeVolumes });
     }
     catch (err) {
-        logger_1.log.error(`Failed to remove container ${container.id}: ${err}`);
+        logger_1.log.error(`Failed to remove container: ${err}`, { containerId: container.id });
         throw err;
     }
 });

package/dist/src/docker/functions/container/restart-container.js

@@ -16,7 +16,7 @@ const restartContainer = (container, options) => __awaiter(void 0, void 0, void
         yield container.restart({ t: options.timeout / 1000 });
     }
     catch (err) {
-        logger_1.log.error(`Failed to restart container ${container.id}: ${err}`);
+        logger_1.log.error(`Failed to restart container: ${err}`, { containerId: container.id });
         throw err;
     }
 });

package/dist/src/docker/functions/container/start-container.js

@@ -16,7 +16,7 @@ const startContainer = (container) => __awaiter(void 0, void 0, void 0, function
         yield container.start();
     }
     catch (err) {
-        logger_1.log.error(`Failed to start container ${container.id}: ${err}`);
+        logger_1.log.error(`Failed to start container: ${err}`, { containerId: container.id });
         throw err;
     }
 });

package/dist/src/docker/functions/container/stop-container.js

@@ -18,10 +18,10 @@ const stopContainer = (container, options) => __awaiter(void 0, void 0, void 0,
     }
     catch (err) {
         if (err.statusCode === 304) {
-            logger_1.log.info(`Container has already been stopped: ${container.id}`);
+            logger_1.log.info(`Container has already been stopped`, { containerId: container.id });
         }
         else {
-            logger_1.log.error(`Failed to stop container ${container.id}: ${err}`);
+            logger_1.log.error(`Failed to stop container: ${err}`, { containerId: container.id });
             throw err;
         }
     }

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

@@ -6,9 +6,6 @@ const labels_1 = require("../../labels");
 const package_json_1 = require("../../../package.json");
 const createLabels = (reusable, dockerImageName, extraLabels = {}) => {
     const labels = Object.assign(Object.assign({}, extraLabels), { [labels_1.LABEL_TESTCONTAINERS]: "true", [labels_1.LABEL_TESTCONTAINERS_LANG]: "node", [labels_1.LABEL_TESTCONTAINERS_VERSION]: package_json_1.version });
-    if (dockerImageName && dockerImageName.isReaper()) {
-        return labels;
-    }
     if (!reusable) {
         labels[labels_1.LABEL_TESTCONTAINERS_SESSION_ID] = session_id_1.sessionId;
     }

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

@@ -16,14 +16,14 @@ exports.buildImage = void 0;
 const logger_1 = require("../../../logger");
 const tar_fs_1 = __importDefault(require("tar-fs"));
 const byline_1 = __importDefault(require("byline"));
-const docker_client_1 = require("../../docker-client");
+const docker_client_1 = require("../../client/docker-client");
 const create_labels_1 = require("../create-labels");
 const path_1 = __importDefault(require("path"));
 const fs_1 = require("fs");
 const dockerignore_1 = __importDefault(require("@balena/dockerignore"));
 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}'`);
+        logger_1.log.info(`Building image "${options.imageName.toString()}" with context "${options.context}"...`);
         const isDockerIgnored = yield createIsDockerIgnoredFunction(options.context);
         const tarStream = tar_fs_1.default.pack(options.context, {
             ignore: (aPath) => {
@@ -36,7 +36,7 @@ const buildImage = (options) => __awaiter(void 0, void 0, void 0, function* () {
                 }
             },
         });
-        const { dockerode } = yield (0, docker_client_1.dockerClient)();
+        const { dockerode } = yield (0, docker_client_1.getDockerClient)();
         const buildImageOptions = {
             dockerfile: options.dockerfileName,
             nocache: !options.cache,
@@ -46,16 +46,21 @@ const buildImage = (options) => __awaiter(void 0, void 0, void 0, function* () {
             registryconfig: options.registryConfig,
             pull: options.pullPolicy.shouldPull() ? "true" : undefined,
         };
-        return new Promise((resolve) => {
+        yield new Promise((resolve) => {
             dockerode
                 .buildImage(tarStream, buildImageOptions)
                 .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}`));
+                stream.on("data", (line) => {
+                    if (logger_1.buildLog.enabled()) {
+                        logger_1.buildLog.trace(line, { imageName: options.imageName.toString() });
+                    }
+                });
                 stream.on("end", () => resolve());
             });
         });
+        logger_1.log.info(`Built image "${options.imageName.toString()}" with context "${options.context}"`);
     }
     catch (err) {
         logger_1.log.error(`Failed to build image: ${err}`);

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

@@ -14,23 +14,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 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 image_exists_1 = require("./image-exists");
 const get_auth_config_1 = require("../../../registry-auth-locator/get-auth-config");
 const async_lock_1 = __importDefault(require("async-lock"));
+const byline_1 = __importDefault(require("byline"));
 const imagePullLock = new async_lock_1.default();
 const pullImage = (dockerode, indexServerAddress, options) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         return imagePullLock.acquire(options.imageName.toString(), () => __awaiter(void 0, void 0, void 0, function* () {
             var _a;
             if (!options.force && (yield (0, image_exists_1.imageExists)(dockerode, options.imageName))) {
-                logger_1.log.debug(`Not pulling image as it already exists: ${options.imageName}`);
+                logger_1.log.debug(`Not pulling image "${options.imageName}" as it already exists`);
                 return;
             }
-            logger_1.log.info(`Pulling image: ${options.imageName}`);
+            logger_1.log.info(`Pulling image "${options.imageName}"...`);
             const authconfig = yield (0, get_auth_config_1.getAuthConfig)((_a = options.imageName.registry) !== null && _a !== void 0 ? _a : indexServerAddress);
             const stream = yield dockerode.pull(options.imageName.toString(), { authconfig });
-            yield new pull_stream_parser_1.PullStreamParser(options.imageName, logger_1.log).consume(stream);
+            return new Promise((resolve) => {
+                (0, byline_1.default)(stream).on("data", (line) => {
+                    if (logger_1.pullLog.enabled()) {
+                        logger_1.pullLog.trace(line, { imageName: options.imageName.toString() });
+                    }
+                });
+                stream.on("end", resolve);
+            });
         }));
     }
     catch (err) {

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

@@ -11,16 +11,17 @@ 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 container ${options.containerId} to network ${options.networkId}`);
-        const { dockerode } = yield (0, docker_client_1.dockerClient)();
+        logger_1.log.info(`Connecting to network "${options.networkId}"...`, { containerId: options.containerId });
+        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 });
     }
     catch (err) {
-        logger_1.log.error(`Failed to connect container ${options.containerId} to network ${options.networkId}: ${err}`);
+        logger_1.log.error(`Failed to connect to network "${options.networkId}": ${err}`, { containerId: options.containerId });
         throw err;
     }
 });

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)();
+        logger_1.log.info(`Creating network "${options.name}"...`);
+        const { dockerode } = yield (0, docker_client_1.getDockerClient)();
         const network = yield dockerode.createNetwork({
             Name: options.name,
             CheckDuplicate: options.checkDuplicate,
@@ -28,6 +28,7 @@ const createNetwork = (options) => __awaiter(void 0, void 0, void 0, function* (
             Options: options.options,
             Labels: Object.assign(Object.assign({}, options.labels), (0, create_labels_1.createLabels)(false)),
         });
+        logger_1.log.info(`Created network "${options.name}"`);
         return network.id;
     }
     catch (err) {

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

@@ -11,19 +11,20 @@ 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)();
+        logger_1.log.info(`Removing network "${id}"...`);
+        const { dockerode } = yield (0, docker_client_1.getDockerClient)();
         const network = dockerode.getNetwork(id);
         const { message } = yield network.remove();
         if (message) {
             logger_1.log.warn(message);
         }
+        logger_1.log.info(`Removed network "${id}"`);
     }
     catch (err) {
-        logger_1.log.error(`Failed to remove network ${id}: ${err}`);
+        logger_1.log.error(`Failed to remove network "${id}": ${err}`);
         throw err;
     }
 });

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

@@ -19,20 +19,20 @@ const stream_utils_1 = require("../../stream-utils");
 const runInContainer = (dockerode, indexServerAddress, image, command) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         yield (0, pull_image_1.pullImage)(dockerode, indexServerAddress, { imageName: docker_image_name_1.DockerImageName.fromString(image), force: false });
-        logger_1.log.debug(`Creating container: ${image} with command: ${command.join(" ")}`);
+        logger_1.log.debug(`Creating container: ${image} with command "${command.join(" ")}"...`);
         const container = yield dockerode.createContainer({ Image: image, Cmd: command });
-        logger_1.log.debug(`Attaching to container: ${container.id}`);
+        logger_1.log.debug(`Attaching to container...`, { containerId: container.id });
         const stream = yield (0, attach_container_1.attachContainer)(dockerode, container);
-        logger_1.log.debug(`Starting container: ${container.id}`);
+        logger_1.log.debug(`Starting container...`, { containerId: container.id });
         yield (0, start_container_1.startContainer)(container);
-        logger_1.log.debug(`Waiting for container output: ${container.id}`);
+        logger_1.log.debug(`Waiting for container output...`, { containerId: container.id });
         const output = yield (0, stream_utils_1.streamToString)(stream, { trim: true });
-        logger_1.log.debug(`Removing container: ${container.id}`);
+        logger_1.log.debug(`Removing container...`, { containerId: container.id });
         yield container.remove({ force: true, v: true });
         return output.length === 0 ? undefined : output;
     }
     catch (err) {
-        logger_1.log.error(`Failed to run command in container: "${command.join(" ")}", error: "${err}"`);
+        logger_1.log.error(`Failed to run command "${command.join(" ")}" in container: "${err}"`);
         return undefined;
     }
 });

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;
@@ -46,12 +48,12 @@ const resolveHost = (dockerode, provider, indexServerAddress, uri, env = process
 exports.resolveHost = resolveHost;
 const findGateway = (dockerode, networkName) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c;
-    logger_1.log.debug(`Checking gateway for Docker host`);
+    logger_1.log.debug(`Checking gateway for Docker host...`);
     const inspectResult = yield dockerode.getNetwork(networkName).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, indexServerAddress) => __awaiter(void 0, void 0, void 0, function* () {
-    logger_1.log.debug(`Checking default gateway for Docker host`);
+    logger_1.log.debug(`Checking default gateway for Docker host...`);
     return (0, run_in_container_1.runInContainer)(dockerode, indexServerAddress, "alpine:3.14", [
         "sh",
         "-c",

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,22 +21,24 @@ 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,
-        callback: logger_1.log.enabled()
+        callback: log.enabled()
             ? (chunk) => {
                 chunk
                     .toString()
                     .split(os_1.EOL)
                     .filter(type_guards_1.isNotEmptyString)
-                    .forEach((line) => logger_1.log.trace(line.trim()));
+                    .forEach((line) => log.trace(line.trim()));
             }
             : undefined,
         cwd: options.filePath,

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

@@ -1,4 +1,5 @@
 import { Environment } from "../docker/types";
+import { Logger } from "../logger";
 export type DockerComposeOptions = {
     filePath: string;
     files: string | string[];
@@ -6,4 +7,5 @@ export type DockerComposeOptions = {
     commandOptions?: string[];
     composeOptions?: string[];
     environment?: Environment;
+    logger?: Logger;
 };

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

@@ -14,7 +14,7 @@ const logger_1 = require("../../logger");
 const default_docker_compose_options_1 = require("../default-docker-compose-options");
 const docker_compose_1 = require("docker-compose");
 const dockerComposeDown = (options, downOptions) => __awaiter(void 0, void 0, void 0, function* () {
-    logger_1.log.info(`Downing DockerCompose environment`);
+    logger_1.log.info(`Downing DockerCompose environment...`);
     try {
         yield (0, docker_compose_1.down)(Object.assign(Object.assign({}, (yield (0, default_docker_compose_options_1.defaultDockerComposeOptions)(options))), { commandOptions: commandOptions(downOptions) }));
         logger_1.log.info(`Downed DockerCompose environment`);

package/dist/src/docker-compose/functions/docker-compose-pull.js

@@ -16,12 +16,12 @@ const default_docker_compose_options_1 = require("../default-docker-compose-opti
 const dockerComposePull = (options, services) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         if (services) {
-            logger_1.log.info(`Pulling DockerCompose environment images for ${services.join(", ")}`);
-            yield (0, docker_compose_1.pullMany)(services, yield (0, default_docker_compose_options_1.defaultDockerComposeOptions)(options));
+            logger_1.log.info(`Pulling DockerCompose environment images "${services.join('", "')}"...`);
+            yield (0, docker_compose_1.pullMany)(services, yield (0, default_docker_compose_options_1.defaultDockerComposeOptions)(Object.assign(Object.assign({}, options), { logger: logger_1.pullLog })));
         }
         else {
-            logger_1.log.info(`Pulling DockerCompose environment images`);
-            yield (0, docker_compose_1.pullAll)(yield (0, default_docker_compose_options_1.defaultDockerComposeOptions)(options));
+            logger_1.log.info(`Pulling DockerCompose environment images...`);
+            yield (0, docker_compose_1.pullAll)(yield (0, default_docker_compose_options_1.defaultDockerComposeOptions)(Object.assign(Object.assign({}, options), { logger: logger_1.pullLog })));
         }
         logger_1.log.info(`Pulled DockerCompose environment`);
         // eslint-disable-next-line @typescript-eslint/no-explicit-any

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

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

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

@@ -15,7 +15,7 @@ const docker_compose_1 = require("docker-compose");
 const default_docker_compose_options_1 = require("../default-docker-compose-options");
 const docker_compose_down_1 = require("./docker-compose-down");
 const dockerComposeUp = (options, services) => __awaiter(void 0, void 0, void 0, function* () {
-    logger_1.log.info(`Upping DockerCompose environment`);
+    logger_1.log.info(`Upping DockerCompose environment...`);
     try {
         if (services) {
             yield (0, docker_compose_1.upMany)(services, yield (0, default_docker_compose_options_1.defaultDockerComposeOptions)(options));

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");
@@ -76,7 +76,7 @@ class DockerComposeEnvironment {
     }
     up(services) {
         return __awaiter(this, void 0, void 0, function* () {
-            logger_1.log.info(`Starting DockerCompose environment: ${this.projectName}`);
+            logger_1.log.info(`Starting DockerCompose environment "${this.projectName}"...`);
             (yield reaper_1.ReaperInstance.getInstance()).addProject(this.projectName);
             const options = {
                 filePath: this.composeFilePath,
@@ -104,11 +104,11 @@ class DockerComposeEnvironment {
                 ...containerNames,
                 startedContainer.Names.join(", "),
             ], []);
-            logger_1.log.info(`Started the following containers: ${startedContainerNames.join(", ")}`);
+            logger_1.log.info(`Started containers "${startedContainerNames.join('", "')}"`);
             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]
@@ -123,12 +123,9 @@ class DockerComposeEnvironment {
                         .on("err", (data) => logger_1.containerLog.error(`${containerName}: ${data.trim()}`));
                 }
                 try {
-                    logger_1.log.info(`Waiting for container ${containerName} to be ready`);
                     yield (0, wait_for_container_1.waitForContainer)(container, waitStrategy, boundPorts);
-                    logger_1.log.info(`Container ${containerName} is ready`);
                 }
                 catch (err) {
-                    logger_1.log.error(`Container ${containerName} failed to be ready: ${err}`);
                     try {
                         yield (0, docker_compose_down_1.dockerComposeDown)(options, { removeVolumes: true, timeout: 0 });
                     }
@@ -142,7 +139,7 @@ class DockerComposeEnvironment {
                 const containerName = startedGenericContainer.getName();
                 return Object.assign(Object.assign({}, map), { [containerName]: startedGenericContainer });
             }, {});
-            logger_1.log.info(`DockerCompose environment started: ${Object.keys(startedGenericContainers).join(", ")}`);
+            logger_1.log.info(`DockerCompose environment started`);
             return new started_docker_compose_environment_1.StartedDockerComposeEnvironment(startedGenericContainers, Object.assign(Object.assign({}, options), { composeOptions, environment: this.environment }));
         });
     }

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()) {
@@ -52,10 +52,10 @@ class GenericContainerBuilder {
             const imageName = docker_image_name_1.DockerImageName.fromString(image);
             yield reaper_1.ReaperInstance.getInstance();
             const dockerfile = path_1.default.resolve(this.context, this.dockerfileName);
-            logger_1.log.debug(`Preparing to build Dockerfile: ${dockerfile}`);
+            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,