diff --git a/.golangci.yml b/.golangci.yml index bc5929f4a13b..2a4db15bd3c4 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -7,7 +7,6 @@ run: build-tags: - dfrunsecurity - - dfrunnetwork - dfheredoc linters: diff --git a/frontend/dockerfile/dockerfile2llb/convert_norunnetwork.go b/frontend/dockerfile/dockerfile2llb/convert_norunnetwork.go deleted file mode 100644 index 300b9d85f1d7..000000000000 --- a/frontend/dockerfile/dockerfile2llb/convert_norunnetwork.go +++ /dev/null @@ -1,12 +0,0 @@ -// +build !dfrunnetwork - -package dockerfile2llb - -import ( - "github.com/moby/buildkit/client/llb" - "github.com/moby/buildkit/frontend/dockerfile/instructions" -) - -func dispatchRunNetwork(c *instructions.RunCommand) (llb.RunOption, error) { - return nil, nil -} diff --git a/frontend/dockerfile/dockerfile2llb/convert_runnetwork.go b/frontend/dockerfile/dockerfile2llb/convert_runnetwork.go index 01313e23be19..e09153560a9f 100644 --- a/frontend/dockerfile/dockerfile2llb/convert_runnetwork.go +++ b/frontend/dockerfile/dockerfile2llb/convert_runnetwork.go @@ -1,5 +1,3 @@ -// +build dfrunnetwork - package dockerfile2llb import ( diff --git a/frontend/dockerfile/dockerfile_runnetwork_test.go b/frontend/dockerfile/dockerfile_runnetwork_test.go index 4fcacac110e4..a8fccac1705c 100644 --- a/frontend/dockerfile/dockerfile_runnetwork_test.go +++ b/frontend/dockerfile/dockerfile_runnetwork_test.go @@ -1,5 +1,3 @@ -// +build dfrunnetwork - package dockerfile import ( diff --git a/frontend/dockerfile/instructions/commands_runnetwork.go b/frontend/dockerfile/instructions/commands_runnetwork.go index adef3fd7aa97..142c3075b589 100644 --- a/frontend/dockerfile/instructions/commands_runnetwork.go +++ b/frontend/dockerfile/instructions/commands_runnetwork.go @@ -1,5 +1,3 @@ -// +build dfrunnetwork - package instructions import ( diff --git a/frontend/dockerfile/release/labs/tags b/frontend/dockerfile/release/labs/tags index 54281f95113d..97f82d903056 100644 --- a/frontend/dockerfile/release/labs/tags +++ b/frontend/dockerfile/release/labs/tags @@ -1 +1 @@ -dfrunsecurity dfrunnetwork dfheredoc +dfrunsecurity dfheredoc