From be61d26bcab1db5def762a61ffd51b818812a105 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Tue, 20 Apr 2021 21:48:38 -0700 Subject: [PATCH] dockerfile: use none differ for dockerfile/dockerignore This avoids wrong metadata matches on small files Signed-off-by: Tonis Tiigi --- frontend/dockerfile/builder/build.go | 2 ++ session/filesync/filesync.go | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/dockerfile/builder/build.go b/frontend/dockerfile/builder/build.go index 5e67a83370e83..db2442bd6138a 100644 --- 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 index f6cfb762a4898..89110a27558bb 100644 --- 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 {