From e96d6d1775a778e39a54c570cbd9391e7f04bd68 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Sun, 10 Mar 2019 21:08:51 -0700 Subject: [PATCH] dockerfile: make fileop default Signed-off-by: Tonis Tiigi --- frontend/dockerfile/dockerfile2llb/convert.go | 2 +- frontend/dockerfile/dockerfile2llb/convert_fileop.go | 5 ----- frontend/dockerfile/dockerfile2llb/convert_nofileop.go | 5 ----- 3 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 frontend/dockerfile/dockerfile2llb/convert_fileop.go delete mode 100644 frontend/dockerfile/dockerfile2llb/convert_nofileop.go diff --git a/frontend/dockerfile/dockerfile2llb/convert.go b/frontend/dockerfile/dockerfile2llb/convert.go index a6e564b0f114..a6a7d99323ec 100644 --- a/frontend/dockerfile/dockerfile2llb/convert.go +++ b/frontend/dockerfile/dockerfile2llb/convert.go @@ -1279,7 +1279,7 @@ func prefixCommand(ds *dispatchState, str string, prefixPlatform bool, platform } func useFileOp(args map[string]string, caps *apicaps.CapSet) bool { - enabled := fileOpEnabled + enabled := true if v, ok := args["BUILDKIT_USE_FILEOP"]; ok { if b, err := strconv.ParseBool(v); err == nil { enabled = b diff --git a/frontend/dockerfile/dockerfile2llb/convert_fileop.go b/frontend/dockerfile/dockerfile2llb/convert_fileop.go deleted file mode 100644 index 9c8abc7c323a..000000000000 --- a/frontend/dockerfile/dockerfile2llb/convert_fileop.go +++ /dev/null @@ -1,5 +0,0 @@ -// +build fileop - -package dockerfile2llb - -const fileOpEnabled = true diff --git a/frontend/dockerfile/dockerfile2llb/convert_nofileop.go b/frontend/dockerfile/dockerfile2llb/convert_nofileop.go deleted file mode 100644 index f8f7582b045f..000000000000 --- a/frontend/dockerfile/dockerfile2llb/convert_nofileop.go +++ /dev/null @@ -1,5 +0,0 @@ -// +build !fileop - -package dockerfile2llb - -const fileOpEnabled = false