From 105312128561285cf3c3d805f3d6b71c5f4a6fda Mon Sep 17 00:00:00 2001 From: Darren Stahl Date: Mon, 17 Apr 2017 11:59:23 -0700 Subject: [PATCH] Fix tmp folder deletion Signed-off-by: Darren Stahl Upstream-commit: 5cea9a0aa557401447d440ce2286be19f8fe3cc2 Component: engine --- components/engine/daemon/daemon.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/daemon/daemon.go b/components/engine/daemon/daemon.go index 080ff1202d..c4a156acd0 100644 --- a/components/engine/daemon/daemon.go +++ b/components/engine/daemon/daemon.go @@ -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)