Capture stderr from Docker container (#615)

dagu-org · Jul 14, 2024 · cad2555 · cad2555
1 parent 62a0dc9
commit cad2555
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/internal/dag/executor/docker.go b/internal/dag/executor/docker.go
@@ -95,6 +95,22 @@ func (e *docker) Run() error {
 		}
 	}()
 
+	out, err := cli.ContainerLogs(
+		ctx, resp.ID, types.ContainerLogsOptions{
+			ShowStdout: true,
+			ShowStderr: true,
+			Follow:     true,
+		},
+	)
+	if err != nil {
+		return err
+	}
+
+	go func() {
+		_, err = stdcopy.StdCopy(e.stdout, e.stdout, out)
+		util.LogErr("docker executor: stdcopy", err)
+	}()
+
 	statusCh, errCh := cli.ContainerWait(
 		ctx, resp.ID, container.WaitConditionNotRunning,
 	)
@@ -109,16 +125,6 @@ func (e *docker) Run() error {
 		}
 	}
 
-	out, err := cli.ContainerLogs(
-		ctx, resp.ID, types.ContainerLogsOptions{ShowStdout: true},
-	)
-	if err != nil {
-		return err
-	}
-
-	_, err = stdcopy.StdCopy(e.stdout, e.stdout, out)
-	util.LogErr("docker executor: stdcopy", err)
-
 	return nil
 }