dockerfile: use none differ for dockerfile/dockerignore

This avoids wrong metadata matches on small files Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
moby · Jun 12, 2021 · be61d26 · be61d26
1 parent a7b155e
commit be61d26
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/frontend/dockerfile/builder/build.go b/frontend/dockerfile/builder/build.go
@@ -143,6 +143,7 @@ func Build(ctx context.Context, c client.Client) (*client.Result, error) {
 		llb.SessionID(c.BuildOpts().SessionID),
 		llb.SharedKeyHint(localNameDockerfile),
 		dockerfile2llb.WithInternalName(name),
+		llb.Differ(llb.DiffNone, false),
 	)
 
 	fileop := useFileOp(opts, &caps)
@@ -302,6 +303,7 @@ func Build(ctx context.Context, c client.Client) (*client.Result, error) {
 					llb.FollowPaths([]string{dockerignoreFilename}),
 					llb.SharedKeyHint(localNameContext+"-"+dockerignoreFilename),
 					dockerfile2llb.WithInternalName("load "+dockerignoreFilename),
+					llb.Differ(llb.DiffNone, false),
 				)
 				dockerignoreState = &st
 			}

diff --git a/session/filesync/filesync.go b/session/filesync/filesync.go
@@ -24,7 +24,6 @@ const (
 	keyFollowPaths        = "followpaths"
 	keyDirName            = "dir-name"
 	keyExporterMetaPrefix = "exporter-md-"
-	keyDiffer             = "differ"
 )
 
 type fsSyncProvider struct {