testcontainers 9.5.0 → 9.7.0

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "testcontainers",
     "author": "Cristian Greco",
-    "version": "9.5.0",
+    "version": "9.7.0",
     "main": "dist/src/index",
     "types": "dist/src/index",
     "keywords": [
@@ -27,8 +27,8 @@
         "build": "npm run clean && tsc -p tsconfig.prod.json",
         "docs:serve": "docker-compose up",
         "clean": "rimraf dist",
-        "test": "cross-env DEBUG=testcontainers,testcontainers:exec,testcontainers:containers jest",
-        "test:ci": "cross-env DEBUG=testcontainers,testcontainers:exec,testcontainers:containers jest --runInBand --coverage",
+        "test": "cross-env DEBUG=testcontainers* jest",
+        "test:ci": "npm run test -- --runInBand --coverage",
         "format": "prettier --write package.json \"src/**/*.ts\"",
         "lint": "eslint --fix package.json \"src/**/*.ts\"",
         "lint:ci": "eslint package.json \"src/**/*.ts\" --max-warnings=0",
@@ -56,31 +56,31 @@
         "@types/async-lock": "^1.4.0",
         "@types/byline": "^4.2.33",
         "@types/debug": "4.1.7",
-        "@types/jest": "^29.5.0",
-        "@types/node": "^18.15.11",
+        "@types/jest": "^29.5.1",
+        "@types/node": "^18.16.2",
         "@types/node-fetch": "^2.6.3",
         "@types/pg": "^8.6.6",
         "@types/properties-reader": "^2.1.1",
         "@types/tar-fs": "^2.0.1",
-        "@typescript-eslint/eslint-plugin": "^5.57.0",
-        "@typescript-eslint/parser": "^5.57.0",
-        "arangojs": "^8.2.0",
+        "@typescript-eslint/eslint-plugin": "^5.59.1",
+        "@typescript-eslint/parser": "^5.59.1",
+        "arangojs": "^8.2.1",
         "cross-env": "^7.0.3",
-        "eslint": "^8.37.0",
+        "eslint": "^8.39.0",
         "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-prettier": "^4.2.1",
         "husky": "^8.0.3",
         "jest": "^29.5.0",
         "kafkajs": "^2.2.4",
-        "lint-staged": "^13.2.0",
-        "mongoose": "^6.10.4",
+        "lint-staged": "^13.2.2",
+        "mongoose": "^6.10.5",
         "mysql2": "^2.3.3",
         "nats": "^2.13.1",
-        "neo4j-driver": "^5.6.0",
+        "neo4j-driver": "^5.7.0",
         "pg": "^8.10.0",
-        "prettier": "^2.8.7",
+        "prettier": "^2.8.8",
         "rimraf": "^3.0.2",
-        "ts-jest": "^29.0.5",
+        "ts-jest": "^29.1.0",
         "ts-node": "^10.9.1",
         "typescript": "^4.9.5",
         "wait-for-expect": "^3.0.2"

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

@@ -20,47 +20,53 @@ const fs_1 = require("fs");
 const promises_1 = require("fs/promises");
 const properties_reader_1 = __importDefault(require("properties-reader"));
 const getDockerClientConfig = (env = process.env) => __awaiter(void 0, void 0, void 0, function* () {
-    let dockerHost;
-    let dockerTlsVerify;
-    let dockerCertPath;
-    const file = path_1.default.resolve((0, os_1.homedir)(), ".testcontainers.properties");
-    if ((0, fs_1.existsSync)(file)) {
-        logger_1.log.debug("Found .testcontainers.properties file");
-        const string = yield (0, promises_1.readFile)(file, { encoding: "utf-8" });
-        const properties = (0, properties_reader_1.default)("").read(string);
-        const host = properties.get("docker.host");
-        if (host !== null) {
-            dockerHost = host;
-        }
-        const tlsVerify = properties.get("docker.tls.verify");
-        if (tlsVerify !== null) {
-            dockerTlsVerify = `${tlsVerify}`;
-        }
-        const certPath = properties.get("docker.cert.path");
-        if (certPath !== null) {
-            dockerCertPath = certPath;
+    const dockerClientConfig = Object.assign(Object.assign({}, (yield loadFromFile())), loadFromEnv(env));
+    logDockerClientConfig(dockerClientConfig);
+    return dockerClientConfig;
+});
+exports.getDockerClientConfig = getDockerClientConfig;
+function loadFromFile() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const file = path_1.default.resolve((0, os_1.homedir)(), ".testcontainers.properties");
+        const dockerClientConfig = {};
+        if ((0, fs_1.existsSync)(file)) {
+            logger_1.log.debug(`Found ".testcontainers.properties" file`);
+            const string = yield (0, promises_1.readFile)(file, { encoding: "utf-8" });
+            const properties = (0, properties_reader_1.default)("").read(string);
+            const host = properties.get("docker.host");
+            if (host !== null) {
+                dockerClientConfig.dockerHost = host;
+            }
+            const tlsVerify = properties.get("docker.tls.verify");
+            if (tlsVerify !== null) {
+                dockerClientConfig.dockerTlsVerify = `${tlsVerify}`;
+            }
+            const certPath = properties.get("docker.cert.path");
+            if (certPath !== null) {
+                dockerClientConfig.dockerCertPath = certPath;
+            }
         }
-    }
+        return dockerClientConfig;
+    });
+}
+function loadFromEnv(env) {
+    const dockerClientConfig = {};
     if (env["DOCKER_HOST"] !== undefined) {
-        dockerHost = env["DOCKER_HOST"];
+        dockerClientConfig.dockerHost = env["DOCKER_HOST"];
     }
     if (env["DOCKER_TLS_VERIFY"] !== undefined) {
-        dockerTlsVerify = env["DOCKER_TLS_VERIFY"];
+        dockerClientConfig.dockerTlsVerify = env["DOCKER_TLS_VERIFY"];
     }
     if (env["DOCKER_CERT_PATH"] !== undefined) {
-        dockerCertPath = env["DOCKER_CERT_PATH"];
-    }
-    let logStr = "Loaded properties: ";
-    if (dockerHost !== undefined) {
-        logStr += `dockerHost=${dockerHost}, `;
-    }
-    if (dockerTlsVerify !== undefined) {
-        logStr += `dockerTlsVerify=${dockerTlsVerify}, `;
+        dockerClientConfig.dockerCertPath = env["DOCKER_CERT_PATH"];
     }
-    if (dockerCertPath !== undefined) {
-        logStr += `dockerCertPath=${dockerCertPath}`;
+    return dockerClientConfig;
+}
+function logDockerClientConfig(config) {
+    const configurations = Object.entries(config)
+        .filter(([, value]) => value !== undefined)
+        .map(([key, value]) => `${key}: "${value}"`);
+    if (configurations.length > 0) {
+        logger_1.log.debug(`Loaded Docker client configuration, ${configurations.join(", ")}`);
     }
-    logger_1.log.debug(logStr);
-    return { dockerHost, dockerTlsVerify, dockerCertPath };
-});
-exports.getDockerClientConfig = getDockerClientConfig;
+}

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

