1 files changed, 31 insertions, 4 deletions
diff --git a/pkg/varlinkapi/util.go b/pkg/varlinkapi/util.go
index a80c8db41..7e487c03a 100644
--- a/pkg/varlinkapi/util.go
+++ b/pkg/varlinkapi/util.go
@@ -3,11 +3,14 @@ package varlinkapi
 import (
 	"context"
 	"strconv"
+	"strings"
 	"time"
 
+	"github.com/containers/buildah"
 	"github.com/containers/libpod/cmd/podman/shared"
 	"github.com/containers/libpod/cmd/podman/varlink"
 	"github.com/containers/libpod/libpod"
+	"github.com/containers/storage/pkg/archive"
 )
 
 // getContext returns a non-nil, empty context
@@ -15,7 +18,7 @@ func getContext() context.Context {
 	return context.TODO()
 }
 
-func makeListContainer(containerID string, batchInfo shared.BatchContainerStruct) iopodman.ListContainerData {
+func makeListContainer(containerID string, batchInfo shared.BatchContainerStruct) iopodman.Container {
 	var (
 		mounts []iopodman.ContainerMount
 		ports  []iopodman.ContainerPortMappings
@@ -56,12 +59,12 @@ func makeListContainer(containerID string, batchInfo shared.BatchContainerStruct
 		Ipc:    ns.IPC,
 	}
 
-	lc := iopodman.ListContainerData{
+	lc := iopodman.Container{
 		Id:               containerID,
 		Image:            batchInfo.ConConfig.RootfsImageName,
 		Imageid:          batchInfo.ConConfig.RootfsImageID,
 		Command:          batchInfo.ConConfig.Spec.Process.Args,
-		Createdat:        batchInfo.ConConfig.CreatedTime.String(),
+		Createdat:        batchInfo.ConConfig.CreatedTime.Format(time.RFC3339),
 		Runningfor:       time.Since(batchInfo.ConConfig.CreatedTime).String(),
 		Status:           batchInfo.ConState.String(),
 		Ports:            ports,
@@ -107,7 +110,7 @@ func makeListPod(pod *libpod.Pod, batchInfo shared.PsOptions) (iopodman.ListPodD
 		listPodsContainers = append(listPodsContainers, makeListPodContainers(ctr.ID(), batchInfo))
 	}
 	listPod := iopodman.ListPodData{
-		Createdat:          pod.CreatedTime().String(),
+		Createdat:          pod.CreatedTime().Format(time.RFC3339),
 		Id:                 pod.ID(),
 		Name:               pod.Name(),
 		Status:             status,
@@ -133,3 +136,27 @@ func handlePodCall(call iopodman.VarlinkCall, pod *libpod.Pod, ctrErrs map[strin
 
 	return nil
 }
+
+func stringCompressionToArchiveType(s string) archive.Compression {
+	switch strings.ToUpper(s) {
+	case "BZIP2":
+		return archive.Bzip2
+	case "GZIP":
+		return archive.Gzip
+	case "XZ":
+		return archive.Xz
+	}
+	return archive.Uncompressed
+}
+
+func stringPullPolicyToType(s string) buildah.PullPolicy {
+	switch strings.ToUpper(s) {
+	case "PULLIFMISSING":
+		return buildah.PullIfMissing
+	case "PULLALWAYS":
+		return buildah.PullAlways
+	case "PULLNEVER":
+		return buildah.PullNever
+	}
+	return buildah.PullIfMissing
+}