diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-29 07:09:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-29 07:09:12 -0400 |
| commit | e7e97956b4a0ab66e1f1f2b453745b38d21f0703 (patch) | |
| tree | f082f174d1b01217b6c021721bc6e1a0a5d62e97 | |
| parent | 386b7f94f30ebb67e0073e0d31a9f203f0ac6db7 (diff) | |
| parent | 92371d63827465bbb723af822e4d6cd1da1a07f3 (diff) | |
| download | podman-e7e97956b4a0ab66e1f1f2b453745b38d21f0703.tar.gz podman-e7e97956b4a0ab66e1f1f2b453745b38d21f0703.tar.bz2 podman-e7e97956b4a0ab66e1f1f2b453745b38d21f0703.zip | |
Merge pull request #10171 from rhatdan/events
Docker returns 'die' status rather then 'died' status
| -rw-r--r-- | pkg/api/handlers/compat/events.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/api/handlers/compat/events.go b/pkg/api/handlers/compat/events.go index dd0a9e7a9..405e616c5 100644 --- a/pkg/api/handlers/compat/events.go +++ b/pkg/api/handlers/compat/events.go @@ -89,6 +89,10 @@ func GetEvents(w http.ResponseWriter, r *http.Request) { } e := entities.ConvertToEntitiesEvent(*evt) + if !utils.IsLibpodRequest(r) && e.Status == "died" { + e.Status = "die" + } + if err := coder.Encode(e); err != nil { logrus.Errorf("unable to write json: %q", err) } |