From 4a245e6efc8b8e2b359dcc25d9457b2f30dadd4d Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.pro>
Date: Tue, 16 Sep 2025 22:28:57 -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/bin/entrypoint.sh
rootfs/usr/local/etc/docker/init.d/05-dockerd.sh
rootfs/usr/local/etc/docker/init.d/08-gitea.sh
rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh
---
 rootfs/usr/local/bin/entrypoint.sh            | 539 +++++++++---------
 .../usr/local/etc/docker/init.d/05-dockerd.sh |   2 +-
 .../usr/local/etc/docker/init.d/08-gitea.sh   |   2 +-
 .../local/etc/docker/init.d/zz-act_runner.sh  |   2 +-
 4 files changed, 271 insertions(+), 274 deletions(-)

diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh
index 8a07550..d4289c0 100755
--- a/rootfs/usr/local/bin/entrypoint.sh
+++ b/rootfs/usr/local/bin/entrypoint.sh
@@ -12,18 +12,15 @@
 # @@Description      :  Entrypoint file for gitea
 # @@Changelog        :  New script
 # @@TODO             :  Better documentation
-# @@Other            :  
-# @@Resource         :  
+# @@Other            :
+# @@Resource         :
 # @@Terminal App     :  no
 # @@sudo/root        :  no
 # @@Template         :  other/docker-entrypoint
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2120,SC2155,SC2199,SC2317,SC2329
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-set -e
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # run trap command on exit
-trap 'echo "❌ Fatal error, killing container"; kill -TERM 1' ERR
 trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE";exit $retVal' SIGINT SIGTERM SIGPWR
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # setup debugging - https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
@@ -46,24 +43,24 @@ while :; do [ "$1" = " " ] && shift 1 || break; done
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # import the functions file
 if [ -f "/usr/local/etc/docker/functions/entrypoint.sh" ]; then
-  . "/usr/local/etc/docker/functions/entrypoint.sh"
+	. "/usr/local/etc/docker/functions/entrypoint.sh"
 else
-  echo "Can not load functions from /usr/local/etc/docker/functions/entrypoint.sh"
-  exit 1
+	echo "Can not load functions from /usr/local/etc/docker/functions/entrypoint.sh"
+	exit 1
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 case "$1" in
 # Help message
 -h | --help)
-  shift 1
-  echo 'Docker container for '$CONTAINER_NAME''
-  echo "Usage: $CONTAINER_NAME [help tail cron exec start init shell certbot ssl procs ports healthcheck backup command]"
-  echo ""
-  exit 0
-  ;;
+	shift 1
+	echo 'Docker container for '$CONTAINER_NAME''
+	echo "Usage: $CONTAINER_NAME [help tail cron exec start init shell certbot ssl procs ports healthcheck backup command]"
+	echo ""
+	exit 0
+	;;
 -*)