@@ -1,8 +1,10 @@
 /// <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;

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

@@ -38,17 +38,18 @@ const getDockerClient = () => __awaiter(void 0, void 0, void 0, function* () {
             yield strategy.init();
         }
         if (strategy.isApplicable()) {
-            logger_1.log.debug(`Found applicable Docker client strategy: ${strategy.getName()}`);
+            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: ${uri}`);
+            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 host = yield (0, resolve_host_1.resolveHost)(dockerode, indexServerAddress, uri);
+                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
+                logger_1.log.info(`Using Docker client strategy "${strategy.getName()}", Docker host "${host}" (${hostIps
                     .map((hostIp) => hostIp.address)
                     .join(", ")})`);
-                return { uri, host, hostIps, dockerode, indexServerAddress, composeEnvironment };
+                return { uri, provider, host, hostIps, dockerode, indexServerAddress, composeEnvironment };
             }
             else {
                 logger_1.log.warn(`Docker client strategy ${strategy.getName()} is not reachable`);

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

@@ -18,7 +18,7 @@ const attachContainer = (dockerode, container) => __awaiter(void 0, void 0, void
         return (0, demux_stream_1.demuxStream)(dockerode, stream);
     }
     catch (err) {
-        logger_1.log.error(`Failed to attach to container ${container.id}: ${err}`);
+        logger_1.log.error(`Failed to attach to container: ${err}`, { containerId: container.id });
         throw err;
     }
 });

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

@@ -17,9 +17,9 @@ const create_labels_1 = require("../create-labels");
 const createContainer = (options) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     try {
-        logger_1.log.info(`Creating container for image: ${options.imageName}`);
+        logger_1.log.info(`Creating container for image "${options.imageName}"...`);
         const { dockerode } = yield (0, docker_client_1.dockerClient)();
-        return yield dockerode.createContainer({
+        const container = yield dockerode.createContainer({
             name: options.name,
             User: options.user,
             Image: options.imageName.toString(),
@@ -47,9 +47,11 @@ const createContainer = (options) => __awaiter(void 0, void 0, void 0, function*
                 NanoCpus: (_b = options.resourcesQuota) === null || _b === void 0 ? void 0 : _b.cpu,
             },
         });
+        logger_1.log.info(`Created container for image "${options.imageName}"`, { containerId: container.id });
+        return container;
     }
     catch (err) {
-        logger_1.log.error(`Failed to create container for image ${options.imageName}: ${err}`);
+        logger_1.log.error(`Failed to create container for image "${options.imageName}": ${err}`);
         throw err;
     }
 });
@@ -72,7 +74,7 @@ const getPortBindings = (exposedPorts) => {
             dockerodePortBindings[exposedPort.container] = [{ HostPort: exposedPort.host.toString() }];
         }
         else {
-            dockerodePortBindings[exposedPort] = [{ HostPort: "0" }];
+            dockerodePortBindings[exposedPort] = [{ HostPort: "" }];
         }
     }
     return dockerodePortBindings;

package/dist/src/docker/functions/container/exec-container.d.ts

@@ -1,3 +1,4 @@
 import { ExecResult } from "../../types";
 import Dockerode from "dockerode";
-export declare const execContainer: (container: Dockerode.Container, command: string[], shouldLog?: boolean) => Promise<ExecResult>;
+import { Provider } from "../../docker-client";
+export declare const execContainer: (dockerode: Dockerode, provider: Provider, container: Dockerode.Container, command: string[], shouldLog?: boolean) => Promise<ExecResult>;

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

@@ -15,7 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.execContainer = void 0;
 const logger_1 = require("../../../logger");
 const byline_1 = __importDefault(require("byline"));
-const execContainer = (container, command, shouldLog = true) => __awaiter(void 0, void 0, void 0, function* () {
+const demux_stream_1 = require("../demux-stream");
+const execContainer = (dockerode, provider, container, command, shouldLog = true) => __awaiter(void 0, void 0, void 0, function* () {
     const chunks = [];
     try {
         const exec = yield container.exec({
@@ -23,29 +24,35 @@ const execContainer = (container, command, shouldLog = true) => __awaiter(void 0
             AttachStdout: true,
             AttachStderr: true,
         });
-        const stream = yield startExec(exec);
+        const stream = yield startExec(dockerode, provider, 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 = (exec) => __awaiter(void 0, void 0, void 0, function* () {
+const startExec = (dockerode, provider, exec, container) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const stream = yield exec.start({ stdin: true, Detach: false, Tty: true });
-        stream.setEncoding("utf-8");
-        return stream;
+        if (provider === "podman") {
+            return (0, demux_stream_1.demuxStream)(dockerode, stream);
+        }
+        else {
+            return stream;
+        }
     }
     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

@@ -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/put-container-archive.js

@@ -10,13 +10,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.putContainerArchive = void 0;
+const stream_1 = require("stream");
 const logger_1 = require("../../../logger");
+const stream_utils_1 = require("../../../stream-utils");
 const putContainerArchive = (options) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        yield options.container.putArchive(options.stream, { path: options.containerPath });
+        const stream = yield options.container.putArchive(options.stream, { path: options.containerPath });
+        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

@@ -23,7 +23,7 @@ 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) => {
@@ -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/image-exists.js

@@ -13,22 +13,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.imageExists = void 0;
-const logger_1 = require("../../../logger");
 const async_lock_1 = __importDefault(require("async-lock"));
-const list_images_1 = require("./list-images");
 const existingImages = new Set();
 const imageCheckLock = new async_lock_1.default();
 const imageExists = (dockerode, imageName) => __awaiter(void 0, void 0, void 0, function* () {
-    logger_1.log.debug(`Checking if image exists: ${imageName}`);
     return imageCheckLock.acquire(imageName.toString(), () => __awaiter(void 0, void 0, void 0, function* () {
         if (existingImages.has(imageName.toString())) {
             return true;
         }
-        const images = yield (0, list_images_1.listImages)(dockerode);
-        images.forEach((name) => {
-            existingImages.add(name.toString());
-        });
-        return existingImages.has(imageName.toString());
+        try {
+            yield dockerode.getImage(imageName.toString()).inspect();
+            existingImages.add(imageName.toString());
+            return true;
+        }
+        catch (err) {
+            if (err instanceof Error && err.message.toLowerCase().includes("no such image")) {
+                return false;
+            }
+            throw err;
+        }
     }));
 });
 exports.imageExists = imageExists;

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

@@ -24,13 +24,13 @@ const pullImage = (dockerode, indexServerAddress, options) => __awaiter(void 0,
         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);
+            yield new pull_stream_parser_1.PullStreamParser(options.imageName, logger_1.pullLog).consume(stream);
         }));
     }
     catch (err) {

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

@@ -14,13 +14,14 @@ const logger_1 = require("../../../logger");
 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}`);
+        logger_1.log.info(`Connecting to network "${options.networkId}"...`, { containerId: options.containerId });
         const { dockerode } = yield (0, docker_client_1.dockerClient)();
         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

@@ -15,7 +15,7 @@ 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}`);
+        logger_1.log.info(`Creating network "${options.name}"...`);
         const { dockerode } = yield (0, docker_client_1.dockerClient)();
         const network = yield dockerode.createNetwork({
             Name: options.name,
@@ -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

@@ -14,16 +14,17 @@ const logger_1 = require("../../../logger");
 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}`);
