OSSInnovation
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #933 from zhaoleidd/workaround_for_ps 

cli: Workaround for ps's argument
This commit is contained in:
Qiang Huang 2016-08-27 10:57:17 +08:00 committed by GitHub
parent 9b53b362e2 cdb552d341
commit dc9be6cab1
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/runc-ps.8.md
View File

@ -2,7 +2,7 @@
runc ps - ps displays the processes running inside a container runc ps - ps displays the processes running inside a container
# SYNOPSIS # SYNOPSIS
runc ps [command options] <container-id> [ps options] runc ps [command options] <container-id> [-- ps options]
# OPTIONS # OPTIONS
--format value, -f value select one of: table(default) or json --format value, -f value select one of: table(default) or json

19
ps.go
View File

@ -16,7 +16,7 @@ import (
var psCommand = cli.Command{ var psCommand = cli.Command{
Name: "ps", Name: "ps",
Usage: "ps displays the processes running inside a container", Usage: "ps displays the processes running inside a container",
ArgsUsage: `<container-id> [ps options]`, ArgsUsage: `<container-id> [-- ps options]`,
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.StringFlag{ cli.StringFlag{
Name: "format, f", Name: "format, f",
@ -42,12 +42,21 @@ var psCommand = cli.Command{
return nil return nil
} }
psArgs := context.Args().Get(1) // [1:] is to remove command name, ex:
if psArgs == "" { // context.Args(): [containet_id ps_arg1 ps_arg2 ...]
psArgs = "-ef" // psArgs: [ps_arg1 ps_arg2 ...]
//
psArgs := context.Args()[1:]
if len(psArgs) > 0 && psArgs[0] == "--" {
psArgs = psArgs[1:]
} }
output, err := exec.Command("ps", strings.Split(psArgs, " ")...).Output() if len(psArgs) == 0 {
psArgs = []string{"-ef"}
}
output, err := exec.Command("ps", psArgs...).Output()
if err != nil { if err != nil {
return err return err
} }