Merge branch 'master' into master

gondor · web-flow · commit a760292f9196 · 2017-05-29T08:40:41.000-07:00
diff --git a/netshare/netshare.go b/netshare/netshare.go
@@ -5,11 +5,11 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
-
 	"github.com/dmaj/docker-volume-netshare/netshare/drivers"
 	log "github.com/Sirupsen/logrus"
 	"github.com/docker/go-plugins-helpers/volume"
 	"github.com/spf13/cobra"
+	"syscall"
 )
 
 const (
@@ -239,7 +239,7 @@ func start(dt drivers.DriverType, driver volume.Driver) {
 		}
 		fmt.Println(h.ServeTCP(dt.String(), addr, nil))
 	} else {
-		fmt.Println(h.ServeUnix(dt.String(), int(dt)))
+		fmt.Println(h.ServeUnix(dt.String(), syscall.Getgid()))
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,11 @@ import (`
`5`	`5`	`"os"`
`6`	`6`	`"path/filepath"`
`7`	`7`	`"strconv"`
`8`		`-`
`9`	`8`	`"github.com/dmaj/docker-volume-netshare/netshare/drivers"`
`10`	`9`	`log "github.com/Sirupsen/logrus"`
`11`	`10`	`"github.com/docker/go-plugins-helpers/volume"`
`12`	`11`	`"github.com/spf13/cobra"`
	`12`	`+ "syscall"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`const (`
`@@ -239,7 +239,7 @@ func start(dt drivers.DriverType, driver volume.Driver) {`
`239`	`239`	`}`
`240`	`240`	`fmt.Println(h.ServeTCP(dt.String(), addr, nil))`
`241`	`241`	`} else {`
`242`		`- fmt.Println(h.ServeUnix(dt.String(), int(dt)))`
	`242`	`+ fmt.Println(h.ServeUnix(dt.String(), syscall.Getgid()))`
`243`	`243`	`}`
`244`	`244`	`}`
`245`	`245`