testcontainers 8.6.0 → 8.6.1-beta.0

package/README.md

@@ -24,9 +24,9 @@ The following environment variables are supported:
 - `DOCKER_HOST=tcp://docker:2375` Sets the URL of the docker daemon
 - `DOCKER_TLS_VERIFY=1` When set to `1`, enables TLS communication with the docker
   daemon
-- `DOCKER_CONFIG=/some/path` Configures the path to the `config.json`. Defaults to `~/.docker`
 - `DOCKER_CERT_PATH=/some/path` Configures the path to the `ca.pem`, `cert.pem`, and `key.pem` files used for TLS
   verification. Defaults to `~/.docker`
+- `DOCKER_CONFIG=/some/path` Configures the path to the `config.json`. Defaults to `~/.docker`
 - `TESTCONTAINERS_HOST_OVERRIDE=docker.svc.local` Docker's host on which ports are exposed
 - `TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock` Path to Docker's socket. Used by [ryuk](#ryuk) and
   other [auxiliary containers](#auxiliary-containers) that need to perform Docker actions

package/dist/docker/docker-client.js

@@ -17,7 +17,7 @@ const dockerode_1 = __importDefault(require("dockerode"));
 const path_1 = __importDefault(require("path"));
 const logger_1 = require("../logger");
 const url_1 = require("url");
-const fs_1 = __importDefault(require("fs"));
+const fs_1 = require("fs");
 const run_in_container_1 = require("./functions/run-in-container");
 const log_system_diagnostics_1 = require("../log-system-diagnostics");
 require("../testcontainers-properties-file");
@@ -30,11 +30,10 @@ const getDockerClient = () => __awaiter(void 0, void 0, void 0, function* () {
     for (const strategy of strategies) {
         if (strategy.isApplicable()) {
             logger_1.log.debug(`Found applicable Docker client strategy: ${strategy.getName()}`);
-            const dockerConfig = strategy.getDockerConfig();
-            const dockerode = new dockerode_1.default(createDockerodeOptions(dockerConfig));
-            logger_1.log.debug(`Testing Docker client strategy URI: ${dockerConfig.uri}`);
+            const { uri, dockerode } = yield strategy.initialise();
+            logger_1.log.debug(`Testing Docker client strategy URI: ${uri}`);
             if (yield isDockerDaemonReachable(dockerode)) {
-                const host = yield resolveHost(dockerode, dockerConfig.uri);
+                const host = yield resolveHost(dockerode, uri);
                 logger_1.log.info(`Using Docker client strategy: ${strategy.getName()}, Docker host: ${host}`);
                 log_system_diagnostics_1.logSystemDiagnostics();
                 return { host, dockerode };
@@ -46,23 +45,6 @@ const getDockerClient = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     throw new Error("No Docker client strategy found");
 });
-const createDockerodeOptions = (dockerConfig) => {
-    const dockerOptions = {};
-    if (dockerConfig.socketPath) {
-        dockerOptions.socketPath = dockerConfig.socketPath;
-    }
-    else {
-        const { hostname, port } = new url_1.URL(dockerConfig.uri);
-        dockerOptions.host = hostname;
-        dockerOptions.port = port;
-    }
-    if (dockerConfig.ssl) {
-        dockerOptions.ca = dockerConfig.ssl.ca;
-        dockerOptions.cert = dockerConfig.ssl.cert;
-        dockerOptions.key = dockerConfig.ssl.key;
-    }
-    return dockerOptions;
-};
 const isDockerDaemonReachable = (dockerode) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const response = yield dockerode.ping();
@@ -74,18 +56,25 @@ const isDockerDaemonReachable = (dockerode) => __awaiter(void 0, void 0, void 0,
     }
 });
 class ConfigurationStrategy {
-    getDockerConfig() {
-        const { DOCKER_HOST, DOCKER_TLS_VERIFY, DOCKER_CERT_PATH } = process.env;
-        return {
-            uri: DOCKER_HOST,
-            ssl: DOCKER_TLS_VERIFY === "1" && DOCKER_CERT_PATH !== undefined
-                ? {
-                    ca: path_1.default.resolve(DOCKER_CERT_PATH, "ca.pem"),
-                    cert: path_1.default.resolve(DOCKER_CERT_PATH, "cert.pem"),
-                    key: path_1.default.resolve(DOCKER_CERT_PATH, "key.pem"),
-                }
-                : undefined,
-        };
+    initialise() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { DOCKER_HOST, DOCKER_TLS_VERIFY, DOCKER_CERT_PATH } = process.env;
+            const dockerOptions = {};
+            const url = new url_1.URL(DOCKER_HOST);
+            const dockerHost = url.host === "" ? `tcp://${DOCKER_HOST}` : DOCKER_HOST;
+            const { hostname, port } = new url_1.URL(dockerHost);
+            dockerOptions.host = hostname;
+            dockerOptions.port = port;
+            if (DOCKER_TLS_VERIFY === "1" && DOCKER_CERT_PATH !== undefined) {
+                dockerOptions.ca = yield fs_1.promises.readFile(path_1.default.resolve(DOCKER_CERT_PATH, "ca.pem"));
+                dockerOptions.cert = yield fs_1.promises.readFile(path_1.default.resolve(DOCKER_CERT_PATH, "cert.pem"));
+                dockerOptions.key = yield fs_1.promises.readFile(path_1.default.resolve(DOCKER_CERT_PATH, "key.pem"));
+            }
+            return {
+                uri: dockerHost,
+                dockerode: new dockerode_1.default(dockerOptions),
+            };
+        });
     }
     isApplicable() {
         return process.env.DOCKER_HOST !== undefined;
@@ -95,11 +84,13 @@ class ConfigurationStrategy {
     }
 }
 class UnixSocketStrategy {
-    getDockerConfig() {
-        return {
-            uri: "unix:///var/run/docker.sock",
-            socketPath: "/var/run/docker.sock",
-        };
+    initialise() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return {
+                uri: "unix:///var/run/docker.sock",
+                dockerode: new dockerode_1.default({ socketPath: "/var/run/docker.sock" }),
+            };
+        });
     }
     isApplicable() {
         return process.platform === "linux" || process.platform === "darwin";
@@ -109,11 +100,13 @@ class UnixSocketStrategy {
     }
 }
 class NpipeSocketStrategy {
-    getDockerConfig() {
-        return {
-            uri: "npipe:////./pipe/docker_engine",
-            socketPath: "//./pipe/docker_engine",
-        };
+    initialise() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return {
+                uri: "npipe:////./pipe/docker_engine",
+                dockerode: new dockerode_1.default({ socketPath: "//./pipe/docker_engine" }),
+            };
+        });
     }
     isApplicable() {
         return process.platform === "win32";
@@ -156,5 +149,5 @@ const findGateway = (dockerode) => __awaiter(void 0, void 0, void 0, function* (
     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 run_in_container_1.runInContainer(dockerode, "alpine:3.5", ["sh", "-c", "ip route|awk '/default/ { print $3 }'"]); });
-const isInContainer = () => fs_1.default.existsSync("/.dockerenv");
+const isInContainer = () => fs_1.existsSync("/.dockerenv");
 exports.dockerClient = getDockerClient();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testcontainers",
   "author": "Cristian Greco",
-  "version": "8.6.0",
+  "version": "8.6.1-beta.0",
   "main": "dist/index",
   "types": "dist/index",
   "keywords": [