Merge pull request #133 from rhatdan/docs
Cleanup help and add options to man page
This commit is contained in:
commit
78438e0ec6
2 changed files with 30 additions and 26 deletions
|
@ -34,6 +34,9 @@ func mergeConfig(config *server.Config, ctx *cli.Context) error {
|
||||||
if ctx.GlobalIsSet("conmon") {
|
if ctx.GlobalIsSet("conmon") {
|
||||||
config.Conmon = ctx.GlobalString("conmon")
|
config.Conmon = ctx.GlobalString("conmon")
|
||||||
}
|
}
|
||||||
|
if ctx.GlobalIsSet("containerdir") {
|
||||||
|
config.ContainerDir = ctx.GlobalString("containerdir")
|
||||||
|
}
|
||||||
if ctx.GlobalIsSet("pause") {
|
if ctx.GlobalIsSet("pause") {
|
||||||
config.Pause = ctx.GlobalString("pause")
|
config.Pause = ctx.GlobalString("pause")
|
||||||
}
|
}
|
||||||
|
@ -43,9 +46,6 @@ func mergeConfig(config *server.Config, ctx *cli.Context) error {
|
||||||
if ctx.GlobalIsSet("sandboxdir") {
|
if ctx.GlobalIsSet("sandboxdir") {
|
||||||
config.SandboxDir = ctx.GlobalString("sandboxdir")
|
config.SandboxDir = ctx.GlobalString("sandboxdir")
|
||||||
}
|
}
|
||||||
if ctx.GlobalIsSet("containerdir") {
|
|
||||||
config.ContainerDir = ctx.GlobalString("containerdir")
|
|
||||||
}
|
|
||||||
if ctx.GlobalIsSet("listen") {
|
if ctx.GlobalIsSet("listen") {
|
||||||
config.Listen = ctx.GlobalString("listen")
|
config.Listen = ctx.GlobalString("listen")
|
||||||
}
|
}
|
||||||
|
@ -77,37 +77,17 @@ func main() {
|
||||||
Name: "conmon",
|
Name: "conmon",
|
||||||
Usage: "path to the conmon executable",
|
Usage: "path to the conmon executable",
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
|
||||||
Name: "pause",
|
|
||||||
Usage: "path to the pause executable",
|
|
||||||
},
|
|
||||||
cli.StringFlag{
|
|
||||||
Name: "root",
|
|
||||||
Usage: "ocid root dir",
|
|
||||||
},
|
|
||||||
cli.StringFlag{
|
|
||||||
Name: "sandboxdir",
|
|
||||||
Usage: "ocid pod sandbox dir",
|
|
||||||
},
|
|
||||||
cli.StringFlag{
|
cli.StringFlag{
|
||||||
Name: "containerdir",
|
Name: "containerdir",
|
||||||
Usage: "ocid container dir",
|
Usage: "ocid container dir",
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
|
||||||
Name: "listen",
|
|
||||||
Usage: "path to ocid socket",
|
|
||||||
},
|
|
||||||
cli.StringFlag{
|
|
||||||
Name: "runtime",
|
|
||||||
Usage: "OCI runtime path",
|
|
||||||
},
|
|
||||||
cli.BoolFlag{
|
cli.BoolFlag{
|
||||||
Name: "debug",
|
Name: "debug",
|
||||||
Usage: "enable debug output for logging",
|
Usage: "enable debug output for logging",
|
||||||
},
|
},
|
||||||
cli.BoolFlag{
|
cli.StringFlag{
|
||||||
Name: "selinux",
|
Name: "listen",
|
||||||
Usage: "enable selinux support",
|
Usage: "path to ocid socket",
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
cli.StringFlag{
|
||||||
Name: "log",
|
Name: "log",
|
||||||
|
@ -119,6 +99,26 @@ func main() {
|
||||||
Value: "text",
|
Value: "text",
|
||||||
Usage: "set the format used by logs ('text' (default), or 'json')",
|
Usage: "set the format used by logs ('text' (default), or 'json')",
|
||||||
},
|
},
|
||||||
|
cli.StringFlag{
|
||||||
|
Name: "pause",
|
||||||
|
Usage: "path to the pause executable",
|
||||||
|
},
|
||||||
|
cli.StringFlag{
|
||||||
|
Name: "root",
|
||||||
|
Usage: "ocid root dir",
|
||||||
|
},
|
||||||
|
cli.StringFlag{
|
||||||
|
Name: "runtime",
|
||||||
|
Usage: "OCI runtime path",
|
||||||
|
},
|
||||||
|
cli.StringFlag{
|
||||||
|
Name: "sandboxdir",
|
||||||
|
Usage: "ocid pod sandbox dir",
|
||||||
|
},
|
||||||
|
cli.BoolFlag{
|
||||||
|
Name: "selinux",
|
||||||
|
Usage: "enable selinux support",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
app.Commands = []cli.Command{
|
app.Commands = []cli.Command{
|
||||||
|
|
|
@ -6,6 +6,7 @@ ocid - Enable OCI Kubernetes Container Runtime daemon
|
||||||
|
|
||||||
# SYNOPSIS
|
# SYNOPSIS
|
||||||
**ocid**
|
**ocid**
|
||||||
|
[**--config**=[*value*]]
|
||||||
[**--conmon**=[*value*]]
|
[**--conmon**=[*value*]]
|
||||||
[**--containerdir**=[*value*]]
|
[**--containerdir**=[*value*]]
|
||||||
[**--debug**]
|
[**--debug**]
|
||||||
|
@ -38,6 +39,9 @@ ocid is meant to provide an integration path between OCI conformant runtimes and
|
||||||
|
|
||||||
# GLOBAL OPTIONS
|
# GLOBAL OPTIONS
|
||||||
|
|
||||||
|
**--config**=""
|
||||||
|
path to configuration file
|
||||||
|
|
||||||
**--conmon**=""
|
**--conmon**=""
|
||||||
path to the conmon executable (default: "/usr/libexec/ocid/conmon")
|
path to the conmon executable (default: "/usr/libexec/ocid/conmon")
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue