From 73174f51dbc3c6b087f40a12f1256c16e0946c7e Mon Sep 17 00:00:00 2001 From: Jahed Ahmed Date: Wed, 28 Jul 2021 16:41:25 +0000 Subject: [PATCH] fix: use correct exit codes for docker entrypoint --- docker/docker-entrypoint.sh | 6 +++--- docker/docker-python-entrypoint.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 485b1b6e76d..a3e257d9a49 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -51,7 +51,7 @@ PROJECT_SUBDIR="" if [ -n "${TARGET_FILE}" ]; then if [ ! -f "${PROJECT_PATH}/${PROJECT_FOLDER}/${TARGET_FILE}" ]; then - exitWithMsg "\"${PROJECT_PATH}/${PROJECT_FOLDER}/${TARGET_FILE}\" does not exist" 1 + exitWithMsg "\"${PROJECT_PATH}/${PROJECT_FOLDER}/${TARGET_FILE}\" does not exist" 2 fi PROJECT_SUBDIR=$(dirname "${TARGET_FILE}") @@ -70,7 +70,7 @@ SNYK_PARAMS="${SNYK_PARAMS} ${TEST_SETTINGS}" ## if [ -z "${SNYK_TOKEN}" ]; then - exitWithMsg "Missing \${SNYK_TOKEN}" 1 + exitWithMsg "Missing \${SNYK_TOKEN}" 2 fi if [ -n "${ENV_FLAGS}" ]; then @@ -78,7 +78,7 @@ if [ -n "${ENV_FLAGS}" ]; then fi cd "${PROJECT_PATH}/${PROJECT_FOLDER}/${PROJECT_SUBDIR}" || - exitWithMsg "Can't cd to ${PROJECT_PATH}/${PROJECT_FOLDER}/${PROJECT_SUBDIR}" 1 + exitWithMsg "Can't cd to ${PROJECT_PATH}/${PROJECT_FOLDER}/${PROJECT_SUBDIR}" 2 runCmdAsDockerUser "PATH=${PATH} snyk ${SNYK_COMMAND} --json ${SNYK_PARAMS} \ ${ADDITIONAL_ENV} > \"${OUTPUT_FILE}\" 2>\"${ERROR_FILE}\"" diff --git a/docker/docker-python-entrypoint.sh b/docker/docker-python-entrypoint.sh index 7566c99d410..27e4b76b671 100755 --- a/docker/docker-python-entrypoint.sh +++ b/docker/docker-python-entrypoint.sh @@ -30,7 +30,7 @@ PROJECT_SUBDIR="" echo "Project path = ${PROJECT_PATH}" if [ -n "${TARGET_FILE}" ]; then if [ ! -f "${PROJECT_PATH}/${PROJECT_FOLDER}/${TARGET_FILE}" ]; then - exitWithMsg "\"${PROJECT_PATH}/${PROJECT_FOLDER}/${TARGET_FILE}\" does not exist" 1 + exitWithMsg "\"${PROJECT_PATH}/${PROJECT_FOLDER}/${TARGET_FILE}\" does not exist" 2 fi PROJECT_SUBDIR=$(dirname "${TARGET_FILE}") @@ -53,7 +53,7 @@ if [ -n "${TARGET_FILE}" ]; then installPipfileDeps ;; *) - exitWithMsg "\"${PROJECT_PATH}/${TARGET_FILE}\" is not supported" 1 + exitWithMsg "\"${PROJECT_PATH}/${TARGET_FILE}\" is not supported" 3 ;; esac fi