Merge pull request #138 from wanghaibo/master

gondor · web-flow · commit a26e6b3fca11 · 2017-10-23T11:33:42.000-07:00
add NETSHAER_SOCKET_NAME to set the interface socket name
diff --git a/netshare/netshare.go b/netshare/netshare.go
@@ -45,6 +45,7 @@ const (
 	EnvNfsVers       = "NETSHARE_NFS_VERSION"
 	EnvTCP           = "NETSHARE_TCP_ENABLED"
 	EnvTCPAddr       = "NETSHARE_TCP_ADDR"
+	EnvSocketName    = "NETSHARE_SOCKET_NAME"
 	PluginAlias      = "netshare"
 	NetshareHelp     = `
 	docker-volume-netshare (NFS V3/4, AWS EFS and CIFS Volume Driver Plugin)
@@ -238,7 +239,11 @@ func start(dt drivers.DriverType, driver volume.Driver) {
 		}
 		fmt.Println(h.ServeTCP(dt.String(), addr, nil))
 	} else {
-		fmt.Println(h.ServeUnix(dt.String(), syscall.Getgid()))
+		socketName := os.Getenv(EnvSocketName)
+		if socketName == "" {
+			socketName = dt.String()
+		}
+		fmt.Println(h.ServeUnix(socketName, syscall.Getgid()))
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ const (`
`45`	`45`	`EnvNfsVers = "NETSHARE_NFS_VERSION"`
`46`	`46`	`EnvTCP = "NETSHARE_TCP_ENABLED"`
`47`	`47`	`EnvTCPAddr = "NETSHARE_TCP_ADDR"`
	`48`	`+ EnvSocketName = "NETSHARE_SOCKET_NAME"`
`48`	`49`	`PluginAlias = "netshare"`
`49`	`50`	NetshareHelp = `
`50`	`51`	`docker-volume-netshare (NFS V3/4, AWS EFS and CIFS Volume Driver Plugin)`
`@@ -238,7 +239,11 @@ func start(dt drivers.DriverType, driver volume.Driver) {`
`238`	`239`	`}`
`239`	`240`	`fmt.Println(h.ServeTCP(dt.String(), addr, nil))`
`240`	`241`	`} else {`
`241`		`- fmt.Println(h.ServeUnix(dt.String(), syscall.Getgid()))`
	`242`	`+ socketName := os.Getenv(EnvSocketName)`
	`243`	`+ if socketName == "" {`
	`244`	`+ socketName = dt.String()`
	`245`	`+ }`
	`246`	`+ fmt.Println(h.ServeUnix(socketName, syscall.Getgid()))`
`242`	`247`	`}`
`243`	`248`	`}`
`244`	`249`