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

ingress sandbox hosts and resolve.conf files location didn't respect the custom daemon root directory

Browse source 
Signed-off-by: Krasi Georgiev <krasi@vip-consult.solutions>
This commit is contained in:
Krasi Georgiev 2017-03-10 13:28:14 +02:00 • committed by Krasi Georgiev
parent 0141a37163
commit 421c089e98
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libnetwork/controller.go
View file

@ -47,6 +47,7 @@ import (
"container/heap" "container/heap"
"fmt" "fmt"
"net" "net"
"path/filepath"
"strings" "strings"
"sync" "sync"
"time" "time"
@ -957,6 +958,8 @@ func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (s
if sb.ingress { if sb.ingress {
c.ingressSandbox = sb 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" sb.id = "ingress_sbox"
} }
c.Unlock() c.Unlock()