Merge pull request #82 from hyperius/docker-compose-fix

gondor · web-flow · commit be000ec51030 · 2016-10-10T13:16:24.000-07:00
EFS volume id extractor added for compatibility with docker-compose
diff --git a/netshare/drivers/efs.go b/netshare/drivers/efs.go
@@ -6,6 +6,7 @@ import (
 	"github.com/docker/go-plugins-helpers/volume"
 	"os"
 	"strings"
+	"regexp"
 )
 
 const (
@@ -100,6 +101,9 @@ func (e efsDriver) Unmount(r volume.UnmountRequest) volume.Response {
 }
 
 func (e efsDriver) fixSource(name, id string) string {
+	reg, _ := regexp.Compile("(fs-[0-9a-f]+)$")
+	name = reg.FindString(name)
+
 	if e.mountm.HasOption(name, ShareOpt) {
 		name = e.mountm.GetOption(name, ShareOpt)
 	}

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`	`"github.com/docker/go-plugins-helpers/volume"`
`7`	`7`	`"os"`
`8`	`8`	`"strings"`
	`9`	`+ "regexp"`
`9`	`10`	`)`
`10`	`11`
`11`	`12`	`const (`
`@@ -100,6 +101,9 @@ func (e efsDriver) Unmount(r volume.UnmountRequest) volume.Response {`
`100`	`101`	`}`
`101`	`102`
`102`	`103`	`func (e efsDriver) fixSource(name, id string) string {`
	`104`	`+ reg, _ := regexp.Compile("(fs-[0-9a-f]+)$")`
	`105`	`+ name = reg.FindString(name)`
	`106`	`+`
`103`	`107`	`if e.mountm.HasOption(name, ShareOpt) {`
`104`	`108`	`name = e.mountm.GetOption(name, ShareOpt)`
`105`	`109`	`}`