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

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

Browse source 
builder: remove unused netnsRoot field in builder-next
This commit is contained in:
Tõnis Tiigi 2018-09-06 13:33:35 -07:00 committed by GitHub
commit 4842f7a867
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
builder/builder-next/builder.go
View file

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

2
builder/builder-next/controller.go
View file

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

5
builder/builder-next/executor_unix.go
View file

@ -19,9 +19,9 @@ import (
const networkName = "bridge" 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{ 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_HOST: network.NewHostProvider(),
pb.NetMode_NONE: network.NewNoneProvider(), pb.NetMode_NONE: network.NewNoneProvider(),
} }
@ -33,7 +33,6 @@ func newExecutor(root, netnsRoot string, net libnetwork.NetworkController) (exec
type bridgeProvider struct { type bridgeProvider struct {
libnetwork.NetworkController libnetwork.NetworkController
netnsRoot string
} }
func (p *bridgeProvider) New() (network.Namespace, error) { func (p *bridgeProvider) New() (network.Namespace, error) {

2
builder/builder-next/executor_windows.go
View file

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

1
cmd/dockerd/daemon.go
View file

@ -287,7 +287,6 @@ func newRouterOptions(config *config.Config, daemon *daemon.Daemon) (routerOptio
bk, err := buildkit.New(buildkit.Opt{ bk, err := buildkit.New(buildkit.Opt{
SessionManager: sm, SessionManager: sm,
Root: filepath.Join(config.Root, "buildkit"), Root: filepath.Join(config.Root, "buildkit"),
NetnsRoot: filepath.Join(config.ExecRoot, "netns"),
Dist: daemon.DistributionServices(), Dist: daemon.DistributionServices(),
NetworkController: daemon.NetworkController(), NetworkController: daemon.NetworkController(),
}) })