Merge pull request #37688 from tiborvass/features-not-flat
Fix logic when enabling buildkit
diff --git a/api/server/router/build/build_routes.go b/api/server/router/build/build_routes.go
index acacfac..c2a15c0 100644
--- a/api/server/router/build/build_routes.go
+++ b/api/server/router/build/build_routes.go
@@ -231,7 +231,7 @@
}
// 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/daemon/config/config.go b/daemon/config/config.go
index 6081b5c..451078d 100644
--- a/daemon/config/config.go
+++ b/daemon/config/config.go
@@ -54,6 +54,7 @@
"log-opts": true,
"runtimes": true,
"default-ulimits": true,
+ "features": true,
}
// skipValidateOptions contains configuration keys
