clean up after remote build

when performing an image build over a varlink connection, we should clean up tmp files that are a result of sending the file to the host and untarring it for the build. Fixes: containers#3869 Signed-off-by: baude <[email protected]>
mheon · Aug 28, 2019 · 8b09b07 · 8b09b07
1 parent 67926d8
commit 8b09b07
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go
@@ -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))
 	}
 	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
 	var output bytes.Buffer