bump buildkit, remove logs

Signed-off-by: Alex Suraci <alex@dagger.io>
vito · Jul 18, 2023 · 39cec48 · 39cec48
1 parent 291ed0b
commit 39cec48
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/cmd/shim/main.go b/cmd/shim/main.go
@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"log"
 	"net"
 	"net/http"
 	"os"
@@ -436,8 +435,6 @@ func setupBundle() int {
 		}
 	}
 
-	log.Println("!!! SEARCH DOMAINS", searchDomains)
-
 	var hostsFilePath string
 	for i, mnt := range spec.Mounts {
 		switch mnt.Destination {
@@ -450,14 +447,12 @@ func setupBundle() int {
 
 			newResolvPath := filepath.Join(bundleDir, "resolv.conf")
 
-			log.Println("!!! UPDATING RESOLV FILE PATH", mnt.Source, newResolvPath)
-
 			newResolv, err := os.Create(newResolvPath)
 			if err != nil {
 				panic(err)
 			}
 
-			if err := replaceSearch(io.MultiWriter(newResolv, os.Stderr), mnt.Source, searchDomains); err != nil {
+			if err := replaceSearch(newResolv, mnt.Source, searchDomains); err != nil {
 				panic(err)
 			}
 
@@ -578,7 +573,6 @@ func appendHostAlias(hostsFilePath string, env string, searchDomains []string) e
 
 		var err error
 		ips, err = net.LookupIP(qualified)
-		log.Println("!!! LOOKUP", qualified, ips)
 		if err == nil {
 			errs = nil // ignore prior failures
 			break

diff --git a/core/service.go b/core/service.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"log"
 	"sort"
 	"strings"
 	"sync"
@@ -385,7 +384,6 @@ func (svc *Service) Start(ctx context.Context, gw bkgw.Client, progSock *Socket)
 
 	// set a hostname qualified by the current session ID
 	fullHost := host + "." + searchDomain
-	log.Println("!!! SERVICE FULL HOST", fullHost)
 
 	health := newHealth(gw, fullHost, svc.Container.Ports)
 

diff --git a/go.mod b/go.mod
@@ -264,4 +264,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/moby/buildkit => github.com/vito/buildkit v0.10.1-0.20230619215640-f5303ca0cc88
+replace github.com/moby/buildkit => github.com/vito/buildkit v0.10.1-0.20230619221809-ee00c80336fd
diff --git a/go.sum b/go.sum
@@ -1941,8 +1941,8 @@ github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmF
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
-github.com/vito/buildkit v0.10.1-0.20230619215640-f5303ca0cc88 h1:O+hzsUp/nhvODSnM/MW8AAJfyFuiPPm3Z8MWKELW7ZE=
-github.com/vito/buildkit v0.10.1-0.20230619215640-f5303ca0cc88/go.mod h1:6Y1HYDrxg3sY5gBY2FVaEvQpswBj3g/ck7aKYCjOkk0=
+github.com/vito/buildkit v0.10.1-0.20230619221809-ee00c80336fd h1:4UjJ9VoTekX8ZmItYn6c5+tlEDEdElQERfESud9bpE0=
+github.com/vito/buildkit v0.10.1-0.20230619221809-ee00c80336fd/go.mod h1:6Y1HYDrxg3sY5gBY2FVaEvQpswBj3g/ck7aKYCjOkk0=
 github.com/vito/progrock v0.7.1-0.20230628234355-c8ce2c2e3c24 h1:E6NeGFp8/YGYHnWtwzP5lrphxXLmoKsoAvdwuIkUTOk=
 github.com/vito/progrock v0.7.1-0.20230628234355-c8ce2c2e3c24/go.mod h1:YjiMvY2X47zc9H5je8w4V59cTSrV2d0vQPwJOB5TLH8=
 github.com/vito/vt100 v0.1.2 h1:gRhKJ/shHTRfMHg+Wc5ExHJzV6HHZqyQIAL52x4EUmA=