Sync ops.md, update CLI --help output to be consistent in descriptions

Signed-off-by: Alex Rodriguez <alexrodriguez@ibm.com>
This commit is contained in:
Alex Rodriguez 2023-10-30 08:32:30 -07:00
parent 332fbd907e
commit 124d3a20a6
No known key found for this signature in database
GPG Key ID: 932AE96711B39534
4 changed files with 29 additions and 8 deletions

View File

@ -62,6 +62,11 @@ func init() {
if err := setRlimit(); err != nil { if err := setRlimit(); err != nil {
panic(err) panic(err)
} }
cli.HelpFlag = cli.BoolFlag{
Name: "help, h",
Usage: "Show help",
}
} }
type worker interface { type worker interface {

View File

@ -57,6 +57,14 @@ func init() {
cli.VersionPrinter = func(c *cli.Context) { cli.VersionPrinter = func(c *cli.Context) {
fmt.Println(c.App.Name, version.Package, c.App.Version, version.Revision) fmt.Println(c.App.Name, version.Package, c.App.Version, version.Revision)
} }
cli.VersionFlag = cli.BoolFlag{
Name: "version, v",
Usage: "Print the version",
}
cli.HelpFlag = cli.BoolFlag{
Name: "help, h",
Usage: "Show help",
}
} }
// App returns a *cli.App instance. // App returns a *cli.App instance.

View File

@ -55,6 +55,14 @@ func init() {
cli.VersionPrinter = func(c *cli.Context) { cli.VersionPrinter = func(c *cli.Context) {
fmt.Println(c.App.Name, version.Package, c.App.Version) fmt.Println(c.App.Name, version.Package, c.App.Version)
} }
cli.VersionFlag = cli.BoolFlag{
Name: "version, v",
Usage: "Print the version",
}
cli.HelpFlag = cli.BoolFlag{
Name: "help, h",
Usage: "Show help",
}
} }
// New returns a *cli.App instance. // New returns a *cli.App instance.

View File

@ -35,19 +35,19 @@ generate the default configuration for containerd. The output of that command
can be used and modified as necessary as a custom configuration. can be used and modified as necessary as a custom configuration.
COMMANDS: COMMANDS:
config information on the containerd config config Information on the containerd config
publish binary to publish events to containerd publish Binary to publish events to containerd
oci-hook provides a base for OCI runtime hooks to allow arguments to be injected. oci-hook Provides a base for OCI runtime hooks to allow arguments to be injected.
help, h Shows a list of commands or help for one command help, h Shows a list of commands or help for one command
GLOBAL OPTIONS: GLOBAL OPTIONS:
--config value, -c value path to the configuration file (default: "/etc/containerd/config.toml") --config value, -c value Path to the configuration file (default: "/etc/containerd/config.toml")
--log-level value, -l value set the logging level [trace, debug, info, warn, error, fatal, panic] --log-level value, -l value Set the logging level [trace, debug, info, warn, error, fatal, panic]
--address value, -a value address for containerd's GRPC server --address value, -a value Address for containerd's GRPC server
--root value containerd root directory --root value containerd root directory
--state value containerd state directory --state value containerd state directory
--help, -h show help --help, -h Show help
--version, -v print the version --version, -v Print the version
``` ```