casjaysdevdocker/gitea
1
0
Fork 0
mirror of https://github.com/casjaysdevdocker/gitea synced 2026-08-14 14:01:17 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 Fix silent set -e abort on unguarded DEBUGGER echo pattern 🐛

Browse Source 
App-breaking bug found during full runtime verification of the act_runner
cache-server feature: the container died immediately on every startup,
printing only the initial banner line, with no error message.

Root cause: 26 occurrences of `[ "$DEBUGGER" = "on" ] && echo/printf/
__service_banner "..."` used as a bare (non-if-guarded) statement. Under
`set -eo pipefail`, when `$DEBUGGER` is not "on" (the default), the test
fails and the statement's exit status is nonzero, aborting the whole
script silently. Confirmed via `bash -x` trace pinpointing the exact
crash line.

- rootfs/usr/local/etc/docker/functions/entrypoint.sh: appended `|| true`
  to all 26 occurrences of the pattern
- TODO.AI.md: logged the fix and the upstream-template-sync follow-up
  (functions/entrypoint.sh is normally regenerated from casjay-dotfiles,
  not hand-edited)
This commit is contained in:
jason
2026-08-05 01:49:20 -04:00
parent 87d9e2d50f
commit 97270cfe91
2 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TODO.AI.md
+10
View File
@@ -11,6 +11,16 @@ Not fixed yet — out of scope for the cache-enablement change; flagged by `scri
- line 4: `##@Version` header present but no matching `VERSION=` assignment in script body - line 4: `##@Version` header present but no matching `VERSION=` assignment in script body
- missing `--` before the grep query at lines 124 (x2), 130, 133, 134, 369, 390, 401, 438, 468, 525 (x2), 544 (x2, also should quote the `grep` pattern), 571, 583 - missing `--` before the grep query at lines 124 (x2), 130, 133, 134, 369, 390, 401, 438, 468, 525 (x2), 544 (x2, also should quote the `grep` pattern), 571, 583
## App-breaking bug fixed — DEBUGGER guard pattern under set -e (functions/entrypoint.sh)
Needs syncing back to the upstream template in `casjay-dotfiles/scripts` per the Docker Template
Update Runbook in AI.md — `functions/entrypoint.sh` is normally regenerated, not hand-edited.
- 26x occurrences of `[ "$DEBUGGER" = "on" ] && echo/printf/__service_banner "..."` used as a bare
statement: under `set -e`, this aborts the whole script silently whenever `$DEBUGGER` != "on"
(the default). This was the root cause of the container dying immediately after printing only
the startup banner. Fixed by appending `|| true` to all 26 occurrences.
## Other observations not yet actioned ## Other observations not yet actioned
- `.gitea/workflows/docker.yaml` uses the same stale/unpinned action pattern (`@v2`-`@v4`, DockerHub-only, `catthehacker/ubuntu:act-latest`) that was removed from the `opengist` repo's duplicate workflow — no `build.yml` counterpart exists here yet. - `.gitea/workflows/docker.yaml` uses the same stale/unpinned action pattern (`@v2`-`@v4`, DockerHub-only, `catthehacker/ubuntu:act-latest`) that was removed from the `opengist` repo's duplicate workflow — no `build.yml` counterpart exists here yet.
rootfs/usr/local/etc/docker/functions/entrypoint.sh
+26 -26
View File
@@ -35,7 +35,7 @@ fi
__remove_extra_spaces() { sed -E 's/ +/ /g; s|^ ||'; } __remove_extra_spaces() { sed -E 's/ +/ /g; s|^ ||'; }
# - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - -
__log_debug() { __log_debug() {
[ "$DEBUGGER" = "on" ] && echo "[DEBUG] $*" >&2 [ "$DEBUGGER" = "on" ] && echo "[DEBUG] $*" >&2 || true
} }
__log_info() { __log_info() {
echo "[INFO] $*" echo "[INFO] $*"
@@ -62,7 +62,7 @@ __printf_space() {
__mkdir() { __mkdir() {
if [ -n "$1" ]; then if [ -n "$1" ]; then
if ! mkdir -p "$@" 2>/dev/null; then if ! mkdir -p "$@" 2>/dev/null; then
[ "$DEBUGGER" = "on" ] && echo "Warning: Failed to create directory: $*" >&2 [ "$DEBUGGER" = "on" ] && echo "Warning: Failed to create directory: $*" >&2 || true
return 1 return 1
fi fi
fi fi
@@ -71,7 +71,7 @@ __mkdir() {
__rm() { __rm() {
if [ -n "$1" ] && [ -e "$1" ]; then if [ -n "$1" ] && [ -e "$1" ]; then
if ! rm -Rf "${1:?}" 2>/dev/null; then if ! rm -Rf "${1:?}" 2>/dev/null; then
[ "$DEBUGGER" = "on" ] && echo "Warning: Failed to remove: $1" >&2 [ "$DEBUGGER" = "on" ] && echo "Warning: Failed to remove: $1" >&2 || true
return 1 return 1
fi fi
fi fi
@@ -80,7 +80,7 @@ __rm() {
__grep_test() { grep -sh "$1" "$2" 2>/dev/null | grep -qwF "${3:-$1}"; } __grep_test() { grep -sh "$1" "$2" 2>/dev/null | grep -qwF "${3:-$1}"; }
__netstat() { __netstat() {
command -v netstat &>/dev/null || { command -v netstat &>/dev/null || {
[ "$DEBUGGER" = "on" ] && echo "Warning: netstat command not found" >&2 [ "$DEBUGGER" = "on" ] && echo "Warning: netstat command not found" >&2 || true
return 10 return 10
} }
netstat "$@" 2>/dev/null netstat "$@" 2>/dev/null
@@ -171,7 +171,7 @@ __is_running() {
} }
__get_pid() { __get_pid() {
if [ -z "$1" ]; then if [ -z "$1" ]; then
[ "$DEBUGGER" = "on" ] && echo "Warning: __get_pid called without process name" >&2 [ "$DEBUGGER" = "on" ] && echo "Warning: __get_pid called without process name" >&2 || true
return 1 return 1
fi fi
local pid local pid
@@ -180,7 +180,7 @@ __get_pid() {
echo "$pid" echo "$pid"
return 0 return 0
fi fi
[ "$DEBUGGER" = "on" ] && echo "Debug: No PID found for process: $1" >&2 [ "$DEBUGGER" = "on" ] && echo "Debug: No PID found for process: $1" >&2 || true
return 1 return 1
} }
# - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -368,7 +368,7 @@ __init_working_dir() {
# cd to dir # cd to dir
__cd "${workdir:-$home}" __cd "${workdir:-$home}"
# - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - -
[ "$DEBUGGER" = "on" ] && echo "Setting the working directory to: $PWD" [ "$DEBUGGER" = "on" ] && echo "Setting the working directory to: $PWD" || true
# - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - -
export WORK_DIR="$workdir" HOME="$home" export WORK_DIR="$workdir" HOME="$home"
} }
@@ -376,7 +376,7 @@ __init_working_dir() {
__exec_service() { __exec_service() {
local count=6 local count=6
local bgpid local bgpid
[ "$DEBUGGER" = "on" ] && echo "Starting $1" [ "$DEBUGGER" = "on" ] && echo "Starting $1" || true
eval "$@" & eval "$@" &
bgpid=$! bgpid=$!
while [ $count -ne 0 ]; do while [ $count -ne 0 ]; do
@@ -607,7 +607,7 @@ __cron() {
[ -d "/run/cron" ] || mkdir -p "/run/cron" [ -d "/run/cron" ] || mkdir -p "/run/cron"
echo "$pid" >"/run/cron/$bin.pid" echo "$pid" >"/run/cron/$bin.pid"
echo "$command" >"/run/cron/$bin.run" echo "$command" >"/run/cron/$bin.run"
[ "$DEBUGGER" = "on" ] && echo "Log is saved to /data/logs/cron.log" [ "$DEBUGGER" = "on" ] && echo "Log is saved to /data/logs/cron.log" || true
# eval is intentional: $command is operator-controlled input from this container's init # eval is intentional: $command is operator-controlled input from this container's init
while :; do while :; do
eval "$command" eval "$command"
@@ -645,7 +645,7 @@ __symlink() {
[ "$from" = "$to" ] && return 0 [ "$from" = "$to" ] && return 0
__rm "$from" __rm "$from"
[ -d "${from%/*}" ] || mkdir -p "${from%/*}" 2>/dev/null [ -d "${from%/*}" ] || mkdir -p "${from%/*}" 2>/dev/null
ln -sf "$to" "$from" && [ "$DEBUGGER" = "on" ] && echo "Created symlink: $from -> $to" ln -sf "$to" "$from" && [ "$DEBUGGER" = "on" ] && echo "Created symlink: $from -> $to" || true
} }
# - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - -
__file_copy() { __file_copy() {
@@ -657,7 +657,7 @@ __file_copy() {
if [ -n "$from" ] && [ -e "$from" ] && [ -n "$dest" ]; then if [ -n "$from" ] && [ -e "$from" ] && [ -n "$dest" ]; then
if [ -d "$from" ]; then if [ -d "$from" ]; then
if cp -Rf "$from/." "$dest/" &>/dev/null; then if cp -Rf "$from/." "$dest/" &>/dev/null; then
[ "$DEBUGGER" = "on" ] && printf '%s\n' "Copied: $from > $dest" [ "$DEBUGGER" = "on" ] && printf '%s\n' "Copied: $from > $dest" || true
return 0 return 0
else else
printf '%s\n' "Copy failed: $from < $dest" >&2 printf '%s\n' "Copy failed: $from < $dest" >&2
@@ -665,7 +665,7 @@ __file_copy() {
fi fi
else else
if cp -Rf "$from" "$dest" &>/dev/null; then if cp -Rf "$from" "$dest" &>/dev/null; then
[ "$DEBUGGER" = "on" ] && printf '%s\n' "Copied: $from > $dest" [ "$DEBUGGER" = "on" ] && printf '%s\n' "Copied: $from > $dest" || true
return 0 return 0
else else
printf '%s\n' "Copy failed: $from < $dest" >&2 printf '%s\n' "Copy failed: $from < $dest" >&2
@@ -703,7 +703,7 @@ __setup_directories() {
__initialize_www_root __initialize_www_root
mkdir -p "$WWW_ROOT_DIR" 2>/dev/null mkdir -p "$WWW_ROOT_DIR" 2>/dev/null
find "$WWW_ROOT_DIR" -type d -exec chmod -f 777 {} \; 2>/dev/null find "$WWW_ROOT_DIR" -type d -exec chmod -f 777 {} \; 2>/dev/null
[ "$DEBUGGER" = "on" ] && echo "Created directory $WWW_ROOT_DIR" [ "$DEBUGGER" = "on" ] && echo "Created directory $WWW_ROOT_DIR" || true
fi fi
# Setup DATABASE_DIR # Setup DATABASE_DIR
if [ "$IS_DATABASE_SERVICE" = "yes" ] || [ "$USES_DATABASE_SERVICE" = "yes" ]; then if [ "$IS_DATABASE_SERVICE" = "yes" ] || [ "$USES_DATABASE_SERVICE" = "yes" ]; then
@@ -711,7 +711,7 @@ __setup_directories() {
if __is_dir_empty "$DATABASE_DIR" || [ ! -d "$DATABASE_DIR" ]; then if __is_dir_empty "$DATABASE_DIR" || [ ! -d "$DATABASE_DIR" ]; then
mkdir -p "$DATABASE_DIR" 2>/dev/null mkdir -p "$DATABASE_DIR" 2>/dev/null
chmod -f 777 "$DATABASE_DIR" 2>/dev/null chmod -f 777 "$DATABASE_DIR" 2>/dev/null
[ "$DEBUGGER" = "on" ] && echo "Created directory $DATABASE_DIR" [ "$DEBUGGER" = "on" ] && echo "Created directory $DATABASE_DIR" || true
fi fi
fi fi
# create default directories # create default directories
@@ -719,7 +719,7 @@ __setup_directories() {
if [ -n "$filedirs" ] && [ ! -d "$filedirs" ]; then if [ -n "$filedirs" ] && [ ! -d "$filedirs" ]; then
mkdir -p "$filedirs" 2>/dev/null mkdir -p "$filedirs" 2>/dev/null
chmod -f 777 "$filedirs" 2>/dev/null chmod -f 777 "$filedirs" 2>/dev/null
[ "$DEBUGGER" = "on" ] && echo "Created directory $filedirs" [ "$DEBUGGER" = "on" ] && echo "Created directory $filedirs" || true
fi fi
done done
# create default files # create default files
@@ -727,7 +727,7 @@ __setup_directories() {
if [ -n "$application_files" ] && [ ! -e "$application_files" ]; then if [ -n "$application_files" ] && [ ! -e "$application_files" ]; then
touch "$application_files" 2>/dev/null touch "$application_files" 2>/dev/null
chmod -Rf 777 "$application_files" 2>/dev/null chmod -Rf 777 "$application_files" 2>/dev/null
[ "$DEBUGGER" = "on" ] && echo "Created file $application_files" [ "$DEBUGGER" = "on" ] && echo "Created file $application_files" || true
fi fi
done done
} }
@@ -742,7 +742,7 @@ __fix_permissions() {
for permissions in $ADD_APPLICATION_DIRS $APPLICATION_DIRS; do for permissions in $ADD_APPLICATION_DIRS $APPLICATION_DIRS; do
if [ -n "$permissions" ] && [ -e "$permissions" ]; then if [ -n "$permissions" ] && [ -e "$permissions" ]; then
chown -Rf "$change_user" "$permissions" 2>/dev/null chown -Rf "$change_user" "$permissions" 2>/dev/null
[ "$DEBUGGER" = "on" ] && echo "Changed ownership of $permissions to $change_user" [ "$DEBUGGER" = "on" ] && echo "Changed ownership of $permissions to $change_user" || true
fi fi
done done
fi fi
@@ -752,7 +752,7 @@ __fix_permissions() {
for permissions in $ADD_APPLICATION_DIRS $APPLICATION_DIRS; do for permissions in $ADD_APPLICATION_DIRS $APPLICATION_DIRS; do
if [ -n "$permissions" ] && [ -e "$permissions" ]; then if [ -n "$permissions" ] && [ -e "$permissions" ]; then
chgrp -Rf "$change_group" "$permissions" 2>/dev/null chgrp -Rf "$change_group" "$permissions" 2>/dev/null
[ "$DEBUGGER" = "on" ] && echo "Changed group of $permissions to $change_group" [ "$DEBUGGER" = "on" ] && echo "Changed group of $permissions to $change_group" || true
fi fi
done done
fi fi
@@ -1002,7 +1002,7 @@ __start_init_scripts() {
# Clean stale PID files from previous runs # Clean stale PID files from previous runs
if [ ! -f "/run/.start_init_scripts.pid" ]; then if [ ! -f "/run/.start_init_scripts.pid" ]; then
[ "$DEBUGGER" = "on" ] && echo "Cleaning stale PID files from previous container run" [ "$DEBUGGER" = "on" ] && echo "Cleaning stale PID files from previous container run" || true
rm -f /run/*.pid /run/init.d/*.pid 2>/dev/null || true rm -f /run/*.pid /run/init.d/*.pid 2>/dev/null || true
fi fi
@@ -1030,7 +1030,7 @@ __start_init_scripts() {
touch "$pidFile" touch "$pidFile"
name="${init##*/}" name="${init##*/}"
service="${name#*-}"; service="${service%.sh}" service="${name#*-}"; service="${service%.sh}"
[ "$DEBUGGER" = "on" ] && __service_banner "🔧" "Executing service script:" "${init##*/}" [ "$DEBUGGER" = "on" ] && __service_banner "🔧" "Executing service script:" "${init##*/}" || true
# Execute the init script and capture the exit code (subshell isolates exit calls) # Execute the init script and capture the exit code (subshell isolates exit calls)
if ( source "$init" ); then if ( source "$init" ); then
# Check if service was disabled first # Check if service was disabled first
@@ -1180,7 +1180,7 @@ EOF
if [ ! -e "/usr/sbin/sendmail" ] && command -v msmtp &>/dev/null; then if [ ! -e "/usr/sbin/sendmail" ] && command -v msmtp &>/dev/null; then
__symlink "/usr/sbin/sendmail" "$(command -v msmtp)" __symlink "/usr/sbin/sendmail" "$(command -v msmtp)"
fi fi
[ "$DEBUGGER" = "on" ] && echo "Done setting up msmtp" [ "$DEBUGGER" = "on" ] && echo "Done setting up msmtp" || true
fi fi
################# sSMTP relay setup ################# sSMTP relay setup
@@ -1221,7 +1221,7 @@ EOF
__symlink "/etc/ssmtp/revaliases" "/config/ssmtp/revaliases" __symlink "/etc/ssmtp/revaliases" "/config/ssmtp/revaliases"
__initialize_replace_variables "/etc/ssmtp/revaliases" __initialize_replace_variables "/etc/ssmtp/revaliases"
fi fi
[ "$DEBUGGER" = "on" ] && echo "Done setting up ssmtp" [ "$DEBUGGER" = "on" ] && echo "Done setting up ssmtp" || true
fi fi
################# postfix relay setup ################# postfix relay setup
@@ -1275,7 +1275,7 @@ EOF
if [ ! -f "/run/init.d/postfix.pid" ]; then if [ ! -f "/run/init.d/postfix.pid" ]; then
__exec_service postfix start __exec_service postfix start
fi fi
[ "$DEBUGGER" = "on" ] && echo "Done setting up postfix" [ "$DEBUGGER" = "on" ] && echo "Done setting up postfix" || true
fi fi
fi fi
[ -f "/root/dead.letter" ] && __rm "/root/dead.letter" [ -f "/root/dead.letter" ] && __rm "/root/dead.letter"
@@ -1386,12 +1386,12 @@ __initialize_system_etc() {
if [ -n "$conf_dir" ] && [ -e "$conf_dir" ]; then if [ -n "$conf_dir" ] && [ -e "$conf_dir" ]; then
files=$(find "$conf_dir"/* -not -path '*/env/*' -type f 2>/dev/null | sort -u | sed 's|/config/||') files=$(find "$conf_dir"/* -not -path '*/env/*' -type f 2>/dev/null | sort -u | sed 's|/config/||')
directories=$(find "$conf_dir"/* -not -path '*/env/*' -type d 2>/dev/null | sort -u | sed 's|/config/||') directories=$(find "$conf_dir"/* -not -path '*/env/*' -type d 2>/dev/null | sort -u | sed 's|/config/||')
[ "$DEBUGGER" = "on" ] && echo "Copying config: $conf_dir > /etc/${conf_dir//\/config\//}" [ "$DEBUGGER" = "on" ] && echo "Copying config: $conf_dir > /etc/${conf_dir//\/config\//}" || true
if [ -n "$directories" ]; then if [ -n "$directories" ]; then
for d in $directories; do for d in $directories; do
dir="/etc/$d" dir="/etc/$d"
mkdir -p "$dir" mkdir -p "$dir"
[ "$DEBUGGER" = "on" ] && echo "Created directory: $dir" [ "$DEBUGGER" = "on" ] && echo "Created directory: $dir" || true
done done
fi fi
for f in $files; do for f in $files; do
@@ -1410,7 +1410,7 @@ __initialize_custom_bin_dir() {
[ -d "/data/bin" ] && SET_USR_BIN+="$(__find /data/bin f) " [ -d "/data/bin" ] && SET_USR_BIN+="$(__find /data/bin f) "
[ -d "/config/bin" ] && SET_USR_BIN+="$(__find /config/bin f) " [ -d "/config/bin" ] && SET_USR_BIN+="$(__find /config/bin f) "
if [ -n "$SET_USR_BIN" ]; then if [ -n "$SET_USR_BIN" ]; then
[ "$DEBUGGER" = "on" ] && echo "Setting up bin: $SET_USR_BIN > $LOCAL_BIN_DIR" [ "$DEBUGGER" = "on" ] && echo "Setting up bin: $SET_USR_BIN > $LOCAL_BIN_DIR" || true
for create_bin_template in $SET_USR_BIN; do for create_bin_template in $SET_USR_BIN; do
if [ -n "$create_bin_template" ]; then if [ -n "$create_bin_template" ]; then
create_bin_name="${create_bin_template##*/}" create_bin_name="${create_bin_template##*/}"