From 5cfdcedf9a9f3d842afbd29318adadc41a3bb0ed Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Wed, 17 Apr 2024 16:52:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=AE=B9=E5=99=A8?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=BC=BA=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20(#4549)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/container.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/app/service/container.go b/backend/app/service/container.go
index 504e6e4f3..b37ae98da 100644
--- a/backend/app/service/container.go
+++ b/backend/app/service/container.go
@@ -657,6 +657,7 @@ func (u *ContainerService) ContainerLogs(wsConn *websocket.Conn, containerType,
 	}
 	if !follow {
 		cmd := exec.Command(commandName, commandArg...)
+		cmd.Stderr = cmd.Stdout
 		stdout, _ := cmd.CombinedOutput()
 		if !utf8.Valid(stdout) {
 			return errors.New("invalid utf8")
@@ -673,6 +674,7 @@ func (u *ContainerService) ContainerLogs(wsConn *websocket.Conn, containerType,
 		_ = cmd.Process.Signal(syscall.SIGTERM)
 		return err
 	}
+	cmd.Stderr = cmd.Stdout
 	if err := cmd.Start(); err != nil {
 		_ = cmd.Process.Signal(syscall.SIGTERM)
 		return err