Merge pull request #10561 from vrothberg/fix-remote-events-label

remote events: support labels

1 files changed, 20 insertions, 8 deletions

diff --git a/pkg/domain/entities/events.go b/pkg/domain/entities/events.go
index 930ca53ae..5e7cc9ad1 100644
--- a/pkg/domain/entities/events.go
+++ b/pkg/domain/entities/events.go
@@ -30,29 +30,41 @@ func ConvertToLibpodEvent(e Event) *libpodEvents.Event {
 	if err != nil {
 		return nil
 	}
+	image := e.Actor.Attributes["image"]
+	name := e.Actor.Attributes["name"]
+	details := e.Actor.Attributes
+	delete(details, "image")
+	delete(details, "name")
+	delete(details, "containerExitCode")
 	return &libpodEvents.Event{
 		ContainerExitCode: exitCode,
 		ID:                e.Actor.ID,
-		Image:             e.Actor.Attributes["image"],
-		Name:              e.Actor.Attributes["name"],
+		Image:             image,
+		Name:              name,
 		Status:            status,
 		Time:              time.Unix(e.Time, e.TimeNano),
 		Type:              t,
+		Details: libpodEvents.Details{
+			Attributes: details,
+		},
 	}
 }
 
 // ConvertToEntitiesEvent converts a libpod event to an entities one.
 func ConvertToEntitiesEvent(e libpodEvents.Event) *Event {
+	attributes := e.Details.Attributes
+	if attributes == nil {
+		attributes = make(map[string]string)
+	}
+	attributes["image"] = e.Image
+	attributes["name"] = e.Name
+	attributes["containerExitCode"] = strconv.Itoa(e.ContainerExitCode)
 	return &Event{dockerEvents.Message{
 		Type:   e.Type.String(),
 		Action: e.Status.String(),
 		Actor: dockerEvents.Actor{
-			ID: e.ID,
-			Attributes: map[string]string{
-				"image":             e.Image,
-				"name":              e.Name,
-				"containerExitCode": strconv.Itoa(e.ContainerExitCode),
-			},
+			ID:         e.ID,
+			Attributes: attributes,
 		},
 		Scope:    "local",
 		Time:     e.Time.Unix(),