Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #136 from johnstep/fix_stack_service_volumes 

Fix stack compose bind-mount volumes for Windows
This commit is contained in:
Brian Goff 2017-06-01 11:06:06 -04:00 committed by GitHub
parent efaadcf465 9043d39dea
commit bf22fc6781
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cli/compose/loader/loader.go
View File

@ -3,6 +3,7 @@ package loader
import ( import (
"fmt" "fmt"
"path" "path"
"path/filepath"
"reflect" "reflect"
"sort" "sort"
"strings" "strings"
@ -371,7 +372,16 @@ func resolveVolumePaths(volumes []types.ServiceVolumeConfig, workingDir string,
continue continue
} }
volume.Source = absPath(workingDir, expandUser(volume.Source, lookupEnv)) filePath := expandUser(volume.Source, lookupEnv)
// Check for a Unix absolute path first, to handle a Windows client
// with a Unix daemon. This handles a Windows client connecting to a
// Unix daemon. Note that this is not required for Docker for Windows
// when specifying a local Windows path, because Docker for Windows
// translates the Windows path into a valid path within the VM.
if !path.IsAbs(filePath) {
filePath = absPath(workingDir, filePath)
}
volume.Source = filePath
volumes[i] = volume volumes[i] = volume
} }
} }
@ -492,11 +502,11 @@ func LoadConfigObjs(source map[string]interface{}, workingDir string) (map[strin
return configs, nil return configs, nil
} }
func absPath(workingDir string, filepath string) string { func absPath(workingDir string, filePath string) string {
if path.IsAbs(filepath) { if filepath.IsAbs(filePath) {
return filepath return filePath
} }
return path.Join(workingDir, filepath) return filepath.Join(workingDir, filePath)
} }
func transformMapStringString(data interface{}) (interface{}, error) { func transformMapStringString(data interface{}) (interface{}, error) {