fix: make sure to return the status of the docker run command from run_macaron.sh

Signed-off-by: Trong Nhan Mai <[email protected]>

Author: Trong Nhan Mai

scripts/release_scripts/run_macaron.sh

@@ -259,6 +259,18 @@ function mount_file() {
     mounts+=("-v" "${file_on_host}:${file_in_container}:${mount_option}")
 }
 
+# Clean up the token file and EXIT this bash script with the given status code.
+#
+# Arguments:
+#   $1: The eventual exit status code.
+#   $2: The path to the token file.
+function clean_up_exit() {
+    status_code=$1
+    token_file_path=$2
+    rm -f "$token_file_path"
+    exit "$status_code"
+}
+
 # Parse main arguments.
 while [[ $# -gt 0 ]]; do
     case $1 in
@@ -599,7 +611,7 @@ mount_file "macaron_env_file" ${TOKEN_FILE} ${MACARON_WORKSPACE}/${TOKEN_FILE} "
 set -u
 
 # Force docker to use linux/amd64 platform in order to make docker use emulation on ARM host platforms.
-# We need the `docker run` command to be within `set +e`` so that when it returns a non-zero status code,
+# We need the `docker run` command to be within `set +e` so that when it returns a non-zero status code,
 # it doesn't exit right away and still run the token file cleaning up command.
 set +e
 docker run \
@@ -614,6 +626,5 @@ docker run \
     "${IMAGE}:${MACARON_IMAGE_TAG}" \
     "${entrypoint[@]}" \
     "${macaron_args[@]}"
-set -e
 
-rm -f "$TOKEN_FILE"
+clean_up_exit "$?" "$TOKEN_FILE"