executor/oci: use buildkit bklog instead of containerd/log

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

executor/oci/internal/resolvconf/resolvconf.go

@@ -25,8 +25,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/containerd/log"
 	"github.com/moby/buildkit/errdefs"
+	"github.com/moby/buildkit/util/bklog"
 )
 
 // Fallback nameservers, to use if none can be obtained from the host or command
@@ -220,7 +220,7 @@ func (rc *ResolvConf) TransformForLegacyNw(ipv6 bool) {
 	}
 	rc.nameServers = filtered
 	if len(rc.nameServers) == 0 {
-		log.G(context.TODO()).Info("No non-localhost DNS nameservers are left in resolv.conf. Using default external servers")
+		bklog.G(context.TODO()).Info("No non-localhost DNS nameservers are left in resolv.conf. Using default external servers")
 		rc.nameServers = defaultNSAddrs(ipv6)
 		rc.md.Warnings = append(rc.md.Warnings, "Used default nameservers.")
 	}

executor/oci/internal/resolvconf/resolvconf_path.go

@@ -5,7 +5,7 @@ import (
 	"net/netip"
 	"sync"
 
-	"github.com/containerd/log"
+	"github.com/moby/buildkit/util/bklog"
 )
 
 const (
@@ -49,7 +49,7 @@ func Path() string {
 		ns := rc.nameServers
 		if len(ns) == 1 && ns[0] == netip.MustParseAddr("127.0.0.53") {
 			pathAfterSystemdDetection = alternatePath
-			log.G(context.TODO()).Infof("detected 127.0.0.53 nameserver, assuming systemd-resolved, so using resolv.conf: %s", alternatePath)
+			bklog.G(context.TODO()).Infof("detected 127.0.0.53 nameserver, assuming systemd-resolved, so using resolv.conf: %s", alternatePath)
 		}
 	})
 	return pathAfterSystemdDetection