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 the destination directory exists when using docker insert

Browse source
This commit is contained in:
Guillaume J. Charmes 2013-04-24 13:51:28 -07:00
parent 9751483112
commit 9db4972a70
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builder.go
View file

@ -110,7 +110,7 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) error {
}
// Commit the container
base, err := builder.Commit(c, "", "", "", "")
base, err = builder.Commit(c, "", "", "", "")
if err != nil {
return err
}

2
commands.go
View file

@ -105,7 +105,7 @@ func (srv *Server) CmdInsert(stdin io.ReadCloser, stdout rcli.DockerConn, args .
if err != nil {
return err
}
fmt.Fprintf(stdout, "%s\n", img)
fmt.Fprintf(stdout, "%s\n", img.Id)
return nil
}

7
container.go
View file

@ -180,7 +180,12 @@ func (settings *NetworkSettings) PortMappingHuman() string {
// Inject the io.Reader at the given path. Note: do not close the reader
func (container *Container) Inject(file io.Reader, pth string) error {
dest, err := os.Open(path.Join(container.rwPath(), pth))
// Make sure the directory exists
if err := os.MkdirAll(path.Join(container.rwPath(), path.Dir(pth)), 0755); err != nil {
return err
}
// FIXME: Handle permissions/already existing dest
dest, err := os.Create(path.Join(container.rwPath(), pth))
if err != nil {
return err
}