From 164f1d362ef180e9e0721dc4f8f01b7bde9ccc6e Mon Sep 17 00:00:00 2001
From: Tonis Tiigi <tonistiigi@gmail.com>
Date: Tue, 21 Mar 2017 19:09:02 -0700
Subject: [PATCH] Return proper exit code on builder panic

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 385f1174ff6905243c51d97d641d815a520229ff)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
---
 cli/command/image/build.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cli/command/image/build.go b/cli/command/image/build.go
index 5f7d5d07a8..040a2c2293 100644
--- a/cli/command/image/build.go
+++ b/cli/command/image/build.go
@@ -305,6 +305,7 @@ func runBuild(dockerCli *command.DockerCli, options buildOptions) error {
 			}
 			return cli.StatusError{Status: jerr.Message, StatusCode: jerr.Code}
 		}
+		return err
 	}
 
 	// Windows: show error message about modified file permissions if the