From 4961e8368642c6ea6ac78f5cc9b7ab77ecae6da7 Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Wed, 12 Aug 2015 14:02:36 +0100 Subject: [PATCH] [proxy] support new docker 1.8 --net="default" --- proxy/proxy.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/proxy/proxy.go b/proxy/proxy.go index 5a421538..83664800 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -25,9 +25,8 @@ var ( containerStartRegexp = regexp.MustCompile("^(/v[0-9\\.]*)?/containers/[^/]*/(re)?start$") execCreateRegexp = regexp.MustCompile("^(/v[0-9\\.]*)?/containers/[^/]*/exec$") - ErrInvalidNetworkMode = errors.New("--net option") - ErrWeaveCIDRNone = errors.New("WEAVE_CIDR=none") - ErrNoDefaultIPAM = errors.New("--no-default-ipam option") + ErrWeaveCIDRNone = errors.New("WEAVE_CIDR=none") + ErrNoDefaultIPAM = errors.New("--no-default-ipam option") ) type Proxy struct { @@ -152,8 +151,9 @@ func (proxy *Proxy) ListenAndServe() error { func (proxy *Proxy) weaveCIDRsFromConfig(config *docker.Config, hostConfig *docker.HostConfig) ([]string, error) { if hostConfig != nil && hostConfig.NetworkMode != "" && + hostConfig.NetworkMode != "default" && hostConfig.NetworkMode != "bridge" { - return nil, ErrInvalidNetworkMode + return nil, fmt.Errorf("--net option: %q", hostConfig.NetworkMode) } for _, e := range config.Env { if strings.HasPrefix(e, "WEAVE_CIDR=") {