0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #37826 from AntaresS/buildkit-cli-control

Browse source 
always allow client to override builder version regardless the server setup
This commit is contained in:
Tõnis Tiigi 2018-09-13 18:20:07 -07:00 • committed by GitHub
commit 3c0e47f025
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 6 deletions
Show stats 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