From 28934e300ea4b00fd83bc3bcbda4a05268ce6835 Mon Sep 17 00:00:00 2001 From: rjshrjndrn Date: Tue, 15 Nov 2022 12:34:16 +0100 Subject: [PATCH] chore(script): error handling Signed-off-by: rjshrjndrn --- api/build.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/api/build.sh b/api/build.sh index 9e1df8a28..895f9bb8e 100644 --- a/api/build.sh +++ b/api/build.sh @@ -6,8 +6,16 @@ # Default will be OSS build. # Usage: IMAGE_TAG=latest DOCKER_REPO=myDockerHubID bash build.sh -set -e +# Helper function +exit_err() { + err_code=$1 + if [[ err_code != 0 ]]; then + exit $err_code + fi +} + +environment=$1 git_sha1=${IMAGE_TAG:-$(git rev-parse HEAD)} envarg="default-foss" check_prereq() { @@ -45,13 +53,13 @@ function build_api(){ } check_prereq -build_api $1 +build_api $environment echo buil_complete IMAGE_TAG=$IMAGE_TAG PUSH_IMAGE=$PUSH_IMAGE DOCKER_REPO=$DOCKER_REPO bash build_alerts.sh $1 -echo "alerts done" -[[ $1 == "ee" ]] && { +[[ $environment == "ee" ]] && { cp ../ee/api/build_crons.sh . IMAGE_TAG=$IMAGE_TAG PUSH_IMAGE=$PUSH_IMAGE DOCKER_REPO=$DOCKER_REPO bash build_crons.sh $1 + exit_err $? rm build_crons.sh } || true