[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
@@ -46,7 +46,7 @@ func (i *createContainerInterceptor) InterceptRequest(r *http.Request) error {
return err
}
if cidrs, ok := i.proxy.weaveCIDRsFromConfig(container.Config); ok {
if cidrs, ok := i.proxy.weaveCIDRsFromConfig(container.Config, container.HostConfig); ok {
Info.Printf("Creating container with WEAVE_CIDR \"%s\"", strings.Join(cidrs, " "))
if container.HostConfig == nil {
container.HostConfig = &docker.HostConfig{}