Fix Docker on windows does not support mount with short filename

docker/for-win#1560 (comment)
werf · Jan 23, 2020 · 9e30889 · 9e30889
1 parent c99ae51
commit 9e30889
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/pkg/testing/utils/suite.go b/pkg/testing/utils/suite.go
@@ -20,7 +20,7 @@ func GetTempDir() string {
 	dir, err := ioutil.TempDir("", "werf-integration-tests-")
 	Ω(err).ShouldNot(HaveOccurred())
 
-	if runtime.GOOS == "darwin" {
+	if runtime.GOOS == "darwin" || runtime.GOOS == "windows" {
 		dir, err = filepath.EvalSymlinks(dir)
 		Ω(err).ShouldNot(HaveOccurred(), fmt.Sprintf("eval symlinks of path %s failed: %s", dir, err))
 	}

diff --git a/pkg/tmp_manager/common.go b/pkg/tmp_manager/common.go
@@ -5,7 +5,6 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"runtime"
 
 	"github.com/flant/werf/pkg/werf"
 )
@@ -100,13 +99,5 @@ func newTmpFile(prefix string) (string, error) {
 		return "", err
 	}
 
-	if runtime.GOOS == "darwin" {
-		dir, err := filepath.EvalSymlinks(path)
-		if err != nil {
-			return "", fmt.Errorf("eval symlinks of path %s failed: %s", path, err)
-		}
-		path = dir
-	}
-
 	return path, nil
 }
diff --git a/pkg/werf/main.go b/pkg/werf/main.go
@@ -67,7 +67,7 @@ func Init(tmpDirOption, homeDirOption string) error {
 		tmpDir = os.TempDir()
 	}
 
-	if runtime.GOOS == "darwin" {
+	if runtime.GOOS == "darwin" || runtime.GOOS == "windows" {
 		dir, err := filepath.EvalSymlinks(tmpDir)
 		if err != nil {
 			return fmt.Errorf("eval symlinks of path %s failed: %s", tmpDir, err)