Merge pull request #38609 from kwojcicki/enhancement/38518-docker_info_builder_version

Adding builder version

api/server/router/system/system_routes.go

@@ -52,6 +52,8 @@ func (s *systemRouter) getInfo(ctx context.Context, w http.ResponseWriter, r *ht
 		info.Swarm = s.cluster.Info()
 	}
 
+	info.Builder = build.BuilderVersion(*s.features)
+
 	if versions.LessThan(httputils.VersionFromContext(ctx), "1.25") {
 		// TODO: handle this conversion in engine-api
 		type oldInfo struct {

api/types/types.go

@@ -146,6 +146,7 @@ type Commit struct {
 // GET "/info"
 type Info struct {
 	ID                 string
+	Builder            BuilderVersion
 	Containers         int
 	ContainersRunning  int
 	ContainersPaused   int

integration/system/info_test.go

@@ -35,7 +35,8 @@ func TestInfoAPI(t *testing.T) {
 		"KernelVersion",
 		"Driver",
 		"ServerVersion",
-		"SecurityOptions"}
+		"SecurityOptions",
+		"Builder"}
 
 	out := fmt.Sprintf("%+v", info)
 	for _, linePrefix := range stringsToCheck {