🗃️ Committing everything that changed 🗃️

rootfs/usr/local/etc/docker/functions/entrypoint.sh

rootfs/usr/local/etc/docker/functions/entrypoint.sh

@@ -48,19 +48,37 @@ __find() { find "$1" -mindepth 1 -type ${2:-f,d} 2>/dev/null | grep '.' || retur
 __pcheck() { [ -n "$(which pgrep 2>/dev/null)" ] && pgrep -o "$1$" &>/dev/null || return 10; }
 __file_exists_with_content() { [ -n "$1" ] && [ -f "$1" ] && [ -s "$1" ] && return 0 || return 2; }
 __sed() { sed -i 's|'$1'|'$2'|g' "$3" &>/dev/null || sed -i "s|$1|$2|g" "$3" &>/dev/null || return 1; }
-__pgrep() { __pcheck "${1:-SERVICE_NAME}" || __ps "${1:-$SERVICE_NAME}" | grep -qv ' grep' || return 10; }
 __ps() { [ -f "$(type -P ps)" ] && ps "$@" 2>/dev/null | sed 's|:||g' | grep -Fw " ${1:-$SERVICE_NAME}$" || return 10; }
 __is_dir_empty() { if [ -n "$1" ]; then [ "$(ls -A "$1" 2>/dev/null | wc -l)" -eq 0 ] && return 0 || return 1; else return 1; fi; }
 __get_ip6() { ip a 2>/dev/null | grep -w 'inet6' | awk '{print $2}' | grep -vE '^::1|^fe' | sed 's|/.*||g' | head -n1 | grep '.' || echo ''; }
 __get_ip4() { ip a 2>/dev/null | grep -w 'inet' | awk '{print $2}' | grep -vE '^127.0.0' | sed 's|/.*||g' | head -n1 | grep '.' || echo '127.0.0.1'; }
-__find_file_relative() { find "$1"/* -not -path '*env/*' -not -path '.git*' -type f 2>/dev/null | sed 's|'$1'/||g' | sort -u | grep -v '^$' | grep '.' || false; }
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-__find_directory_relative() { find "$1"/* -not -path '*env/*' -not -path '.git*' -type d 2>/dev/null | sed 's|'$1'/||g' | sort -u | grep -v '^$' | grep '.' || false; }
+__pgrep() {
+  local count=3
+  local srvc="${1:-SERVICE_NAME}"
+  while [ $count -ge 0 ]; do
+    __pcheck "${1:-SERVICE_NAME}" || __ps "${1:-$SERVICE_NAME}" | grep -qv ' grep'
+    sleep 1
+    count=$((count - 1))
+  done
+  [ $count -ne 0 ] && return 0 || return 10
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+__find_file_relative() {
+  [ -e "$1" ] || return 0
+  find "$1"/* -not -path '*env/*' -not -path '.git*' -type f 2>/dev/null | sed 's|'$1'/||g' | sort -u | grep -v '^$' | grep '.' || false
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+__find_directory_relative() {
+  [ -d "$1" ] || return 0
+  find "$1"/* -not -path '*env/*' -not -path '.git*' -type d 2>/dev/null | sed 's|'$1'/||g' | sort -u | grep -v '^$' | grep '.' || false
+}
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __pid_exists() { ps -ax --no-header | sed 's/^[[:space:]]*//g' | awk -F' ' '{print $1}' | sed 's|:||g' | grep '[0-9]' | sort -uV | grep "^$1$" && return 0 || return 1; }
 __is_running() { ps -eo args --no-header | awk '{print $1,$2,$3}' | sed 's|:||g' | sort -u | grep -vE 'grep|COMMAND|awk|tee|ps|sed|sort|tail' | grep "$1" | grep -q "${2:-^}" && return 0 || return 1; }
 __get_pid() { ps -ax --no-header | sed 's/^[[:space:]]*//g;s|;||g;s|:||g' | awk '{print $1,$5}' | sed 's|:||g' | grep "$1$" | grep -v 'grep' | awk -F' ' '{print $1}' | grep '[0-9]' | sort -uV | head -n1 | grep '.' && return 0 || return 1; }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-__format_variables() { printf '%s\n' "${@//,/ }" | tr ' ' '\n' | sort -RVu | grep -v '^$' | tr '\n' ' ' | __clean_variables | grep '.' || return 3; }
+__format_variables() { printf '%s\n' "${@//,/ }" | tr ' ' '\n' | sort -RVu | grep -v '^$' | tr '\n' ' ' | __clean_variables | grep '.' || return 0; }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __clean_variables() {
   local var="$*"
@@ -118,7 +136,25 @@ __trim() {
   printf '%s' "$var" | sed 's|;||g' | grep -v '^$'
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-__banner() { printf '# - - - %-60s  - - - #\n' "$*"; }
+__banner() {
+  local message="$*"
+  local total_width=80
+  local content_width=$((total_width - 14)) # Account for "# - - - " and " - - - #"
+  printf '# - - - %-*s - - - #\n' "$content_width" "$message"
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+__service_banner() {
+  local icon="${1:-🔧}"
+  local message="${2:-Processing}"
+  local service="${3:-service}"
+  local full_message="$message $service"
+  local total_width=80
+  local content_width=$((total_width - 14))                # Account for "# - - - " and " - - - #"
+  local icon_width=2                                       # Most emojis are 2 chars wide
+  local text_width=$((content_width - icon_width * 2 - 2)) # Account for both icons and spaces
+  printf '# - - - %s %-*s %s - - - #\n' "$icon" "$text_width" "$full_message" "$icon"
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __find_php_bin() { find -L '/usr'/*bin -maxdepth 4 -name 'php-fpm*' 2>/dev/null | head -n1 | grep '.' || echo ''; }
 __find_php_ini() { find -L '/etc' -maxdepth 4 -name 'php.ini' 2>/dev/null | head -n1 | sed 's|/php.ini||g' | grep '.' || echo ''; }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -150,8 +186,8 @@ __init_working_dir() {
   # create needed directories
   [ -n "$home" ] && { [ -d "$home" ] || mkdir -p "$home"; }
   [ -n "$workdir" ] && { [ -d "$workdir" ] || mkdir -p "$workdir"; }
-  [ "$SERVICE_USER" = "root " ] || [ -d "$home" ] && chmod -f 777 "$home"
+  [ "$SERVICE_USER" = "root" ] || [ -d "$home" ] && chmod -f 777 "$home"
-  [ "$SERVICE_USER" = "root " ] || [ -d "$workdir" ] && chmod -f 777 "$workdir"
+  [ "$SERVICE_USER" = "root" ] || [ -d "$workdir" ] && chmod -f 777 "$workdir"
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   # cd to dir
   __cd "${workdir:-$home}"
@@ -166,7 +202,7 @@ __exec_service() {
   echo "Starting $1"
   eval "$@" 2>>/dev/stderr >>/data/logs/start.log &
   while [ $count -ne 0 ]; do
-    sleep 10
+    sleep 3
     __pgrep $1 && touch "/run/init.d/$1.pid" && break || count=$((count - 1))
   done
 }
@@ -193,7 +229,7 @@ __certbot() {
   local certbot_key_opts="--key-path $SSL_KEY --fullchain-path $SSL_CERT"
   mkdir -p "/config/letsencrypt"
   __symlink "/etc/letsencrypt" "/config/letsencrypt"
-  is_renewal="$(find /etc/letsencrypt/renewal -type -f 2>/dev/null || false)"
+  is_renewal="$(find /etc/letsencrypt/renewal -type f 2>/dev/null || false)"
   [ -f "/config/env/ssl.sh" ] && . "/config/env/ssl.sh"
   [ -f "/config/certbot/env.sh" ] && . "/config/certbot/env.sh"
   [ -n "$SSL_KEY" ] && { mkdir -p "$(dirname "$SSL_KEY")" || true; } || { echo "The variable $SSL_KEY is not set" >&2 && return 1; }
@@ -203,7 +239,7 @@ __certbot() {
   [ "$CERT_BOT_ENABLED" = "true" ] || { export CERT_BOT_ENABLED="" && return 10; }
   [ -n "$CERT_BOT_MAIL" ] || { echo "The variable CERT_BOT_MAIL is not set" >&2 && return 1; }
   [ -n "$CERTBOT_DOMAINS" ] || { echo "The variable CERTBOT_DOMAINS is not set" >&2 && return 1; }
-  for domain in $$CERTBOT_DOMAINS; do
+  for domain in $CERTBOT_DOMAINS; do
     [ -n "$domain" ] && ADD_CERTBOT_DOMAINS+="-d $domain "
   done
   [ -n "$is_renewal" ] && options="renew" ADD_CERTBOT_DOMAINS="" || options="certonly"
@@ -458,7 +494,7 @@ __file_copy() {
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __generate_random_uids() {
-  local set_random_uid="$(seq 3000 5000 | sort -R | head -n 1)"
+  local set_random_uid="$(seq 100 999 | sort -R | head -n 1)"
   while :; do
     if grep -shq "x:.*:$set_random_uid:" "/etc/group" && ! grep -shq "x:$set_random_uid:.*:" "/etc/passwd"; then
       set_random_uid=$((set_random_uid + 1))
@@ -557,7 +593,7 @@ __set_user_group_id() {
   local random_id="$(__generate_random_uids)"
   set_uid="$(__get_uid "$set_user" || echo "$set_uid")"
   set_gid="$(__get_gid "$set_user" || echo "$set_gid")"
-  grep -shq "^$create_user:" "/etc/passwd" "/etc/group" || return 0
+  grep -shq "^$set_user:" "/etc/passwd" "/etc/group" || return 0
   [ -n "$set_user" ] && [ "$set_user" != "root" ] || return
   if grep -shq "^$set_user:" "/etc/passwd" "/etc/group"; then
     if __check_for_guid "$set_gid"; then
@@ -588,8 +624,8 @@ __create_service_user() {
     create_uid="${create_uid:-1000}"
     create_gid="${create_gid:-1000}"
   fi
-  create_uid="$(__get_uid "$set_user" || echo "$create_uid")"
+  create_uid="$(__get_uid "$create_user" || echo "$create_uid")"
-  create_gid="$(__get_gid "$set_user" || echo "$create_gid")"
+  create_gid="$(__get_gid "$create_user" || echo "$create_gid")"
   [ -n "$create_uid" ] && [ "$create_uid" != "0" ] || create_uid="$random_id"
   [ -n "$create_gid" ] && [ "$create_gid" != "0" ] || create_gid="$random_id"
   while :; do
@@ -608,7 +644,7 @@ __create_service_user() {
     echo "creating system user $create_user"
     useradd --system -u $create_uid -g $create_group -c "Account for $create_user" -d "$create_home_dir" -s /bin/false $create_user 2>/dev/stderr | tee -p -a "/data/logs/init.txt" >/dev/null
   fi
-  grep -shq "$create_group" "/etc/group" || exitStatus=$((exitCode + 1))
+  grep -shq "$create_group" "/etc/group" || exitStatus=$((exitStatus + 1))
   grep -shq "$create_user" "/etc/passwd" || exitStatus=$((exitCode + 1))
   if [ $exitStatus -eq 0 ]; then
     export WORK_DIR="${create_home_dir:-}"
@@ -618,7 +654,7 @@ __create_service_user() {
     fi
     if [ -d "/etc/sudoers.d" ] && [ ! -f "/etc/sudoers.d/$create_user" ]; then
       echo "$create_user ALL=(ALL)   NOPASSWD: ALL" >"/etc/sudoers.d/$create_user"
-    elif [ -f "/etc/sudoers" ] && grep -qs "$create_user" "/etc/sudoers"; then
+    elif [ -f "/etc/sudoers" ] && ! grep -qs "$create_user" "/etc/sudoers"; then
       echo "$create_user ALL=(ALL)   NOPASSWD: ALL" >"/etc/sudoers"
     fi
     export SERVICE_UID="$create_uid"
@@ -680,8 +716,6 @@ __exec_command() {
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Setup the server init scripts
 __start_init_scripts() {
-  set -e
-  trap 'echo "❌ Fatal error, killing container"; kill -TERM 1' ERR
   [ "$1" = " " ] && shift 1
   [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -o pipefail -x$DEBUGGER_OPTIONS || set -o pipefail
   local retPID=""
@@ -689,17 +723,11 @@ __start_init_scripts() {
   local init_pids=""
   local retstatus="0"
   local initStatus="0"
+  local critical_failures="0"
   local init_dir="${1:-/usr/local/etc/docker/init.d}"
   local init_count="$(ls -A "$init_dir"/* 2>/dev/null | grep -v '\.sample' | wc -l)"
-  local critical_failures=0
   local exit_on_failure="${EXIT_ON_SERVICE_FAILURE:-true}"
 
-  if [ -n "$SERVICE_DISABLED" ]; then
-    unset SERVICE_DISABLED
-    echo "$SERVICE_DISABLED is disabled"
-    return 0
-  fi
-
   # Clean stale PID files from previous runs
   if [ ! -f "/run/__start_init_scripts.pid" ]; then
     echo "🧹 Cleaning stale PID files from previous container run"
@@ -707,8 +735,6 @@ __start_init_scripts() {
   fi
 
   touch /run/__start_init_scripts.pid
-  mkdir -p "/tmp" "/run" "/run/init.d" "/usr/local/etc/docker/exec"
-  chmod -R 777 "/tmp" "/run" "/run/init.d" "/usr/local/etc/docker/exec"
 
   if [ "$init_count" -eq 0 ] || [ ! -d "$init_dir" ]; then
     mkdir -p "/data/logs/init"
@@ -728,27 +754,50 @@ __start_init_scripts() {
         if [ -x "$init" ]; then
           name="$(basename "$init")"
           service="$(printf '%s' "$name" | sed 's/^[^-]*-//;s|.sh$||g')"
-
+          __service_banner "🔧" "Executing service script:" "$(basename "$init")"
-          echo "🔧 Executing service script: $init (service: $service)"
-
           # Execute the init script and capture the exit code
-          if eval "$init"; then
+          if source "$init"; then
-            sleep 5
+            # Check if service was disabled first
-            retPID=$(__get_pid "$service")
+            if [ -n "$SERVICE_DISABLED" ]; then
-            if [ -n "$retPID" ]; then
               initStatus="0"
-              echo "✅ Service $service started successfully - PID: ${retPID}"
+              __service_banner "🚫" "Service $service is disabled -" "skipping"
+              unset SERVICE_DISABLED
             else
-              initStatus="1"
+              sleep 2
-              critical_failures=$((critical_failures + 1))
+              # Check for service success indicators
-              echo "⚠️ Service $service appears to have started but no process found"
+              local expected_pid_file="/run/init.d/$service.pid"
+              if [ "$SERVICE_USES_PID" = "no" ]; then
+                # Service doesn't use PID files - check if expected PID file exists or assume success
+                if [ -f "$expected_pid_file" ]; then
+                  retPID="$(cat "$expected_pid_file" 2>/dev/null || echo "0")"
+                  initStatus="0"
+                  __service_banner "✅" "Service $service started successfully -" "PID file"
+                else
+                  initStatus="0"
+                  __service_banner "✅" "Service $service started successfully -" "no PID tracking"
+                fi
+              else
+                # Service uses PID tracking - get actual PID
+                retPID=$(__get_pid "$service")
+                if [ -n "$retPID" ] && [ "$retPID" != "0" ]; then
+                  initStatus="0"
+                  __service_banner "✅" "Service $service started successfully -" "PID: ${retPID}"
+                elif [ -f "$expected_pid_file" ]; then
+                  retPID="$(cat "$expected_pid_file" 2>/dev/null || echo "0")"
+                  initStatus="0"
+                  __service_banner "✅" "Service $service started successfully -" "PID file"
+                else
+                  initStatus="1"
+                  critical_failures=$((critical_failures + 1))
+                  __service_banner "⚠️" "Service $service appears to have started but" "no process found"
+                fi
+              fi
             fi
           else
             initStatus="1"
             critical_failures=$((critical_failures + 1))
-            echo "❌ Service $service failed to start - check logs: docker logs $CONTAINER_NAME"
+            __service_banner "❌" "Service $service failed to start -" "check logs"
           fi
-
           echo ""
         fi
         retstatus=$((retstatus + initStatus))