testcontainers 7.23.2 → 8.1.1

package/dist/reaper.js

@@ -14,7 +14,7 @@ const net_1 = require("net");
 const logger_1 = require("./logger");
 const generic_container_1 = require("./generic-container/generic-container");
 const session_id_1 = require("./docker/session-id");
-const docker_host_1 = require("./docker/docker-host");
+const docker_client_1 = require("./docker/docker-client");
 const images_1 = require("./images");
 class RealReaper {
     constructor(container, socket) {
@@ -68,6 +68,9 @@ class ReaperInstance {
     static isEnabled() {
         return process.env.TESTCONTAINERS_RYUK_DISABLED !== "true";
     }
+    static isPrivileged() {
+        return process.env.TESTCONTAINERS_RYUK_PRIVILEGED === "true";
+    }
     static createDisabledInstance() {
         logger_1.log.debug(`Not creating new Reaper for session: ${session_id_1.sessionId}`);
         return Promise.resolve(new DisabledReaper());
@@ -77,33 +80,36 @@ class ReaperInstance {
         return __awaiter(this, void 0, void 0, function* () {
             const dockerSocket = (_a = process.env["TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE"]) !== null && _a !== void 0 ? _a : "/var/run/docker.sock";
             logger_1.log.debug(`Creating new Reaper for session: ${session_id_1.sessionId}`);
-            const container = yield new generic_container_1.GenericContainer(images_1.REAPER_IMAGE)
+            const container = new generic_container_1.GenericContainer(images_1.REAPER_IMAGE)
                 .withName(`testcontainers-ryuk-${session_id_1.sessionId}`)
                 .withExposedPorts(8080)
-                .withBindMount(dockerSocket, "/var/run/docker.sock")
-                .withPrivilegedMode()
-                .start();
-            const host = yield docker_host_1.dockerHost;
-            const port = container.getMappedPort(8080);
-            logger_1.log.debug(`Connecting to Reaper ${container.getId()} on ${host}:${port}`);
+                .withBindMount(dockerSocket, "/var/run/docker.sock");
+            if (this.isPrivileged()) {
+                container.withPrivilegedMode();
+            }
+            const startedContainer = yield container.start();
+            const containerId = startedContainer.getId();
+            const host = (yield docker_client_1.dockerClient).host;
+            const port = startedContainer.getMappedPort(8080);
+            logger_1.log.debug(`Connecting to Reaper ${containerId} on ${host}:${port}`);
             const socket = new net_1.Socket();
             socket.unref();
             socket
-                .on("timeout", () => logger_1.log.error(`Reaper ${container.getId()} socket timed out`))
-                .on("error", (err) => logger_1.log.error(`Reaper ${container.getId()} socket error: ${err}`))
+                .on("timeout", () => logger_1.log.error(`Reaper ${containerId} socket timed out`))
+                .on("error", (err) => logger_1.log.error(`Reaper ${containerId} socket error: ${err}`))
                 .on("close", (hadError) => {
                 if (hadError) {
-                    logger_1.log.error(`Connection to Reaper ${container.getId()} closed with error`);
+                    logger_1.log.error(`Connection to Reaper ${containerId} closed with error`);
                 }
                 else {
-                    logger_1.log.warn(`Connection to Reaper ${container.getId()} closed`);
+                    logger_1.log.warn(`Connection to Reaper ${containerId} closed`);
                 }
             });
             return new Promise((resolve) => {
                 socket.connect(port, host, () => {
-                    logger_1.log.debug(`Connected to Reaper ${container.getId()}`);
+                    logger_1.log.debug(`Connected to Reaper ${containerId}`);
                     socket.write(`label=org.testcontainers.session-id=${session_id_1.sessionId}\r\n`);
-                    const reaper = new RealReaper(container, socket);
+                    const reaper = new RealReaper(startedContainer, socket);
                     resolve(reaper);
                 });
             });

package/dist/test-container.d.ts

@@ -3,7 +3,7 @@ import { Port } from "./port";
 import { PullPolicy } from "./pull-policy";
 import { WaitStrategy } from "./wait-strategy";
 import { Readable } from "stream";
-import { BindMode, Command, ContainerName, Dir, EnvKey, EnvValue, ExecResult, Host, Id, NetworkMode, TmpFs } from "./docker/types";
+import { BindMode, Command, ContainerName, Dir, EnvKey, EnvValue, ExecResult, ExtraHost, Host, Id, NetworkMode, TmpFs } from "./docker/types";
 export interface TestContainer {
     start(): Promise<StartedTestContainer>;
     withEnv(key: EnvKey, value: EnvValue): this;
@@ -14,6 +14,7 @@ export interface TestContainer {
     withWaitStrategy(waitStrategy: WaitStrategy): this;
     withStartupTimeout(startupTimeout: number): this;
     withNetworkMode(networkMode: NetworkMode): this;
+    withExtraHosts(...extraHosts: ExtraHost[]): this;
     withDefaultLogDriver(): this;
     withPrivilegedMode(): this;
     withUser(user: string): this;

package/dist/testcontainers-properties-file.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/testcontainers-properties-file.js

@@ -0,0 +1,31 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const logger_1 = require("./logger");
+const os_1 = require("os");
+const fs_1 = require("fs");
+const properties_reader_1 = __importDefault(require("properties-reader"));
+const file = path_1.default.resolve(os_1.homedir(), ".testcontainers.properties");
+if (fs_1.existsSync(file)) {
+    logger_1.log.debug("Found .testcontainers.properties file");
+    const string = fs_1.readFileSync(file, { encoding: "utf-8" });
+    const properties = properties_reader_1.default("").read(string);
+    const host = properties.get("docker.host");
+    if (host !== null) {
+        logger_1.log.debug(`Setting DOCKER_HOST to ${host}`);
+        process.env.DOCKER_HOST = host;
+    }
+    const tlsVerify = properties.get("docker.tls.verify");
+    if (tlsVerify !== null) {
+        logger_1.log.debug(`Setting DOCKER_TLS_VERIFY to ${tlsVerify}`);
+        process.env.DOCKER_TLS_VERIFY = `${tlsVerify}`;
+    }
+    const certPath = properties.get("docker.cert.path");
+    if (certPath !== null) {
+        logger_1.log.debug(`Setting DOCKER_CERT_PATH to ${certPath}`);
+        process.env.DOCKER_CERT_PATH = certPath;
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testcontainers",
   "author": "Cristian Greco",
-  "version": "7.23.2",
+  "version": "8.1.1",
   "main": "dist/index",
   "types": "dist/index",
   "keywords": [
@@ -26,7 +26,7 @@
     "pre-commit": "lint-staged",
     "build": "npm run clean && tsc",
     "clean": "rimraf dist",
-    "test": "cross-env DEBUG=testcontainers jest --maxWorkers=2",
+    "test": "cross-env DEBUG=testcontainers jest --runInBand",
     "format": "prettier --write package.json \"src/**/*.ts\"",
     "lint": "eslint --fix package.json \"src/**/*.ts\"",
     "updateDeps": "npx npm-check-updates -u"
@@ -41,6 +41,7 @@
     "dockerode": "^3.3.1",
     "get-port": "^5.1.1",
     "glob": "^7.2.0",
+    "properties-reader": "^2.2.0",
     "slash": "^3.0.0",
     "ssh-remote-port-forward": "^1.0.4",
     "tar-fs": "^2.1.1"
@@ -54,6 +55,7 @@
     "@types/node": "^16.9.6",
     "@types/node-fetch": "^2.5.11",
     "@types/pg": "^8.6.1",
+    "@types/properties-reader": "^2.1.1",
     "@types/tar-fs": "^2.0.1",
     "@typescript-eslint/eslint-plugin": "^4.31.2",
     "@typescript-eslint/parser": "^4.31.2",

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

@@ -1 +0,0 @@
-export declare const dockerHost: Promise<string>;

package/dist/docker/docker-host.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.dockerHost = void 0;
-const log_system_diagnostics_1 = require("../log-system-diagnostics");
-const get_docker_host_1 = require("./get-docker-host");
-const dockerode_1 = require("./dockerode");
-exports.dockerHost = get_docker_host_1.getDockerHost(dockerode_1.dockerode);
-log_system_diagnostics_1.logSystemDiagnostics();

package/dist/docker/dockerode.d.ts

@@ -1,2 +0,0 @@
-import Dockerode from "dockerode";
-export declare const dockerode: Dockerode;

package/dist/docker/dockerode.js

@@ -1,10 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.dockerode = void 0;
-const dockerode_1 = __importDefault(require("dockerode"));
-const logger_1 = require("../logger");
-logger_1.log.debug("Creating new Docker instance");
-exports.dockerode = new dockerode_1.default();

package/dist/docker/get-docker-host.d.ts

@@ -1,3 +0,0 @@
-import Dockerode from "dockerode";
-import { Host } from "./types";
-export declare const getDockerHost: (dockerode: Dockerode) => Promise<Host>;

package/dist/docker/get-docker-host.js

@@ -1,60 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDockerHost = void 0;
-const logger_1 = require("../logger");
-const run_in_container_1 = require("./functions/run-in-container");
-const fs_1 = __importDefault(require("fs"));
-const DEFAULT_HOST = "localhost";
-const getDockerHost = (dockerode) => __awaiter(void 0, void 0, void 0, function* () {
-    if (process.env.DOCKER_HOST) {
-        logger_1.log.info(`Detected DOCKER_HOST environment variable: ${process.env.DOCKER_HOST}`);
-    }
-    for (const [hostStrategyName, hostStrategy] of Object.entries(hostStrategies(dockerode))) {
-        const result = yield hostStrategy();
-        if (result) {
-            logger_1.log.info(`Docker host strategy ${hostStrategyName}: ${result}`);
-            return result;
-        }
-    }
-    logger_1.log.info(`Docker host strategy FALLBACK: ${DEFAULT_HOST}`);
-    return DEFAULT_HOST;
-});
-exports.getDockerHost = getDockerHost;
-const hostStrategies = (dockerode) => ({
-    MODEM: () => __awaiter(void 0, void 0, void 0, function* () { return dockerode.modem.host; }),
-    TESTCONTAINERS_HOST_OVERRIDE: () => __awaiter(void 0, void 0, void 0, function* () { return process.env["TESTCONTAINERS_HOST_OVERRIDE"]; }),
-    OUTSIDE_CONTAINER: () => __awaiter(void 0, void 0, void 0, function* () {
-        if (!isInContainer()) {
-            return DEFAULT_HOST;
-        }
-    }),
-    INSIDE_CONTAINER_NO_IPAM: () => __awaiter(void 0, void 0, void 0, function* () {
-        const network = yield dockerode.getNetwork("bridge").inspect();
-        if (!network.IPAM || !network.IPAM.Config) {
-            return DEFAULT_HOST;
-        }
-    }),
-    INSIDE_CONTAINER_IPAM: () => __awaiter(void 0, void 0, void 0, function* () {
-        const network = yield dockerode.getNetwork("bridge").inspect();
-        if (network.IPAM && network.IPAM.Config) {
-            const gateways = network.IPAM.Config.filter((config) => !!config.Gateway);
-            if (gateways.length > 0) {
-                return gateways[0].Gateway;
-            }
-        }
-    }),
-    CONTAINER_GATEWAY: () => __awaiter(void 0, void 0, void 0, function* () { return run_in_container_1.runInContainer("alpine:3.5", ["sh", "-c", "ip route|awk '/default/ { print $3 }'"]); }),
-});
-const isInContainer = () => fs_1.default.existsSync("/.dockerenv");