5 files changed, 52 insertions, 26 deletions
diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go
index cce3001eb..0f909ab37 100644
--- a/pkg/domain/entities/images.go
+++ b/pkg/domain/entities/images.go
@@ -1,7 +1,6 @@
 package entities
 
 import (
-	"net/url"
 	"time"
 
 	"github.com/containers/image/v5/manifest"
@@ -221,15 +220,13 @@ type ImageSearchReport struct {
 
 // Image List Options
 type ImageListOptions struct {
-	All     bool       `json:"all" schema:"all"`
-	Filter  []string   `json:"Filter,omitempty"`
-	Filters url.Values `json:"filters" schema:"filters"`
+	All    bool     `json:"all" schema:"all"`
+	Filter []string `json:"Filter,omitempty"`
 }
 
 type ImagePruneOptions struct {
-	All     bool       `json:"all" schema:"all"`
-	Filter  []string   `json:"filter" schema:"filter"`
-	Filters url.Values `json:"filters" schema:"filters"`
+	All    bool     `json:"all" schema:"all"`
+	Filter []string `json:"filter" schema:"filter"`
 }
 
 type ImagePruneReport struct {
diff --git a/pkg/domain/infra/abi/healthcheck.go b/pkg/domain/infra/abi/healthcheck.go
index 351bf4f7e..4e925ef56 100644
--- a/pkg/domain/infra/abi/healthcheck.go
+++ b/pkg/domain/infra/abi/healthcheck.go
@@ -3,7 +3,6 @@ package abi
 import (
 	"context"
 
-	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/pkg/domain/entities"
 )
@@ -13,9 +12,9 @@ func (ic *ContainerEngine) HealthCheckRun(ctx context.Context, nameOrId string,
 	if err != nil {
 		return nil, err
 	}
-	hcStatus := "unhealthy"
-	if status == libpod.HealthCheckSuccess {
-		hcStatus = "healthy"
+	hcStatus := define.HealthCheckUnhealthy
+	if status == define.HealthCheckSuccess {
+		hcStatus = define.HealthCheckHealthy
 	}
 	report := define.HealthCheckResults{
 		Status: hcStatus,
diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go
index c559e250c..3034e36ec 100644
--- a/pkg/domain/infra/abi/images_list.go
+++ b/pkg/domain/infra/abi/images_list.go
@@ -13,14 +13,7 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions)
 		err    error
 	)
 
-	// TODO: Future work support for domain.Filters
-	// filters := utils.ToLibpodFilters(opts.Filters)
-
-	if len(opts.Filter) > 0 {
-		images, err = ir.Libpod.ImageRuntime().GetImagesWithFilters(opts.Filter)
-	} else {
-		images, err = ir.Libpod.ImageRuntime().GetImages()
-	}
+	images, err = ir.Libpod.ImageRuntime().GetImagesWithFilters(opts.Filter)
 	if err != nil {
 		return nil, err
 	}
@@ -40,9 +33,18 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions)
 				}
 			}
 		} else {
-			repoTags, _ = img.RepoTags()
-			if len(repoTags) == 0 {
-				continue
+			repoTags, err = img.RepoTags()
+			if err != nil {
+				return nil, err
+			}
+			if len(img.Names()) == 0 {
+				parent, err := img.IsParent(ctx)
+				if err != nil {
+					return nil, err
+				}
+				if parent {
+					continue
+				}
 			}
 		}
 
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 445b49ba8..d02c54e76 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -360,10 +360,19 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
 		report := entities.ContainerStartReport{Id: name}
 		if options.Attach {
 			report.Err = startAndAttach(ic, name, &options.DetachKeys, options.Stdin, options.Stdout, options.Stderr)
+			if report.Err == nil {
+				exitCode, err := containers.Wait(ic.ClientCxt, name, nil)
+				if err == nil {
+					report.ExitCode = int(exitCode)
+				}
+			} else {
+				report.ExitCode = define.ExitCode(report.Err)
+			}
 			reports = append(reports, &report)
 			return reports, nil
 		}
 		report.Err = containers.Start(ic.ClientCxt, name, &options.DetachKeys)
+		report.ExitCode = define.ExitCode(report.Err)
 		reports = append(reports, &report)
 	}
 	return reports, nil
@@ -385,11 +394,18 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta
 	// Attach
 	if !opts.Detach {
 		err = startAndAttach(ic, con.ID, &opts.DetachKeys, opts.InputStream, opts.OutputStream, opts.ErrorStream)
-
+		if err == nil {
+			exitCode, err := containers.Wait(ic.ClientCxt, con.ID, nil)
+			if err == nil {
+				report.ExitCode = int(exitCode)
+			}
+		}
 	} else {
 		err = containers.Start(ic.ClientCxt, con.ID, nil)
 	}
-	report.ExitCode = define.ExitCode(err)
+	if err != nil {
+		report.ExitCode = define.ExitCode(err)
+	}
 	return &report, err
 }
 
diff --git a/pkg/domain/infra/tunnel/images.go b/pkg/domain/infra/tunnel/images.go
index 4d00d331b..3d5626c45 100644
--- a/pkg/domain/infra/tunnel/images.go
+++ b/pkg/domain/infra/tunnel/images.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"io/ioutil"
 	"os"
+	"strings"
 
 	"github.com/containers/common/pkg/config"
 	"github.com/containers/image/v5/docker/reference"
@@ -25,8 +26,13 @@ func (ir *ImageEngine) Remove(ctx context.Context, imagesArg []string, opts enti
 }
 
 func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions) ([]*entities.ImageSummary, error) {
-	images, err := images.List(ir.ClientCxt, &opts.All, opts.Filters)
 
+	filters := make(map[string][]string, len(opts.Filter))
+	for _, filter := range opts.Filter {
+		f := strings.Split(filter, "=")
+		filters[f[0]] = f[1:]
+	}
+	images, err := images.List(ir.ClientCxt, &opts.All, filters)
 	if err != nil {
 		return nil, err
 	}
@@ -61,7 +67,13 @@ func (ir *ImageEngine) History(ctx context.Context, nameOrId string, opts entiti
 }
 
 func (ir *ImageEngine) Prune(ctx context.Context, opts entities.ImagePruneOptions) (*entities.ImagePruneReport, error) {
-	results, err := images.Prune(ir.ClientCxt, &opts.All, opts.Filters)
+	filters := make(map[string][]string, len(opts.Filter))
+	for _, filter := range opts.Filter {
+		f := strings.Split(filter, "=")
+		filters[f[0]] = f[1:]
+	}
+
+	results, err := images.Prune(ir.ClientCxt, &opts.All, filters)
 	if err != nil {
 		return nil, err
 	}