[proxy] adding log message for ignored containers

proxy/proxy.go

@@ -116,9 +116,7 @@ func (proxy *Proxy) ListenAndServe() error {
 }
 
 func (proxy *Proxy) weaveCIDRsFromConfig(config *docker.Config, hostConfig *docker.HostConfig) ([]string, bool) {
-	if hostConfig != nil &&
-		hostConfig.NetworkMode != "" &&
-		hostConfig.NetworkMode != "bridge" {
+	if !validNetworkMode(hostConfig) {
 		return nil, false
 	}
 	for _, e := range config.Env {
@@ -131,3 +129,14 @@ func (proxy *Proxy) weaveCIDRsFromConfig(config *docker.Config, hostConfig *dock
 	}
 	return nil, !proxy.NoDefaultIPAM
 }
+
+func validNetworkMode(hostConfig *docker.HostConfig) bool {
+	return networkMode(hostConfig) == "bridge"
+}
+
+func networkMode(hostConfig *docker.HostConfig) string {
+	if hostConfig == nil || hostConfig.NetworkMode == "" {
+		return "bridge"
+	}
+	return hostConfig.NetworkMode
+}

proxy/start_container_interceptor.go

@@ -21,6 +21,10 @@ func (i *startContainerInterceptor) InterceptResponse(r *http.Response) error {
 		return err
 	}
 
+	if !validNetworkMode(container.HostConfig) {
+		Debug.Printf("Ignoring container %s with --net=%s", container.ID, networkMode(container.HostConfig))
+		return nil
+	}
 	cidrs, ok := i.proxy.weaveCIDRsFromConfig(container.Config, container.HostConfig)
 	if !ok {
 		Debug.Print("No Weave CIDR, ignoring")