Merge branch 'master' into patch-1

container/docker_common.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/docker/docker/pkg/stdcopy"
 	"io"
 	"os"
 
@@ -31,12 +32,10 @@ type dockerMessage struct {
 }
 
 func (i *DockerExecutorInput) logDockerOutput(dockerResponse io.Reader) {
-	scanner := bufio.NewScanner(dockerResponse)
+	w := i.Logger.Writer()
-	if i.Logger == nil {
+	_, err := stdcopy.StdCopy(w, w, dockerResponse)
-		return
+	if err != nil {
-	}
+		i.Logger.Error(err)
-	for scanner.Scan() {
-		i.Logger.Infof(scanner.Text())
 	}
 }
 

container/docker_run_test.go

@@ -0,0 +1,55 @@
+package container
+
+import (
+	"bytes"
+	"context"
+	"github.com/nektos/act/common"
+	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/assert"
+	"io/ioutil"
+	"testing"
+)
+
+type rawFormatter struct{}
+
+func (f *rawFormatter) Format(entry *logrus.Entry) ([]byte, error) {
+	return []byte(entry.Message), nil
+}
+
+func TestNewDockerRunExecutor(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping slower test")
+	}
+
+	noopLogger := logrus.New()
+	noopLogger.SetOutput(ioutil.Discard)
+
+	buf := &bytes.Buffer{}
+	logger := logrus.New()
+	logger.SetOutput(buf)
+	logger.SetFormatter(&rawFormatter{})
+
+	runner := NewDockerRunExecutor(NewDockerRunExecutorInput{
+		DockerExecutorInput: DockerExecutorInput{
+			Ctx:    context.TODO(),
+			Logger: logrus.NewEntry(logger),
+		},
+		Image: "hello-world",
+	})
+
+	puller := NewDockerPullExecutor(NewDockerPullExecutorInput{
+		DockerExecutorInput: DockerExecutorInput{
+			Ctx:    context.TODO(),
+			Logger: logrus.NewEntry(noopLogger),
+		},
+		Image: "hello-world",
+	})
+
+	pipeline := common.NewPipelineExecutor(puller, runner)
+	err := pipeline()
+	assert.NoError(t, err)
+
+	expected := `docker run image=hello-world entrypoint=[] cmd=[]Hello from Docker!`
+	actual := buf.String()
+	assert.Equal(t, expected, actual[:len(expected)])
+}