Carry #21567
Use `LabeledVolume` interface type instead of manual interface. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
parent
1a72934cd5
commit
6d787dae1a
|
@ -589,18 +589,12 @@ func (daemon *Daemon) filterVolumes(vols []volume.Volume, filter filters.Args) (
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if filter.Include("label") {
|
if filter.Include("label") {
|
||||||
v, err := daemon.volumes.Get(vol.Name())
|
v, ok := vol.(volume.LabeledVolume)
|
||||||
if err != nil {
|
if !ok {
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if v, ok := v.(interface {
|
|
||||||
Labels() map[string]string
|
|
||||||
}); ok {
|
|
||||||
labels := v.Labels()
|
|
||||||
|
|
||||||
if !filter.MatchKVList("label", labels) {
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
if !filter.MatchKVList("label", v.Labels()) {
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
retVols = append(retVols, vol)
|
retVols = append(retVols, vol)
|
||||||
|
|
Loading…
Reference in New Issue