summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-02-05 04:41:41 -0500
committerGitHub <noreply@github.com>2021-02-05 04:41:41 -0500
commit42d4652fed759904bb51a5d3420724dc25009494 (patch)
treee75db0e16733dfbf688168293042e972f2b1c1c0 /cmd/podman
parent4a0ae01261f2aa90c37d95b7cc4415682e96dead (diff)
parent05444cb2ccf29515e6cb8f2711c64213b7cb3325 (diff)
downloadpodman-42d4652fed759904bb51a5d3420724dc25009494.tar.gz
podman-42d4652fed759904bb51a5d3420724dc25009494.tar.bz2
podman-42d4652fed759904bb51a5d3420724dc25009494.zip
Merge pull request #9048 from matejvasek/apiv2_wait
Fix Docker APIv2 container wait endpoint
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/containers/wait.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/containers/wait.go b/cmd/podman/containers/wait.go
index 14d660678..7a531b98a 100644
--- a/cmd/podman/containers/wait.go
+++ b/cmd/podman/containers/wait.go
@@ -95,10 +95,11 @@ func wait(cmd *cobra.Command, args []string) error {
return errors.New("--latest and containers cannot be used together")
}
- waitOptions.Condition, err = define.StringToContainerStatus(waitCondition)
+ cond, err := define.StringToContainerStatus(waitCondition)
if err != nil {
return err
}
+ waitOptions.Condition = []define.ContainerStatus{cond}
responses, err := registry.ContainerEngine().ContainerWait(context.Background(), args, waitOptions)
if err != nil {