Merge pull request #11435 from 1Panel-dev/pr@dev-v2@fix_compose_log

fix: Fix compose log download failure issue

Author: ssongliu

agent/app/service/container.go

@@ -970,21 +970,20 @@ func collectLogs(done <-chan struct{}, params dto.StreamLog, messageChan chan<-
 
 	var dockerCmd *exec.Cmd
 	if params.Type == "compose" {
-		dockerComposCmd := common.GetDockerComposeCommand()
+		dockerComposeCmd := common.GetDockerComposeCommand()
 		var yamlFiles []string
 		for _, item := range strings.Split(params.Compose, ",") {
 			if len(item) != 0 {
 				yamlFiles = append(yamlFiles, "-f", item)
 			}
 		}
-		if dockerComposCmd == "docker-compose" {
+		if dockerComposeCmd == "docker-compose" {
 			newCmdArgs := append(yamlFiles, cmdArgs...)
-			dockerCmd = exec.Command(dockerComposCmd, newCmdArgs...)
+			dockerCmd = exec.Command(dockerComposeCmd, newCmdArgs...)
 		} else {
 			newCmdArgs := append(append([]string{"compose"}, yamlFiles...), cmdArgs...)
 			dockerCmd = exec.Command("docker", newCmdArgs...)
 		}
-		global.LOG.Debug("Docker command:", dockerCmd.Args)
 	} else {
 		dockerCmd = exec.Command("docker", cmdArgs...)
 	}
@@ -1062,10 +1061,16 @@ func (u *ContainerService) DownloadContainerLogs(containerType, container, since
 	commandArg := []string{"logs", container}
 	dockerCommand := global.CONF.DockerConfig.Command
 	if containerType == "compose" {
+		var yamlFiles []string
+		for _, item := range strings.Split(container, ",") {
+			if len(item) != 0 {
+				yamlFiles = append(yamlFiles, "-f", item)
+			}
+		}
 		if dockerCommand == "docker-compose" {
-			commandArg = []string{"-f", container, "logs"}
+			commandArg = append(yamlFiles, "logs")
 		} else {
-			commandArg = []string{"compose", "-f", container, "logs"}
+			commandArg = append(append([]string{"compose"}, yamlFiles...), "logs")
 		}
 	}
 

agent/init/business/business.go

@@ -78,13 +78,13 @@ func initAcmeAccount() {
 }
 
 func checkDockerCompose() {
-	dockerComposCmd := common.GetDockerComposeCommand()
-	if dockerComposCmd == "" {
+	dockerComposeCmd := common.GetDockerComposeCommand()
+	if dockerComposeCmd == "" {
 		global.LOG.Errorf("Docker Compose command not found, please install Docker Compose Plugin")
 		return
 	}
-	global.CONF.DockerConfig.Command = dockerComposCmd
-	if err := service.NewISettingService().Update("DockerComposeCommand", dockerComposCmd); err != nil {
+	global.CONF.DockerConfig.Command = dockerComposeCmd
+	if err := service.NewISettingService().Update("DockerComposeCommand", dockerComposeCmd); err != nil {
 		global.LOG.Errorf("update docker compose command error: %s", err.Error())
 		return
 	}

agent/utils/compose/compose.go

@@ -20,11 +20,11 @@ import (
 
 func checkCmd() error {
 	if global.CONF.DockerConfig.Command == "" {
-		dockerComposCmd := common.GetDockerComposeCommand()
-		if dockerComposCmd == "" {
+		dockerComposeCmd := common.GetDockerComposeCommand()
+		if dockerComposeCmd == "" {
 			return buserr.New("ErrDockerComposeCmdNotFound")
 		}
-		global.CONF.DockerConfig.Command = dockerComposCmd
+		global.CONF.DockerConfig.Command = dockerComposeCmd
 	}
 	return nil
 }