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

moby: Improve debug output for 'docker run'

Browse Source 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2018-04-16 11:39:15 +01:00
parent 4cae8c95e3
commit 52cb0e1cfe
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/moby/docker.go
View File

@ -22,7 +22,7 @@ import (
) )
func dockerRun(input io.Reader, output io.Writer, trust bool, img string, args ...string) error { func dockerRun(input io.Reader, output io.Writer, trust bool, img string, args ...string) error {
log.Debugf("docker run (input): %s", strings.Join(args, " ")) log.Debugf("docker run %s (trust=%t) (input): %s", img, trust, strings.Join(args, " "))
docker, err := exec.LookPath("docker") docker, err := exec.LookPath("docker")
if err != nil { if err != nil {
return errors.New("Docker does not seem to be installed") return errors.New("Docker does not seem to be installed")
@ -38,7 +38,7 @@ func dockerRun(input io.Reader, output io.Writer, trust bool, img string, args .
pull.Env = env pull.Env = env
if err := pull.Run(); err != nil { if err := pull.Run(); err != nil {
if exitError, ok := err.(*exec.ExitError); ok { if exitError, ok := err.(*exec.ExitError); ok {
return fmt.Errorf("docker pull failed: %v output:\n%s", err, exitError.Stderr) return fmt.Errorf("docker pull %s failed: %v output:\n%s", img, err, exitError.Stderr)
} }
return err return err
} }
@ -51,12 +51,12 @@ func dockerRun(input io.Reader, output io.Writer, trust bool, img string, args .
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
if exitError, ok := err.(*exec.ExitError); ok { if exitError, ok := err.(*exec.ExitError); ok {
return fmt.Errorf("docker run failed: %v output:\n%s", err, exitError.Stderr) return fmt.Errorf("docker run %s failed: %v output:\n%s", img, err, exitError.Stderr)
} }
return err return err
} }
log.Debugf("docker run (input): %s...Done", strings.Join(args, " ")) log.Debugf("docker run %s (input): %s...Done", img, strings.Join(args, " "))
return nil return nil
} }