summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-02-09 13:49:29 +0100
committerGitHub <noreply@github.com>2019-02-09 13:49:29 +0100
commite1ce36384a42711883252fbf78649635732d07cb (patch)
tree7bd10ff593943a9aeee1e75c502d10b0374ecf24
parent1fd9be022fc1484c9bdebfc41008d2344237073c (diff)
parent4b40640c81bb488c5bf48478159b34475545528f (diff)
downloadpodman-e1ce36384a42711883252fbf78649635732d07cb.tar.gz
podman-e1ce36384a42711883252fbf78649635732d07cb.tar.bz2
podman-e1ce36384a42711883252fbf78649635732d07cb.zip
Merge pull request #2296 from baude/psShowMount
Add volume mounts to PS output
-rw-r--r--cmd/podman/shared/container.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/cmd/podman/shared/container.go b/cmd/podman/shared/container.go
index f84fb8261..c74d8fdce 100644
--- a/cmd/podman/shared/container.go
+++ b/cmd/podman/shared/container.go
@@ -88,6 +88,7 @@ type PsContainerOutput struct {
PIDNS string
User string
UTS string
+ Mounts string
}
// Namespace describes output for ps namespace
@@ -228,6 +229,7 @@ func NewBatchContainer(ctr *libpod.Container, opts PsOptions) (PsContainerOutput
pso.CreatedAt = ctr.CreatedTime()
pso.StartedAt = startedAt
pso.Labels = ctr.Labels()
+ pso.Mounts = strings.Join(ctr.UserVolumes(), " ")
if opts.Namespace {
pso.Cgroup = ns.Cgroup