From cea4607c21c765cad83a5f9f261ef0742261b264 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Tue, 21 Aug 2018 22:19:45 +0000 Subject: [PATCH 1/2] remove experimental guard for buildkit Signed-off-by: Andrew Hsu Upstream-commit: 239047c2d36706f2826b0a9bc115e0a08b1c3d27 Component: engine --- components/engine/api/server/router/build/build_routes.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/engine/api/server/router/build/build_routes.go b/components/engine/api/server/router/build/build_routes.go index 62bcf3f13d..acacfac2ed 100644 --- a/components/engine/api/server/router/build/build_routes.go +++ b/components/engine/api/server/router/build/build_routes.go @@ -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")) } From 2594f77b01f738be9ebb1c78c11e57ff46ee74fc Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Tue, 21 Aug 2018 22:43:34 +0000 Subject: [PATCH 2/2] move /session api endpoint out of experimental Signed-off-by: Andrew Hsu Upstream-commit: 01c9e7082eba71cbe60ce2e47acb9aad2c83c7ef Component: engine --- components/engine/api/server/router/session/session.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/api/server/router/session/session.go b/components/engine/api/server/router/session/session.go index de6d63008a..79ddc134e7 100644 --- a/components/engine/api/server/router/session/session.go +++ b/components/engine/api/server/router/session/session.go @@ -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), } }