GitList

Browse code

Merge pull request #37738 from tiborvass/remove-unused-field-in-builder

builder: remove unused netnsRoot field in builder-next

Tõnis Tiigi authored on 2018/09/07 05:33:35
Showing 5 changed files

builder/builder-next/builder.go index aff43f6..0016d9e 100644
builder/builder-next/controller.go index df0f3d4..f50dea3 100644
builder/builder-next/executor_unix.go index f72a27f..808889a 100644
builder/builder-next/executor_windows.go index f19bf18..e3b5aba 100644
cmd/dockerd/daemon.go index 8ad3725..01da5de 100644

@@ -52,7 +52,6 @@ func init() {
                      type Opt struct {
                      	SessionManager    *session.Manager
                      	Root              string
                     -	NetnsRoot         string
                      	Dist              images.DistributionServices
                      	NetworkController libnetwork.NetworkController
+                     }

builder/builder-next/controller.go

History View file @ 4842f7a

@@ -102,7 +102,7 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 		return nil, err
 	}
 
-	exec, err := newExecutor(root, opt.NetnsRoot, opt.NetworkController)
+	exec, err := newExecutor(root, opt.NetworkController)
 	if err != nil {
 		return nil, err
 	}

builder/builder-next/executor_unix.go

History View file @ 4842f7a

@@ -19,9 +19,9 @@ import (
                      const networkName = "bridge"
                     -func newExecutor(root, netnsRoot string, net libnetwork.NetworkController) (executor.Executor, error) {
                     +func newExecutor(root string, net libnetwork.NetworkController) (executor.Executor, error) {
                      	networkProviders := map[pb.NetMode]network.Provider{
                     -		pb.NetMode_UNSET: &bridgeProvider{NetworkController: net, netnsRoot: netnsRoot},
                     +		pb.NetMode_UNSET: &bridgeProvider{NetworkController: net},
                      		pb.NetMode_HOST:  network.NewHostProvider(),
                      		pb.NetMode_NONE:  network.NewNoneProvider(),
+                     	}
@@ -33,7 +33,6 @@ func newExecutor(root, netnsRoot string, net libnetwork.NetworkController) (exec
                      type bridgeProvider struct {
                      	libnetwork.NetworkController
                     -	netnsRoot string
+                     }
                      func (p *bridgeProvider) New() (network.Namespace, error) {

builder/builder-next/executor_windows.go

History View file @ 4842f7a

@@ -10,7 +10,7 @@ import (
 	"github.com/moby/buildkit/executor"
 )
 
-func newExecutor(_, _ string, _ libnetwork.NetworkController) (executor.Executor, error) {
+func newExecutor(_ string, _ libnetwork.NetworkController) (executor.Executor, error) {
 	return &winExecutor{}, nil
 }
 

cmd/dockerd/daemon.go

History View file @ 4842f7a

@@ -287,7 +287,6 @@ 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(),
                      	})

...	...	@@ -102,7 +102,7 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
102	102	return nil, err
103	103	}
104	104
105		- exec, err := newExecutor(root, opt.NetnsRoot, opt.NetworkController)
	105	+ exec, err := newExecutor(root, opt.NetworkController)
106	106	if err != nil {
107	107	return nil, err
108	108	}

...	...	@@ -10,7 +10,7 @@ import (
10	10	"github.com/moby/buildkit/executor"
11	11	)
12	12
13		-func newExecutor(_, _ string, _ libnetwork.NetworkController) (executor.Executor, error) {
	13	+func newExecutor(_ string, _ libnetwork.NetworkController) (executor.Executor, error) {
14	14	return &winExecutor{}, nil
15	15	}
16	16