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

Merge pull request #32669 from darrenstahlmsft/FixTmpDelete

Browse Source 
Fix tmp deletion
Upstream-commit: 64932563c91eccec589c02c788a179799fbe5ac6
Component: engine
This commit is contained in:
Tõnis Tiigi
2017-04-17 23:13:54 -05:00
committed by GitHub
parent 59735a2883 1053121285
commit 25a20bf925
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/daemon.go
+1 -1
View File
@@ -955,7 +955,7 @@ func prepareTempDir(rootDir string, rootUID, rootGID int) (string, error) {
if tmpDir = os.Getenv("DOCKER_TMPDIR"); tmpDir == "" {
tmpDir = filepath.Join(rootDir, "tmp")
newName := tmpDir + "-old"
if err := os.Rename(tmpDir, newName); err != nil {
if err := os.Rename(tmpDir, newName); err == nil {
go func() {
if err := os.RemoveAll(newName); err != nil {
logrus.Warnf("failed to delete old tmp directory: %s", newName)