kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Make sure dirs are created before injecting file

Browse source
This commit is contained in:
Michael Crosby 2013-11-08 12:06:15 -08:00
parent 6669c86fdf
commit 20f690f176
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
container.go
View file

@ -396,7 +396,8 @@ func (container *Container) Inject(file io.Reader, pth string) error {
} }
// Return error if path exists // Return error if path exists
if _, err := os.Stat(path.Join(container.RootfsPath(), pth)); err == nil { destPath := path.Join(container.RootfsPath(), pth)
if _, err := os.Stat(destPath); err == nil {
// Since err is nil, the path could be stat'd and it exists // Since err is nil, the path could be stat'd and it exists
return fmt.Errorf("%s exists", pth) return fmt.Errorf("%s exists", pth)
} else if !os.IsNotExist(err) { } else if !os.IsNotExist(err) {
@ -405,10 +406,18 @@ func (container *Container) Inject(file io.Reader, pth string) error {
return err return err
} }
dest, err := os.Create(path.Join(container.RootfsPath(), pth))
// Make sure the directory exists
if err := os.MkdirAll(path.Join(container.RootfsPath(), path.Dir(pth)), 0755); err != nil {
return err
}
dest, err := os.Create(destPath)
if err != nil { if err != nil {
return err return err
} }
defer dest.Close()
if _, err := io.Copy(dest, file); err != nil { if _, err := io.Copy(dest, file); err != nil {
return err return err
} }