summaryrefslogtreecommitdiff
path: root/cmd/podmanV2/pods/stop.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-03-31 16:32:59 +0200
committerGitHub <noreply@github.com>2020-03-31 16:32:59 +0200
commit4e3010d4e761fcb3d6de3b38cac1dc5b4371b129 (patch)
tree5f5a6a305536a7fa0c67cb3e10cd91da5c997223 /cmd/podmanV2/pods/stop.go
parent7d4ab3fd8f48c7ded1a226f148e3677a1122c657 (diff)
parent3449b27cd1743a1353ea8c4503eec5d126d04b0d (diff)
downloadpodman-4e3010d4e761fcb3d6de3b38cac1dc5b4371b129.tar.gz
podman-4e3010d4e761fcb3d6de3b38cac1dc5b4371b129.tar.bz2
podman-4e3010d4e761fcb3d6de3b38cac1dc5b4371b129.zip
Merge pull request #5681 from rhatdan/timeout
Switch to using --time as opposed to --timeout to better match Docker.
Diffstat (limited to 'cmd/podmanV2/pods/stop.go')
-rw-r--r--cmd/podmanV2/pods/stop.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/cmd/podmanV2/pods/stop.go b/cmd/podmanV2/pods/stop.go
index 2b61850e2..403c7d95d 100644
--- a/cmd/podmanV2/pods/stop.go
+++ b/cmd/podmanV2/pods/stop.go
@@ -26,7 +26,7 @@ var (
},
Example: `podman pod stop mywebserverpod
podman pod stop --latest
- podman pod stop --timeout 0 490eb 3557fb`,
+ podman pod stop --time 0 490eb 3557fb`,
}
)
@@ -47,19 +47,20 @@ func init() {
flags.BoolVarP(&stopOptions.All, "all", "a", false, "Stop all running pods")
flags.BoolVarP(&stopOptions.Ignore, "ignore", "i", false, "Ignore errors when a specified pod is missing")
flags.BoolVarP(&stopOptions.Latest, "latest", "l", false, "Stop the latest pod podman is aware of")
- flags.UintVarP(&timeout, "timeout", "t", 0, "Seconds to wait for pod stop before killing the container")
+ flags.UintVarP(&timeout, "time", "t", 0, "Seconds to wait for pod stop before killing the container")
if registry.IsRemote() {
_ = flags.MarkHidden("latest")
_ = flags.MarkHidden("ignore")
}
+ flags.SetNormalizeFunc(utils.AliasFlags)
}
func stop(cmd *cobra.Command, args []string) error {
var (
errs utils.OutputErrors
)
- if cmd.Flag("timeout").Changed {
+ if cmd.Flag("time").Changed {
stopOptions.Timeout = int(timeout)
}
responses, err := registry.ContainerEngine().PodStop(context.Background(), args, stopOptions)