+        logger_1.log.info(`Removing network "${id}"...`);
         const { dockerode } = yield (0, docker_client_1.dockerClient)();
         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/pull-stream-parser.d.ts

@@ -7,5 +7,4 @@ export declare class PullStreamParser {
     private readonly logger;
     constructor(dockerImageName: DockerImageName, logger: Logger);
     consume(stream: Readable): Promise<void>;
-    private getOrElse;
 }

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

@@ -11,53 +11,14 @@ class PullStreamParser {
         this.logger = logger;
     }
     consume(stream) {
-        const messagesById = new Map();
-        const statusesById = new Map();
         return new Promise((resolve) => {
             (0, byline_1.default)(stream).on("data", (line) => {
-                try {
-                    const json = JSON.parse(line);
-                    const { id, status } = json;
-                    const prefix = id
-                        ? `Pulling ${this.dockerImageName.toString()} - ${id}`
-                        : `Pulling ${this.dockerImageName.toString()}`;
-                    if (status === "Downloading") {
-                        const { current, total } = json.progressDetail;
-                        const percentage = Math.round(100 * (current / total));
-                        const message = `${prefix} - ${json.status} ${percentage}%`;
-                        const messages = this.getOrElse(messagesById, id, new Set());
-                        if (!messages.has(message)) {
-                            messages.add(message);
-                            this.logger.trace(message);
-                        }
-                    }
-                    else {
-                        const statuses = this.getOrElse(statusesById, id, new Set());
-                        if (!statuses.has(status)) {
-                            statuses.add(status);
-                            const message = `${prefix} - ${json.status}`;
-                            const messages = this.getOrElse(messagesById, id, new Set());
-                            if (!messages.has(message)) {
-                                messages.add(message);
-                                this.logger.trace(message);
-                            }
-                        }
-                    }
-                }
-                catch (_a) {
-                    this.logger.warn(`Unexpected message format: ${line}`);
+                if (this.logger.enabled()) {
+                    this.logger.trace(line, { imageName: this.dockerImageName.toString() });
                 }
             });
             stream.on("end", resolve);
         });
     }
-    getOrElse(map, key, orElse) {
-        const value = map.get(key);
-        if (value === undefined) {
-            map.set(key, orElse);
-            return orElse;
-        }
-        return value;
-    }
 }
 exports.PullStreamParser = PullStreamParser;