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 #40187 from SamWhited/remove_global_args

Browse source 
Remove unused GlobalFlags
This commit is contained in:
Akihiro Suda 2019-11-07 11:13:27 +09:00 • committed by GitHub
commit 65523469c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
testutil/daemon/daemon.go
View file

@ -57,7 +57,6 @@ type clientConfig struct {
// Daemon represents a Docker daemon for the testing framework
type Daemon struct {
GlobalFlags []string
Root string
Folder string
Wait chan error
@ -256,17 +255,17 @@ func (d *Daemon) StartWithLogFile(out *os.File, providedArgs ...string) error {
d.pidFile = filepath.Join(d.Folder, "docker.pid")
}
d.args = append(d.GlobalFlags, "--data-root", d.Root)
if d.containerdSocket != "" {
d.args = append(d.args, "--containerd", d.containerdSocket)
}
d.args = append(d.args,
d.args = []string{
"--data-root", d.Root,
"--exec-root", d.execRoot,
"--pidfile", d.pidFile,
fmt.Sprintf("--userland-proxy=%t", d.userlandProxy),
"--containerd-namespace", d.id,
"--containerd-plugins-namespace", d.id+"p",
)
"--containerd-plugins-namespace", d.id + "p",
}
if d.containerdSocket != "" {
d.args = append(d.args, "--containerd", d.containerdSocket)
}
if d.defaultCgroupNamespaceMode != "" {
d.args = append(d.args, "--default-cgroupns-mode", d.defaultCgroupNamespaceMode)