Log the detected Docker address we use

Author: pimterry

src/interceptors/docker/docker-interception-services.ts

@@ -4,6 +4,7 @@ import { ProxySettingCallback } from 'mockttp';
 import { logError } from '../../error-tracking';
 import { addShutdownHandler } from '../../shutdown';
 
+import { getDockerAddress } from './docker-utils';
 import { DOCKER_BUILD_LABEL } from './docker-build-injection';
 import { DOCKER_CONTAINER_LABEL } from './docker-commands';
 
@@ -76,9 +77,16 @@ export async function startDockerInterceptionServices(
     }
 
     // Log if Docker was not available at proxy start, and why, for debugging later:
-    isDockerAvailable({ logError: true }).then((isAvailable) => {
-        if (isAvailable) console.log('Connected to Docker');
-        // logError will log the specific not-available error, if this failed
+    isDockerAvailable({ logError: true }).then(async (isAvailable) => {
+        if (isAvailable) {
+            const dockerAddress = await getDockerAddress(new Docker());
+            console.log(`Connected to Docker at ${
+                'socketPath' in dockerAddress
+                ? dockerAddress.socketPath
+                : `tcp://${dockerAddress.host}:${dockerAddress.port}`
+            }`);
+        }
+        // logError:true will log the specific not-available error, if this failed
     });
 
     const networkMonitor = monitorDockerNetworkAliases(proxyPort);

src/interceptors/docker/docker-proxy.ts

@@ -14,6 +14,7 @@ import { streamToBuffer } from '../../util/stream';
 import { logError } from '../../error-tracking';
 import { addShutdownHandler } from '../../shutdown';
 
+import { getDockerAddress } from './docker-utils';
 import {
     isInterceptedContainer,
     transformContainerCreationConfig
@@ -76,18 +77,7 @@ async function createDockerProxy(
 ) {
     const docker = new Dockerode();
 
-    // Hacky logic to reuse docker-modem's internal env + OS parsing logic to
-    // work out where the local Docker host is:
-    const modem = docker.modem as any as ({
-        getSocketPath(): undefined | Promise<string>;
-        host: string;
-        port: number;
-    });
-
-    const modemSocketPath = await modem.getSocketPath();
-    const dockerHostOptions = modemSocketPath
-        ? { socketPath: modemSocketPath }
-        : { host: modem.host, port: modem.port };
+    const dockerHostOptions = await getDockerAddress(docker);
 
     const agent = new http.Agent({ keepAlive: true });
 

src/interceptors/docker/docker-utils.ts

@@ -15,4 +15,22 @@ export const waitForDockerStream = (
 
         resolve();
     });
-});
+});
+
+export const getDockerAddress = async (docker: Docker): Promise<
+    | { socketPath: string }
+    | { host: string, port: number }
+> => {
+    // Hacky logic to reuse docker-modem's internal env + OS parsing logic to
+    // work out where the local Docker host is:
+    const modem = docker.modem as any as ({
+        getSocketPath(): undefined | Promise<string>;
+        host: string;
+        port: number;
+    });
+
+    const modemSocketPath = await modem.getSocketPath();
+    return modemSocketPath
+        ? { socketPath: modemSocketPath }
+        : { host: modem.host, port: modem.port };
+}