From ed97b30d09757fa5beed3f3ffab2feb367344e16 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Tue, 21 Aug 2018 23:20:19 +0000 Subject: [PATCH] Fix logic when enabling buildkit Signed-off-by: Tibor Vass Upstream-commit: c973cde7606dc7a2557094fc90d8e6bb595fa354 Component: engine --- components/engine/api/server/router/build/build_routes.go | 2 +- components/engine/daemon/config/config.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/engine/api/server/router/build/build_routes.go b/components/engine/api/server/router/build/build_routes.go index acacfac2ed..c2a15c0ad3 100644 --- a/components/engine/api/server/router/build/build_routes.go +++ b/components/engine/api/server/router/build/build_routes.go @@ -231,7 +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 { + if buildOptions.Version == types.BuilderBuildKit && br.builderVersion != "" && br.builderVersion != types.BuilderBuildKit { return errdefs.InvalidParameter(errors.New("buildkit is not enabled on daemon")) } diff --git a/components/engine/daemon/config/config.go b/components/engine/daemon/config/config.go index 6081b5c8ed..451078d8c5 100644 --- a/components/engine/daemon/config/config.go +++ b/components/engine/daemon/config/config.go @@ -54,6 +54,7 @@ var flatOptions = map[string]bool{ "log-opts": true, "runtimes": true, "default-ulimits": true, + "features": true, } // skipValidateOptions contains configuration keys