Merge pull request #16912 from vrothberg/fix-16875

events: support "die" filter

docs/source/markdown/podman-events.1.md

@@ -26,6 +26,7 @@ The *container* event type will report the follow statuses:
  * commit
  * connect
  * create
+ * died
  * disconnect
  * exec
  * exec_died
@@ -91,7 +92,7 @@ filters are supported:
  * volume=name_or_id
  * type=event_type (described above)
 
-In the case where an ID is used, the ID may be in its full or shortened form.
+In the case where an ID is used, the ID may be in its full or shortened form.  The "die" event is mapped to "died" for Docker compatibility.
 
 #### **--format**
 

libpod/events/filters.go

@@ -21,6 +21,9 @@ func generateEventFilter(filter, filterValue string) (func(e *Event) bool, error
 			return strings.HasPrefix(e.ID, filterValue)
 		}, nil
 	case "EVENT", "STATUS":
+		if filterValue == "die" { // Docker compat
+			filterValue = "died"
+		}
 		return func(e *Event) bool {
 			return string(e.Status) == filterValue
 		}, nil

test/system/090-events.bats

@@ -291,3 +291,15 @@ EOF
     _events_container_create_inspect_data journald
     _events_container_create_inspect_data file
 }
+
+@test "events - docker compat" {
+    local cname=c$(random_string 15)
+    t0=$(date --iso-8601=seconds)
+    run_podman run --name=$cname --rm $IMAGE true
+    run_podman events \
+        --since="$t0"           \
+        --filter=status=$cname  \
+        --filter=status=die     \
+        --stream=false
+    is "${lines[0]}" ".* container died .* (image=$IMAGE, name=$cname, .*)"
+}