Browse Source

Merge pull request #27924 from vieux/prevent_panic_volume_plugin_disable

prevent panic when docker build & volume plugin is disabled
Tibor Vass 8 years ago
parent
commit
cc8b8ce0b3
1 changed files with 4 additions and 2 deletions
  1. 4 2
      plugin/store/store.go

+ 4 - 2
plugin/store/store.go

@@ -79,8 +79,10 @@ func (ps *Store) getAllByCap(capability string) []plugingetter.CompatPlugin {
 
 
 	result := make([]plugingetter.CompatPlugin, 0, 1)
 	result := make([]plugingetter.CompatPlugin, 0, 1)
 	for _, p := range ps.plugins {
 	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
 	return result