fix: archiveLogs needs to copy stderr (#2136)

argoproj · Feb 3, 2020 · 14d8b5d · 14d8b5d
1 parent 91319ee
commit 14d8b5d
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/workflow/executor/docker/docker.go b/workflow/executor/docker/docker.go
@@ -5,6 +5,7 @@ import (
 	"compress/gzip"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"time"
@@ -72,13 +73,20 @@ func (d *DockerExecutor) CopyFile(containerID string, sourcePath string, destPat
 func (d *DockerExecutor) GetOutputStream(containerID string, combinedOutput bool) (io.ReadCloser, error) {
 	cmd := exec.Command("docker", "logs", containerID)
 	log.Info(cmd.Args)
-	if combinedOutput {
-		cmd.Stderr = cmd.Stdout
-	}
+
 	reader, err := cmd.StdoutPipe()
 	if err != nil {
 		return nil, errors.InternalWrapError(err)
 	}
+
+	if combinedOutput {
+		stderr, err := cmd.StderrPipe()
+		if err != nil {
+			return nil, errors.InternalWrapError(err)
+		}
+		reader = ioutil.NopCloser(io.MultiReader(reader, stderr))
+	}
+
 	err = cmd.Start()
 	if err != nil {
 		return nil, errors.InternalWrapError(err)