diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-05 04:41:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-05 04:41:41 -0500 |
| commit | 42d4652fed759904bb51a5d3420724dc25009494 (patch) | |
| tree | e75db0e16733dfbf688168293042e972f2b1c1c0 /cmd | |
| parent | 4a0ae01261f2aa90c37d95b7cc4415682e96dead (diff) | |
| parent | 05444cb2ccf29515e6cb8f2711c64213b7cb3325 (diff) | |
| download | podman-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')
| -rw-r--r-- | cmd/podman/containers/wait.go | 3 |
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 { |