6 files changed, 41 insertions, 30 deletions
diff --git a/pkg/api/handlers/compat/containers_start.go b/pkg/api/handlers/compat/containers_start.go
index 9cb1492fb..cdbc8ff76 100644
--- a/pkg/api/handlers/compat/containers_start.go
+++ b/pkg/api/handlers/compat/containers_start.go
@@ -33,7 +33,6 @@ func StartContainer(w http.ResponseWriter, r *http.Request) {
 		utils.ContainerNotFound(w, name, err)
 		return
 	}
-
 	state, err := con.State()
 	if err != nil {
 		utils.InternalServerError(w, err)
@@ -43,7 +42,7 @@ func StartContainer(w http.ResponseWriter, r *http.Request) {
 		utils.WriteResponse(w, http.StatusNotModified, "")
 		return
 	}
-	if err := con.Start(r.Context(), false); err != nil {
+	if err := con.Start(r.Context(), len(con.PodID()) > 0); err != nil {
 		utils.InternalServerError(w, err)
 		return
 	}
diff --git a/pkg/api/handlers/compat/container_start.go b/pkg/api/handlers/compat/containers_stop.go
index d26ef2c82..d26ef2c82 100644
--- a/pkg/api/handlers/compat/container_start.go
+++ b/pkg/api/handlers/compat/containers_stop.go
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index e208e6ddc..e9d8fd719 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -226,6 +226,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
 	id, _, err := runtime.Build(r.Context(), buildOptions, query.Dockerfile)
 	if err != nil {
 		utils.InternalServerError(w, err)
+		return
 	}
 
 	// Find image ID that was built...
diff --git a/pkg/api/handlers/libpod/healthcheck.go b/pkg/api/handlers/libpod/healthcheck.go
index 6eb2ab0e3..0ca3574b7 100644
--- a/pkg/api/handlers/libpod/healthcheck.go
+++ b/pkg/api/handlers/libpod/healthcheck.go
@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/pkg/api/handlers/utils"
 )
 
@@ -12,32 +13,27 @@ func RunHealthCheck(w http.ResponseWriter, r *http.Request) {
 	name := utils.GetName(r)
 	status, err := runtime.HealthCheck(name)
 	if err != nil {
-		if status == libpod.HealthCheckContainerNotFound {
+		if status == define.HealthCheckContainerNotFound {
 			utils.ContainerNotFound(w, name, err)
 			return
 		}
-		if status == libpod.HealthCheckNotDefined {
+		if status == define.HealthCheckNotDefined {
 			utils.Error(w, "no healthcheck defined", http.StatusConflict, err)
 			return
 		}
-		if status == libpod.HealthCheckContainerStopped {
+		if status == define.HealthCheckContainerStopped {
 			utils.Error(w, "container not running", http.StatusConflict, err)
 			return
 		}
 		utils.InternalServerError(w, err)
 		return
 	}
-	ctr, err := runtime.LookupContainer(name)
-	if err != nil {
-		utils.InternalServerError(w, err)
-		return
+	hcStatus := define.HealthCheckUnhealthy
+	if status == define.HealthCheckSuccess {
+		hcStatus = define.HealthCheckHealthy
 	}
-
-	hcLog, err := ctr.GetHealthCheckLog()
-	if err != nil {
-		utils.InternalServerError(w, err)
-		return
+	report := define.HealthCheckResults{
+		Status: hcStatus,
 	}
-
-	utils.WriteResponse(w, http.StatusOK, hcLog)
+	utils.WriteResponse(w, http.StatusOK, report)
 }
diff --git a/pkg/api/handlers/libpod/system.go b/pkg/api/handlers/libpod/system.go
index 81ed37b4a..f575546c9 100644
--- a/pkg/api/handlers/libpod/system.go
+++ b/pkg/api/handlers/libpod/system.go
@@ -71,16 +71,6 @@ func SystemPrune(w http.ResponseWriter, r *http.Request) {
 	utils.WriteResponse(w, http.StatusOK, systemPruneReport)
 }
 
-// SystemReset Resets podman storage back to default state
-func SystemReset(w http.ResponseWriter, r *http.Request) {
-	err := r.Context().Value("runtime").(*libpod.Runtime).Reset(r.Context())
-	if err != nil {
-		utils.InternalServerError(w, err)
-		return
-	}
-	utils.WriteResponse(w, http.StatusOK, nil)
-}
-
 func DiskUsage(w http.ResponseWriter, r *http.Request) {
 	// Options are only used by the CLI
 	options := entities.SystemDfOptions{}
diff --git a/pkg/api/handlers/utils/images.go b/pkg/api/handlers/utils/images.go
index 1c67de9db..7fb31a177 100644
--- a/pkg/api/handlers/utils/images.go
+++ b/pkg/api/handlers/utils/images.go
@@ -62,7 +62,6 @@ func GetImages(w http.ResponseWriter, r *http.Request) ([]*image.Image, error) {
 	}{
 		// This is where you can override the golang default value for one of fields
 	}
-	// TODO I think all is implemented with a filter?
 
 	if err := decoder.Decode(&query, r.URL.Query()); err != nil {
 		return nil, err
@@ -71,6 +70,10 @@ func GetImages(w http.ResponseWriter, r *http.Request) ([]*image.Image, error) {
 	if _, found := r.URL.Query()["digests"]; found && query.Digests {
 		UnSupportedParameter("digests")
 	}
+	var (
+		images []*image.Image
+		err    error
+	)
 
 	if len(query.Filters) > 0 {
 		for k, v := range query.Filters {
@@ -78,11 +81,33 @@ func GetImages(w http.ResponseWriter, r *http.Request) ([]*image.Image, error) {
 				filters = append(filters, fmt.Sprintf("%s=%s", k, val))
 			}
 		}
-		return runtime.ImageRuntime().GetImagesWithFilters(filters)
+		images, err = runtime.ImageRuntime().GetImagesWithFilters(filters)
+		if err != nil {
+			return images, err
+		}
 	} else {
-		return runtime.ImageRuntime().GetImages()
+		images, err = runtime.ImageRuntime().GetImages()
+		if err != nil {
+			return images, err
+		}
 	}
-
+	if query.All {
+		return images, nil
+	}
+	var returnImages []*image.Image
+	for _, img := range images {
+		if len(img.Names()) == 0 {
+			parent, err := img.IsParent(r.Context())
+			if err != nil {
+				return nil, err
+			}
+			if parent {
+				continue
+			}
+		}
+		returnImages = append(returnImages, img)
+	}
+	return returnImages, nil
 }
 
 func GetImage(r *http.Request, name string) (*image.Image, error) {