diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-01 09:51:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-01 09:51:23 -0400 |
| commit | 23e57575b0a402d7f7de9d20571776d0512fd489 (patch) | |
| tree | 15e4759aa0305b4cecd9d20eeeaafbc5955eb9cf /libpod/container_inspect.go | |
| parent | 59fcf0e39d91e00d8385ffda3a09c32a1464c117 (diff) | |
| parent | 7a5342804944472246ed0b977e9088e0b01be87b (diff) | |
| download | podman-23e57575b0a402d7f7de9d20571776d0512fd489.tar.gz podman-23e57575b0a402d7f7de9d20571776d0512fd489.tar.bz2 podman-23e57575b0a402d7f7de9d20571776d0512fd489.zip | |
Merge pull request #13594 from cdoern/podVolumes
fix pod volume passing and alter infra inheritance
Diffstat (limited to 'libpod/container_inspect.go')
| -rw-r--r-- | libpod/container_inspect.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index 5fb32bd90..f2a2c2d16 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -103,8 +103,8 @@ func (c *Container) getContainerInspectData(size bool, driverData *define.Driver } } - namedVolumes, mounts := c.sortUserVolumes(ctrSpec) - inspectMounts, err := c.GetInspectMounts(namedVolumes, c.config.ImageVolumes, mounts) + namedVolumes, mounts := c.SortUserVolumes(ctrSpec) + inspectMounts, err := c.GetMounts(namedVolumes, c.config.ImageVolumes, mounts) if err != nil { return nil, err } @@ -222,7 +222,7 @@ func (c *Container) getContainerInspectData(size bool, driverData *define.Driver // Get inspect-formatted mounts list. // Only includes user-specified mounts. Only includes bind mounts and named // volumes, not tmpfs volumes. -func (c *Container) GetInspectMounts(namedVolumes []*ContainerNamedVolume, imageVolumes []*ContainerImageVolume, mounts []spec.Mount) ([]define.InspectMount, error) { +func (c *Container) GetMounts(namedVolumes []*ContainerNamedVolume, imageVolumes []*ContainerImageVolume, mounts []spec.Mount) ([]define.InspectMount, error) { inspectMounts := []define.InspectMount{} // No mounts, return early |