testcontainers 8.13.1 → 8.14.0

package/dist/docker/docker-client.js

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

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

@@ -1,3 +1,3 @@
 import { Readable } from "stream";
 import Dockerode from "dockerode";
-export declare const attachContainer: (container: Dockerode.Container) => Promise<Readable>;
+export declare const attachContainer: (dockerode: Dockerode, container: Dockerode.Container) => Promise<Readable>;

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

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

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

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.containerLogs = void 0;
 const logger_1 = require("../../../logger");
 const demux_stream_1 = require("../demux-stream");
+const docker_client_1 = require("../../docker-client");
 const containerLogs = (container) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const options = {
@@ -21,7 +22,7 @@ const containerLogs = (container) => __awaiter(void 0, void 0, void 0, function*
         };
         const stream = (yield container.logs(options));
         stream.socket.unref();
-        return (0, demux_stream_1.demuxStream)(stream);
+        return (0, demux_stream_1.demuxStream)((yield (0, docker_client_1.dockerClient)()).dockerode, stream);
     }
     catch (err) {
         logger_1.log.error(`Failed to get container logs: ${err}`);

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

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

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

@@ -12,11 +12,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.demuxStream = void 0;
 const stream_1 = require("stream");
 const logger_1 = require("../../logger");
-const docker_client_1 = require("../docker-client");
-const demuxStream = (stream) => __awaiter(void 0, void 0, void 0, function* () {
+const demuxStream = (dockerode, stream) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const demuxedStream = new stream_1.PassThrough({ autoDestroy: true, encoding: "utf-8" });
-        const { dockerode } = yield (0, docker_client_1.dockerClient)();
         dockerode.modem.demuxStream(stream, demuxedStream, demuxedStream);
         stream.on("end", () => demuxedStream.end());
         demuxedStream.on("close", () => {

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

@@ -1,3 +1,4 @@
+import Dockerode from "dockerode";
 declare type DockerInfo = {
     serverVersion: number;
     operatingSystem: string;
@@ -6,5 +7,5 @@ declare type DockerInfo = {
     cpus: number;
     memory: number;
 };
-export declare const getDockerInfo: () => Promise<DockerInfo>;
+export declare const getDockerInfo: (dockerode: Dockerode) => Promise<DockerInfo>;
 export {};

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

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

package/dist/docker/functions/image/image-exists.d.ts

@@ -1,2 +1,3 @@
 import { DockerImageName } from "../../../docker-image-name";
-export declare const imageExists: (imageName: DockerImageName) => Promise<boolean>;
+import Dockerode from "dockerode";
+export declare const imageExists: (dockerode: Dockerode, imageName: DockerImageName) => Promise<boolean>;

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

@@ -11,7 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.imageExists = void 0;
 const list_images_1 = require("./list-images");
-const imageExists = (imageName) => __awaiter(void 0, void 0, void 0, function* () {
-    return (yield (0, list_images_1.listImages)()).some((image) => image.equals(imageName));
+const logger_1 = require("../../../logger");
+const imageExists = (dockerode, imageName) => __awaiter(void 0, void 0, void 0, function* () {
+    logger_1.log.debug(`Checking if image exists: ${imageName}`);
+    return (yield (0, list_images_1.listImages)(dockerode)).some((image) => image.equals(imageName));
 });
 exports.imageExists = imageExists;

package/dist/docker/functions/image/list-images.d.ts

@@ -1,2 +1,3 @@
 import { DockerImageName } from "../../../docker-image-name";
-export declare const listImages: () => Promise<DockerImageName[]>;
+import Dockerode from "dockerode";
+export declare const listImages: (dockerode: Dockerode) => Promise<DockerImageName[]>;

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

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

package/dist/docker/functions/image/pull-image.d.ts

@@ -1,8 +1,9 @@
 import { DockerImageName } from "../../../docker-image-name";
 import { AuthConfig } from "../../types";
+import Dockerode from "dockerode";
 export declare type PullImageOptions = {
     imageName: DockerImageName;
     force: boolean;
     authConfig?: AuthConfig;
 };
-export declare const pullImage: (options: PullImageOptions) => Promise<void>;
+export declare const pullImage: (dockerode: Dockerode, options: PullImageOptions) => Promise<void>;

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

@@ -12,16 +12,14 @@ 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 docker_client_1 = require("../../docker-client");
 const image_exists_1 = require("./image-exists");
-const pullImage = (options) => __awaiter(void 0, void 0, void 0, function* () {
+const pullImage = (dockerode, options) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        if ((yield (0, image_exists_1.imageExists)(options.imageName)) && !options.force) {
+        if ((yield (0, image_exists_1.imageExists)(dockerode, options.imageName)) && !options.force) {
             logger_1.log.debug(`Not pulling image as it already exists: ${options.imageName}`);
             return;
         }
         logger_1.log.info(`Pulling image: ${options.imageName}`);
-        const { dockerode } = yield (0, docker_client_1.dockerClient)();
         const stream = yield dockerode.pull(options.imageName.toString(), { authconfig: options.authConfig });
         yield new pull_stream_parser_1.PullStreamParser(options.imageName, logger_1.log).consume(stream);
     }

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

@@ -19,11 +19,11 @@ const inspect_container_1 = require("./container/inspect-container");
 const runInContainer = (dockerode, image, command) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const imageName = docker_image_name_1.DockerImageName.fromString(image);
-        yield (0, pull_image_1.pullImage)({ imageName, force: false });
+        yield (0, pull_image_1.pullImage)(dockerode, { imageName, force: false });
         logger_1.log.debug(`Creating container: ${image} with command: ${command.join(" ")}`);
         const container = yield dockerode.createContainer({ Image: image, Cmd: command, HostConfig: { AutoRemove: true } });
         logger_1.log.debug(`Attaching to container: ${container.id}`);
-        const stream = yield (0, attach_container_1.attachContainer)(container);
+        const stream = yield (0, attach_container_1.attachContainer)(dockerode, container);
         const promise = new Promise((resolve) => {
             const interval = setInterval(() => __awaiter(void 0, void 0, void 0, function* () {
                 const inspect = yield (0, inspect_container_1.inspectContainer)(container);

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

@@ -24,6 +24,7 @@ const build_image_1 = require("../docker/functions/image/build-image");
 const image_exists_1 = require("../docker/functions/image/image-exists");
 const registry_auth_locator_1 = require("../registry-auth-locator");
 const generic_container_1 = require("./generic-container");
+const docker_client_1 = require("../docker/docker-client");
 class GenericContainerBuilder {
     constructor(context, dockerfileName, uuid = new uuid_1.RandomUuid()) {
         this.context = context;
@@ -57,7 +58,7 @@ class GenericContainerBuilder {
                 registryConfig,
             });
             const container = new generic_container_1.GenericContainer(imageName.toString());
-            if (!(yield (0, image_exists_1.imageExists)(imageName))) {
+            if (!(yield (0, image_exists_1.imageExists)((yield (0, docker_client_1.dockerClient)()).dockerode, imageName))) {
                 throw new Error("Failed to build image");
             }
             return Promise.resolve(container);

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

@@ -61,7 +61,7 @@ class GenericContainer {
     }
     start() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield (0, pull_image_1.pullImage)({
+            yield (0, pull_image_1.pullImage)((yield (0, docker_client_1.dockerClient)()).dockerode, {
                 imageName: this.imageName,
                 force: this.pullPolicy.shouldPull(),
                 authConfig: yield (0, registry_auth_locator_1.getAuthConfig)(this.imageName.registry),

package/dist/log-system-diagnostics.d.ts

@@ -1 +1,2 @@
-export declare const logSystemDiagnostics: () => Promise<void>;
+import Dockerode from "dockerode";
+export declare const logSystemDiagnostics: (dockerode: Dockerode) => Promise<void>;

package/dist/log-system-diagnostics.js

@@ -13,10 +13,11 @@ exports.logSystemDiagnostics = void 0;
 const logger_1 = require("./logger");
 const docker_compose_1 = require("./docker-compose/docker-compose");
 const get_info_1 = require("./docker/functions/get-info");
-const logSystemDiagnostics = () => __awaiter(void 0, void 0, void 0, function* () {
+const logSystemDiagnostics = (dockerode) => __awaiter(void 0, void 0, void 0, function* () {
+    logger_1.log.debug("Fetching system diagnostics");
     const info = {
         node: getNodeInfo(),
-        docker: yield (0, get_info_1.getDockerInfo)(),
+        docker: yield (0, get_info_1.getDockerInfo)(dockerode),
         dockerCompose: yield getDockerComposeInfo(),
     };
     logger_1.log.debug(`System diagnostics: ${JSON.stringify(info)}`);
@@ -36,7 +37,7 @@ const getDockerComposeInfo = () => __awaiter(void 0, void 0, void 0, function* (
         };
     }
     catch (err) {
-        logger_1.log.warn(`Unable to detect docker-compose version, is it installed? ${err}`);
+        logger_1.log.info(`Unable to detect docker-compose version, is it installed? ${err}`);
         return undefined;
     }
 });

package/dist/port-check.d.ts

@@ -11,6 +11,9 @@ export declare class HostPortCheck implements PortCheck {
 }
 export declare class InternalPortCheck implements PortCheck {
     private readonly container;
+    private isDistroless;
+    private commandOutputs;
     constructor(container: Dockerode.Container);
     isBound(port: Port): Promise<boolean>;
+    private commandOutputsKey;
 }

package/dist/port-check.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InternalPortCheck = exports.HostPortCheck = void 0;
 const net_1 = require("net");
 const exec_container_1 = require("./docker/functions/container/exec-container");
+const logger_1 = require("./logger");
 class HostPortCheck {
     constructor(host) {
         this.host = host;
@@ -40,6 +41,8 @@ exports.HostPortCheck = HostPortCheck;
 class InternalPortCheck {
     constructor(container) {
         this.container = container;
+        this.isDistroless = false;
+        this.commandOutputs = new Set();
     }
     isBound(port) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -50,8 +53,32 @@ class InternalPortCheck {
                 ["/bin/bash", "-c", `</dev/tcp/localhost/${port}`],
             ];
             const commandResults = yield Promise.all(commands.map((command) => (0, exec_container_1.execContainer)(this.container, command)));
-            return commandResults.some((result) => result.exitCode === 0);
+            const isBound = commandResults.some((result) => result.exitCode === 0);
+            if (!isBound) {
+                const shellExists = commandResults.some((result) => result.exitCode !== 126);
+                if (!shellExists) {
+                    if (!this.isDistroless) {
+                        this.isDistroless = true;
+                        logger_1.log.error(`The HostPortWaitStrategy will not work on a distroless image, use an alternate wait strategy for container ${this.container.id}`);
+                    }
+                }
+                else {
+                    commandResults
+                        .map((result) => (Object.assign(Object.assign({}, result), { output: result.output.trim() })))
+                        .filter((result) => result.exitCode !== 126 && result.output.length > 0)
+                        .forEach((result) => {
+                        if (!this.commandOutputs.has(this.commandOutputsKey(result.output))) {
+                            logger_1.log.trace(`Port check result for container ${this.container.id} exit code ${result.exitCode}: ${result.output}`);
+                            this.commandOutputs.add(this.commandOutputsKey(result.output));
+                        }
+                    });
+                }
+            }
+            return isBound;
         });
     }
+    commandOutputsKey(output) {
+        return `${this.container.id}:${output}`;
+    }
 }
 exports.InternalPortCheck = InternalPortCheck;

package/package.json

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