containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3358 from mheon/use_disk_spec 

Swap to using the on-disk spec for inspect mounts
This commit is contained in:
OpenShift Merge Robot 2019-06-18 23:10:06 +02:00 committed by GitHub
parent 3cabd81045 dc4d20b573
commit 9dd9705c2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/container_inspect.go
View File

@ -241,7 +241,7 @@ func (c *Container) getContainerInspectData(size bool, driverData *driver.Data)
}
}
mounts, err := c.getInspectMounts()
mounts, err := c.getInspectMounts(spec)
if err != nil {
return nil, err
}
@ -357,7 +357,7 @@ func (c *Container) getContainerInspectData(size bool, driverData *driver.Data)
// Get inspect-formatted mounts list.
// Only includes user-specified mounts. Only includes bind mounts and named
// volumes, not tmpfs volumes.
func (c *Container) getInspectMounts() ([]*InspectMount, error) {
func (c *Container) getInspectMounts(ctrSpec *spec.Spec) ([]*InspectMount, error) {
inspectMounts := []*InspectMount{}
// No mounts, return early
@ -374,7 +374,7 @@ func (c *Container) getInspectMounts() ([]*InspectMount, error) {
for _, namedVol := range c.config.NamedVolumes {
namedVolumes[namedVol.Dest] = namedVol
}
for _, mount := range c.config.Spec.Mounts {
for _, mount := range ctrSpec.Mounts {
mounts[mount.Destination] = mount
}