opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-19 04:03:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adjust names to match struct tags in Inspect

Browse Source 
In Go templating, we use the names of fields, not the JSON struct
tags. To ensure templating works are expected, we need the two to
match.

Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
Matthew Heon
2019-06-21 15:09:59 -04:00
parent 778a634daa
commit 7d76548b41
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libpod/container_inspect.go
View File

@ -111,10 +111,10 @@ type InspectMount struct {
// The name of the volume. Empty for bind mounts. // The name of the volume. Empty for bind mounts.
Name string `json:"Name,omptempty"` Name string `json:"Name,omptempty"`
// The source directory for the volume. // The source directory for the volume.
Src string `json:"Source"` Source string `json:"Source"`
// The destination directory for the volume. Specified as a path within // The destination directory for the volume. Specified as a path within
// the container, as it would be passed into the OCI runtime. // the container, as it would be passed into the OCI runtime.
Dst string `json:"Destination"` Destination string `json:"Destination"`
// The driver used for the named volume. Empty for bind mounts. // The driver used for the named volume. Empty for bind mounts.
Driver string `json:"Driver"` Driver string `json:"Driver"`
// Contains SELinux :z/:Z mount options. Unclear what, if anything, else // Contains SELinux :z/:Z mount options. Unclear what, if anything, else
@ -386,7 +386,7 @@ func (c *Container) getInspectMounts(ctrSpec *spec.Spec) ([]InspectMount, error)
if volume, ok := namedVolumes[vol]; ok { if volume, ok := namedVolumes[vol]; ok {
mountStruct := InspectMount{} mountStruct := InspectMount{}
mountStruct.Type = "volume" mountStruct.Type = "volume"
mountStruct.Dst = volume.Dest mountStruct.Destination = volume.Dest
mountStruct.Name = volume.Name mountStruct.Name = volume.Name
// For src and driver, we need to look up the named // For src and driver, we need to look up the named
@ -396,7 +396,7 @@ func (c *Container) getInspectMounts(ctrSpec *spec.Spec) ([]InspectMount, error)
return nil, errors.Wrapf(err, "error looking up volume %s in container %s config", volume.Name, c.ID()) return nil, errors.Wrapf(err, "error looking up volume %s in container %s config", volume.Name, c.ID())
} }
mountStruct.Driver = volFromDB.Driver() mountStruct.Driver = volFromDB.Driver()
mountStruct.Src = volFromDB.MountPoint() mountStruct.Source = volFromDB.MountPoint()
parseMountOptionsForInspect(volume.Options, &mountStruct) parseMountOptionsForInspect(volume.Options, &mountStruct)
@ -410,8 +410,8 @@ func (c *Container) getInspectMounts(ctrSpec *spec.Spec) ([]InspectMount, error)
mountStruct := InspectMount{} mountStruct := InspectMount{}
mountStruct.Type = "bind" mountStruct.Type = "bind"
mountStruct.Src = mount.Source mountStruct.Source = mount.Source
mountStruct.Dst = mount.Destination mountStruct.Destination = mount.Destination
parseMountOptionsForInspect(mount.Options, &mountStruct) parseMountOptionsForInspect(mount.Options, &mountStruct)