toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #37686 from andrewhsu/bk-no-ex

Browse Source 
remove experimental guard for buildkit
Upstream-commit: 9972a826c81630ed6136a198586ae4a36c6f9dfe
Component: engine
This commit is contained in:
Tibor Vass
2018-08-21 16:43:46 -07:00
committed by GitHub
parent c0b7cd4ffb 2594f77b01
commit 821e8ae86c
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/api/server/router/build/build_routes.go
+1 -2
View File
@@ -231,8 +231,7 @@ func (br *buildRouter) postBuild(ctx context.Context, w http.ResponseWriter, r *
}
// check if the builder feature has been enabled from daemon as well.
if buildOptions.Version == types.BuilderBuildKit &&
(br.builderVersion != types.BuilderBuildKit || !br.daemon.HasExperimental()) {
if buildOptions.Version == types.BuilderBuildKit && br.builderVersion != types.BuilderBuildKit {
return errdefs.InvalidParameter(errors.New("buildkit is not enabled on daemon"))
}
components/engine/api/server/router/session/session.go
+1 -1
View File
@@ -24,6 +24,6 @@ func (r *sessionRouter) Routes() []router.Route {
func (r *sessionRouter) initRoutes() {
r.routes = []router.Route{
router.Experimental(router.NewPostRoute("/session", r.startSession)),
router.NewPostRoute("/session", r.startSession),
}
}