docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup build tmp dir stuff 

If there's an error while unpacking the build context then we weren't erasing
the tmp dir created to persist the context.

Signed-off-by: Doug Davis <dug@us.ibm.com>
This commit is contained in:
Doug Davis 2015-07-15 06:04:35 -07:00
parent a031b6476c
commit 13c08b898b
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
builder/internals.go
View File

@ -39,27 +39,37 @@ import (
"github.com/docker/docker/runconfig" "github.com/docker/docker/runconfig"
) )
func (b *Builder) readContext(context io.Reader) error { func (b *Builder) readContext(context io.Reader) (err error) {
tmpdirPath, err := ioutil.TempDir("", "docker-build") tmpdirPath, err := ioutil.TempDir("", "docker-build")
if err != nil { if err != nil {
return err return
} }
// Make sure we clean-up upon error. In the happy case the caller
// is expected to manage the clean-up
defer func() {
if err != nil {
if e := os.RemoveAll(tmpdirPath); e != nil {
logrus.Debugf("[BUILDER] failed to remove temporary context: %s", e)
}
}
}()
decompressedStream, err := archive.DecompressStream(context) decompressedStream, err := archive.DecompressStream(context)
if err != nil { if err != nil {
return err return
} }
if b.context, err = tarsum.NewTarSum(decompressedStream, true, tarsum.Version1); err != nil { if b.context, err = tarsum.NewTarSum(decompressedStream, true, tarsum.Version1); err != nil {
return err return
} }
if err := chrootarchive.Untar(b.context, tmpdirPath, nil); err != nil { if err = chrootarchive.Untar(b.context, tmpdirPath, nil); err != nil {
return err return
} }
b.contextPath = tmpdirPath b.contextPath = tmpdirPath
return nil return
} }
func (b *Builder) commit(id string, autoCmd *runconfig.Command, comment string) error { func (b *Builder) commit(id string, autoCmd *runconfig.Command, comment string) error {