Merge pull request #27924 from vieux/prevent_panic_volume_plugin_disable

prevent panic when docker build & volume plugin is disabled
Upstream-commit: cc8b8ce0b3d2d6b3345687464d3a3b1c2c4971ef
Component: engine
This commit is contained in:
Tibor Vass
2016-11-01 14:57:52 -07:00
committed by GitHub

View File

@ -79,8 +79,10 @@ func (ps *Store) getAllByCap(capability string) []plugingetter.CompatPlugin {
result := make([]plugingetter.CompatPlugin, 0, 1)
for _, p := range ps.plugins {
if _, err := p.FilterByCap(capability); err == nil {
result = append(result, p)
if p.IsEnabled() {
if _, err := p.FilterByCap(capability); err == nil {
result = append(result, p)
}
}
}
return result