more die-fast error handling

accetto · Nov 18, 2023 · d1d7394 · d1d7394
1 parent 10fbd28
commit d1d7394
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 11 deletions.
diff --git a/builder.sh b/builder.sh
@@ -12,7 +12,7 @@ die() {
     local -i code=${2:-1}
     local place="${3:-$0}"
 
-    echo -e "EXITING '${place}' with code ${code}: ${message}" >&2
+    echo -e "EXITING at line "${BASH_LINENO[0]}" in '${place}' with code ${code}: ${message}" >&2
     exit ${code}
 }
 

diff --git a/ci-builder.sh b/ci-builder.sh
@@ -13,7 +13,7 @@ die() {
     local -i code=${2:-1}
     local place="${3:-$0}"
 
-    echo -e "\nEXITING '${place}' with code ${code}: ${message}\n" >&2
+    echo -e "\nEXITING at line "${BASH_LINENO[0]}" in '${place}' with code ${code}: ${message}\n" >&2
     exit ${code}
 }
 

diff --git a/docker/hooks/build b/docker/hooks/build
@@ -70,7 +70,8 @@ main() {
 
         nodejs | nodejs-* | nodejs-current | nodejs-current-* )
 
-            ### no quotes around 'params'
+            ### no quotes around ${params}!
+            set -x
             docker build ${params} \
                 -f "${DOCKERFILE_PATH}" \
                     --build-arg BASEIMAGE="${BASEIMAGE}" \
