5 files changed, 19 insertions, 4 deletions
diff --git a/pkg/api/handlers/swagger/swagger.go b/pkg/api/handlers/swagger/swagger.go
index 87891d4a8..7d8932f56 100644
--- a/pkg/api/handlers/swagger/swagger.go
+++ b/pkg/api/handlers/swagger/swagger.go
@@ -143,7 +143,7 @@ type swagListPodsResponse struct {
 type swagInspectPodResponse struct {
 	// in:body
 	Body struct {
-		libpod.PodInspect
+		define.InspectPodData
 	}
 }
 
diff --git a/pkg/domain/entities/manifest.go b/pkg/domain/entities/manifest.go
index a9c961f9d..7316735b0 100644
--- a/pkg/domain/entities/manifest.go
+++ b/pkg/domain/entities/manifest.go
@@ -10,6 +10,7 @@ type ManifestAddOptions struct {
 	Arch       string   `json:"arch" schema:"arch"`
 	Features   []string `json:"features" schema:"features"`
 	Images     []string `json:"images" schema:"images"`
+	OS         string   `json:"os" schema:"os"`
 	OSVersion  string   `json:"os_version" schema:"os_version"`
 	Variant    string   `json:"variant" schema:"variant"`
 }
diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go
index 27d4bf9a5..88331f96c 100644
--- a/pkg/domain/infra/abi/manifest.go
+++ b/pkg/domain/infra/abi/manifest.go
@@ -79,6 +79,7 @@ func (ir *ImageEngine) ManifestAdd(ctx context.Context, opts entities.ManifestAd
 		Arch:      opts.Arch,
 		Features:  opts.Features,
 		Images:    opts.Images,
+		OS:        opts.OS,
 		OSVersion: opts.OSVersion,
 		Variant:   opts.Variant,
 	}
diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go
index c4ae9efbf..7732d5aa3 100644
--- a/pkg/domain/infra/abi/pods.go
+++ b/pkg/domain/infra/abi/pods.go
@@ -292,9 +292,12 @@ func (ic *ContainerEngine) PodTop(ctx context.Context, options entities.PodTopOp
 
 func (ic *ContainerEngine) PodPs(ctx context.Context, options entities.PodPSOptions) ([]*entities.ListPodsReport, error) {
 	var (
+		err     error
 		filters []libpod.PodFilter
+		pds     []*libpod.Pod
 		reports []*entities.ListPodsReport
 	)
+
 	for k, v := range options.Filters {
 		for _, filter := range v {
 			f, err := lpfilters.GeneratePodFilterFunc(k, filter)
@@ -305,10 +308,19 @@ func (ic *ContainerEngine) PodPs(ctx context.Context, options entities.PodPSOpti
 
 		}
 	}
-	pds, err := ic.Libpod.Pods(filters...)
-	if err != nil {
-		return nil, err
+	if options.Latest {
+		pod, err := ic.Libpod.GetLatestPod()
+		if err != nil {
+			return nil, err
+		}
+		pds = append(pds, pod)
+	} else {
+		pds, err = ic.Libpod.Pods(filters...)
+		if err != nil {
+			return nil, err
+		}
 	}
+
 	for _, p := range pds {
 		var lpcs []*entities.ListPodContainer
 		status, err := p.GetPodStatus()
diff --git a/pkg/domain/infra/tunnel/manifest.go b/pkg/domain/infra/tunnel/manifest.go
index 338256530..18b400533 100644
--- a/pkg/domain/infra/tunnel/manifest.go
+++ b/pkg/domain/infra/tunnel/manifest.go
@@ -41,6 +41,7 @@ func (ir *ImageEngine) ManifestAdd(ctx context.Context, opts entities.ManifestAd
 		Arch:      opts.Arch,
 		Features:  opts.Features,
 		Images:    opts.Images,
+		OS:        opts.OS,
 		OSVersion: opts.OSVersion,
 		Variant:   opts.Variant,
 	}