opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-15 03:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3883 from baude/varlinkbuildcleanup

Browse Source 
clean up after remote build
This commit is contained in:
OpenShift Merge Robot
2019-08-26 17:24:09 +02:00
committed by GitHub
parent 67926d86b5 ed88a5fb64
commit 112a3cce5d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/varlinkapi/images.go
View File

@ -142,7 +142,14 @@ func (i *LibpodAPI) BuildImage(call iopodman.VarlinkCall, config iopodman.BuildI
return call.ReplyErrorOccurred(fmt.Sprintf("unable to untar context dir %s", contextDir)) return call.ReplyErrorOccurred(fmt.Sprintf("unable to untar context dir %s", contextDir))
} }
logrus.Debugf("untar of %s successful", contextDir) logrus.Debugf("untar of %s successful", contextDir)
defer func() {
if err := os.Remove(contextDir); err != nil {
logrus.Errorf("unable to delete file '%s': %q", contextDir, err)
}
if err := os.RemoveAll(newContextDir); err != nil {
logrus.Errorf("unable to delete directory '%s': %q", newContextDir, err)
}
}()
// All output (stdout, stderr) is captured in output as well // All output (stdout, stderr) is captured in output as well
var output bytes.Buffer var output bytes.Buffer