Fix recreation of aliases/network config in Docker container attach

Previously we didn't touch 'NetworkMode' which meant that it retained
the name of the main network the container was using, and that meant
that it reconnected to that automatically, ignoring the subsequent
network connection call we made with the full settings.

We now connect all attached containers to 'none' initially, and then
manually reconnect them to the original networks with their full
settings, to preserve everything (especially aliases).

This change also ensures we wait for network setup to be complete, so
the container starts with this change entirely in place.

Author: pimterry

src/interceptors/docker/docker-commands.ts

@@ -191,10 +191,13 @@ function deriveContainerCreationConfigFromInspection(
 ): Docker.ContainerCreateOptions {
     return {
         ...containerDetails.Config,
-        HostConfig: containerDetails.HostConfig,
         name: containerDetails.Name,
         // You can't reconnect all networks at creation for >1 network.
-        // To simplify things, we just connect all networks after creation.
+        // To avoid issues, we just reconnect all networks after creation.
+        HostConfig: {
+            ...containerDetails.HostConfig,
+            NetworkMode: 'none'
+        },
         NetworkingConfig: {}
     };
 }
@@ -204,6 +207,11 @@ async function connectNetworks(
     containerId: string,
     networks: Docker.EndpointsConfig
 ) {
+    // At creation, we initially connect containers to 'none', and we have to
+    // undo that before we can connect to anything else. Note that this all
+    // happens before container startup, so this is invisible.
+    await docker.getNetwork('none').disconnect({ Container: containerId });
+
     await Promise.all(
         Object.keys(networks).map(networkName =>
             docker.getNetwork(networkName).connect({
@@ -268,7 +276,7 @@ export async function restartAndInjectContainer(
     );
 
     // Reconnect to all the previous container's networks:
-    connectNetworks(
+    await connectNetworks(
         docker,
         newContainer.id,
         containerDetails.NetworkSettings.Networks