InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #53 from thaJeztah/18.09_backport_buildkit-cli-control

Browse Source 
[18.09] backport always hornor client side to choose which builder to use with DOCKER_…
This commit is contained in:
Sebastiaan van Stijn
2018-09-17 12:34:28 +02:00
committed by GitHub
parent e988001872 5badfb40eb
commit 5fb0a7ced7
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/server/router/build/build_routes.go
View File

@@ -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