github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-11-14 00:03:05 +00:00
Code Issues Projects Releases Wiki Activity

Put tmp direcories under ~/.moby

Browse Source 
Docker4Mac won't bind mount default tmp dir into containers

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack
2017-06-02 22:36:21 +01:00
parent 294389aef9
commit 5b73f53dcf
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/moby/output.go
View File

@@ -82,10 +82,11 @@ var outFuns = map[string]func(string, []byte, int, bool) error{
if err != nil {
return fmt.Errorf("Error converting to initrd: %v", err)
}
tmp, err := ioutil.TempDir("", "img-gz")
tmp, err := ioutil.TempDir(filepath.Join(MobyDir, "tmp"), "img-gz")
if err != nil {
return err
}
defer os.RemoveAll(tmp)
err = outputLinuxKit("raw", filepath.Join(tmp, "uncompressed.img"), kernel, initrd, cmdline, size, hyperkit)
if err != nil {
return fmt.Errorf("Error writing img-gz output: %v", err)
@@ -112,10 +113,6 @@ var outFuns = map[string]func(string, []byte, int, bool) error{
if err != nil {
return err
}
err = os.RemoveAll(tmp)
if err != nil {
return err
}
return nil
},
"gcp-img": func(base string, image []byte, size int, hyperkit bool) error {
@@ -125,10 +122,11 @@ var outFuns = map[string]func(string, []byte, int, bool) error{
if err != nil {
return fmt.Errorf("Error converting to initrd: %v", err)
}
tmp, err := ioutil.TempDir("", "gcp-img")
tmp, err := ioutil.TempDir(filepath.Join(MobyDir, "tmp"), "gcp-img")
if err != nil {
return err
}
defer os.RemoveAll(tmp)
err = outputLinuxKit("raw", filepath.Join(tmp, "disk.raw"), kernel, initrd, cmdline, size, hyperkit)
if err != nil {
return fmt.Errorf("Error writing gcp-img output: %v", err)
@@ -173,10 +171,6 @@ var outFuns = map[string]func(string, []byte, int, bool) error{
if err != nil {
return err
}
err = os.RemoveAll(tmp)
if err != nil {
return err
}
return nil
},
"qcow2": func(base string, image []byte, size int, hyperkit bool) error {