1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Vendoring Libnetwork library

- adding conntrack flush fix for docker/docker#8795

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
This commit is contained in:
Flavio Crisciani 2017-04-10 17:11:18 -07:00
parent e88bc31afa
commit c16eb5f88a
No known key found for this signature in database
GPG key ID: 28CAFCE754CF3A48
12 changed files with 170 additions and 15 deletions

View file

@ -47,6 +47,7 @@ import (
"container/heap"
"fmt"
"net"
"path/filepath"
"strings"
"sync"
"time"
@ -979,6 +980,8 @@ func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (s
if sb.ingress {
c.ingressSandbox = sb
sb.config.hostsPath = filepath.Join(c.cfg.Daemon.DataDir, "/network/files/hosts")
sb.config.resolvConfPath = filepath.Join(c.cfg.Daemon.DataDir, "/network/files/resolv.conf")
sb.id = "ingress_sbox"
}
c.Unlock()