perf: add Dockerfile file to select build (#2372)

Signed-off-by: 张启航 <[email protected]>

Author: ZhangSetSail

api/handler/service_operation.go

@@ -398,6 +398,10 @@ func (o *OperationHandler) buildFromSourceCode(r *model.ComponentBuildReq, servi
 		body["user"] = r.CodeInfo.User
 		body["password"] = r.CodeInfo.Password
 	}
+	// 传递 dockerfile_path 到构建任务
+	if r.CodeInfo.DockerfilePath != "" {
+		body["dockerfile_path"] = r.CodeInfo.DockerfilePath
+	}
 	body["expire"] = 180
 	body["configs"] = r.Configs
 	return o.sendBuildTopic(service.ServiceID, "build_from_source_code", body, r.Arch)

api/model/model.go

@@ -1729,6 +1729,10 @@ type BuildCodeInfo struct {
 	Password   string `json:"password" validate:"password"`
 	//for .netcore source type, need cmd
 	Cmd string `json:"cmd"`
+	// Dockerfile路径，用于指定子目录中的Dockerfile
+	// in: body
+	// required: false
+	DockerfilePath string `json:"dockerfile_path"`
 }
 
 // BuildSlugInfo -

builder/build/dockerfile_build.go

@@ -46,8 +46,13 @@ type dockerfileBuild struct {
 }
 
 func (d *dockerfileBuild) Build(re *Request) (*Response, error) {
-	filepath := path.Join(re.SourceDir, "Dockerfile")
-	re.Logger.Info("Start parse Dockerfile", map[string]string{"step": "builder-exector"})
+	// 如果指定了 dockerfile_path，使用它；否则使用默认的 Dockerfile
+	dockerfilePath := "Dockerfile"
+	if re.CodeSouceInfo.DockerfilePath != "" {
+		dockerfilePath = re.CodeSouceInfo.DockerfilePath
+	}
+	filepath := path.Join(re.SourceDir, dockerfilePath)
+	re.Logger.Info("Start parse Dockerfile", map[string]string{"step": "builder-exector", "dockerfile_path": dockerfilePath})
 	_, err := sources.ParseFile(filepath)
 	if err != nil {
 		logrus.Error("parse dockerfile error.", err.Error())
@@ -88,6 +93,11 @@ func (d *dockerfileBuild) stopPreBuildJob(re *Request) error {
 func (d *dockerfileBuild) runBuildJob(re *Request, buildImageName string) error {
 	name := fmt.Sprintf("%s-%s", re.ServiceID, re.DeployVersion)
 	namespace := re.RbdNamespace
+	// 获取 dockerfile 路径
+	dockerfilePath := "Dockerfile"
+	if re.CodeSouceInfo.DockerfilePath != "" {
+		dockerfilePath = re.CodeSouceInfo.DockerfilePath
+	}
 	job := corev1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
@@ -171,6 +181,10 @@ func (d *dockerfileBuild) runBuildJob(re *Request, buildImageName string) error
 			Privileged: &privileged,
 		},
 	}
+	// 如果指定了自定义的 dockerfile 路径，添加 filename 参数
+	if dockerfilePath != "Dockerfile" {
+		container.Args = append(container.Args, fmt.Sprintf("--opt=filename=%s", dockerfilePath))
+	}
 	if len(re.BuildKitArgs) > 0 {
 		container.Args = append(container.Args, re.BuildKitArgs...)
 	}

builder/exector/build_from_sourcecode_run.go

@@ -98,14 +98,15 @@ func NewSouceCodeBuildItem(in []byte) *SourceCodeBuildItem {
 	eventID := gjson.GetBytes(in, "event_id").String()
 	logger := event.GetManager().GetLogger(eventID)
 	csi := sources.CodeSourceInfo{
-		ServerType:    strings.Replace(gjson.GetBytes(in, "server_type").String(), " ", "", -1),
-		RepositoryURL: gjson.GetBytes(in, "repo_url").String(),
-		Branch:        gjson.GetBytes(in, "branch").String(),
-		User:          gjson.GetBytes(in, "user").String(),
-		Password:      gjson.GetBytes(in, "password").String(),
-		TenantID:      gjson.GetBytes(in, "tenant_id").String(),
-		ServiceID:     gjson.GetBytes(in, "service_id").String(),
-		Configs:       gjson.GetBytes(in, "configs").Map(),
+		ServerType:     strings.Replace(gjson.GetBytes(in, "server_type").String(), " ", "", -1),
+		RepositoryURL:  gjson.GetBytes(in, "repo_url").String(),
+		Branch:         gjson.GetBytes(in, "branch").String(),
+		User:           gjson.GetBytes(in, "user").String(),
+		Password:       gjson.GetBytes(in, "password").String(),
+		TenantID:       gjson.GetBytes(in, "tenant_id").String(),
+		ServiceID:      gjson.GetBytes(in, "service_id").String(),
+		Configs:        gjson.GetBytes(in, "configs").Map(),
+		DockerfilePath: gjson.GetBytes(in, "dockerfile_path").String(),
 	}
 	envs := gjson.GetBytes(in, "envs").String()
 	be := make(map[string]string)

builder/parser/code/lang.go

@@ -20,7 +20,9 @@ package code
 
 import (
 	"fmt"
+	"io/ioutil"
 	"path"
+	"path/filepath"
 	"strings"
 
 	"github.com/goodrain/rainbond/util"
@@ -313,3 +315,82 @@ func netcore(homepath string) Lang {
 func scala(homepath string) Lang {
 	return NO
 }
+
+// FindDockerfiles 在指定目录中查找所有 Dockerfile 文件
+// 返回相对于 rootPath 的路径列表
+func FindDockerfiles(rootPath string, maxDepth int, maxFiles int) []string {
+	var dockerfiles []string
+	var ignoreDirs = map[string]bool{
+		".git":          true,
+		"node_modules":  true,
+		"vendor":        true,
+		".svn":          true,
+		".hg":           true,
+		"__pycache__":   true,
+		".idea":         true,
+		".vscode":       true,
+		"target":        true,
+		"build":         true,
+		"dist":          true,
+		".gradle":       true,
+		".cache":        true,
+	}
+
+	var walk func(currentPath string, currentDepth int) bool
+	walk = func(currentPath string, currentDepth int) bool {
+		// 超过最大深度或已找到足够数量
+		if currentDepth > maxDepth || len(dockerfiles) >= maxFiles {
+			return len(dockerfiles) >= maxFiles
+		}
+
+		files, err := ioutil.ReadDir(currentPath)
+		if err != nil {
+			return false
+		}
+
+		// 先检查当前目录中的文件
+		for _, file := range files {
+			if file.IsDir() {
+				continue
+			}
+
+			fileName := file.Name()
+			// 检查是否是 Dockerfile 或 Dockerfile.xxx
+			if fileName == "Dockerfile" || strings.HasPrefix(fileName, "Dockerfile.") {
+				relPath, err := filepath.Rel(rootPath, filepath.Join(currentPath, fileName))
+				if err == nil {
+					dockerfiles = append(dockerfiles, relPath)
+					if len(dockerfiles) >= maxFiles {
+						return true
+					}
+				}
+			}
+		}
+
+		// 递归遍历子目录
+		for _, file := range files {
+			if !file.IsDir() {
+				continue
+			}
+
+			dirName := file.Name()
+			// 跳过隐藏目录和忽略目录
+			if strings.HasPrefix(dirName, ".") && dirName != "." {
+				continue
+			}
+			if ignoreDirs[dirName] {
+				continue
+			}
+
+			subPath := filepath.Join(currentPath, dirName)
+			if walk(subPath, currentDepth+1) {
+				return true
+			}
+		}
+
+		return false
+	}
+
+	walk(rootPath, 0)
+	return dockerfiles
+}

builder/parser/parser.go

@@ -196,10 +196,12 @@ type ServiceInfo struct {
 	//For third party services
 	Endpoints []*discovery.Endpoint `json:"endpoints,omitempty"`
 	//os type,default linux
-	OS        string `json:"os"`
-	Name      string `json:"name,omitempty"`  // module name
-	Cname     string `json:"cname,omitempty"` // service cname
+	OS string `json:"os"`
+	Name string `json:"name,omitempty"` // module name
+	Cname string `json:"cname,omitempty"` // service cname
 	Packaging string `json:"packaging,omitempty"`
+	// Dockerfile 文件列表，相对于代码根目录的路径
+	Dockerfiles []string `json:"dockerfiles,omitempty"`
 }
 
 // GetServiceInfo GetServiceInfo

builder/parser/source_code.go

@@ -47,17 +47,18 @@ import (
 
 // SourceCodeParse docker run 命令解析或直接镜像名解析
 type SourceCodeParse struct {
-	ports   map[int]*types.Port
-	volumes map[string]*types.Volume
-	envs    map[string]*types.Env
-	source  string
-	memory  int
-	image   Image
-	args    []string
-	branchs []string
-	errors  []ParseError
-	logger  event.Logger
-	Lang    code.Lang
+	ports       map[int]*types.Port
+	volumes     map[string]*types.Volume
+	envs        map[string]*types.Env
+	source      string
+	memory      int
+	image       Image
+	args        []string
+	branchs     []string
+	errors      []ParseError
+	logger      event.Logger
+	Lang        code.Lang
+	dockerfiles []string // 所有找到的 Dockerfile 文件路径
 
 	Runtime      bool `json:"runtime"`
 	Dependencies bool `json:"dependencies"`
@@ -520,6 +521,14 @@ func (d *SourceCodeParse) Parse() ParseErrorList {
 			d.args = strings.Split(rbdfileConfig.Cmd, " ")
 		}
 	}
+
+	// 扫描所有 Dockerfile 文件
+	// 参数：最大深度 5 层，最多返回 20 个文件
+	d.dockerfiles = code.FindDockerfiles(buildPath, 5, 20)
+	if len(d.dockerfiles) > 0 {
+		logrus.Infof("Found %d Dockerfile(s) in source code", len(d.dockerfiles))
+	}
+
 	return d.errors
 }
 
@@ -632,6 +641,7 @@ func (d *SourceCodeParse) GetServiceInfo() []ServiceInfo {
 		Lang:        d.GetLang(),
 		ServiceType: model.ServiceTypeStatelessMultiple.String(),
 		OS:          runtime.GOOS,
+		Dockerfiles: d.dockerfiles,
 	}
 	var res []ServiceInfo
 	if d.isMulti && d.services != nil && len(d.services) > 0 {