diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-04 19:52:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-04 19:52:05 +0100 |
| commit | ec9d67b7e4dc1ee7f289dcb768e9285dd40e0e43 (patch) | |
| tree | e14ef067bdf29a1f94b548a8305e45942af53b1b | |
| parent | 9a35494141f2a3614e6e2a4c3bc2d5c6d5db9e92 (diff) | |
| parent | 0c6ae3ab2681c06dbaba0bb5c002d7f2b339db61 (diff) | |
| download | podman-ec9d67b7e4dc1ee7f289dcb768e9285dd40e0e43.tar.gz podman-ec9d67b7e4dc1ee7f289dcb768e9285dd40e0e43.tar.bz2 podman-ec9d67b7e4dc1ee7f289dcb768e9285dd40e0e43.zip | |
Merge pull request #12735 from rhatdan/mount
Fix Container List API call to return mount info
| -rw-r--r-- | pkg/api/handlers/compat/containers.go | 11 | ||||
| -rw-r--r-- | test/apiv2/20-containers.at | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go index 5a06722ec..ad341c3ab 100644 --- a/pkg/api/handlers/compat/containers.go +++ b/pkg/api/handlers/compat/containers.go @@ -356,6 +356,15 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error return nil, err } + m, err := json.Marshal(inspect.Mounts) + if err != nil { + return nil, err + } + mounts := []types.MountPoint{} + if err := json.Unmarshal(m, &mounts); err != nil { + return nil, err + } + return &handlers.Container{Container: types.Container{ ID: l.ID(), Names: []string{fmt.Sprintf("/%s", l.Name())}, @@ -374,7 +383,7 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error }{ "host"}, NetworkSettings: &networkSettings, - Mounts: nil, + Mounts: mounts, }, ContainerCreateConfig: types.ContainerCreateConfig{}, }, nil diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at index 5a02ca3cb..554a905d4 100644 --- a/test/apiv2/20-containers.at +++ b/test/apiv2/20-containers.at @@ -18,7 +18,7 @@ podman rm -a -f &>/dev/null t GET "libpod/containers/json (at start: clean slate)" 200 length=0 -podman run $IMAGE true +podman run -v /tmp:/tmp $IMAGE true t GET libpod/containers/json 200 length=0 @@ -33,6 +33,7 @@ t GET libpod/containers/json?all=true 200 \ .[0].Command[0]="true" \ .[0].State~\\\(exited\\\|stopped\\\) \ .[0].ExitCode=0 \ + .[0].Mounts~.*/tmp \ .[0].IsInfra=false # Test compat API for Network Settings (.Network is N/A when rootless) @@ -44,6 +45,7 @@ t GET /containers/json?all=true 200 \ length=1 \ .[0].Id~[0-9a-f]\\{64\\} \ .[0].Image=$IMAGE \ + .[0].Mounts~.*/tmp \ $network_expect # compat API imageid with sha256: prefix |