[proxy] do not weave attach containers in '--net=host|container:<name|id>'

This commit is contained in:
Paul Bellamy committed 2015-07-16 13:58:27 +01:00
1 parent 77bc56751b
commit 1132d26d47
5 files changed
+17 -4

No files matched your search

+1 -1
View File
@@ -30,7 +30,7 @@ func (i *createExecInterceptor) InterceptRequest(r *http.Request) error {
}
_, hasWeaveWait := container.Volumes["/w"]
cidrs, hasCIDRs := i.proxy.weaveCIDRsFromConfig(container.Config)
cidrs, hasCIDRs := i.proxy.weaveCIDRsFromConfig(container.Config, container.HostConfig)
if hasCIDRs && hasWeaveWait {
Info.Printf("Exec in container %s with WEAVE_CIDR \"%s\"", container.ID, strings.Join(cidrs, " "))
cmd := append(weaveWaitEntrypoint, "-s")