2 files changed, 55 insertions, 26 deletions

diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go
index ec2532bea..7ed58092b 100644
--- a/pkg/domain/infra/abi/system.go
+++ b/pkg/domain/infra/abi/system.go
@@ -168,37 +168,61 @@ func checkInput() error { // nolint:deadcode,unused
 // SystemPrune removes unused data from the system. Pruning pods, containers, volumes and images.
 func (ic *ContainerEngine) SystemPrune(ctx context.Context, options entities.SystemPruneOptions) (*entities.SystemPruneReport, error) {
 	var systemPruneReport = new(entities.SystemPruneReport)
-	podPruneReport, err := ic.prunePodHelper(ctx)
-	if err != nil {
-		return nil, err
-	}
-	systemPruneReport.PodPruneReport = podPruneReport
-
-	containerPruneReport, err := ic.pruneContainersHelper(nil)
-	if err != nil {
-		return nil, err
-	}
-	systemPruneReport.ContainerPruneReport = containerPruneReport
-
-	results, err := ic.Libpod.ImageRuntime().PruneImages(ctx, options.All, nil)
-	if err != nil {
-		return nil, err
-	}
-	report := entities.ImagePruneReport{
-		Report: entities.Report{
-			Id:  results,
-			Err: nil,
-		},
-	}
+	found := true
+	for found {
+		found = false
+		podPruneReport, err := ic.prunePodHelper(ctx)
+		if err != nil {
+			return nil, err
+		}
+		if len(podPruneReport) > 0 {
+			found = true
+		}
+		systemPruneReport.PodPruneReport = append(systemPruneReport.PodPruneReport, podPruneReport...)
+		containerPruneReport, err := ic.pruneContainersHelper(nil)
+		if err != nil {
+			return nil, err
+		}
+		if len(containerPruneReport.ID) > 0 {
+			found = true
+		}
+		if systemPruneReport.ContainerPruneReport == nil {
+			systemPruneReport.ContainerPruneReport = containerPruneReport
+		} else {
+			for name, val := range containerPruneReport.ID {
+				systemPruneReport.ContainerPruneReport.ID[name] = val
+			}
+		}
 
-	systemPruneReport.ImagePruneReport = &report
+		results, err := ic.Libpod.ImageRuntime().PruneImages(ctx, options.All, nil)
 
-	if options.Volume {
-		volumePruneReport, err := ic.pruneVolumesHelper(ctx)
 		if err != nil {
 			return nil, err
 		}
-		systemPruneReport.VolumePruneReport = volumePruneReport
+		if len(results) > 0 {
+			found = true
+		}
+
+		if systemPruneReport.ImagePruneReport == nil {
+			systemPruneReport.ImagePruneReport = &entities.ImagePruneReport{
+				Report: entities.Report{
+					Id:  results,
+					Err: nil,
+				},
+			}
+		} else {
+			systemPruneReport.ImagePruneReport.Report.Id = append(systemPruneReport.ImagePruneReport.Report.Id, results...)
+		}
+		if options.Volume {
+			volumePruneReport, err := ic.pruneVolumesHelper(ctx)
+			if err != nil {
+				return nil, err
+			}
+			if len(volumePruneReport) > 0 {
+				found = true
+			}
+			systemPruneReport.VolumePruneReport = append(systemPruneReport.VolumePruneReport, volumePruneReport...)
+		}
 	}
 	return systemPruneReport, nil
 }
diff --git a/pkg/specgen/generate/kube/kube.go b/pkg/specgen/generate/kube/kube.go
index 5f72d28bb..5cc7891ac 100644
--- a/pkg/specgen/generate/kube/kube.go
+++ b/pkg/specgen/generate/kube/kube.go
@@ -148,6 +148,11 @@ func ToSpecGen(ctx context.Context, containerYAML v1.Container, iid string, newI
 
 	// Environment Variables
 	envs := map[string]string{}
+	for _, env := range imageData.Config.Env {
+		keyval := strings.Split(env, "=")
+		envs[keyval[0]] = keyval[1]
+	}
+
 	for _, env := range containerYAML.Env {
 		value := envVarValue(env, configMaps)