1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

No error shadow pullImageIfNotExist

Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard 2015-10-06 11:38:23 -07:00
parent 1529343a3f
commit b7009a4b3a

View file

@ -609,16 +609,16 @@ func imageExists(image string) error {
return err
}
func pullImageIfNotExist(image string) (err error) {
func pullImageIfNotExist(image string) error {
if err := imageExists(image); err != nil {
pullCmd := exec.Command(dockerBinary, "pull", image)
_, exitCode, err := runCommandWithOutput(pullCmd)
if err != nil || exitCode != 0 {
err = fmt.Errorf("image %q wasn't found locally and it couldn't be pulled: %s", image, err)
return fmt.Errorf("image %q wasn't found locally and it couldn't be pulled: %s", image, err)
}
}
return
return nil
}
func dockerCmdWithError(args ...string) (string, int, error) {