Merge pull request #35244 from joyce/joyce/todo-fixes
fix todo for printing error messages
diff --git a/builder/remotecontext/git.go b/builder/remotecontext/git.go
index 158bb5a..f6fc0bc 100644
--- a/builder/remotecontext/git.go
+++ b/builder/remotecontext/git.go
@@ -6,6 +6,7 @@
"github.com/docker/docker/builder"
"github.com/docker/docker/builder/remotecontext/git"
"github.com/docker/docker/pkg/archive"
+ "github.com/sirupsen/logrus"
)
// MakeGitContext returns a Context from gitURL that is cloned in a temporary directory.
@@ -21,9 +22,14 @@
}
defer func() {
- // TODO: print errors?
- c.Close()
- os.RemoveAll(root)
+ err := c.Close()
+ if err != nil {
+ logrus.WithField("action", "MakeGitContext").WithField("module", "builder").WithField("url", gitURL).WithError(err).Error("error while closing git context")
+ }
+ err = os.RemoveAll(root)
+ if err != nil {
+ logrus.WithField("action", "MakeGitContext").WithField("module", "builder").WithField("url", gitURL).WithError(err).Error("error while removing path and children of root")
+ }
}()
return FromArchive(c)
}
