Merge pull request #2148 from weaveworks/issues/2146-cni-sock

Bind-mount the docker socket for CNI plugin

Fixes #2146

plugin/ipam/cni.go

@@ -27,6 +27,9 @@ func (i *Ipam) Allocate(args *skel.CmdArgs) (*types.Result, error) {
 		conf = &ipamConf{}
 	}
 	containerID := args.ContainerID
+	if containerID == "" {
+		return nil, fmt.Errorf("Weave CNI Allocate: blank container name")
+	}
 	var ipnet *net.IPNet
 
 	if conf.Subnet == "" {