0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request from ryansimmen/35076-WindowsDaemonTmpDir

Browse source 
Windows Daemon should respect DOCKER_TMPDIR
This commit is contained in:
Yong Tang 2017-10-20 08:40:43 -07:00 • committed by GitHub
commit ab0eb8fcf6
1 changed files with 11 additions and 1 deletions

12
daemon/daemon.go
View file

@ -555,7 +555,17 @@ func NewDaemon(config *config.Config, registryService registry.Service, containe
if err != nil {
return nil, fmt.Errorf("Unable to get the full path to the TempDir (%s): %s", tmp, err)
}
os.Setenv("TMPDIR", realTmp)
if runtime.GOOS == "windows" {
if _, err := os.Stat(realTmp); err != nil && os.IsNotExist(err) {
if err := system.MkdirAll(realTmp, 0700, ""); err != nil {
return nil, fmt.Errorf("Unable to create the TempDir (%s): %s", realTmp, err)
}
}
os.Setenv("TEMP", realTmp)
os.Setenv("TMP", realTmp)
} else {
os.Setenv("TMPDIR", realTmp)
}
d := &Daemon{
configStore: config,