@@ -104,7 +105,11 @@ main() {
                     ${FEATURES_VSCODE:+--build-arg ARG_FINAL_STAGE_BASE="stage_vscode"} \
                     \
                 -t "${DOCKER_REPO}":"${DOCKER_TAG}" "${_build_context}"
+
+            exit_code=$?
             set +x
+
+            if [[ ${exit_code} -ne 0 ]] ; then die "Failed to build image '${DOCKER_REPO}:${DOCKER_TAG}'" ${exit_code} ; fi
             ;;
 
         ### --------------------------
@@ -113,8 +118,8 @@ main() {
 
         postman | postman-* )
 
+            ### no quotes around ${params}!
             set -x
-            ### no quotes around 'params'
             docker build ${params} \
                 -f "${DOCKERFILE_PATH}" \
                     --build-arg BASEIMAGE="${BASEIMAGE}" \
@@ -146,7 +151,11 @@ main() {
                     ${FEATURES_POSTMAN:+--build-arg ARG_FINAL_STAGE_BASE="stage_postman"} \
                     \
                 -t "${DOCKER_REPO}":"${DOCKER_TAG}" "${_build_context}"
+
+            exit_code=$?
             set +x
+
+            if [[ ${exit_code} -ne 0 ]] ; then die "Failed to build image '${DOCKER_REPO}:${DOCKER_TAG}'" ${exit_code} ; fi
             ;;
 
         ### -------------------------
@@ -155,8 +164,8 @@ main() {
 
         python | python-* )
 
+            ### no quotes around ${params}!
             set -x
-            ### no quotes around 'params'
             docker build ${params} \
                 -f "${DOCKERFILE_PATH}" \
                     --build-arg BASEIMAGE="${BASEIMAGE}" \
@@ -188,7 +197,11 @@ main() {
                     ${FEATURES_VSCODE:+--build-arg ARG_FINAL_STAGE_BASE="stage_vscode"} \
                     \
                 -t "${DOCKER_REPO}":"${DOCKER_TAG}" "${_build_context}"
+
+            exit_code=$?
             set +x
+
+            if [[ ${exit_code} -ne 0 ]] ; then die "Failed to build image '${DOCKER_REPO}:${DOCKER_TAG}'" ${exit_code} ; fi
             ;;
 
         ### -------------------------
@@ -197,8 +210,8 @@ main() {
 
         vscode | vscode-* )
 
+            ### no quotes around ${params}!
             set -x
-            ### no quotes around 'params'
             docker build ${params} \
                 -f "${DOCKERFILE_PATH}" \
                     --build-arg BASEIMAGE="${BASEIMAGE}" \
@@ -228,7 +241,11 @@ main() {
                     ${FEATURES_VSCODE:+--build-arg ARG_FINAL_STAGE_BASE="stage_vscode"} \
                     \
                 -t "${DOCKER_REPO}":"${DOCKER_TAG}" "${_build_context}"
+
+            exit_code=$?
             set +x
+
+            if [[ ${exit_code} -ne 0 ]] ; then die "Failed to build image '${DOCKER_REPO}:${DOCKER_TAG}'" ${exit_code} ; fi
             ;;
 
         * )

diff --git a/docker/hooks/env.rc b/docker/hooks/env.rc
@@ -5,7 +5,7 @@ die() {
     local -i code=${2:-1}
     local place="${3:-$0}"
 
-    echo -e "EXITING '${place}' with code ${code}: ${message}" >&2
+    echo -e "EXITING at line "${BASH_LINENO[0]}" in '${place}' with code ${code}: ${message}" >&2
     exit ${code}
 }
 

diff --git a/docker/hooks/pre_build b/docker/hooks/pre_build
@@ -66,8 +66,8 @@ main() {
 
         nodejs | nodejs-* | nodejs-current | nodejs-current-* )
 
+            ### no quotes around ${params}!
             set -x
-            ### no quotes around 'params'
             docker build ${params} \
                 -f "${DOCKERFILE_PATH}" \
                     --build-arg BASEIMAGE="${BASEIMAGE}" \
@@ -97,7 +97,11 @@ main() {
                     ${FEATURES_VSCODE:+--build-arg ARG_FINAL_STAGE_BASE="stage_vscode"} \
                     \
                 -t "${DOCKER_REPO}":"${DOCKER_TAG}${helper_suffix}" "${_build_context}"
+
+            exit_code=$?
             set +x
+
+            if [[ ${exit_code} -ne 0 ]] ; then set +x; die "Failed to build image '${DOCKER_REPO}:${DOCKER_TAG}${helper_suffix}'" ${exit_code} ; fi
             ;;
 
         ### --------------------------
@@ -106,8 +110,8 @@ main() {
 
         postman | postman-* )
 
+            ### no quotes around ${params}!
             set -x
-            ### no quotes around 'params'
             docker build ${params} \
                 -f "${DOCKERFILE_PATH}" \
                     --build-arg BASEIMAGE="${BASEIMAGE}" \
@@ -135,7 +139,11 @@ main() {
                     ${FEATURES_POSTMAN:+--build-arg ARG_FINAL_STAGE_BASE="stage_postman"} \
                     \
                 -t "${DOCKER_REPO}":"${DOCKER_TAG}${helper_suffix}" "${_build_context}"
+
+            exit_code=$?
             set +x
+
+            if [[ ${exit_code} -ne 0 ]] ; then die "Failed to build image '${DOCKER_REPO}:${DOCKER_TAG}${helper_suffix}'" ${exit_code} ; fi
             ;;
 
         ### -------------------------
@@ -144,8 +152,8 @@ main() {
 
         python | python-* )
 
+            ### no quotes around ${params}!
             set -x
-            ### no quotes around 'params'
             docker build ${params} \
                 -f "${DOCKERFILE_PATH}" \
                     --build-arg BASEIMAGE="${BASEIMAGE}" \
@@ -173,7 +181,11 @@ main() {
                     ${FEATURES_VSCODE:+--build-arg ARG_FINAL_STAGE_BASE="stage_vscode"} \
                     \
                 -t "${DOCKER_REPO}":"${DOCKER_TAG}${helper_suffix}" "${_build_context}"
+
+            exit_code=$?
             set +x
+
+            if [[ ${exit_code} -ne 0 ]] ; then die "Failed to build image '${DOCKER_REPO}:${DOCKER_TAG}${helper_suffix}'" ${exit_code} ; fi
             ;;
 
         ### -------------------------
@@ -182,8 +194,8 @@ main() {
 
         vscode | vscode-* )
 
+            ### no quotes around ${params}!
             set -x
-            ### no quotes around 'params'
             docker build ${params} \
                 -f "${DOCKERFILE_PATH}" \
                     --build-arg BASEIMAGE="${BASEIMAGE}" \
@@ -209,7 +221,11 @@ main() {
                     ${FEATURES_VSCODE:+--build-arg ARG_FINAL_STAGE_BASE="stage_vscode"} \
                     \
                 -t "${DOCKER_REPO}":"${DOCKER_TAG}${helper_suffix}" "${_build_context}"
+
+            exit_code=$?
             set +x
+
+            if [[ ${exit_code} -ne 0 ]] ; then die "Failed to build image '${DOCKER_REPO}:${DOCKER_TAG}${helper_suffix}'" ${exit_code} ; fi
             ;;
 
         * )

diff --git a/docker/hooks/push b/docker/hooks/push
@@ -13,6 +13,7 @@ deployment_push() {
     local target
     local repo="${_deploy_repo##*/}"
     local keeper_repo_tag="${_deploy_builder_tags[0]}"
+    local -i exit_code=0
 
     if [[ -n "${repo}" && "${repo}" != "${_prohibited_repo_name}" ]] ; then
 
@@ -26,9 +27,16 @@ deployment_push() {
                 target="${_deploy_repo}:${t}"
 
                 echo ; echo "Deploying image '${target}'"
+
                 docker tag "${DOCKER_REPO}:${keeper_repo_tag}" "${target}"
                 docker push "${target}"
+                exit_code=$?
                 docker rmi "${target}"
+
+                if [[ ${exit_code} -ne 0 ]] ; then
+                    docker logout
+                    die "Unable to push image '${target}'" ${exit_code}
+                fi
             fi
         done
 
@@ -41,6 +49,7 @@ main() {
     local target
     local repo="${DOCKER_REPO##*/}"
     local keeper_repo_tag="${_deploy_builder_tags[0]}"
+    local -i exit_code=0
 
     if [[ -f "${_build_context}/${_scrap_demand_stop_building}" ]] ; then
         echo "Skipping push on demand."
@@ -79,13 +88,24 @@ main() {
 
                     # first element is the master repo (a keeper)
                     docker push "${DOCKER_REPO}:${t}"
+                    exit_code=$?
 
+                    if [[ ${exit_code} -ne 0 ]] ; then
+                        docker logout
+                        die "Unable to push image '${DOCKER_REPO}:${t}'" ${exit_code}
+                    fi
                 else
                     target="${DOCKER_REPO}:${t}"
 
                     docker tag "${DOCKER_REPO}:${keeper_repo_tag}" "${target}"
                     docker push "${target}"
+                    exit_code=$?
                     docker rmi "${target}"
+
+                    if [[ ${exit_code} -ne 0 ]] ; then
+                        docker logout
+                        die "Unable to push image '${target}'" ${exit_code}
+                    fi
                 fi
             done