Ignore node modules when packaging the tar.gz (#349)

grafana · Aug 13, 2024 · f202e86 · f202e86
1 parent ceda23b
commit f202e86
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/artifacts/package_targz.go b/artifacts/package_targz.go
@@ -262,10 +262,14 @@ func (t *Tarball) BuildFile(ctx context.Context, b *dagger.Container, opts *pipe
 		targz.NewMappedDir("packaging/docker", grafanaDir.Directory("packaging/docker")),
 		targz.NewMappedDir("packaging/wrappers", grafanaDir.Directory("packaging/wrappers")),
 		targz.NewMappedDir("bin", backendDir),
-		targz.NewMappedDir("public", frontendDir),
+		targz.NewMappedDir("public", frontendDir, dagger.ContainerWithDirectoryOpts{
+			Exclude: []string{"node_modules", "*/node_modules", "**/*/node_modules"},
+		}),
 		targz.NewMappedDir("npm-artifacts", npmDir),
 		targz.NewMappedDir("storybook", storybookDir),
-		targz.NewMappedDir("plugins-bundled", pluginsDir),
+		targz.NewMappedDir("plugins-bundled", pluginsDir, dagger.ContainerWithDirectoryOpts{
+			Exclude: []string{"node_modules", "*/node_modules", "**/*/node_modules"},
+		}),
 	}
 
 	root := fmt.Sprintf("grafana-%s", version)

diff --git a/targz/build.go b/targz/build.go
@@ -6,13 +6,14 @@ import (
 	"dagger.io/dagger"
 )
 
-func NewMappedDir(path string, directory *dagger.Directory) MappedDirectory {
-	return MappedDirectory{path: path, directory: directory}
+func NewMappedDir(path string, directory *dagger.Directory, opts ...dagger.ContainerWithDirectoryOpts) MappedDirectory {
+	return MappedDirectory{path: path, directory: directory, opts: opts}
 }
 
 type MappedDirectory struct {
 	path      string
 	directory *dagger.Directory
+	opts      []dagger.ContainerWithDirectoryOpts
 }
 
 type MappedFile struct {
@@ -51,7 +52,7 @@ func Build(packager *dagger.Container, opts *Opts) *dagger.File {
 
 	for _, v := range opts.Directories {
 		path := path.Join(root, v.path)
-		packager = packager.WithMountedDirectory(path, v.directory)
+		packager = packager.WithDirectory(path, v.directory, v.opts...)
 		paths = append(paths, path)
 	}