From fb1fa1d3cff7a84188cf4b7c832a7bd6e3757443 Mon Sep 17 00:00:00 2001 From: casjay Date: Fri, 5 Sep 2025 18:46:38 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rootfs/usr/local/etc/docker/functions/entrypoint.sh --- rootfs/usr/local/etc/docker/functions/entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rootfs/usr/local/etc/docker/functions/entrypoint.sh b/rootfs/usr/local/etc/docker/functions/entrypoint.sh index dc1c22c..82f8eb4 100644 --- a/rootfs/usr/local/etc/docker/functions/entrypoint.sh +++ b/rootfs/usr/local/etc/docker/functions/entrypoint.sh @@ -152,7 +152,7 @@ __no_exit() { } >> "/data/logs/start.log" # Terminate the container (PID 1 is the init process) - kill -TERM 1 + exit 1 exit 1 fi @@ -743,8 +743,8 @@ __exec_command() { # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Setup the server init scripts __start_init_scripts() { - set -e - trap 'echo "❌ Fatal error in service startup - killing container"; rm -f /run/__start_init_scripts.pid; kill -TERM 1' ERR + # Remove set -e to let individual scripts handle their own errors properly + trap 'echo "❌ Fatal error in service startup - killing container"; rm -f /run/__start_init_scripts.pid; exit 1' ERR [ "$1" = " " ] && shift 1 [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -o pipefail -x$DEBUGGER_OPTIONS || set -o pipefail