kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Consolidate tmpdir implementations, include Windows

Browse source 
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
This commit is contained in:
Ahmet Alp Balkan 2014-11-13 10:48:19 -08:00
parent 91a86670aa
commit 376ae7780b
2 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
utils/tmpdir.go
View file

@ -1,12 +1,16 @@
// +build !darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd
package utils package utils
import ( import (
"os" "os"
"path/filepath"
) )
// TempDir returns the default directory to use for temporary files. // TempDir returns the default directory to use for temporary files.
func TempDir(rootdir string) (string error) { func TempDir(rootDir string) (string, error) {
return os.TempDir(), nil var tmpDir string
if tmpDir = os.Getenv("DOCKER_TMPDIR"); tmpDir == "" {
tmpDir = filepath.Join(rootDir, "tmp")
}
err := os.MkdirAll(tmpDir, 0700)
return tmpDir, err
} }

18
utils/tmpdir_unix.go
View file

@ -1,18 +0,0 @@
// +build darwin dragonfly freebsd linux netbsd openbsd
package utils
import (
"os"
"path/filepath"
)
// TempDir returns the default directory to use for temporary files.
func TempDir(rootDir string) (string, error) {
var tmpDir string
if tmpDir = os.Getenv("DOCKER_TMPDIR"); tmpDir == "" {
tmpDir = filepath.Join(rootDir, "tmp")
}
err := os.MkdirAll(tmpDir, 0700)
return tmpDir, err
}