github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 17:26:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3678 from olljanat/docker-run-print-stderr

Browse Source 
Print docker run stderr in-case of error
This commit is contained in:
David Scott 2021-12-30 10:37:30 +00:00 committed by GitHub
commit 6a11c118f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cmd/linuxkit/moby/docker.go
View File

@ -35,15 +35,17 @@ func dockerRun(input io.Reader, output io.Writer, img string, args ...string) er
return err
}
var errbuf strings.Builder
args = append([]string{"run", "--network=none", "--log-driver=none", "--rm", "-i", img}, args...)
cmd := exec.Command(docker, args...)
cmd.Stderr = &errbuf
cmd.Stdin = input
cmd.Stdout = output
cmd.Env = env
if err := cmd.Run(); err != nil {
if exitError, ok := err.(*exec.ExitError); ok {
return fmt.Errorf("docker run %s failed: %v output:\n%s", img, err, exitError.Stderr)
if _, ok := err.(*exec.ExitError); ok {
return fmt.Errorf("docker run %s failed: %v output:\n%s", img, err, errbuf.String())
}
return err
}