From 815b828ddbf4add2be5176ae6908dee274dfee5a Mon Sep 17 00:00:00 2001 From: Anda Xu Date: Tue, 11 Sep 2018 17:19:51 -0700 Subject: [PATCH] always hornor client side to choose which builder to use with DOCKER_BUILDKIT env var regardless the server setup Signed-off-by: Anda Xu (cherry picked from commit 5d931705e33927ba9f0b7251b74b6b3c450edaf6) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 5badfb40ebf1877bb319af3892b32a78491fb8e8 Component: engine --- components/engine/api/server/router/build/build_routes.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/components/engine/api/server/router/build/build_routes.go b/components/engine/api/server/router/build/build_routes.go index 22850a69c4..60a136a92c 100644 --- a/components/engine/api/server/router/build/build_routes.go +++ b/components/engine/api/server/router/build/build_routes.go @@ -250,12 +250,6 @@ func (br *buildRouter) postBuild(ctx context.Context, w http.ResponseWriter, r * return errdefs.InvalidParameter(errors.New("squash is only supported with experimental mode")) } - builderVersion := BuilderVersion(*br.features) - // check if the builder feature has been enabled from daemon as well. - if buildOptions.Version == types.BuilderBuildKit && builderVersion != "" && builderVersion != types.BuilderBuildKit { - return errdefs.InvalidParameter(errors.New("buildkit is not enabled on daemon")) - } - out := io.Writer(output) if buildOptions.SuppressOutput { out = notVerboseBuffer