summaryrefslogtreecommitdiff
path: root/cmd/podman/commands.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-02-06 23:03:21 +0100
committerGitHub <noreply@github.com>2019-02-06 23:03:21 +0100
commitc7350721bff99fb4455a0ddb51e7155e04a9283d (patch)
tree9c5dd9778e8cdd8fc9f0b5880c3fdb7f9a615d61 /cmd/podman/commands.go
parent72fcfb7e8624a4f61761d10f3bd80d9c6da3e31e (diff)
parent0830bb9035a9ee35810e358a32b8011da2dc1be6 (diff)
downloadpodman-c7350721bff99fb4455a0ddb51e7155e04a9283d.tar.gz
podman-c7350721bff99fb4455a0ddb51e7155e04a9283d.tar.bz2
podman-c7350721bff99fb4455a0ddb51e7155e04a9283d.zip
Merge pull request #2252 from rhatdan/system
Add podman system prune and info commands
Diffstat (limited to 'cmd/podman/commands.go')
-rw-r--r--cmd/podman/commands.go30
1 files changed, 17 insertions, 13 deletions
diff --git a/cmd/podman/commands.go b/cmd/podman/commands.go
index d8fdd556f..57126da4a 100644
--- a/cmd/podman/commands.go
+++ b/cmd/podman/commands.go
@@ -53,6 +53,10 @@ func getImageSubCommands() []cli.Command {
}
}
+func getSystemSubCommands() []cli.Command {
+ return []cli.Command{infoCommand}
+}
+
func getContainerSubCommands() []cli.Command {
return []cli.Command{
attachCommand,
@@ -91,58 +95,58 @@ func getMainAppFlags() []cli.Flag {
return []cli.Flag{
cli.StringFlag{
Name: "cgroup-manager",
- Usage: "cgroup manager to use (cgroupfs or systemd, default systemd)",
+ Usage: "Cgroup manager to use (cgroupfs or systemd, default systemd)",
},
cli.StringFlag{
Name: "cni-config-dir",
- Usage: "path of the configuration directory for CNI networks",
+ Usage: "Path of the configuration directory for CNI networks",
},
cli.StringFlag{
Name: "conmon",
- Usage: "path of the conmon binary",
+ Usage: "Path of the conmon binary",
},
cli.StringFlag{
Name: "default-mounts-file",
- Usage: "path to default mounts file",
+ Usage: "Path to default mounts file",
Hidden: true,
},
cli.StringSliceFlag{
Name: "hooks-dir",
- Usage: "set the OCI hooks directory path (may be set multiple times)",
+ Usage: "Set the OCI hooks directory path (may be set multiple times)",
},
cli.IntFlag{
Name: "max-workers",
- Usage: "the maximum number of workers for parallel operations",
+ Usage: "The maximum number of workers for parallel operations",
Hidden: true,
},
cli.StringFlag{
Name: "namespace",
- Usage: "set the libpod namespace, used to create separate views of the containers and pods on the system",
+ Usage: "Set the libpod namespace, used to create separate views of the containers and pods on the system",
Value: "",
},
cli.StringFlag{
Name: "root",
- Usage: "path to the root directory in which data, including images, is stored",
+ Usage: "Path to the root directory in which data, including images, is stored",
},
cli.StringFlag{
Name: "runroot",
- Usage: "path to the 'run directory' where all state information is stored",
+ Usage: "Path to the 'run directory' where all state information is stored",
},
cli.StringFlag{
Name: "runtime",
- Usage: "path to the OCI-compatible binary used to run containers, default is /usr/bin/runc",
+ Usage: "Path to the OCI-compatible binary used to run containers, default is /usr/bin/runc",
},
cli.StringFlag{
Name: "storage-driver, s",
- Usage: "select which storage driver is used to manage storage of images and containers (default is overlay)",
+ Usage: "Select which storage driver is used to manage storage of images and containers (default is overlay)",
},
cli.StringSliceFlag{
Name: "storage-opt",
- Usage: "used to pass an option to the storage driver",
+ Usage: "Used to pass an option to the storage driver",
},
cli.BoolFlag{
Name: "syslog",
- Usage: "output logging information to syslog as well as the console",
+ Usage: "Output logging information to syslog as well as the console",
},
}
}