From 4a98ab377aa56c18a09ac57bf6c230854005ffbd Mon Sep 17 00:00:00 2001 From: Andy Thompson Date: Mon, 21 Jul 2014 20:39:17 +0100 Subject: [PATCH] Add Stderr capture to Commit and TagImage calls. --- builder/docker/driver_docker.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/builder/docker/driver_docker.go b/builder/docker/driver_docker.go index 78c91f76f..6a43ced5f 100644 --- a/builder/docker/driver_docker.go +++ b/builder/docker/driver_docker.go @@ -37,15 +37,19 @@ func (d *DockerDriver) DeleteImage(id string) error { func (d *DockerDriver) Commit(id string) (string, error) { var stdout bytes.Buffer + var stderr bytes.Buffer + cmd := exec.Command("docker", "commit", id) cmd.Stdout = &stdout + cmd.Stderr = &stderr if err := cmd.Start(); err != nil { return "", err } if err := cmd.Wait(); err != nil { - err = fmt.Errorf("Error committing container: %s", err) + err = fmt.Errorf("Error committing container: %s\nStderr: %s", + err, stderr.String()) return "", err } @@ -190,14 +194,17 @@ func (d *DockerDriver) StopContainer(id string) error { } func (d *DockerDriver) TagImage(id string, repo string) error { + var stderr bytes.Buffer cmd := exec.Command("docker", "tag", id, repo) + cmd.Stderr = &stderr if err := cmd.Start(); err != nil { return err } if err := cmd.Wait(); err != nil { - err = fmt.Errorf("Error tagging image: %s", err) + err = fmt.Errorf("Error tagging image: %s\nStderr: %s", + err, stderr.String()) return err }