GitList

Browse code

Merge pull request #29497 from yongtang/29486-docker-build-tmp-file

Clean up tmp files for interrupted `docker build`
(cherry picked from commit 6138a02c8739045a2f6dec85fd0d89db9bed43e5)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2016/12/19 07:59:00
Showing 1 changed files

builder/tarsum.go index 35054dc..77d3142 100644

builder/tarsum.go

History View file @ 1c47c89

@@ -104,7 +104,8 @@ func MakeTarSumContext(tarStream io.Reader) (ModifiableContext, error) {
 		return nil, err
 	}
 
-	if err := chrootarchive.Untar(sum, root, nil); err != nil {
+	err = chrootarchive.Untar(sum, root, nil)
+	if err != nil {
 		return nil, err
 	}
 

...	...	@@ -104,7 +104,8 @@ func MakeTarSumContext(tarStream io.Reader) (ModifiableContext, error) {
104	104	return nil, err
105	105	}
106	106
107		- if err := chrootarchive.Untar(sum, root, nil); err != nil {
	107	+ err = chrootarchive.Untar(sum, root, nil)
	108	+ if err != nil {
108	109	return nil, err
109	110	}
110	111