-  shift
-  ;;
+	shift
+	;;
 esac
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Create the default env files
@@ -71,7 +68,7 @@ __create_env_file "/config/env/default.sh" "/root/env.sh" &>/dev/null
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # import variables from files
 for set_env in "/root/env.sh" "/usr/local/etc/docker/env"/*.sh "/config/env"/*.sh; do
-  [ -f "$set_env" ] && . "$set_env"
+	[ -f "$set_env" ] && . "$set_env"
 done
 unset set_env
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -87,8 +84,8 @@ SERVICE_UID="${SERVICE_UID:-0}" # set the user id
 SERVICE_GID="${SERVICE_GID:-0}" # set the group id
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # User and group in which the service switches to - IE: nginx,apache,mysql,postgres
-SERVICE_USER="${SERVICE_USER:-$gitea}"  # execute command as another user
-SERVICE_GROUP="${SERVICE_GROUP:-gitea}" # Set the service group
+SERVICE_USER="${SERVICE_USER:-git}"   # execute command as another user
+SERVICE_GROUP="${SERVICE_GROUP:-git}" # Set the service group
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Secondary ports
 SERVER_PORTS="" # specifiy other ports
@@ -110,7 +107,7 @@ export PATH RUNAS_USER SERVICE_USER SERVICE_GROUP SERVICE_UID SERVICE_GID WWW_RO
 # show message
 __run_message() {
 
-  return
+	return
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ################## END OF CONFIGURATION #####################
@@ -165,13 +162,13 @@ export ENTRYPOINT_DATA_INIT_FILE="${ENTRYPOINT_DATA_INIT_FILE:-/data/.docker_has
 export ENTRYPOINT_CONFIG_INIT_FILE="${ENTRYPOINT_CONFIG_INIT_FILE:-/config/.docker_has_run}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -n "$CONTAINER_WEB_SERVER_WWW_REPO" ]; then
-  www_temp_dir="/tmp/git/$(basename -- "$CONTAINER_WEB_SERVER_WWW_REPO")"
-  rm -Rf "${WWW_ROOT_DIR:?}"/* "${www_temp_dir:?}"/*
-  mkdir -p "$WWW_ROOT_DIR" "$www_temp_dir"
-  git clone -q "$CONTAINER_WEB_SERVER_WWW_REPO" "$www_temp_dir" 2>/dev/null
-  rm -Rf "$www_temp_dir/.git" "$www_temp_dir"/.git*
-  rsync -ra "$www_temp_dir/" "$WWW_ROOT_DIR" --delete >/dev/null 2>&1
-  rm -Rf "$www_temp_dir"
+	www_temp_dir="/tmp/git/$(basename -- "$CONTAINER_WEB_SERVER_WWW_REPO")"
+	rm -Rf "${WWW_ROOT_DIR:?}"/* "${www_temp_dir:?}"/*
+	mkdir -p "$WWW_ROOT_DIR" "$www_temp_dir"
+	git clone -q "$CONTAINER_WEB_SERVER_WWW_REPO" "$www_temp_dir" 2>/dev/null
+	rm -Rf "$www_temp_dir/.git" "$www_temp_dir"/.git*
+	rsync -ra "$www_temp_dir/" "$WWW_ROOT_DIR" --delete >/dev/null 2>&1
+	rm -Rf "$www_temp_dir"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # variables based on env/files
@@ -255,71 +252,71 @@ EOF
 [ -n "$BACKUP_DIR" ] && { [ -d "$BACKUP_DIR" ] || mkdir -p "$BACKUP_DIR"; }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -f "$ENTRYPOINT_PID_FILE" ]; then
-  START_SERVICES="no"
-  touch "$ENTRYPOINT_PID_FILE"
+	START_SERVICES="no"
+	touch "$ENTRYPOINT_PID_FILE"
 else
-  echo "$$" >"$ENTRYPOINT_PID_FILE"
-  # Clean any stale PID files on first run
-  rm -f /run/init.d/*.pid 2>/dev/null || true
+	echo "$$" >"$ENTRYPOINT_PID_FILE"
+	# Clean any stale PID files on first run
+	rm -f /run/init.d/*.pid 2>/dev/null || true
 fi
 if [ -f "$ENTRYPOINT_INIT_FILE" ]; then
-  ENTRYPOINT_MESSAGE="no" ENTRYPOINT_FIRST_RUN="no"
+	ENTRYPOINT_MESSAGE="no" ENTRYPOINT_FIRST_RUN="no"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
-  # Show start message
-  if [ "$CONFIG_DIR_INITIALIZED" = "no" ] || [ "$DATA_DIR_INITIALIZED" = "no" ]; then
-    [ "$ENTRYPOINT_MESSAGE" = "yes" ] && echo "Executing entrypoint script for gitea"
-  fi
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  # Set reusable variables
-  { { [ -w "/etc" ] && [ ! -f "/etc/hosts" ]; } || [ -w "/etc/hosts" ]; } && UPDATE_FILE_HOSTS="yes" && touch "/etc/hosts"
-  { { [ -w "/etc" ] && [ ! -f "/etc/timezone" ]; } || [ -w "/etc/timezone" ]; } && UPDATE_FILE_TZ="yes" && touch "/etc/timezone"
-  { { [ -w "/etc" ] && [ ! -f "/etc/resolv.conf" ]; } || [ -w "/etc/resolv.conf" ]; } && UPDATE_FILE_RESOLV="yes" && touch "/etc/resolv.conf"
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  # Set timezone
-  [ -n "$TZ" ] && [ "$UPDATE_FILE_TZ" = "yes" ] && echo "$TZ" >"/etc/timezone"
-  [ -f "/usr/share/zoneinfo/$TZ" ] && [ "$UPDATE_FILE_TZ" = "yes" ] && ln -sf "/usr/share/zoneinfo/$TZ" "/etc/localtime"
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  # if ipv6 add it to /etc/hosts
-  if [ "$UPDATE_FILE_HOSTS" = "yes" ]; then
-    echo "# known hostname mappings" >"/etc/hosts"
-    if [ -n "$(ip a 2>/dev/null | grep 'inet6.*::' || ifconfig 2>/dev/null | grep 'inet6.*::')" ]; then
-      __printf_space "40" "::1" "localhost" >>"/etc/hosts"
-      __printf_space "40" "127.0.0.1" "localhost" >>"/etc/hosts"
-    else
-      __printf_space "40" "127.0.0.1" "localhost" >>"/etc/hosts"
-    fi
-  fi
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  # add .internal domain
-  if [ "$UPDATE_FILE_HOSTS" = "yes" ] && [ -n "$HOSTNAME" ]; then
-    __grep_test " $HOSTNAME" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "$HOSTNAME" >>"/etc/hosts"
-    __grep_test " ${HOSTNAME%%.*}.internal" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.internal" >>"/etc/hosts"
-  fi
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  # add domainname
-  if [ "$UPDATE_FILE_HOSTS" = "yes" ] && [ "$DOMAINNAME" != "internal" ] && [ -n "$DOMAINNAME" ] && [ "$HOSTNAME.$DOMAINNAME" != "$DOMAINNAME" ]; then
-    __grep_test " ${HOSTNAME%%.*}.$DOMAINNAME" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.$DOMAINNAME" >>"/etc/hosts"
-  fi
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  # Set containers hostname
-  [ -n "$HOSTNAME" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ] && echo "$HOSTNAME" >"/etc/hostname"
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  if [ -f "/etc/hostname" ]; then
-    [ -n "$(type -P hostname)" ] && hostname -F "/etc/hostname" &>/dev/null || HOSTNAME="$(<"/etc/hostname")"
-    export HOSTNAME
-  fi
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  # import hosts file into container
-  [ -f "/usr/local/etc/hosts" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ] && cat "/usr/local/etc/hosts" | grep -vF "$HOSTNAME" >>"/etc/hosts"
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  # import resolv.conf file into container
-  [ "$CUSTOM_DNS" != "yes" ] && [ -f "/usr/local/etc/resolv.conf" ] && [ "$UPDATE_FILE_RESOLV" = "yes" ] && cat "/usr/local/etc/resolv.conf" >"/etc/resolv.conf"
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  if [ -n "$HOME" ] && [ -d "/usr/local/etc/skel" ]; then
-    [ -d "$HOME" ] && cp -Rf "/usr/local/etc/skel/." "$HOME/"
-  fi
+	# Show start message
+	if [ "$CONFIG_DIR_INITIALIZED" = "no" ] || [ "$DATA_DIR_INITIALIZED" = "no" ]; then
+		[ "$ENTRYPOINT_MESSAGE" = "yes" ] && echo "Executing entrypoint script for gitea"
+	fi
+	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	# Set reusable variables
+	{ { [ -w "/etc" ] && [ ! -f "/etc/hosts" ]; } || [ -w "/etc/hosts" ]; } && UPDATE_FILE_HOSTS="yes" && touch "/etc/hosts"
+	{ { [ -w "/etc" ] && [ ! -f "/etc/timezone" ]; } || [ -w "/etc/timezone" ]; } && UPDATE_FILE_TZ="yes" && touch "/etc/timezone"
+	{ { [ -w "/etc" ] && [ ! -f "/etc/resolv.conf" ]; } || [ -w "/etc/resolv.conf" ]; } && UPDATE_FILE_RESOLV="yes" && touch "/etc/resolv.conf"
+	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	# Set timezone
+	[ -n "$TZ" ] && [ "$UPDATE_FILE_TZ" = "yes" ] && echo "$TZ" >"/etc/timezone"
+	[ -f "/usr/share/zoneinfo/$TZ" ] && [ "$UPDATE_FILE_TZ" = "yes" ] && ln -sf "/usr/share/zoneinfo/$TZ" "/etc/localtime"
+	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	# if ipv6 add it to /etc/hosts
+	if [ "$UPDATE_FILE_HOSTS" = "yes" ]; then
+		echo "# known hostname mappings" >"/etc/hosts"
+		if [ -n "$(ip a 2>/dev/null | grep 'inet6.*::' || ifconfig 2>/dev/null | grep 'inet6.*::')" ]; then
+			__printf_space "40" "::1" "localhost" >>"/etc/hosts"
+			__printf_space "40" "127.0.0.1" "localhost" >>"/etc/hosts"
+		else
+			__printf_space "40" "127.0.0.1" "localhost" >>"/etc/hosts"
+		fi
+	fi
+	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	# add .internal domain
+	if [ "$UPDATE_FILE_HOSTS" = "yes" ] && [ -n "$HOSTNAME" ]; then
+		__grep_test " $HOSTNAME" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "$HOSTNAME" >>"/etc/hosts"
+		__grep_test " ${HOSTNAME%%.*}.internal" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.internal" >>"/etc/hosts"
+	fi
+	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	# add domainname
+	if [ "$UPDATE_FILE_HOSTS" = "yes" ] && [ "$DOMAINNAME" != "internal" ] && [ -n "$DOMAINNAME" ] && [ "$HOSTNAME.$DOMAINNAME" != "$DOMAINNAME" ]; then
+		__grep_test " ${HOSTNAME%%.*}.$DOMAINNAME" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.$DOMAINNAME" >>"/etc/hosts"
+	fi
+	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	# Set containers hostname
+	[ -n "$HOSTNAME" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ] && echo "$HOSTNAME" >"/etc/hostname"
+	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	if [ -f "/etc/hostname" ]; then
+		[ -n "$(type -P hostname)" ] && hostname -F "/etc/hostname" &>/dev/null || HOSTNAME="$(<"/etc/hostname")"
+		export HOSTNAME
+	fi
+	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	# import hosts file into container
+	[ -f "/usr/local/etc/hosts" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ] && cat "/usr/local/etc/hosts" | grep -vF "$HOSTNAME" >>"/etc/hosts"
+	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	# import resolv.conf file into container
+	[ "$CUSTOM_DNS" != "yes" ] && [ -f "/usr/local/etc/resolv.conf" ] && [ "$UPDATE_FILE_RESOLV" = "yes" ] && cat "/usr/local/etc/resolv.conf" >"/etc/resolv.conf"
+	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	if [ -n "$HOME" ] && [ -d "/usr/local/etc/skel" ]; then
+		[ -d "$HOME" ] && cp -Rf "/usr/local/etc/skel/." "$HOME/"
+	fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -343,52 +340,52 @@ __initialize_data_dir
 __initialize_ssl_certs
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -f "$ENTRYPOINT_INIT_FILE" ]; then
-  ENTRYPOINT_FIRST_RUN="no"
+	ENTRYPOINT_FIRST_RUN="no"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -d "/config" ]; then
-  echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_INIT_FILE"
+	echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_INIT_FILE"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Check if this is a new container
 if [ -f "$ENTRYPOINT_DATA_INIT_FILE" ]; then
-  DATA_DIR_INITIALIZED="yes"
+	DATA_DIR_INITIALIZED="yes"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -d "/data" ]; then
-  echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_DATA_INIT_FILE"
+	echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_DATA_INIT_FILE"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ]; then
-  CONFIG_DIR_INITIALIZED="yes"
+	CONFIG_DIR_INITIALIZED="yes"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -d "/config" ]; then
-  echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_CONFIG_INIT_FILE"
+	echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_CONFIG_INIT_FILE"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
-  # setup the smtp server
-  __setup_mta
+	# setup the smtp server
+	__setup_mta
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # if no pid assume container restart - clean stale files on restart
 if [ ! -f "$ENTRYPOINT_PID_FILE" ]; then
-  START_SERVICES="yes"
-  # Clean stale pid files from previous container runs
-  rm -f /run/__start_init_scripts.pid /run/init.d/*.pid /run/*.pid 2>/dev/null || true
+	START_SERVICES="yes"
+	# Clean stale pid files from previous container runs
+	rm -f /run/__start_init_scripts.pid /run/init.d/*.pid /run/*.pid 2>/dev/null || true
 elif [ ! -f "/run/__start_init_scripts.pid" ]; then
-  START_SERVICES="yes"
+	START_SERVICES="yes"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 [ "$ENTRYPOINT_MESSAGE" = "yes" ] && __printf_space "40" "Container ip address is:" "$CONTAINER_IP4_ADDRESS"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Show configured listing processes
 if [ "$ENTRYPOINT_MESSAGE" = "yes" ] && [ -n "$ENV_PORTS" ]; then
-  show_port=""
-  for port in $ENV_PORTS; do [ -n "$port" ] && show_port+="$(printf '%s ' "${port// /}") "; done
-  __printf_space "40" "The following ports are open:" "$show_port"
-  unset port show_port
+	show_port=""
+	for port in $ENV_PORTS; do [ -n "$port" ] && show_port+="$(printf '%s ' "${port// /}") "; done
+	__printf_space "40" "The following ports are open:" "$show_port"
+	unset port show_port
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # execute init script
@@ -408,200 +405,200 @@ START_SERVICES="${START_SERVICES:-SYSTEM_INIT}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Start all services if no pidfile
 if [ "$START_SERVICES" = "yes" ] && [ "$1" != "backup" ] && [ "$1" != "healthcheck" ] && [ "$1" != "cron" ] && [ "$1" != "tail" ] && [ "$1" != "logs" ] && [ "$1" != "cron" ]; then
-  [ "$1" = "start" ] && shift 1
-  [ "$1" = "all" ] && shift 1
-  [ "$1" = "init" ] && export CONTAINER_INIT="yes"
-  echo "$$" >"$ENTRYPOINT_PID_FILE"
-  rm -Rf "/run"/*/*pid
-  __start_init_scripts "/usr/local/etc/docker/init.d"
-  START_SERVICES="no"
-  CONTAINER_INIT="${CONTAINER_INIT:-no}"
+	[ "$1" = "start" ] && shift 1
+	[ "$1" = "all" ] && shift 1
+	[ "$1" = "init" ] && export CONTAINER_INIT="yes"
+	echo "$$" >"$ENTRYPOINT_PID_FILE"
+	rm -Rf "/run"/*/*pid
+	__start_init_scripts "/usr/local/etc/docker/init.d"
+	START_SERVICES="no"
+	CONTAINER_INIT="${CONTAINER_INIT:-no}"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Begin options
 case "$1" in
 init)
-  shift 1
-  echo "Container has been Initialized"
-  exit 0
-  ;;
+	shift 1
+	echo "Container has been Initialized"
+	exit 0
+	;;
 tail)
-  shift 1
-  case "$1" in
-  null)
-    shift $#
-    tail -F "/dev/null"
-    ;;
-  app)
-    shift $#
-    tail -F /data/logs/*/*.log
-    ;;
-  -*)
-    tail "$@"
-    ;;
-  *)
-    tail -F "${@:-/dev/null}"
-    ;;
-  esac
-  ;;
+	shift 1
+	case "$1" in
+	null)
+		shift $#
+		tail -F "/dev/null"
+		;;
+	app)
+		shift $#
+		tail -F /data/logs/*/*.log
+		;;
+	-*)
+		tail "$@"
+		;;
+	*)
+		tail -F "${@:-/dev/null}"
+		;;
+	esac
+	;;
 logs)
-  shift 1
-  case "$1" in
-  follow)
-    tail -Fq /data/logs/*/*
-    ;;
-  clean)
-    log_files="$(find "/data/logs" -type f)"
-    for log in "${log_files[@]}"; do
-      echo "clearing $log"
-      printf '' >$log
-    done
-    ;;
-  *)
-    echo "Usage: logs [follow,clean]"
-    exit 0
-    ;;
-  esac
-  ;;
+	shift 1
+	case "$1" in
+	follow)
+		tail -Fq /data/logs/*/*
+		;;
+	clean)
+		log_files="$(find "/data/logs" -type f)"
+		for log in "${log_files[@]}"; do
+			echo "clearing $log"
+			printf '' >$log
+		done
+		;;
+	*)
+		echo "Usage: logs [follow,clean]"
+		exit 0
+		;;
+	esac
+	;;
 cron)
-  shift 1
-  __cron "$@" &
-  echo "cron script is running with pid: $!"
-  exit
-  ;;
+	shift 1
+	__cron "$@" &
+	echo "cron script is running with pid: $!"
+	exit
+	;;
 # backup data and config dirs
 backup)
-  shift 1
-  __backup $BACKUP_MAX_DAYS $1
-  exit $?
-  ;;
+	shift 1
+	__backup $BACKUP_MAX_DAYS $1
+	exit $?
+	;;
 # Docker healthcheck
 healthcheck)
-  arguments="$*"
-  healthStatus=0
-  healthEnabled="${HEALTH_ENABLED:-}"
-  healthPorts="${WEB_SERVER_PORTS:-}"
-  healthEndPoints="${HEALTH_ENDPOINTS:-}"
-  SERVICES_LIST="${arguments:-$SERVICES_LIST}"
-  services="$(echo "${SERVICES_LIST//,/ }")"
-  healthMessage="Everything seems to be running"
-  [ "$healthEnabled" = "yes" ] || exit 0
-  if [ -d "/run/healthcheck" ] && [ "$(ls -A "/run/healthcheck" | wc -l)" -ne 0 ]; then
-    for service in /run/healthcheck/*; do
-      name=$(basename -- $service)
-      services+="$name "
-    done
-  fi
-  services="$(echo "$services" | tr ' ' '\n' | sort -u | grep -v '^$')"
-  { [ "$1" = "init" ] || [ "$1" = "test" ]; } && exit 0
-  for proc in $services; do
-    if [ -n "$proc" ]; then
-      if ! __pgrep "$proc"; then
-        echo "$proc is not running" >&2
-        healthStatus=$((healthStatus + 1))
-      fi
-    fi
-  done
-  for port in $ports; do
-    if [ -n "$(type -P netstat)" ] && [ -n "$port" ]; then
-      if ! netstat -taupln | grep -q ":$port "; then
-        echo "$port isn't open" >&2
-        healthStatus=$((healthStatus + 1))
-      fi
-    fi
-  done
-  for endpoint in $healthEndPoints; do
-    if [ -n "$endpoint" ]; then
-      if ! __curl "$endpoint"; then
-        echo "Can not connect to $endpoint" >&2
-        healthStatus=$((healthStatus + 1))
-      fi
-    fi
-  done
-  [ "$healthStatus" -eq 0 ] || healthMessage="Errors reported see: docker logs --follow $CONTAINER_NAME"
-  [ -n "$healthMessage" ] && echo "$healthMessage"
-  exit $healthStatus
-  ;;
-  # show open ports
+	arguments="$*"
+	healthStatus=0
+	healthEnabled="${HEALTH_ENABLED:-}"
+	healthPorts="${WEB_SERVER_PORTS:-}"
+	healthEndPoints="${HEALTH_ENDPOINTS:-}"
+	SERVICES_LIST="${arguments:-$SERVICES_LIST}"
+	services="$(echo "${SERVICES_LIST//,/ }")"
+	healthMessage="Everything seems to be running"
+	[ "$healthEnabled" = "yes" ] || exit 0
+	if [ -d "/run/healthcheck" ] && [ "$(ls -A "/run/healthcheck" | wc -l)" -ne 0 ]; then
+		for service in /run/healthcheck/*; do
+			name=$(basename -- $service)
+			services+="$name "
+		done
+	fi
+	services="$(echo "$services" | tr ' ' '\n' | sort -u | grep -v '^$')"
+	{ [ "$1" = "init" ] || [ "$1" = "test" ]; } && exit 0
+	for proc in $services; do
+		if [ -n "$proc" ]; then
+			if ! __pgrep "$proc"; then
+				echo "$proc is not running" >&2
+				healthStatus=$((healthStatus + 1))
+			fi
+		fi
+	done
+	for port in $ports; do
+		if [ -n "$(type -P netstat)" ] && [ -n "$port" ]; then
+			if ! netstat -taupln | grep -q ":$port "; then
+				echo "$port isn't open" >&2
+				healthStatus=$((healthStatus + 1))
+			fi
+		fi
+	done
+	for endpoint in $healthEndPoints; do
+		if [ -n "$endpoint" ]; then
+			if ! __curl "$endpoint"; then
+				echo "Can not connect to $endpoint" >&2
+				healthStatus=$((healthStatus + 1))
+			fi
+		fi
+	done
+	[ "$healthStatus" -eq 0 ] || healthMessage="Errors reported see: docker logs --follow $CONTAINER_NAME"
+	[ -n "$healthMessage" ] && echo "$healthMessage"
+	exit $healthStatus
+	;;
+	# show open ports
 ports)
-  shift 1
-  ports="$(__netstat -taupln | awk -F ' ' '{print $4}' | awk -F ':' '{print $2}' | sort --unique --version-sort | grep -v '^$' | grep '^' || echo '')"
-  [ -n "$ports" ] && printf '%s\n%s\n' "The following are servers:" "$ports" | tr '\n' ' '
-  exit $?
-  ;;
-  # show running processes
+	shift 1
+	ports="$(__netstat -taupln | awk -F ' ' '{print $4}' | awk -F ':' '{print $2}' | sort --unique --version-sort | grep -v '^$' | grep '^' || echo '')"
+	[ -n "$ports" ] && printf '%s\n%s\n' "The following are servers:" "$ports" | tr '\n' ' '
+	exit $?
+	;;
+	# show running processes
 procs)
-  shift 1
-  ps="$(__ps axco command | grep -vE 'COMMAND|grep|ps' | sort -u || grep '^' || echo '')"
-  [ -n "$ps" ] && printf '%s\n%s\n' "Found the following processes" "$ps" | tr '\n' ' '
-  exit $?
-  ;;
-  # setup ssl
+	shift 1
+	ps="$(__ps axco command | grep -vE 'COMMAND|grep|ps' | sort -u || grep '^' || echo '')"
+	[ -n "$ps" ] && printf '%s\n%s\n' "Found the following processes" "$ps" | tr '\n' ' '
+	exit $?
+	;;
+	# setup ssl
 ssl)
-  shift 1
-  __create_ssl_cert
-  exit $?
-  ;;
+	shift 1
+	__create_ssl_cert
+	exit $?
+	;;
 # manage ssl certificate
 certbot)
-  shift 1
-  CERT_BOT_ENABLED="yes"
-  if [ "$1" = "create" ]; then
-    shift 1
-    __certbot "create"
-  elif [ "$1" = "renew" ]; then
-    shift 1
-    __certbot "renew certonly --force-renew"
-  else
-    __exec_command "certbot" "$@"
-  fi
-  exit $?
-  ;;
+	shift 1
+	CERT_BOT_ENABLED="yes"
+	if [ "$1" = "create" ]; then
+		shift 1
+		__certbot "create"
+	elif [ "$1" = "renew" ]; then
+		shift 1
+		__certbot "renew certonly --force-renew"
+	else
+		__exec_command "certbot" "$@"
+	fi
+	exit $?
+	;;
 # Launch shell
 */bin/sh | */bin/bash | bash | sh | shell)
