Merge pull request #123 from tonistiigi/1809-builder-net
[18.09] builder: set externalkey option for faster hook processing
diff --git a/builder/builder-next/executor_unix.go b/builder/builder-next/executor_unix.go
index b3ea33c..3a11f85 100644
--- a/builder/builder-next/executor_unix.go
+++ b/builder/builder-next/executor_unix.go
@@ -15,6 +15,7 @@
"github.com/moby/buildkit/solver/pb"
"github.com/moby/buildkit/util/network"
specs "github.com/opencontainers/runtime-spec/specs-go"
+ "github.com/sirupsen/logrus"
)
const networkName = "bridge"
@@ -63,13 +64,13 @@
defer close(iface.ready)
id := identity.NewID()
- ep, err := n.CreateEndpoint(id)
+ ep, err := n.CreateEndpoint(id, libnetwork.CreateOptionDisableResolution())
if err != nil {
iface.err = err
return
}
- sbx, err := c.NewSandbox(id)
+ sbx, err := c.NewSandbox(id, libnetwork.OptionUseExternalKey())
if err != nil {
iface.err = err
return
@@ -100,10 +101,10 @@
func (iface *lnInterface) Close() error {
<-iface.ready
- err := iface.sbx.Delete()
- if iface.err != nil {
- // iface.err takes precedence over cleanup errors
- return iface.err
- }
- return err
+ go func() {
+ if err := iface.sbx.Delete(); err != nil {
+ logrus.Errorf("failed to delete builder network sandbox: %v", err)
+ }
+ }()
+ return iface.err
}
