diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-03 20:12:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 20:12:05 +0200 |
| commit | bba0a8be1a715fb0903ffc69abd5700a624d47e4 (patch) | |
| tree | 8fa07d2a1bc39fb1eac3151de45e5bfcfedcf8a3 /cmd/podman | |
| parent | cbfb4980ce7d9e6ed1ea769d0f42c52e1ad0bffa (diff) | |
| parent | 8153f299ad3b663f73257cbee58875da13dc8cf8 (diff) | |
| download | podman-bba0a8be1a715fb0903ffc69abd5700a624d47e4.tar.gz podman-bba0a8be1a715fb0903ffc69abd5700a624d47e4.tar.bz2 podman-bba0a8be1a715fb0903ffc69abd5700a624d47e4.zip | |
Merge pull request #6465 from rhatdan/remote
Add more Remote tests
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/containers/wait.go | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cmd/podman/containers/wait.go b/cmd/podman/containers/wait.go index 1f4d4159b..ca3883091 100644 --- a/cmd/podman/containers/wait.go +++ b/cmd/podman/containers/wait.go @@ -24,8 +24,7 @@ var ( Long: waitDescription, RunE: wait, Args: validate.IdOrLatestArgs, - Example: `podman wait --latest - podman wait --interval 5000 ctrID + Example: `podman wait --interval 5000 ctrID podman wait ctrID1 ctrID2`, } @@ -35,8 +34,7 @@ var ( Long: waitCommand.Long, RunE: waitCommand.RunE, Args: validate.IdOrLatestArgs, - Example: `podman container wait --latest - podman container wait --interval 5000 ctrID + Example: `podman container wait --interval 5000 ctrID podman container wait ctrID1 ctrID2`, } ) @@ -48,11 +46,9 @@ var ( func waitFlags(flags *pflag.FlagSet) { flags.DurationVarP(&waitOptions.Interval, "interval", "i", time.Duration(250), "Milliseconds to wait before polling for completion") - flags.BoolVarP(&waitOptions.Latest, "latest", "l", false, "Act on the latest container podman is aware of") flags.StringVar(&waitCondition, "condition", "stopped", "Condition to wait on") - if registry.IsRemote() { - // TODO: This is the same as V1. We could skip creating the flag altogether in V2... - _ = flags.MarkHidden("latest") + if !registry.IsRemote() { + flags.BoolVarP(&waitOptions.Latest, "latest", "l", false, "Act on the latest container podman is aware of") } } |