beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4073 from crosbymichael/fix-docker-cp-close

Browse source 
Ensure docker cp stream is closed properly
This commit is contained in:
unclejack 2014-02-13 14:12:53 +02:00
commit c6edac9a1a
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
container.go
View file

@ -1427,7 +1427,7 @@ func (container *Container) GetSize() (int64, int64) {
return sizeRw, sizeRootfs
}
func (container *Container) Copy(resource string) (archive.Archive, error) {
func (container *Container) Copy(resource string) (io.ReadCloser, error) {
if err := container.Mount(); err != nil {
return nil, err
}
@ -1454,7 +1454,7 @@ func (container *Container) Copy(resource string) (archive.Archive, error) {
if err != nil {
return nil, err
}
return EofReader(archive, func() { container.Unmount() }), nil
return utils.NewReadCloserWrapper(archive, container.Unmount), nil
}
// Returns true if the container exposes a certain port

1
server.go
View file

@ -2341,6 +2341,7 @@ func (srv *Server) ContainerCopy(job *engine.Job) engine.Status {
if err != nil {
return job.Error(err)
}
defer data.Close()
if _, err := io.Copy(job.Stdout, data); err != nil {
return job.Error(err)