Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix storage-path bug

Browse Source 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett
2015-03-20 00:08:58 -04:00
parent 4ca4a28788
commit abd43e8d18
3 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/utils.go
View File

@@ -22,7 +22,7 @@ func GetHomeDir() string {
func GetBaseDir() string {
baseDir := os.Getenv("MACHINE_STORAGE_PATH")
if baseDir == "" {
baseDir = filepath.Join(GetHomeDir(), ".docker")
baseDir = filepath.Join(GetHomeDir(), ".docker", "machine")
}
return baseDir
}
@@ -31,20 +31,16 @@ func GetDockerDir() string {
return filepath.Join(GetHomeDir(), ".docker")
}
func GetMachineRoot() string {
return filepath.Join(GetBaseDir(), "machine")
}
func GetMachineDir() string {
return filepath.Join(GetMachineRoot(), "machines")
return filepath.Join(GetBaseDir(), "machines")
}
func GetMachineCertDir() string {
return filepath.Join(GetMachineRoot(), "certs")
return filepath.Join(GetBaseDir(), "certs")
}
func GetMachineCacheDir() string {
return filepath.Join(GetMachineRoot(), "cache")
return filepath.Join(GetBaseDir(), "cache")
}
func GetUsername() string {