testcontainers 8.1.0 → 8.1.1-beta.3

package/dist/docker/docker-client.js

@@ -33,26 +33,29 @@ const getDockerClient = () => __awaiter(void 0, void 0, void 0, function* () {
             const dockerConfig = strategy.getDockerConfig();
             const dockerode = new dockerode_1.default(createDockerodeOptions(dockerConfig));
             logger_1.log.debug(`Testing Docker client strategy URI: ${dockerConfig.uri}`);
-            if (yield isDockerDaemonReachable(dockerode)) {
-                const host = yield resolveHost(dockerode, dockerConfig.uri);
-                logger_1.log.info(`Using Docker client strategy: ${strategy.getName()}, Docker host: ${host}`);
-                log_system_diagnostics_1.logSystemDiagnostics();
-                return { host, dockerode };
-            }
-            else {
-                logger_1.log.warn(`Docker client strategy ${strategy.getName()} is not reachable`);
-            }
+            // if (await isDockerDaemonReachable(dockerode)) {
+            const host = yield resolveHost(dockerode, dockerConfig.uri);
+            logger_1.log.info(`Using Docker client strategy: ${strategy.getName()}, Docker host: ${host}`);
+            log_system_diagnostics_1.logSystemDiagnostics();
+            return { host, dockerode };
+            // } else {
+            //   log.warn(`Docker client strategy ${strategy.getName()} is not reachable`);
+            // }
         }
     }
     throw new Error("No Docker client strategy found");
 });
 const createDockerodeOptions = (dockerConfig) => {
     const dockerOptions = {};
-    if (dockerConfig.isSocket) {
-        dockerOptions.socketPath = new url_1.URL(dockerConfig.uri).pathname;
+    if (dockerConfig.socketPath) {
+        dockerOptions.socketPath = dockerConfig.socketPath;
     }
     else {
-        dockerOptions.host = dockerConfig.uri;
+        const { protocol, hostname, port } = new url_1.URL(dockerConfig.uri);
+        // @ts-ignore
+        dockerOptions.protocol = protocol.slice(0, -1);
+        dockerOptions.host = hostname;
+        dockerOptions.port = port;
     }
     if (dockerConfig.ssl) {
         dockerOptions.ca = dockerConfig.ssl.ca;
@@ -61,13 +64,11 @@ const createDockerodeOptions = (dockerConfig) => {
     }
     return dockerOptions;
 };
-const isDockerDaemonReachable = (dockerode) => __awaiter(void 0, void 0, void 0, function* () { return (yield dockerode.ping()).toString() === "OK"; });
 class ConfigurationStrategy {
     getDockerConfig() {
         const { DOCKER_HOST, DOCKER_TLS_VERIFY, DOCKER_CERT_PATH } = process.env;
         return {
             uri: DOCKER_HOST,
-            isSocket: false,
             ssl: DOCKER_TLS_VERIFY === "1" && DOCKER_CERT_PATH !== undefined
                 ? {
                     ca: path_1.default.resolve(DOCKER_CERT_PATH, "ca.pem"),
@@ -88,7 +89,7 @@ class UnixSocketStrategy {
     getDockerConfig() {
         return {
             uri: "unix:///var/run/docker.sock",
-            isSocket: true,
+            socketPath: "/var/run/docker.sock",
         };
     }
     isApplicable() {
@@ -102,7 +103,7 @@ class NpipeSocketStrategy {
     getDockerConfig() {
         return {
             uri: "npipe:////./pipe/docker_engine",
-            isSocket: true,
+            socketPath: "//./pipe/docker_engine",
         };
     }
     isApplicable() {

package/dist/log-system-diagnostics.js

@@ -19,7 +19,7 @@ const logSystemDiagnostics = () => __awaiter(void 0, void 0, void 0, function* (
         docker: yield get_info_1.getDockerInfo(),
         dockerCompose: yield getDockerComposeInfo(),
     };
-    logger_1.log.debug(`System diagnostics: ${JSON.stringify(info, null, 2)}`);
+    logger_1.log.debug(`System diagnostics: ${JSON.stringify(info)}`);
 });
 exports.logSystemDiagnostics = logSystemDiagnostics;
 const getNodeInfo = () => {

package/package.json

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