Revert "Use a custom hostname for Docker interception"

This reverts commit 08020b0.

This breaks interception on Windows (and presumably Mac) because
host.docker.internal is used as the target IP for the host mapping, and
that's not an IP. We could use host-gateway, but that's not widely
supported yet (Engine 20.10/API 1.41 only). Only a minor benefit, so
just rolling this back for now, so we can use host.docker.internal
everywhere and get maximum easy compatibility in the short term.

Author: pimterry

src/interceptors/docker/docker-build-injection.ts

@@ -13,7 +13,7 @@ import {
     OVERRIDES_DIR
 } from '../terminal/terminal-env-overrides';
 import { getDeferred } from '../../util/promise';
-import { HTTP_TOOLKIT_DOCKER_HOSTNAME } from './docker-commands';
+import { DOCKER_HOST_HOSTNAME } from './docker-commands';
 
 const HTTP_TOOLKIT_INJECTED_PATH = '/http-toolkit-injections';
 const HTTP_TOOLKIT_INJECTED_OVERRIDES_PATH = path.posix.join(HTTP_TOOLKIT_INJECTED_PATH, 'overrides');
@@ -46,7 +46,7 @@ export function injectIntoBuildStream(
             { certPath: HTTP_TOOLKIT_INJECTED_CA_PATH },
             'runtime-inherit', // Dockerfile commands can reference vars directly
             {
-                httpToolkitIp: HTTP_TOOLKIT_DOCKER_HOSTNAME,
+                httpToolkitIp: DOCKER_HOST_HOSTNAME,
                 overridePath: HTTP_TOOLKIT_INJECTED_OVERRIDES_PATH,
                 targetPlatform: 'linux'
             }

src/interceptors/docker/docker-commands.ts

@@ -31,7 +31,7 @@ const HTTP_TOOLKIT_INJECTED_CA_PATH = path.posix.join(HTTP_TOOLKIT_INJECTED_PATH
  *
  * On Linux this is _not_ supported, so we add it ourselves with (--add-host).
  */
-export const HTTP_TOOLKIT_DOCKER_HOSTNAME = "http-toolkit-host.docker.internal";
+export const DOCKER_HOST_HOSTNAME = "host.docker.internal";
 
 /**
  * To make the above hostname work on Linux, where it's not supported by default, we need to map it to the
@@ -41,7 +41,7 @@ export const getDockerHostIp = (platform: typeof process.platform, dockerVersion
     if (platform !== 'linux') {
         // On non-linux platforms this method isn't necessary - host.docker.internal is always supported
         // so we can just use that.
-        return "host.docker.internal";
+        return DOCKER_HOST_HOSTNAME;
     } else if (dockerVersion &&
         semver.satisfies(semver.coerce(dockerVersion)?.version ?? '0.0.0', '>=1.21')
     ) {
@@ -162,11 +162,17 @@ export function transformContainerCreationConfig(
             }
             : {}
         ),
-        ExtraHosts: [
-            `${HTTP_TOOLKIT_DOCKER_HOSTNAME}:${proxyHost}`,
-            // Seems that first host wins conflicts, so we go before existing values
-            ...(currentConfig.HostConfig?.ExtraHosts ?? [])
-        ]
+        ...(process.platform === 'linux'
+            // On Linux only, we need to add an explicit host to make host.docker.internal work:
+            ? {
+                ExtraHosts: [
+                    `${DOCKER_HOST_HOSTNAME}:${proxyHost}`,
+                    // Seems that first host wins conflicts, so we go before existing values
+                    ...(currentConfig.HostConfig?.ExtraHosts ?? [])
+                ]
+            }
+            : {}
+        )
     };
 
     // Extend that config, injecting our custom overrides:
@@ -181,7 +187,7 @@ export function transformContainerCreationConfig(
                     { certPath: HTTP_TOOLKIT_INJECTED_CA_PATH },
                     envArrayToObject(currentConfig.Env),
                     {
-                        httpToolkitIp: HTTP_TOOLKIT_DOCKER_HOSTNAME,
+                        httpToolkitIp: DOCKER_HOST_HOSTNAME,
                         overridePath: HTTP_TOOLKIT_INJECTED_OVERRIDES_PATH,
                         targetPlatform: 'linux'
                     }

src/interceptors/docker/docker-proxy.ts

@@ -17,7 +17,7 @@ import { addShutdownHandler } from '../../shutdown';
 import {
     isInterceptedContainer,
     transformContainerCreationConfig,
-    HTTP_TOOLKIT_DOCKER_HOSTNAME,
+    DOCKER_HOST_HOSTNAME,
     getDockerHostIp
 } from './docker-commands';
 import { injectIntoBuildStream, getBuildOutputPipeline } from './docker-build-injection';
@@ -247,7 +247,7 @@ async function createDockerProxy(proxyPort: number, httpsConfig: { certPath: str
             if (process.platform === 'linux') {
                 reqUrl.searchParams.append(
                     'extrahosts',
-                    `${HTTP_TOOLKIT_DOCKER_HOSTNAME}:${getDockerHostIp(process.platform, dockerVersion)}`
+                    `${DOCKER_HOST_HOSTNAME}:${getDockerHostIp(process.platform, dockerVersion)}`
                 );
                 req.url = reqUrl.toString();
             }