-  shift 1
-  __exec_command "${@:-/bin/bash -l}"
-  exit $?
-  ;;
+	shift 1
+	__exec_command "${@:-/bin/bash -l}"
+	exit $?
+	;;
 # execute commands
 exec)
-  shift 1
-  __exec_command "${@:-echo "No commands given"}"
-  exit $?
-  ;;
+	shift 1
+	__exec_command "${@:-echo "No commands given"}"
+	exit $?
+	;;
 # show/start init scripts
 start)
-  shift 1
-  export PATH="/usr/local/etc/docker/init.d:$PATH"
-  if [ $# -eq 0 ]; then
-    scripts="$(ls -A "/usr/local/etc/docker/init.d")"
-    [ -n "$scripts" ] && echo "$scripts" || echo "No scripts found in: /usr/local/etc/docker/init.d"
-    exit
-  elif [ "$1" = "all" ]; then
-    shift $#
-    if [ "$START_SERVICES" = "yes" ]; then
-      echo "$$" >"$ENTRYPOINT_PID_FILE"
-      __start_init_scripts "/usr/local/etc/docker/init.d"
-      __no_exit
-    elif [ -f "/usr/local/etc/docker/init.d/$1" ]; then
-      eval "/usr/local/etc/docker/init.d/$1" &
-      __no_exit
-    fi
-  fi
-  ;;
+	shift 1
+	export PATH="/usr/local/etc/docker/init.d:$PATH"
+	if [ $# -eq 0 ]; then
+		scripts="$(ls -A "/usr/local/etc/docker/init.d")"
+		[ -n "$scripts" ] && echo "$scripts" || echo "No scripts found in: /usr/local/etc/docker/init.d"
+		exit
+	elif [ "$1" = "all" ]; then
+		shift $#
+		if [ "$START_SERVICES" = "yes" ]; then
+			echo "$$" >"$ENTRYPOINT_PID_FILE"
+			__start_init_scripts "/usr/local/etc/docker/init.d"
+			__no_exit
+		elif [ -f "/usr/local/etc/docker/init.d/$1" ]; then
+			eval "/usr/local/etc/docker/init.d/$1" &
+			__no_exit
+		fi
+	fi
+	;;
 # Execute primary command
 *)
-  if [ $# -eq 0 ]; then
-    if [ ! -f "$ENTRYPOINT_PID_FILE" ]; then
-      echo "$$" >"$ENTRYPOINT_PID_FILE"
-      [ "$START_SERVICES" = "no" ] && [ "$CONTAINER_INIT" = "yes" ] || __start_init_scripts "/usr/local/etc/docker/init.d"
-    fi
-    __no_exit
-  else
-    __exec_command "$@"
-  fi
-  exit $?
-  ;;
+	if [ $# -eq 0 ]; then
+		if [ ! -f "$ENTRYPOINT_PID_FILE" ]; then
+			echo "$$" >"$ENTRYPOINT_PID_FILE"
+			[ "$START_SERVICES" = "no" ] && [ "$CONTAINER_INIT" = "yes" ] || __start_init_scripts "/usr/local/etc/docker/init.d"
+		fi
+		__no_exit
+	else
+		__exec_command "$@"
+	fi
+	exit $?
+	;;
 esac
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # end of entrypoint
diff --git a/rootfs/usr/local/etc/docker/init.d/05-dockerd.sh b/rootfs/usr/local/etc/docker/init.d/05-dockerd.sh
index 595b2c6..de95704 100755
--- a/rootfs/usr/local/etc/docker/init.d/05-dockerd.sh
+++ b/rootfs/usr/local/etc/docker/init.d/05-dockerd.sh
@@ -23,7 +23,7 @@
 set -e
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # run trap command on exit
-trap 'echo "❌ Fatal error, killing container"; kill -TERM 1' ERR
+trap 'retVal=$?; echo "❌ Fatal error occurred: Exit code $retVal at line $LINENO in command: $BASH_COMMAND"; kill -TERM 1' SIGERR
 trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE";exit $retVal' SIGINT SIGTERM SIGPWR
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 SCRIPT_FILE="$0"
diff --git a/rootfs/usr/local/etc/docker/init.d/08-gitea.sh b/rootfs/usr/local/etc/docker/init.d/08-gitea.sh
index 2d1228d..517577a 100755
--- a/rootfs/usr/local/etc/docker/init.d/08-gitea.sh
+++ b/rootfs/usr/local/etc/docker/init.d/08-gitea.sh
@@ -23,7 +23,7 @@
 set -e
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # run trap command on exit
-trap 'echo "❌ Fatal error, killing container"; kill -TERM 1' ERR
+trap 'retVal=$?; echo "❌ Fatal error occurred: Exit code $retVal at line $LINENO in command: $BASH_COMMAND"; kill -TERM 1' SIGERR
 trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE";exit $retVal' SIGINT SIGTERM SIGPWR
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 SCRIPT_FILE="$0"
diff --git a/rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh b/rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh
index 80f8b7c..7a7d4a4 100755
--- a/rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh
+++ b/rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh
@@ -23,7 +23,7 @@
 set -e
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # run trap command on exit
-trap 'echo "❌ Fatal error, killing container"; kill -TERM 1' ERR
+trap 'retVal=$?; echo "❌ Fatal error occurred: Exit code $retVal at line $LINENO in command: $BASH_COMMAND"; kill -TERM 1' SIGERR
 trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE";exit $retVal' SIGINT SIGTERM SIGPWR
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 SCRIPT_FILE="$0"