update

backend/controller/pipeline_executor.go

@@ -162,7 +162,7 @@ func (h *PipelineHandler) executePipeline(pipeline model.Pipeline, run model.Pip
 	}
 
 	runUpdates := map[string]interface{}{
-		"workspace_path": workspace,
+		"workspace_path":  workspace,
 		"build_node_name": execCtx.NodeName,
 	}
 	if nodeID > 0 {
@@ -545,13 +545,10 @@ func (h *PipelineHandler) runDeploy(workspace string, pipeline model.Pipeline, t
 // resolvePipelineImage 解析流水线构建镜像全名（与镜像打包阶段一致） // Logan.Li
 func (h *PipelineHandler) resolvePipelineImage(pipeline model.Pipeline, tag string) string {
 	var registryURL, imageName string
-	if pipeline.RegistryID != nil {
-		var reg model.PipelineRegistry
-		if err := h.db.First(&reg, *pipeline.RegistryID).Error; err == nil {
-			registryURL = reg.RegistryURL
-			if reg.Namespace != "" {
-				imageName = reg.Namespace + "/"
-			}
+	if pipeline.RegistryCredentialID != nil {
+		var credential model.Credential
+		if err := h.db.Take(&credential, *pipeline.RegistryCredentialID).Error; err == nil {
+			registryURL = credential.Summary
 		}
 	}
 	appName := pipeline.Code
@@ -838,7 +835,7 @@ func cleanOldWorkspaces(baseDir string, maxAge time.Duration) {
 
 var (
 	pipelineRunningCount = make(map[uint]int)    // pipelineID → 当前运行数
-	pipelineQueues       = make(map[uint][]uint)  // pipelineID → 排队 runID 列表
+	pipelineQueues       = make(map[uint][]uint) // pipelineID → 排队 runID 列表
 	queueMu              sync.Mutex
 )
 
@@ -909,9 +906,13 @@ func (h *PipelineHandler) dequeueNext(pipelineID uint) {
 
 	// 加载 pipeline + run
 	var pipeline model.Pipeline
-	if err := h.db.First(&pipeline, pipelineID).Error; err != nil { return }
+	if err := h.db.First(&pipeline, pipelineID).Error; err != nil {
+		return
+	}
 	var run model.PipelineRun
-	if err := h.db.First(&run, nextRunID).Error; err != nil { return }
+	if err := h.db.First(&run, nextRunID).Error; err != nil {
+		return
+	}
 
 	nodeID, canNode := h.tryAcquireBuildNode(pipeline)
 	if !canNode {
@@ -935,8 +936,8 @@ func (h *PipelineHandler) GetQueueStatus(pipelineID uint) map[string]interface{}
 	running := pipelineRunningCount[pipelineID]
 	queued := pipelineQueues[pipelineID]
 	return map[string]interface{}{
-		"running": running,
-		"queued":  len(queued),
+		"running":   running,
+		"queued":    len(queued),
 		"queue_ids": queued,
 	}
 }