Skip to content

Commit

Permalink
git: only configure search domains for services
Browse files Browse the repository at this point in the history
Otherwise this causes failures with Dockerfile builds that use
non-bleeding-edge frontends.

Really should never need these domains without a service anyway, which
was the original plan.

Signed-off-by: Alex Suraci <alex@dagger.io>
  • Loading branch information
vito committed Jul 18, 2023
1 parent ba78743 commit 01bfe28
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
7 changes: 2 additions & 5 deletions core/schema/git.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package schema

import (
"log"

"github.com/dagger/dagger/core"
"github.com/dagger/dagger/core/pipeline"
"github.com/dagger/dagger/router"
Expand Down Expand Up @@ -110,9 +108,7 @@ type gitTreeArgs struct {
}

func (s *gitSchema) tree(ctx *router.Context, parent gitRef, args gitTreeArgs) (*core.Directory, error) {
domains := s.searchDomains()
log.Println("!!! GIT TREE DOMAINS", domains)
opts := []llb.GitOption{llb.SearchDomains(domains)}
opts := []llb.GitOption{}
if parent.Repository.KeepGitDir {
opts = append(opts, llb.KeepGitDir())
}
Expand All @@ -126,6 +122,7 @@ func (s *gitSchema) tree(ctx *router.Context, parent gitRef, args gitTreeArgs) (
var svcs core.ServiceBindings
if parent.Repository.ServiceHost != nil {
svcs = core.ServiceBindings{*parent.Repository.ServiceHost: nil}
opts = append(opts, llb.SearchDomains(s.searchDomains()))
}

st := llb.Git(parent.Repository.URL, parent.Name, opts...)
Expand Down
3 changes: 0 additions & 3 deletions engine/engine.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"
"encoding/json"
"fmt"
"log"
"net"
"net/url"
"os"
Expand Down Expand Up @@ -154,8 +153,6 @@ func Start(ctx context.Context, startOpts Config, fn StartCallback) error {
return fmt.Errorf("normalize workdir: %w", err)
}

log.Println("!!! ENGINE DOMAINS", startOpts.ExtraSearchDomains)

router := router.New(startOpts.SessionToken, recorder)
secretStore := secret.NewStore(startOpts.ExtraSearchDomains)

Expand Down

0 comments on commit 01bfe28

Please sign in to comment.