Merge pull request AliyunContainerService#1326 from shaloulcy/core_vo…

…lume feature: remote volume driver
starnop · May 18, 2018 · 4423313 · 4423313
2 parents 8410064 + f67cf08
commit 4423313
Show file tree

Hide file tree

Showing 13 changed files with 1,013 additions and 306 deletions.
diff --git a/daemon/mgr/volume.go b/daemon/mgr/volume.go
@@ -139,6 +139,7 @@ func (vm *VolumeManager) Remove(ctx context.Context, name string) error {
 		if strings.Contains(err.Error(), "not found") {
 			return errors.Wrap(errtypes.ErrNotfound, err.Error())
 		}
+		return err
 	}
 
 	return nil

diff --git a/plugins/plugins.go b/plugins/plugins.go
@@ -2,7 +2,7 @@ package plugins
 
 var manager = &pluginManager{
 	plugins:         make(map[string]*Plugin),
-	pluginSockPaths: []string{"/run/pouch/plugins"},
+	pluginSockPaths: []string{"/run/pouch/plugins", "/run/docker/plugins"},
 	pluginSpecPaths: []string{"/etc/pouch/plugins", "/var/lib/pouch/plugins"},
 }