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

Move TMPDIR symlink cleanup to NewDaemon

Browse source 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
This commit is contained in:
Solomon Hykes 2014-07-30 06:44:34 +00:00
parent 419b9fe164
commit a7d8c732b1
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
daemon/daemon.go
View file

@ -767,6 +767,13 @@ func NewDaemonFromDirectory(config *daemonconfig.Config, eng *engine.Engine) (*D
if os.Geteuid() != 0 { if os.Geteuid() != 0 {
log.Fatalf("The Docker daemon needs to be run as root") log.Fatalf("The Docker daemon needs to be run as root")
} }
// set up the TempDir to use a canonical path
tmp := os.TempDir()
realTmp, err := utils.ReadSymlinkedDirectory(tmp)
if err != nil {
log.Fatalf("Unable to get the full path to the TempDir (%s): %s", tmp, err)
}
os.Setenv("TMPDIR", realTmp)
if !config.EnableSelinuxSupport { if !config.EnableSelinuxSupport {
selinuxSetDisabled() selinuxSetDisabled()
} }

7
docker/docker.go
View file

@ -119,13 +119,6 @@ func main() {
return return
} }
// set up the TempDir to use a canonical path
tmp := os.TempDir()
realTmp, err := utils.ReadSymlinkedDirectory(tmp)
if err != nil {
log.Fatalf("Unable to get the full path to the TempDir (%s): %s", tmp, err)
}
os.Setenv("TMPDIR", realTmp)
// get the canonical path to the Docker root directory // get the canonical path to the Docker root directory
root := *flRoot root := *flRoot