p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix test file paths

Browse Source 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 1847641b7b6985e7fe06cb09adf5c9f6237b5931
Component: engine
This commit is contained in:
John Howard
2015-10-29 15:51:04 -07:00
parent f8757c11b0
commit 12614debc5
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/engine/integration-cli/docker_utils.go
View File

@ -86,6 +86,15 @@ func init() {
dockerBasePath = info.DockerRootDir
volumesConfigPath = filepath.Join(dockerBasePath, "volumes")
containerStoragePath = filepath.Join(dockerBasePath, "containers")
// Make sure in context of daemon, not the local platform. Note we can't
// use filepath.FromSlash or ToSlash here as they are a no-op on Unix.
if daemonPlatform == "windows" {
volumesConfigPath = strings.Replace(volumesConfigPath, `/`, `\`, -1)
containerStoragePath = strings.Replace(containerStoragePath, `/`, `\`, -1)
} else {
volumesConfigPath = strings.Replace(volumesConfigPath, `\`, `/`, -1)
containerStoragePath = strings.Replace(containerStoragePath, `\`, `/`, -1)
}
}
// Daemon represents a Docker daemon for the testing framework.