From 49d08a8fb66f6f2555451bf08321cfd618e8278a Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sat, 16 Apr 2022 02:44:51 -0400
Subject: [PATCH] fix: pass along failed build status when building from image

---
 plugins/common/functions       | 6 ++++--
 plugins/git/internal-functions | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/common/functions b/plugins/common/functions
index ce1460496..1bda3930e 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -157,7 +157,7 @@ dokku_log_fail_quiet() {
   if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then
     echo " !     $*" 1>&2
   fi
-  exit ${DOKKU_FAIL_EXIT_CODE:=1}
+  exit "${DOKKU_FAIL_EXIT_CODE:=1}"
 }
 
 dokku_log_fail() {
@@ -708,7 +708,9 @@ dokku_receive() {
   fi
 
   DOKKU_QUIET_OUTPUT=1 config_set --no-restart "$APP" DOKKU_APP_TYPE="$IMAGE_SOURCE_TYPE"
-  dokku_build "$APP" "$IMAGE_SOURCE_TYPE" "$TMP_WORK_DIR"
+  if ! dokku_build "$APP" "$IMAGE_SOURCE_TYPE" "$TMP_WORK_DIR"; then
+    return 1
+  fi
   plugn trigger release-and-deploy "$APP"
 }
 
diff --git a/plugins/git/internal-functions b/plugins/git/internal-functions
index 43f545d23..d7f1dfe82 100755
--- a/plugins/git/internal-functions
+++ b/plugins/git/internal-functions
@@ -110,7 +110,9 @@ cmd-git-from-image() {
   verify_app_name "$APP"
   [[ -z "$DOCKER_IMAGE" ]] && dokku_log_fail "Please specify a docker image"
 
-  plugn trigger git-from-image "$APP" "$DOCKER_IMAGE" "$BUILD_DIR" "$USER_NAME" "$USER_EMAIL"
+  if ! plugn trigger git-from-image "$APP" "$DOCKER_IMAGE" "$BUILD_DIR" "$USER_NAME" "$USER_EMAIL"; then
+    return 1
+  fi
   plugn trigger deploy-source-set "$APP" "docker-image" "$DOCKER_IMAGE"
 }