From 7c41244e1504f7b20d76bf1248bd78519b1cc15c Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Thu, 3 Oct 2019 14:50:53 -0700 Subject: [PATCH] use a unique temp dir for each build to prevent concurrent builds from stomping on each other --- builder/docker/step_temp_dir.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/builder/docker/step_temp_dir.go b/builder/docker/step_temp_dir.go index c9578076e..72236dd96 100644 --- a/builder/docker/step_temp_dir.go +++ b/builder/docker/step_temp_dir.go @@ -3,6 +3,7 @@ package docker import ( "context" "fmt" + "io/ioutil" "log" "os" "path/filepath" @@ -34,16 +35,7 @@ func ConfigTmpDir() (string, error) { configdir = fp } - td := filepath.Join(configdir, "tmp") - _, err = os.Stat(td) - if os.IsNotExist(err) { - log.Printf("Creating tempdir in %s", td) - if err = os.MkdirAll(td, 0755); err != nil { - return "", err - } - } else if err != nil { - return "", err - } + td, err := ioutil.TempDir(configdir, "tmp") log.Printf("Set Packer temp dir to %s", td) return td, nil }