builder: fix bridge networking when using buildkit

Signed-off-by: Tibor Vass <tibor@docker.com> (cherry picked from commit dc7e472db986fa3c07806f56e82db756c47567fb) Signed-off-by: Tibor Vass <tibor@docker.com> Upstream-commit: 1d531ff64f99e07ac8733894416de8212a6c7278 Component: engine
2018-08-23 05:32:51 +00:00
parent b1b684bc76
commit cb322aa233
11 changed files with 146 additions and 162 deletions
@@ -288,6 +288,7 @@ func newRouterOptions(config *config.Config, daemon *daemon.Daemon) (routerOptio
 	bk, err := buildkit.New(buildkit.Opt{
 		SessionManager:    sm,
 		Root:              filepath.Join(config.Root, "buildkit"),
+		NetnsRoot:         filepath.Join(config.ExecRoot, "netns"),
 		Dist:              daemon.DistributionServices(),
 		NetworkController: daemon.NetworkController(),
 	})