Merge component 'engine' from git@github.com:docker/engine 18.09

2018-09-17 13:02:03 +00:00
parent d3c8a2bd75 f59ff81d45
commit 4ec08ba334
1 changed files with 0 additions and 6 deletions
@@ -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