Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(hooks): make the output more uniform and delineated #2343

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(hooks): make the output more uniform and delineated #2343

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eeeb4ed
fix(hooks): Consistent logging + skip when empty too
joshtrichards Nov 26, 2024
f360440
fix(hooks): Clear state delineation / consistent output
joshtrichards Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,39 @@ run_as() {
run_path() {
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
local return_code=0
local found=0

if ! [ -d "${hook_folder_path}" ]; then
echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
echo "=> Searching for hook scripts (*.sh) to run, located in the folder \"${hook_folder_path}\""

if ! [ -d "${hook_folder_path}" ] || directory_empty "${hook_folder_path}"; then
echo "==> Skipped: the \"$1\" folder is empty (or does not exist)"
return 0
fi

echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"

(
find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | while read -r script_file_path; do
find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | (
while read -r script_file_path; do
if ! [ -x "${script_file_path}" ]; then
echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
echo "==> The script \"${script_file_path}\" was skipped, because it lacks the executable flag"
found=$((found-1))
continue
fi

echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""

found=$((found+1))
run_as "${script_file_path}" || return_code="$?"

if [ "${return_code}" -ne "0" ]; then
echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
echo "==> Failed at executing script \"${script_file_path}\". Exit code: ${return_code}"
exit 1
fi

echo "==> Finished the script: \"${script_file_path}\""
echo "==> Finished executing the script: \"${script_file_path}\""
done
if [ "$found" -lt "1" ]; then
echo "==> Skipped: the \"$1\" folder does not contain any valid scripts"
else
echo "=> Completed executing scripts in the \"$1\" folder"
fi
)
}

Expand Down
Loading