Merge pull request #3584 from QiWang19/pssize

podman-remote make --size optional in ps

5 files changed, 37 insertions, 31 deletions

diff --git a/API.md b/API.md
index cfe050343..febd094df 100755
--- a/API.md
+++ b/API.md
@@ -1894,6 +1894,8 @@ pod [?bool](#?bool)
 
 quiet [?bool](#?bool)
 
+size [?bool](#?bool)
+
 sort [?string](#?string)
 
 sync [?bool](#?bool)
diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink
index 9410b9459..0bf236b77 100644
--- a/cmd/podman/varlink/io.podman.varlink
+++ b/cmd/podman/varlink/io.podman.varlink
@@ -144,10 +144,11 @@ type PsOpts (
     last: ?int,
     latest: ?bool,
     noTrunc: ?bool,
-	pod: ?bool,
-	quiet: ?bool,
-	sort: ?string,
-	sync: ?bool
+    pod: ?bool,
+    quiet: ?bool,
+    size: ?bool,
+    sort: ?string,
+    sync: ?bool
 )
 
 type PsContainer (
diff --git a/pkg/adapter/containers_remote.go b/pkg/adapter/containers_remote.go
index 5836d0788..c816fd980 100644
--- a/pkg/adapter/containers_remote.go
+++ b/pkg/adapter/containers_remote.go
@@ -493,6 +493,7 @@ func (r *LocalRuntime) Ps(c *cliconfig.PsValues, opts shared.PsOptions) ([]share
 		NoTrunc: &c.NoTrunct,
 		Pod:     &c.Pod,
 		Quiet:   &c.Quiet,
+		Size:    &c.Size,
 		Sort:    &c.Sort,
 		Sync:    &c.Sync,
 	}
diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go
index 700e02b0c..6f6909fac 100644
--- a/pkg/varlinkapi/containers.go
+++ b/pkg/varlinkapi/containers.go
@@ -65,32 +65,34 @@ func (i *LibpodAPI) Ps(call iopodman.VarlinkCall, opts iopodman.PsOpts) error {
 
 	for _, ctr := range psContainerOutputs {
 		container := iopodman.PsContainer{
-			Id:         ctr.ID,
-			Image:      ctr.Image,
-			Command:    ctr.Command,
-			Created:    ctr.Created,
-			Ports:      ctr.Ports,
-			Names:      ctr.Names,
-			IsInfra:    ctr.IsInfra,
-			Status:     ctr.Status,
-			State:      ctr.State.String(),
-			PidNum:     int64(ctr.Pid),
-			RootFsSize: ctr.Size.RootFsSize,
-			RwSize:     ctr.Size.RwSize,
-			Pod:        ctr.Pod,
-			CreatedAt:  ctr.CreatedAt.Format(time.RFC3339Nano),
-			ExitedAt:   ctr.ExitedAt.Format(time.RFC3339Nano),
-			StartedAt:  ctr.StartedAt.Format(time.RFC3339Nano),
-			Labels:     ctr.Labels,
-			NsPid:      ctr.PID,
-			Cgroup:     ctr.Cgroup,
-			Ipc:        ctr.Cgroup,
-			Mnt:        ctr.MNT,
-			Net:        ctr.NET,
-			PidNs:      ctr.PIDNS,
-			User:       ctr.User,
-			Uts:        ctr.UTS,
-			Mounts:     ctr.Mounts,
+			Id:        ctr.ID,
+			Image:     ctr.Image,
+			Command:   ctr.Command,
+			Created:   ctr.Created,
+			Ports:     ctr.Ports,
+			Names:     ctr.Names,
+			IsInfra:   ctr.IsInfra,
+			Status:    ctr.Status,
+			State:     ctr.State.String(),
+			PidNum:    int64(ctr.Pid),
+			Pod:       ctr.Pod,
+			CreatedAt: ctr.CreatedAt.Format(time.RFC3339Nano),
+			ExitedAt:  ctr.ExitedAt.Format(time.RFC3339Nano),
+			StartedAt: ctr.StartedAt.Format(time.RFC3339Nano),
+			Labels:    ctr.Labels,
+			NsPid:     ctr.PID,
+			Cgroup:    ctr.Cgroup,
+			Ipc:       ctr.Cgroup,
+			Mnt:       ctr.MNT,
+			Net:       ctr.NET,
+			PidNs:     ctr.PIDNS,
+			User:      ctr.User,
+			Uts:       ctr.UTS,
+			Mounts:    ctr.Mounts,
+		}
+		if ctr.Size != nil {
+			container.RootFsSize = ctr.Size.RootFsSize
+			container.RwSize = ctr.Size.RwSize
 		}
 		containers = append(containers, container)
 	}
diff --git a/pkg/varlinkapi/util.go b/pkg/varlinkapi/util.go
index e8f74e6aa..d3a41f7ab 100644
--- a/pkg/varlinkapi/util.go
+++ b/pkg/varlinkapi/util.go
@@ -191,7 +191,7 @@ func makePsOpts(inOpts iopodman.PsOpts) shared.PsOptions {
 		Latest:    derefBool(inOpts.Latest),
 		NoTrunc:   derefBool(inOpts.NoTrunc),
 		Pod:       derefBool(inOpts.Pod),
-		Size:      true,
+		Size:      derefBool(inOpts.Size),
 		Sort:      derefString(inOpts.Sort),
 		Namespace: true,
 		Sync:      derefBool(inOpts.Sync),