From a1ba7aa59c6566f8c934c914495e93d37c9f7336 Mon Sep 17 00:00:00 2001 From: Tony Worm Date: Wed, 17 Mar 2021 19:55:28 -0400 Subject: [PATCH] implement .daggerignore Signed-off-by: Tony Worm --- .daggerignore | 3 +++ dagger/pipeline.go | 53 ++++++++++++++++++++++++++++++++++++++----- tests/ignore/main.cue | 21 +++++++++++++++++ 3 files changed, 71 insertions(+), 6 deletions(-) create mode 100644 .daggerignore create mode 100644 tests/ignore/main.cue diff --git a/.daggerignore b/.daggerignore new file mode 100644 index 00000000..af35429b --- /dev/null +++ b/.daggerignore @@ -0,0 +1,3 @@ +vendor +hack +cmd/dagger/dagger diff --git a/dagger/pipeline.go b/dagger/pipeline.go index a9fee6df..37486260 100644 --- a/dagger/pipeline.go +++ b/dagger/pipeline.go @@ -1,6 +1,7 @@ package dagger import ( + "bytes" "context" "encoding/json" "errors" @@ -14,12 +15,17 @@ import ( dockerfilebuilder "github.com/moby/buildkit/frontend/dockerfile/builder" bkgw "github.com/moby/buildkit/frontend/gateway/client" bkpb "github.com/moby/buildkit/solver/pb" + "github.com/moby/buildkit/frontend/dockerfile/dockerignore" "github.com/rs/zerolog/log" "gopkg.in/yaml.v3" "dagger.io/go/dagger/compiler" ) +const ( + daggerignoreFilename = ".daggerignore" +) + // An execution pipeline type Pipeline struct { name string @@ -257,12 +263,46 @@ func (p *Pipeline) Local(ctx context.Context, op *compiler.Value, st llb.State) if err != nil { return st, err } - var include []string - if inc := op.Get("include"); inc.Exists() { - if err := inc.Decode(&include); err != nil { - return st, err - } + + // daggerignore processing + // buildkit related setup + daggerignoreState := llb.Local( + dir, + llb.SessionID(p.s.SessionID()), + llb.FollowPaths([]string{daggerignoreFilename}), + llb.SharedKeyHint(dir+"-"+daggerignoreFilename), + llb.WithCustomName(p.vertexNamef("Load %s", daggerignoreFilename)), + ) + + var daggerignore []byte + + def, err := p.s.Marshal(ctx, daggerignoreState) + if err != nil { + return st, err } + ref, err := p.s.SolveRequest(ctx, bkgw.SolveRequest{ + Definition: def, + }) + if err != nil { + return st, err + } + + // try to read file + daggerignore, err = ref.ReadFile(ctx, bkgw.ReadRequest{ + Filename: daggerignoreFilename, + }) + // hack for string introspection because !errors.Is(err, os.ErrNotExist) does not work, same for fs + if err != nil && !strings.Contains(err.Error(), ".daggerignore: no such file or directory") { + return st, err + } + + // parse out excludes, works even if file does not exist + var excludes []string + excludes, err = dockerignore.ReadAll(bytes.NewBuffer(daggerignore)) + if err != nil { + return st, fmt.Errorf("%w failed to parse daggerignore", err) + } + // FIXME: Remove the `Copy` and use `Local` directly. // // Copy'ing is a costly operation which should be unnecessary. @@ -275,7 +315,8 @@ func (p *Pipeline) Local(ctx context.Context, op *compiler.Value, st llb.State) llb.Copy( llb.Local( dir, - llb.FollowPaths(include), + // llb.FollowPaths(include), + llb.ExcludePatterns(excludes), llb.WithCustomName(p.vertexNamef("Local %s [transfer]", dir)), // Without hint, multiple `llb.Local` operations on the diff --git a/tests/ignore/main.cue b/tests/ignore/main.cue new file mode 100644 index 00000000..c1832cad --- /dev/null +++ b/tests/ignore/main.cue @@ -0,0 +1,21 @@ +package main + +import ( + "dagger.io/dagger" + "dagger.io/llb" +) + +dir: dagger.#Artifact + +ignore: { + string + #compute: [ + llb.#FetchContainer & { ref: "debian:buster" }, + llb.#Exec & { + args: ["bash", "-c", "ls -lh /src > /out.txt"] + mount: "/src": { from: dir } + }, + llb.#Export & { source: "/out.txt" }, + ] +} +