github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Remove urfave cli dep from shim

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-11-07 10:04:33 -05:00
parent a70b95b202
commit 13c7c3ef10
2 changed files with 78 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
linux/shim/client.go
View File

@@ -86,22 +86,22 @@ func WithStart(binary, address, daemonAddress, cgroup string, nonewns, debug boo
func newCommand(binary, daemonAddress string, nonewns, debug bool, config Config, socket *os.File) *exec.Cmd {
args := []string{
"--namespace", config.Namespace,
"--workdir", config.WorkDir,
"--address", daemonAddress,
"-namespace", config.Namespace,
"-workdir", config.WorkDir,
"-address", daemonAddress,
}
if config.Criu != "" {
args = append(args, "--criu-path", config.Criu)
args = append(args, "-criu-path", config.Criu)
}
if config.RuntimeRoot != "" {
args = append(args, "--runtime-root", config.RuntimeRoot)
args = append(args, "-runtime-root", config.RuntimeRoot)
}
if config.SystemdCgroup {
args = append(args, "--systemd-cgroup")
args = append(args, "-systemd-cgroup")
}
if debug {
args = append(args, "--debug")
args = append(args, "-debug")
}
cmd := exec.Command(binary, args...)