3 files changed, 11 insertions, 24 deletions
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/manifests.go b/pkg/api/handlers/libpod/manifests.go
index d87ed7eba..93ca367f7 100644
--- a/pkg/api/handlers/libpod/manifests.go
+++ b/pkg/api/handlers/libpod/manifests.go
@@ -151,6 +151,7 @@ func ManifestPush(w http.ResponseWriter, r *http.Request) {
 	}
 	sc := image.GetSystemContext(rtc.Engine.SignaturePolicyPath, "", false)
 	opts := manifests.PushOptions{
+		Store:              runtime.GetStore(),
 		ImageListSelection: copy2.CopySpecificImages,
 		SystemContext:      sc,
 	}
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{}