github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-27 04:28:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #193 from ijc/bugfix-191

Browse Source 
Defer dockerRm until we are finished with the contents
This commit is contained in:
Justin Cormack 2017-12-13 09:35:13 -08:00 committed by GitHub
commit d9d2a91780
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/moby/image.go
View File

@ -82,7 +82,7 @@ func tarPrefix(path string, tw tarWriter) error {
} }
// ImageTar takes a Docker image and outputs it to a tar stream // ImageTar takes a Docker image and outputs it to a tar stream
func ImageTar(ref *reference.Spec, prefix string, tw tarWriter, trust bool, pull bool, resolv string) error { func ImageTar(ref *reference.Spec, prefix string, tw tarWriter, trust bool, pull bool, resolv string) (e error) {
log.Debugf("image tar: %s %s", ref, prefix) log.Debugf("image tar: %s %s", ref, prefix)
if prefix != "" && prefix[len(prefix)-1] != byte('/') { if prefix != "" && prefix[len(prefix)-1] != byte('/') {
return fmt.Errorf("prefix does not end with /: %s", prefix) return fmt.Errorf("prefix does not end with /: %s", prefix)
@ -119,12 +119,13 @@ func ImageTar(ref *reference.Spec, prefix string, tw tarWriter, trust bool, pull
if err != nil { if err != nil {
return fmt.Errorf("Failed to docker export container from container %s: %v", container, err) return fmt.Errorf("Failed to docker export container from container %s: %v", container, err)
} }
defer contents.Close() defer func() {
contents.Close()
err = dockerRm(container) if err := dockerRm(container); e == nil && err != nil {
if err != nil { e = fmt.Errorf("Failed to docker rm container %s: %v", container, err)
return fmt.Errorf("Failed to docker rm container %s: %v", container, err) }
} }()
// now we need to filter out some files from the resulting tar archive // now we need to filter out some files from the resulting tar archive