Merge pull request #66 from ahmetalpbalkan/remotepath-fix

Preserve double slash in UNC with remotepath
Azure · Sep 16, 2016 · 96e9a52 · 96e9a52
2 parents 81e6f45 + 74af62a
commit 96e9a52
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -96,7 +96,10 @@ $ docker volume create -d azurefile \
 ## Changelog
 
 ```
-# 0.5.0(2016-08-19)
+# 0.5.1 (2016-09-16)
+- Bugfix: "bad UNC" error for remotepath (#63)
+
+# 0.5.0 (2016-08-19)
 - Added volume option 'remotepath' (#46)
 - Upgraded plugin protocol for docker 1.12.0 (#57)
 - Fixed stale version string in --help (#58)

diff --git a/driver.go b/driver.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"path"
 	"path/filepath"
 	"strings"
 	"sync"
@@ -305,7 +304,7 @@ func mount(accountName, accountKey, storageBase, mountPath string, options Volum
 	}
 	mountURI := fmt.Sprintf("//%s.file.%s/%s", accountName, storageBase, options.Share)
 	if len(options.RemotePath) != 0 {
-		mountURI = path.Join(mountURI, options.RemotePath)
+		mountURI += fmt.Sprintf("/%s", strings.TrimPrefix(options.RemotePath, "/"))
 	}
 
 	opts := []string{