iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make sure we create the temp dir explicitly when we are setting up the config dir in docker. Otherwise, we create it with root later on and it causes permissions failures.

This commit is contained in:
Megan Marsh 2019-07-24 16:04:55 -07:00
parent a6072626c9
commit 140785f088
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builder/docker/step_temp_dir.go
View File

@ -3,6 +3,7 @@ package docker
import ( import (
"context" "context"
"fmt" "fmt"
"log"
"os" "os"
"path/filepath" "path/filepath"
@ -18,22 +19,32 @@ type StepTempDir struct {
// ConfigTmpDir returns the configuration tmp directory for Docker // ConfigTmpDir returns the configuration tmp directory for Docker
func ConfigTmpDir() (string, error) { func ConfigTmpDir() (string, error) {
if tmpdir := os.Getenv("PACKER_TMP_DIR"); tmpdir != "" {
return filepath.Abs(tmpdir)
}
configdir, err := packer.ConfigDir() configdir, err := packer.ConfigDir()
if err != nil { if err != nil {
return "", err return "", err
} }
if tmpdir := os.Getenv("PACKER_TMP_DIR"); tmpdir != "" {
// override the config dir with tmp dir. Still stat it and mkdirall if
// necessary.
fp, err := filepath.Abs(tmpdir)
log.Printf("found PACKER_TMP_DIR env variable; setting tmpdir to %s", fp)
if err != nil {
return "", err
}
configdir = fp
}
td := filepath.Join(configdir, "tmp") td := filepath.Join(configdir, "tmp")
_, err = os.Stat(td) _, err = os.Stat(td)
if os.IsNotExist(err) { if os.IsNotExist(err) {
log.Printf("Creating tempdir in %s", td)
if err = os.MkdirAll(td, 0755); err != nil { if err = os.MkdirAll(td, 0755); err != nil {
return "", err return "", err
} }
} else if err != nil { } else if err != nil {
return "", err return "", err
} }
log.Printf("Set Packer temp dir to %s", td)
return td, nil return td, nil
} }