testcontainers 8.13.2 → 8.15.0

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

@@ -1,3 +1,9 @@
 import { Command, ExecResult } from "../../types";
 import Dockerode from "dockerode";
-export declare const execContainer: (container: Dockerode.Container, command: Command[]) => Promise<ExecResult>;
+declare type ExecContainerOptions = {
+    tty: boolean;
+    stdin: boolean;
+    detach: boolean;
+};
+export declare const execContainer: (container: Dockerode.Container, command: Command[], options: ExecContainerOptions) => Promise<ExecResult>;
+export {};

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

@@ -11,14 +11,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.execContainer = void 0;
 const logger_1 = require("../../../logger");
-const execContainer = (container, command) => __awaiter(void 0, void 0, void 0, function* () {
+const execContainer = (container, command, options) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const exec = yield container.exec({
             Cmd: command,
             AttachStdout: true,
             AttachStderr: true,
         });
-        const stream = yield startExec(exec);
+        const stream = yield startExec(exec, options);
         const chunks = [];
         stream.on("data", (chunk) => chunks.push(chunk));
         const exitCode = yield waitForExec(exec);
@@ -31,16 +31,8 @@ const execContainer = (container, command) => __awaiter(void 0, void 0, void 0,
     }
 });
 exports.execContainer = execContainer;
-const startExec = (exec) => __awaiter(void 0, void 0, void 0, function* () {
+const startExec = (exec, options) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const options = {
-            Detach: false,
-            Tty: true,
-            stream: true,
-            stdin: true,
-            stdout: true,
-            stderr: true,
-        };
         const stream = yield exec.start(options);
         stream.setEncoding("utf-8");
         return stream;

package/dist/generic-container/started-generic-container.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { RestartOptions, StartedTestContainer, StopOptions, StoppedTestContainer } from "../test-container";
+import { RestartOptions, StartedTestContainer, StopOptions, ExecOptions, StoppedTestContainer } from "../test-container";
 import Dockerode from "dockerode";
 import { Command, ContainerName, ExecResult, Host, Id as ContainerId, Labels } from "../docker/types";
 import { InspectResult } from "../docker/functions/container/inspect-container";
@@ -27,6 +27,6 @@ export declare class StartedGenericContainer implements StartedTestContainer {
     getNetworkNames(): string[];
     getNetworkId(networkName: string): string;
     getIpAddress(networkName: string): string;
-    exec(command: Command[]): Promise<ExecResult>;
+    exec(command: Command[], options?: Partial<ExecOptions>): Promise<ExecResult>;
     logs(): Promise<Readable>;
 }

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

@@ -96,8 +96,9 @@ class StartedGenericContainer {
     getIpAddress(networkName) {
         return this.inspectResult.networkSettings[networkName].ipAddress;
     }
-    exec(command) {
-        return (0, exec_container_1.execContainer)(this.container, command);
+    exec(command, options = {}) {
+        const resolvedOptions = Object.assign({ stdin: true, detach: false, tty: true }, options);
+        return (0, exec_container_1.execContainer)(this.container, command, resolvedOptions);
     }
     logs() {
         return (0, container_logs_1.containerLogs)(this.container);

package/dist/log-system-diagnostics.js

@@ -37,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* () {
@@ -49,9 +52,33 @@ 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.container, command)));
-            return commandResults.some((result) => result.exitCode === 0);
+            const commandResults = yield Promise.all(commands.map((command) => (0, exec_container_1.execContainer)(this.container, command, { stdin: true, detach: false, tty: true })));
+            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/dist/test-container.d.ts

@@ -30,6 +30,11 @@ export interface StopOptions {
     timeout: number;
     removeVolumes: boolean;
 }
+export interface ExecOptions {
+    tty: boolean;
+    detach: boolean;
+    stdin: boolean;
+}
 export interface StartedTestContainer {
     stop(options?: Partial<StopOptions>): Promise<StoppedTestContainer>;
     restart(options?: Partial<RestartOptions>): Promise<void>;
@@ -41,7 +46,7 @@ export interface StartedTestContainer {
     getNetworkNames(): string[];
     getNetworkId(networkName: string): string;
     getIpAddress(networkName: string): string;
-    exec(command: Command[]): Promise<ExecResult>;
+    exec(command: Command[], options?: Partial<ExecOptions>): Promise<ExecResult>;
     logs(): Promise<Readable>;
 }
 export interface StoppedTestContainer {

package/package.json

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