integration: log dockerd cmd

Signed-off-by: CrazyMax <[email protected]>

Author: crazy-max

util/testutil/dockerd/daemon.go

@@ -2,6 +2,7 @@ package dockerd
 
 import (
 	"bytes"
+	"fmt"
 	"io"
 	"os"
 	"os/exec"
@@ -137,6 +138,7 @@ func (d *Daemon) StartWithError(daemonLogs map[string]*bytes.Buffer, providedArg
 		d.cmd.Stderr = &lockingWriter{Writer: b}
 	}
 
+	fmt.Fprintf(d.cmd.Stderr, "> startCmd %v %+v\n", time.Now(), d.cmd.String())
 	if err := d.cmd.Start(); err != nil {
 		return errors.Wrapf(err, "[%s] could not start daemon container", d.id)
 	}

util/testutil/integration/dockerd.go

@@ -1,7 +1,6 @@
 package integration
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"io"
@@ -141,9 +140,8 @@ func (c moby) New(ctx context.Context, cfg *BackendConfig) (b Backend, cl func()
 	}
 	deferF.append(d.StopWithError)
 
-	logs := map[string]*bytes.Buffer{}
 	if err := waitUnix(d.Sock(), 5*time.Second); err != nil {
-		return nil, nil, errors.Errorf("dockerd did not start up: %q, %s", err, formatLogs(logs))
+		return nil, nil, errors.Errorf("dockerd did not start up: %q, %s", err, formatLogs(cfg.Logs))
 	}
 
 	dockerAPI, err := client.NewClientWithOpts(client.WithHost(d.Sock()))