🔧 Sync template framework updates and fix app.ini config 🔧

Bring all init scripts and support files up to the latest docker template framework, and fully configure gitea's app.ini for a performant, open, reverse-proxy-aware deployment. - rootfs/tmp/etc/gitea/app.ini: add missing sections ([server], [cache], [queue], [git], [git.timeout], [api], [webhook], [indexer], [session], [oauth2], [metrics], [repository.release]); raise MAX_RESPONSE_ITEMS=500; set PROTOCOL=http, HTTP_ADDR=0.0.0.0, USE_PROXY_PROTOCOL=false; INSTALL_LOCK=false; tune DB/session/security - rootfs/usr/local/bin/entrypoint.sh: direct template sync — new trap style, SSL_CA fix, ENTRYPOINT_PID_FILE path, mapfile, __netstat call - rootfs/usr/local/etc/docker/functions/entrypoint.sh: direct template sync — add __log_debug/info/warn/error; improve __netstat, __mkdir, __rm, __grep_test (639 changed lines) - rootfs/usr/local/etc/docker/init.d/00-server01.sh: new generic template/example init.d service script - rootfs/usr/local/etc/docker/init.d/05-dockerd.sh: framework update — __trap_err_handler ERR handler, SIGPWR split, enabled-check expanded, debug if/else, env loop guard, $(<...) PID read, __check_service guard, __run_start_script rewrite (printf %q, md5sum hash, bash launcher), errorCode=${PIPESTATUS[0]}, remove unconditional SERVICE_EXIT_CODE=0, fix __post_execute fire-and-forget - rootfs/usr/local/etc/docker/init.d/08-gitea.sh: same framework updates as 05-dockerd.sh, service-specific content preserved - rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh: same framework updates; service-specific __post_execute daemon/cache-server logic kept - rootfs/root/docker/setup/00-init.sh: version stamp sync - rootfs/root/docker/setup/01-system.sh: version stamp sync - rootfs/root/docker/setup/02-packages.sh: version stamp sync - rootfs/root/docker/setup/03-files.sh: header-only patch, gitea-specific body preserved - rootfs/root/docker/setup/04-users.sh: version stamp sync - rootfs/root/docker/setup/05-custom.sh: header-only patch, gitea/act_runner binary download logic preserved - rootfs/root/docker/setup/06-post.sh: version stamp sync - rootfs/root/docker/setup/07-cleanup.sh: version stamp sync - rootfs/usr/local/share/template-files/config/env/default.sample: ENTRYPOINT_PID_FILE path → /run/init.d/entrypoint.pid - rootfs/usr/local/share/template-files/config/env/examples/zz-entrypoint.sh: ENTRYPOINT_PID_FILE path → /run/init.d/entrypoint.pid rootfs/root/docker/setup/00-init.sh rootfs/root/docker/setup/01-system.sh rootfs/root/docker/setup/02-packages.sh rootfs/root/docker/setup/03-files.sh rootfs/root/docker/setup/04-users.sh rootfs/root/docker/setup/05-custom.sh rootfs/root/docker/setup/06-post.sh rootfs/root/docker/setup/07-cleanup.sh rootfs/tmp/etc/gitea/app.ini rootfs/usr/local/bin/entrypoint.sh rootfs/usr/local/etc/docker/functions/entrypoint.sh rootfs/usr/local/etc/docker/init.d/00-server01.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/share/template-files/config/env/default.sample rootfs/usr/local/share/template-files/config/env/examples/zz-entrypoint.sh
2026-05-24 15:28:44 -04:00 · 2026-05-24 12:19:59 -04:00
parent 4fc5a83354
commit 4d51cc0e7c
17 changed files with 2160 additions and 759 deletions
--- a/rootfs/root/docker/setup/00-init.sh
+++ b/rootfs/root/docker/setup/00-init.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202511290736-git
+##@Version           :  202605241158-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
-# @@Copyright        :  Copyright 2025 CasjaysDev
-# @@Created          :  Sat Nov 29 07:36:08 AM EST 2025
+# @@Copyright        :  Copyright 2026 CasjaysDev
+# @@Created          :  Sun May 24 11:58:45 AM EDT 2026
 # @@File             :  00-init.sh
 # @@Description      :  script to run init
 # @@Changelog        :  newScript
@@ -42,3 +42,4 @@ exit $exitCode
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
+
--- a/rootfs/root/docker/setup/01-system.sh
+++ b/rootfs/root/docker/setup/01-system.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202511290736-git
+##@Version           :  202605241158-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
-# @@Copyright        :  Copyright 2025 CasjaysDev
-# @@Created          :  Sat Nov 29 07:36:08 AM EST 2025
+# @@Copyright        :  Copyright 2026 CasjaysDev
+# @@Created          :  Sun May 24 11:58:45 AM EDT 2026
 # @@File             :  01-system.sh
 # @@Description      :  script to run system
 # @@Changelog        :  newScript
@@ -40,3 +40,4 @@ exit $exitCode
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
+
--- a/rootfs/root/docker/setup/02-packages.sh
+++ b/rootfs/root/docker/setup/02-packages.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202511290736-git
+##@Version           :  202605241158-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
-# @@Copyright        :  Copyright 2025 CasjaysDev
-# @@Created          :  Sat Nov 29 07:36:08 AM EST 2025
+# @@Copyright        :  Copyright 2026 CasjaysDev
+# @@Created          :  Sun May 24 11:58:45 AM EDT 2026
 # @@File             :  02-packages.sh
 # @@Description      :  script to run packages
 # @@Changelog        :  newScript
@@ -28,10 +28,7 @@ exitCode=0

 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Predefined actions
-[ -d "/etc/nginx" ] && rm -Rf "/etc/nginx"/*
-[ -d "/etc/gitea" ] && rm -Rf "/etc/gitea"/*
-[ -d "/etc/docker" ] && rm -Rf "/etc/docker"/*
-[ -d "/etc/act_runner" ] && rm -Rf "/etc/act_runner"/*
+
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main script

@@ -43,3 +40,4 @@ exit $exitCode
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
+
--- a/rootfs/root/docker/setup/03-files.sh
+++ b/rootfs/root/docker/setup/03-files.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202511290736-git
+##@Version           :  202605241158-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
-# @@Copyright        :  Copyright 2025 CasjaysDev
-# @@Created          :  Sat Nov 29 07:36:08 AM EST 2025
+# @@Copyright        :  Copyright 2026 CasjaysDev
+# @@Created          :  Sun May 24 11:58:45 AM EDT 2026
 # @@File             :  03-files.sh
 # @@Description      :  script to run files
 # @@Changelog        :  newScript
--- a/rootfs/root/docker/setup/04-users.sh
+++ b/rootfs/root/docker/setup/04-users.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202511290736-git
+##@Version           :  202605241158-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
-# @@Copyright        :  Copyright 2025 CasjaysDev
-# @@Created          :  Sat Nov 29 07:36:08 AM EST 2025
+# @@Copyright        :  Copyright 2026 CasjaysDev
+# @@Created          :  Sun May 24 11:58:45 AM EDT 2026
 # @@File             :  04-users.sh
 # @@Description      :  script to run users
 # @@Changelog        :  newScript
@@ -40,3 +40,4 @@ exit $exitCode
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
+
--- a/rootfs/root/docker/setup/05-custom.sh
+++ b/rootfs/root/docker/setup/05-custom.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202511290736-git
+##@Version           :  202605241158-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
-# @@Copyright        :  Copyright 2025 CasjaysDev
-# @@Created          :  Sat Nov 29 07:36:08 AM EST 2025
+# @@Copyright        :  Copyright 2026 CasjaysDev
+# @@Created          :  Sun May 24 11:58:45 AM EDT 2026
 # @@File             :  05-custom.sh
 # @@Description      :  script to run custom
 # @@Changelog        :  newScript
--- a/rootfs/root/docker/setup/06-post.sh
+++ b/rootfs/root/docker/setup/06-post.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202511290736-git
+##@Version           :  202605241158-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
-# @@Copyright        :  Copyright 2025 CasjaysDev
-# @@Created          :  Sat Nov 29 07:36:08 AM EST 2025
+# @@Copyright        :  Copyright 2026 CasjaysDev
+# @@Created          :  Sun May 24 11:58:45 AM EDT 2026
 # @@File             :  06-post.sh
 # @@Description      :  script to run post
 # @@Changelog        :  newScript
@@ -40,3 +40,4 @@ exit $exitCode
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
+
--- a/rootfs/root/docker/setup/07-cleanup.sh
+++ b/rootfs/root/docker/setup/07-cleanup.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202511290736-git
+##@Version           :  202605241158-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
-# @@Copyright        :  Copyright 2025 CasjaysDev
-# @@Created          :  Sat Nov 29 07:36:08 AM EST 2025
+# @@Copyright        :  Copyright 2026 CasjaysDev
+# @@Created          :  Sun May 24 11:58:45 AM EDT 2026
 # @@File             :  07-cleanup.sh
 # @@Description      :  script to run cleanup
 # @@Changelog        :  newScript
@@ -44,3 +44,4 @@ exit $exitCode
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
+
--- a/rootfs/tmp/etc/gitea/app.ini
+++ b/rootfs/tmp/etc/gitea/app.ini
@@ -5,6 +5,8 @@ RUN_MODE                                                   = prod

 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 [server]
+PROTOCOL                                                   = http
+HTTP_ADDR                                                  = 0.0.0.0
 HTTP_PORT                                                  = 80
 ROOT_URL                                                   = REPLACE_SERVER_PROTO://REPLACE_SERVER_NAME
 DOMAIN                                                     = REPLACE_SERVER_NAME
@@ -28,6 +30,9 @@ SSH_CREATE_AUTHORIZED_PRINCIPALS_FILE                      = true
 SSH_AUTHORIZED_KEYS_BACKUP                                 = true
 SSH_ROOT_PATH                                              = REPLACE_DATA_DIR/ssh
 SSH_DOMAIN                                                 = REPLACE_SERVER_NAME
+; reverse-proxy passthrough — TLS terminated upstream
+USE_PROXY_PROTOCOL                                         = false
+REDIRECT_OTHER_PORT                                        = false
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 [lfs]
 STORAGE_TYPE                                               = local
@@ -40,12 +45,20 @@ PATH                                                       = REPLACE_DATA_DIR/re
 [repository]
 SCRIPT_TYPE                                                = sh
 ROOT                                                       = REPLACE_DATA_DIR/repositories/root
+DEFAULT_BRANCH                                             = main
+DEFAULT_PRIVATE                                            = false
+MAX_CREATION_LIMIT                                         = -1
+PREFERRED_LICENSES                                         = MIT,Apache-2.0
+DISABLE_HTTP_GIT                                           = false
+USE_COMPAT_SSH_URI                                         = false
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 [repository.local]
 LOCAL_COPY_PATH                                            = REPLACE_DATA_DIR/repositories/local
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 [repository.upload]
 TEMP_PATH                                                  = REPLACE_DATA_DIR/repositories/uploads
+FILE_MAX_SIZE                                              = 100
+MAX_FILES                                                  = 10
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 [repository.pull-request]
 DEFAULT_MERGE_STYLE                                        = merge
@@ -60,6 +73,11 @@ ADD_CO_COMMITTER_TRAILERS                                  = true
 TEST_CONFLICTING_PATCHES_WITH_GIT_APPLY                    = false
 RETARGET_CHILDREN_ON_MERGE                                 = true
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[repository.release]
+ALLOWED_TYPES                                              =
+DEFAULT_PAGING_NUM                                         = 20
+ADD_CO_COMMITTER_TRAILERS                                  = true
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 [repository.signing]
 DEFAULT_TRUST_MODEL                                        = collaboratorcommitter
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -92,13 +110,37 @@ LIMIT_SIZE_VAGRANT                                         = -1
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 [attachment]
 PATH                                                       = REPLACE_DATA_DIR/attachments
+MAX_SIZE                                                   = 100
+MAX_FILES                                                  = 10
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 [indexer]
 ISSUE_INDEXER_PATH                                         = REPLACE_DATA_DIR/indexers/issues.bleve
+REPO_INDEXER_ENABLED                                       = true
+REPO_INDEXER_PATH                                          = REPLACE_DATA_DIR/indexers/repos.bleve
+REPO_INDEXER_INCLUDE                                       =
+REPO_INDEXER_EXCLUDE                                       = vendor,node_modules
+MAX_FILE_SIZE                                              = 1048576
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 [session]
 PROVIDER                                                   = file
 PROVIDER_CONFIG                                            = REPLACE_DATA_DIR/sessions
+COOKIE_SECURE                                              = false
+SAME_SITE                                                  = lax
+SESSION_LIFE_TIME                                          = 86400
+GC_INTERVAL_TIME                                           = 86400
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[cache]
+ADAPTER                                                    = memory
+INTERVAL                                                   = 60
+HOST                                                       =
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[queue]
+TYPE                                                       = channel
+CONN_STR                                                   =
+LENGTH                                                     = 100
+BATCH_LENGTH                                               = 20
+WORKERS                                                    = 0
+MAX_WORKERS                                                = 10
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 [database]
 DB_TYPE                                                    = REPLACE_SQL_TYPE
@@ -107,10 +149,28 @@ USER                                                       = REPLACE_SQL_USER
 PASSWD                                                     = REPLACE_SQL_PASS
 NAME                                                       = REPLACE_SQL_NAME
 LOG_SQL                                                    = false
-SCHEMA                                                     = 
+SCHEMA                                                     =
 SSL_MODE                                                   = disable
 CHARSET                                                    = utf8
 PATH                                                       = REPLACE_DATABASE_DIR/gitea.db
+MAX_IDLE_CONNS                                             = 2
+MAX_OPEN_CONNS                                             = 100
+CONN_MAX_LIFETIME                                          = 3s
+ITERATE_BUFFER_SIZE                                        = 50
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[git]
+MAX_GIT_DIFF_LINES                                         = 1000
+MAX_GIT_DIFF_LINE_CHARACTER_COUNT                          = 5000
+MAX_GIT_DIFF_FILES                                         = 100
+GC_ARGS                                                    =
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[git.timeout]
+DEFAULT                                                    = 360
+MIGRATE                                                    = 600
+MIRROR                                                     = 300
+CLONE                                                      = 300
+PULL                                                       = 300
+GC                                                         = 60
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 [picture]
 ENABLE_FEDERATED_AVATAR                                    = true
@@ -130,11 +190,13 @@ ROOT_PATH                                                  = REPLACE_LOG_DIR
 INSTALL_LOCK                                               = false
 SECRET_KEY                                                 = REPLACE_SECRET_KEY
 INTERNAL_TOKEN                                             = REPLACE_GITEA_INTERNAL_TOKEN
-PASSWORD_HASH_ALGO                                         = pbkdf2
+PASSWORD_HASH_ALGO                                         = argon2
 MIN_PASSWORD_LENGTH                                        = 8
 PASSWORD_COMPLEXITY                                        = on
 LOGIN_REMEMBER_DAYS                                        = 1825
 COOKIE_USERNAME                                            = git_REPLACE_RANDOM_COOKIE_KEY
+COOKIE_SECURE                                              = false
+CSRF_COOKIE_HTTP_ONLY                                      = true
 REVERSE_PROXY_LIMIT                                        = 1
 REVERSE_PROXY_TRUSTED_PROXIES                              = *
 REVERSE_PROXY_AUTHENTICATION_USER                          = X-WEBAUTH-USER
@@ -145,6 +207,22 @@ REVERSE_PROXY_AUTHENTICATION_FULL_NAME                     = X-WEBAUTH-FULLNAME
 DEFAULT_UI_LOCATION                                        = REPLACE_TZ
 FORMAT                                                     = RFC1123
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[api]
+ENABLE_SWAGGER                                             = true
+MAX_RESPONSE_ITEMS                                         = 500
+DEFAULT_PAGING_NUM                                         = 50
+DEFAULT_GIT_TREES_PER_PAGE                                 = 1000
+DEFAULT_MAX_BLOB_SIZE                                      = 10485760
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[webhook]
+QUEUE_LENGTH                                               = 1000
+DELIVER_TIMEOUT                                            = 30
+ALLOWED_HOST_LIST                                          = *
+SKIP_TLS_VERIFY                                            = true
+PAGING_NUM                                                 = 10
+PROXY_URL                                                  =
+PROXY_HOSTS                                                =
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 [service]
 DISABLE_REGISTRATION                                       = false
 REQUIRE_SIGNIN_VIEW                                        = false
@@ -195,13 +273,14 @@ ENABLE_OPENID_SIGNUP                                       = true
 [oauth2]
 ENABLED                                                    = true
 JWT_SIGNING_ALGORITHM                                      = RS256
+JWT_SECRET                                                 = REPLACE_GITEA_LFS_JWT_SECRET
 ACCESS_TOKEN_EXPIRATION_TIME                               = 3600
 REFRESH_TOKEN_EXPIRATION_TIME                              = 730
 MAX_TOKEN_LENGTH                                           = 32767
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 [oauth2_client]
 REGISTER_EMAIL_CONFIRM                                     = REPLACE_GITEA_EMAIL_CONFIRM
-OPENID_CONNECT_SCOPES                                      = 
+OPENID_CONNECT_SCOPES                                      =
 ENABLE_AUTO_REGISTRATION                                   = true
 USERNAME                                                   = nickname
 UPDATE_AVATAR                                              = false
@@ -210,6 +289,12 @@ ACCOUNT_LINKING                                            = login
 [ui]
 DEFAULT_THEME                                              = gitea-dark
 SEARCH_REPO_DESCRIPTION                                    = true
+EXPLORE_PAGING_NUM                                         = 20
+ISSUE_PAGING_NUM                                           = 20
+FEED_MAX_COMMIT_NUM                                        = 5
+GRAPH_MAX_COMMIT_NUM                                       = 100
+CODE_COMMENT_LINES                                         = 4
+REACTIONS                                                  = +1,-1,laugh,hooray,confused,heart,rocket,eyes
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 [ui.meta]
 AUTHOR                                                     = gitea
@@ -222,6 +307,10 @@ MAX_TIMEOUT                                                = 60s
 TIMEOUT_STEP                                               = 10s
 EVENT_SOURCE_UPDATE_TIME                                   = 10s
 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[metrics]
+ENABLED                                                    = false
+TOKEN                                                      =
+; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 [cors]
 ENABLED                                                    = true
 SCHEME                                                     = REPLACE_SERVER_PROTO
--- a/rootfs/usr/local/bin/entrypoint.sh
+++ b/rootfs/usr/local/bin/entrypoint.sh
@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202602061352-git
+##@Version           :  202605241142-git
 # @@Author           :  Jason Hempstead
 # @@Contact          :  jason@casjaysdev.pro
 # @@License          :  WTFPL
 # @@ReadME           :  entrypoint.sh --help
 # @@Copyright        :  Copyright: (c) 2026 Jason Hempstead, Casjays Developments
-# @@Created          :  Tuesday, May 05, 2026 14:38 EDT
+# @@Created          :  Sunday, May 24, 2026 11:58 EDT
 # @@File             :  entrypoint.sh
-# @@Description      :  Entrypoint file for gitea
+# @@Description      :  Entrypoint file for archlinux
 # @@Changelog        :  New script
 # @@TODO             :  Better documentation
 # @@Other            :  
@@ -21,17 +21,25 @@
 # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # run trap command on exit
-trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE";exit $retVal' INT TERM PWR
+trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE";exit $retVal' INT TERM
+trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE";exit $retVal' SIGPWR 2>/dev/null || true
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # setup debugging - https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
 [ -f "/config/.debug" ] && [ -z "$DEBUGGER_OPTIONS" ] && export DEBUGGER_OPTIONS="$(<"/config/.debug")" || DEBUGGER_OPTIONS="${DEBUGGER_OPTIONS:-}"
-{ [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; } && echo "Enabling debugging" && set -o pipefail -x$DEBUGGER_OPTIONS && export DEBUGGER="on" || set -o pipefail
+if [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; then
+  echo "Enabling debugging"
+  set -o pipefail
+  [ -n "$DEBUGGER_OPTIONS" ] && set -"$DEBUGGER_OPTIONS"
+  export DEBUGGER="on"
+else
+  set -o pipefail
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set bash options
 SCRIPT_FILE="$0"
-CONTAINER_NAME="gitea"
+CONTAINER_NAME="archlinux"
 SCRIPT_NAME="${SCRIPT_FILE##*/}"
 CONTAINER_NAME="${ENV_CONTAINER_NAME:-$CONTAINER_NAME}"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -87,8 +95,8 @@ SERVICE_UID="${SERVICE_UID:-0}"
 SERVICE_GID="${SERVICE_GID:-0}"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # 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:-archlinux}"   # execute command as another user
+#SERVICE_GROUP="${SERVICE_GROUP:-archlinux}" # Set the service group
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Secondary ports
 # specifiy other ports
@@ -143,7 +151,7 @@ export DOMAINNAME="$(hostname -d)"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Default directories
 export SSL_DIR="${SSL_DIR:-/config/ssl}"
-export SSL_CA="${SSL_CERT:-/config/ssl/ca.crt}"
+export SSL_CA="${SSL_CA:-/config/ssl/ca.crt}"
 export SSL_KEY="${SSL_KEY:-/config/ssl/localhost.pem}"
 export SSL_CERT="${SSL_CERT:-/config/ssl/localhost.crt}"
 export LOCAL_BIN_DIR="${LOCAL_BIN_DIR:-/usr/local/bin}"
@@ -164,7 +172,7 @@ export NGINX_CONFIG_FILE="${NGINX_CONFIG_FILE:-$(__find_nginx_conf)}"
 export MYSQL_CONFIG_FILE="${MYSQL_CONFIG_FILE:-$(__find_mysql_conf)}"
 export PGSQL_CONFIG_FILE="${PGSQL_CONFIG_FILE:-$(__find_pgsql_conf)}"
 export MONGODB_CONFIG_FILE="${MONGODB_CONFIG_FILE:-$(__find_mongodb_conf)}"
-export ENTRYPOINT_PID_FILE="${ENTRYPOINT_PID_FILE:-$ENTRYPOINT_PID_FILE}"
+export ENTRYPOINT_PID_FILE="${ENTRYPOINT_PID_FILE:-/run/.entrypoint.pid}"
 export ENTRYPOINT_INIT_FILE="${ENTRYPOINT_INIT_FILE:-/config/.entrypoint.done}"
 export ENTRYPOINT_DATA_INIT_FILE="${ENTRYPOINT_DATA_INIT_FILE:-/data/.docker_has_run}"
 export ENTRYPOINT_CONFIG_INIT_FILE="${ENTRYPOINT_CONFIG_INIT_FILE:-/config/.docker_has_run}"
@@ -214,8 +222,6 @@ SERVER_PORTS="${SERVER_PORTS//,/ }"  #
 SERVER_PORTS="${SERVER_PORTS//\/*/}" #
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # clean WEB_SERVER_PORTS variables
-WEB_SERVER_PORTS="${WEB_SERVER_PORT//\/*/}"                             #
-WEB_SERVER_PORTS="${WEB_SERVER_PORTS//\/*/}"                            #
 WEB_SERVER_PORTS="${WEB_SERVER_PORT//,/ } ${ENV_WEB_SERVER_PORTS//,/ }" #
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # rewrite and merge variables
@@ -288,7 +294,7 @@ fi
 if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
  if [ "$CONFIG_DIR_INITIALIZED" = "no" ] || [ "$DATA_DIR_INITIALIZED" = "no" ]; then
    if [ "$ENTRYPOINT_MESSAGE" = "yes" ]; then
-      echo "Executing entrypoint script for gitea"
+      echo "Executing entrypoint script for archlinux"
    fi
  fi
  # - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -357,7 +363,7 @@ if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
  fi
  # - - - - - - - - - - - - - - - - - - - - - - - - -
  if [ -f "/etc/hostname" ]; then
-    if [ -n "$(type -P hostname 2>/dev/null)" ]; then
+    if command -v hostname &>/dev/null; then
      hostname -F "/etc/hostname" 2>/dev/null || true
    else
      HOSTNAME="$(<"/etc/hostname")" 2>/dev/null || true
@@ -372,7 +378,7 @@ if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
  # - - - - - - - - - - - - - - - - - - - - - - - - -
  # import resolv.conf file into container
  if [ "$CUSTOM_DNS" != "yes" ] && [ -f "/usr/local/etc/resolv.conf" ] && [ "$UPDATE_FILE_RESOLV" = "yes" ]; then
-    cat "/usr/local/etc/resolv.conf" >"/etc/resolv.conf" 2>/dev/null || true
+    cp -f "/usr/local/etc/resolv.conf" "/etc/resolv.conf" 2>/dev/null || true
  fi
  # - - - - - - - - - - - - - - - - - - - - - - - - -
  if [ -n "$HOME" ] && [ -d "/usr/local/etc/skel" ]; then
@@ -383,12 +389,13 @@ if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-# Delete any .gitkeep files
+# Delete any .gitkeep files (bash * does not match dotfiles by default,
+# so the explicit /.gitkeep path is required at each depth)
 if [ -d "/data" ]; then
-  rm -Rf "/data/.gitkeep" "/data"/*/*.gitkeep 2>/dev/null || true
+  rm -Rf "/data/.gitkeep" "/data"/*/.gitkeep 2>/dev/null || true
 fi
 if [ -d "/config" ]; then
-  rm -Rf "/config/.gitkeep" "/config"/*/*.gitkeep 2>/dev/null || true
+  rm -Rf "/config/.gitkeep" "/config"/*/.gitkeep 2>/dev/null || true
 fi
 if [ -f "/usr/local/bin/.gitkeep" ]; then
  rm -Rf "/usr/local/bin/.gitkeep" 2>/dev/null || true
@@ -442,7 +449,7 @@ fi
 # if no pid assume container restart - clean stale files on restart
 if [ -f "$ENTRYPOINT_PID_FILE" ]; then
  # Check if the PID in the file is still running
-  entrypoint_pid=$(cat "$ENTRYPOINT_PID_FILE" 2>/dev/null || echo "")
+  entrypoint_pid=$(<"$ENTRYPOINT_PID_FILE") 2>/dev/null
  if [ -n "$entrypoint_pid" ] && kill -0 "$entrypoint_pid" 2>/dev/null; then
    # Process is still running, don't restart services
    START_SERVICES="no"
@@ -451,12 +458,12 @@ if [ -f "$ENTRYPOINT_PID_FILE" ]; then
    # PID file exists but process is dead - this is a restart
    START_SERVICES="yes"
    # Clean any stale PID files on restart
-    rm -f /run/__start_init_scripts.pid /run/init.d/*.pid /run/*.pid 2>/dev/null || true
+    rm -f /run/.start_init_scripts.pid /run/init.d/*.pid /run/*.pid 2>/dev/null || true
  fi
 else
  START_SERVICES=yes
  # Clean any stale PID files on first run
-  rm -f /run/__start_init_scripts.pid /run/init.d/*.pid /run/*.pid 2>/dev/null || true
+  rm -f /run/.start_init_scripts.pid /run/init.d/*.pid /run/*.pid 2>/dev/null || true
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 [ "$ENTRYPOINT_MESSAGE" = "yes" ] && __printf_space "40" "The containers ip address is:" "$CONTAINER_IP4_ADDRESS"
@@ -482,7 +489,7 @@ __set_user_group_id $SERVICE_USER ${SERVICE_UID:-} ${SERVICE_GID:-}
 __run_message
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Just start services
-START_SERVICES="${START_SERVICES:-SYSTEM_INIT}"
+START_SERVICES="${START_SERVICES:-yes}"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Determine if we should start services based on command
 # Only skip service start for the 'init' command
@@ -540,10 +547,10 @@ logs)
    tail -Fq /data/logs/*/*
    ;;
  clean)
-    log_files="$(find "/data/logs" -type f)"
+    mapfile -t log_files < <(find "/data/logs" -type f 2>/dev/null)
    for log in "${log_files[@]}"; do
      __log_info "Clearing log file: $log"
-      printf '' >$log
+      printf '' >"$log"
    done
    ;;
  *)
@@ -578,16 +585,16 @@ healthcheck)
    healthPorts="${WEB_SERVER_PORTS:-}"
    healthEndPoints="${HEALTH_ENDPOINTS:-}"
    SERVICES_LIST="${arguments:-$SERVICES_LIST}"
-    services="$(echo "${SERVICES_LIST//,/ }")"
+    services="${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
+    if [ -d "/run/healthcheck" ] && ! __is_dir_empty "/run/healthcheck"; then
      for service in /run/healthcheck/*; do
        name="${service##*/}"
        services+="$name "
      done
    fi
-    services="$(echo "$services" | tr ' ' '\n' | sort -u | grep -v '^$')"
+    services="$(printf '%s\n' $services | sort -u | grep -v '^$')"
    for proc in $services; do
      if [ -n "$proc" ]; then
        if ! __pgrep "$proc"; then
@@ -596,8 +603,8 @@ healthcheck)
        fi
      fi
    done
-    for port in $ports; do
-      if [ -n "$(type -P netstat)" ] && [ -n "$port" ]; then
+    for port in $healthPorts; do
+      if command -v netstat &>/dev/null && [ -n "$port" ]; then
        if ! netstat -taupln | grep -q ":$port "; then
          echo "$port isn't open" >&2
          healthStatus=$((healthStatus + 1))
@@ -621,14 +628,14 @@ healthcheck)
  # 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 '')"
+  ports="$(__netstat -taupln 2>/dev/null | awk '{ split($4, a, ":"); if (a[2] != "") print a[2] }' | sort -uV)"
  [ -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 '')"
+  ps="$(__ps axco command 2>/dev/null | grep -vE '^(COMMAND|grep|ps)$' | sort -u)"
  [ -n "$ps" ] && printf '%s\n%s\n' "Found the following processes" "$ps" | tr '\n' ' '
  exit $?
  ;;
--- a/rootfs/usr/local/etc/docker/functions/entrypoint.sh
+++ b/rootfs/usr/local/etc/docker/functions/entrypoint.sh
--- a/rootfs/usr/local/etc/docker/init.d/00-server01.sh
+++ b/rootfs/usr/local/etc/docker/init.d/00-server01.sh
@@ -0,0 +1,954 @@
+#!/usr/bin/env bash
+# shellcheck shell=bash
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+##@Version           :  202605241142-git
+# @@Author           :  Jason Hempstead
+# @@Contact          :  jason@casjaysdev.pro
+# @@License          :  WTFPL
+# @@ReadME           :  00-server01.sh --help
+# @@Copyright        :  Copyright: (c) 2026 Jason Hempstead, Casjays Developments
+# @@Created          :  Sunday, May 24, 2026 11:59 EDT
+# @@File             :  00-server01.sh
+# @@Description      :  
+# @@Changelog        :  New script
+# @@TODO             :  Better documentation
+# @@Other            :  
+# @@Resource         :  
+# @@Terminal App     :  no
+# @@sudo/root        :  no
+# @@Template         :  other/start-service
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+set -e
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# run trap command on exit
+trap '__trap_err_handler' ERR
+trap 'retVal=$?;if [ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]; then rm -Rf "$SERVICE_PID_FILE"; fi;exit $retVal' SIGINT SIGTERM
+trap 'retVal=$?;if [ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]; then rm -Rf "$SERVICE_PID_FILE"; fi;exit $retVal' SIGPWR 2>/dev/null || true
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# ERR trap handler - smart about critical vs non-critical errors
+__trap_err_handler() {
+  local retVal=$?
+  local command="$BASH_COMMAND"
+  # Ignore SIGPIPE and user interrupts
+  [ $retVal -eq 130 ] || [ $retVal -eq 141 ] && return $retVal
+  # Non-critical: file operations, text processing, user/group operations
+  if [[ "$command" =~ (mkdir|touch|chmod|chown|chgrp|ln|cp|mv|rm|echo|printf|cat|tee|sed|awk|grep|find|sort|uniq|adduser|addgroup|usermod|groupmod|id|getent) ]]; then
+    return 0
+  fi
+  # Non-critical: conditional checks that might fail
+  if [[ "$command" =~ (test|\[|\[\[|kill -0|pgrep|pidof|ps) ]]; then
+    return 0
+  fi
+  # Critical error - but only fail if service hasn't started yet
+  if [ "$SERVICE_IS_RUNNING" != "yes" ]; then
+    echo "❌ Critical error (exit $retVal): $command" >&2
+    kill -TERM 1 2>/dev/null || exit $retVal
+  fi
+  return 0
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+SCRIPT_FILE="$0"
+SERVICE_NAME="server1"
+SCRIPT_NAME="${SCRIPT_FILE##*/}"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Function to exit appropriately based on context
+__script_exit() {
+  local exit_code="${1:-0}"
+  if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
+    # Script is being sourced - use return
+    return "$exit_code"
+  else
+    # Script is being executed - use exit
+    exit "$exit_code"
+  fi
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Exit if service is disabled
+if [ -n "$SERVER1_APPNAME_ENABLED" ]; then
+  if [ "$SERVER1_APPNAME_ENABLED" != "yes" ]; then
+    export SERVICE_DISABLED="$SERVICE_NAME"
+    __script_exit 0
+  fi
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# setup debugging - https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
+[ -f "/config/.debug" ] && [ -z "$DEBUGGER_OPTIONS" ] && export DEBUGGER_OPTIONS="$(<"/config/.debug")" || DEBUGGER_OPTIONS="${DEBUGGER_OPTIONS:-}"
+if [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; then
+  echo "Enabling debugging"
+  set -o pipefail
+  [ -n "$DEBUGGER_OPTIONS" ] && set -"$DEBUGGER_OPTIONS"
+  export DEBUGGER="on"
+else
+  set -o pipefail
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+export PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# import the functions file
+if [ -f "/usr/local/etc/docker/functions/entrypoint.sh" ]; then
+  . "/usr/local/etc/docker/functions/entrypoint.sh"
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# import variables
+for set_env in "/root/env.sh" "/usr/local/etc/docker/env"/*.sh "/config/env"/*.sh; do
+  if [ -f "$set_env" ]; then
+    . "$set_env"
+  fi
+done
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# exit if __start_init_scripts function hasn't been Initialized
+if [ ! -f "/run/.start_init_scripts.pid" ]; then
+  echo "__start_init_scripts function hasn't been Initialized" >&2
+  SERVICE_IS_RUNNING="no"
+  __script_exit 1
+fi
+# Clean up any stale PID file for this service on startup
+if [ -n "$SERVICE_NAME" ] && [ -f "/run/init.d/$SERVICE_NAME.pid" ]; then
+  old_pid=$(<"/run/init.d/$SERVICE_NAME.pid") 2>/dev/null
+  if [ -n "$old_pid" ] && ! kill -0 "$old_pid" 2>/dev/null; then
+    echo "🧹 Removing stale PID file for $SERVICE_NAME"
+    rm -f "/run/init.d/$SERVICE_NAME.pid"
+  fi
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Custom functions
+
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Script to execute
+START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Reset environment before executing service
+RESET_ENV="no"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Set webroot
+WWW_ROOT_DIR="/usr/local/share/httpd/default"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Default predefined variables
+# set data directory
+DATA_DIR="/data/server1"
+# set config directory
+CONF_DIR="/config/server1"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# set the containers etc directory
+ETC_DIR="/etc/server1"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# set the var dir
+VAR_DIR=""
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# set the temp dir
+TMP_DIR="/tmp/server1"
+# set scripts pid dir
+RUN_DIR="/run/server1"
+# set log directory
+LOG_DIR="/data/logs/server1"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Set the working dir
+WORK_DIR=""
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# port which service is listening on
+SERVICE_PORT=""
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# User to use to launch service - IE: postgres
+# normally root
+RUNAS_USER="root"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# User and group in which the service switches to - IE: nginx,apache,mysql,postgres
+# execute command as another user
+#SERVICE_USER="server1"
+# Set the service group
+#SERVICE_GROUP="server1"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Set password length
+RANDOM_PASS_USER=""
+RANDOM_PASS_ROOT=""
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Set user and group ID
+# set the user id
+SERVICE_UID="0"
+# set the group id
+SERVICE_GID="0"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# execute command variables - keep single quotes variables will be expanded later
+# command to execute
+EXEC_CMD_BIN='server1'
+# command arguments
+EXEC_CMD_ARGS=''
+# execute script before
+EXEC_PRE_SCRIPT=''
+# Set to 'no' for configuration services (no daemon process), leave blank for actual services
+SERVICE_USES_PID=''
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Is this service a web server
+IS_WEB_SERVER="no"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Is this service a database server
+IS_DATABASE_SERVICE="no"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Does this service use a database server
+USES_DATABASE_SERVICE="no"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Set defualt type - [custom,sqlite,redis,postgres,mariadb,mysql,couchdb,mongodb,supabase]
+DATABASE_SERVICE_TYPE="sqlite"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Show message before execute
+PRE_EXEC_MESSAGE=""
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Set the wait time to execute __post_execute function - minutes
+POST_EXECUTE_WAIT_TIME="1"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Update path var
+PATH="$PATH:."
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Where to save passwords to
+# directory to save username/password for root user
+ROOT_FILE_PREFIX="/config/secure/auth/root"
+# directory to save username/password for normal user
+USER_FILE_PREFIX="/config/secure/auth/user"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# root/admin user info password/random]
+# root user name
+root_user_name="${SERVER1_ROOT_USER_NAME:-}"
+# root user password
+root_user_pass="${SERVER1_ROOT_PASS_WORD:-}"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Normal user info [password/random]
+# normal user name
+user_name="${SERVER1_USER_NAME:-}"
+# normal user password
+user_pass="${SERVER1_USER_PASS_WORD:-}"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Load variables from config
+# Generated by my dockermgr script
+if [ -f "/config/env/server1.script.sh" ]; then
+  . "/config/env/server1.script.sh"
+fi
+# Overwrite the variables
+if [ -f "/config/env/server1.sh" ]; then
+  . "/config/env/server1.sh"
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Additional predefined variables
+
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Additional variables
+
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Specifiy custom directories to be created
+ADD_APPLICATION_FILES=""
+ADD_APPLICATION_DIRS=""
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+APPLICATION_FILES="$LOG_DIR/$SERVICE_NAME.log"
+APPLICATION_DIRS="$ETC_DIR $CONF_DIR $DATA_DIR $LOG_DIR $TMP_DIR $RUN_DIR $VAR_DIR"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Additional config dirs - will be Copied to /etc/$name
+ADDITIONAL_CONFIG_DIRS=""
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# define variables that need to be loaded into the service - escape quotes - var=\"value\",other=\"test\"
+CMD_ENV=""
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Overwrite based on file/directory
+
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Per Application Variables or imports
+
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Custom commands to run before copying to /config
+__run_precopy() {
+  # Define environment
+  local hostname=${HOSTNAME}
+  if [ ! -d "/run/healthcheck" ]; then
+    mkdir -p "/run/healthcheck"
+  fi
+  # Define actions/commands
+
+  # allow custom functions
+  if builtin type -t __run_precopy_local | grep -q 'function'; then
+    __run_precopy_local
+  fi
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Custom prerun functions - IE setup WWW_ROOT_DIR
+__execute_prerun() {
+  # Define environment
+  local hostname=${HOSTNAME}
+  # Define actions/commands
+
+  # allow custom functions
+  if builtin type -t __execute_prerun_local | grep -q 'function'; then
+    __execute_prerun_local
+  fi
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Run any pre-execution checks
+__run_pre_execute_checks() {
+  # Set variables
+  local exitStatus=0
+  # message to show at start
+  local pre_execute_checks_MessageST="Running preexecute check for $SERVICE_NAME"
+  # message to show at completion
+  local pre_execute_checks_MessageEnd="Finished preexecute check for $SERVICE_NAME"
+  __banner "$pre_execute_checks_MessageST"
+  # Put command to execute in parentheses
+  {
+    true
+  }
+  exitStatus=$?
+  __banner "$pre_execute_checks_MessageEnd: Status $exitStatus"
+
+  # show exit message
+  if [ $exitStatus -ne 0 ]; then
+    echo "The pre-execution check has failed" >&2
+    if [ -f "$SERVICE_PID_FILE" ]; then
+      rm -Rf "$SERVICE_PID_FILE"
+    fi
+    __script_exit 1
+  fi
+  # allow custom functions
+  if builtin type -t __run_pre_execute_checks_local | grep -q 'function'; then
+    __run_pre_execute_checks_local
+  fi
+  # exit function
+  return $exitStatus
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# use this function to update config files - IE: change port
+__update_conf_files() {
+  # default exit code
+  local exitCode=0
+  # set hostname
+  local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}"
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
+  # delete files
+  #__rm ""
+
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
+  # custom commands
+
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
+  # replace variables
+  # __replace "" "" "$CONF_DIR/server1.conf"
+  # replace variables recursively
+  # __find_replace "" "" "$CONF_DIR"
+
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
+  # define actions
+
+  # allow custom functions
+  if builtin type -t __update_conf_files_local | grep -q 'function'; then
+    __update_conf_files_local
+  fi
+  # exit function
+  return $exitCode
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# function to run before executing
+__pre_execute() {
+  # default exit code
+  local exitCode=0
+  # set hostname
+  local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}"
+  # execute if directories is empty
+  # __is_dir_empty "$CONF_DIR" && true
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
+  # define actions to run after copying to /config
+
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
+  # unset unneeded variables
+  unset sysname
+  # Lets wait a few seconds before continuing
+  sleep 2
+  # allow custom functions
+  if builtin type -t __pre_execute_local | grep -q 'function'; then
+    __pre_execute_local
+  fi
+  # exit function
+  return $exitCode
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# function to run after executing
+__post_execute() {
+  # init pid var
+  local pid=""
+  # set default exit code
+  local retVal=0
+  # how long to wait before executing
+  local ctime=${POST_EXECUTE_WAIT_TIME:-1}
+  # convert minutes to seconds
+  local waitTime=$((ctime * 60))
+  # message to show at start
+  local postMessageST="Running post commands for $SERVICE_NAME"
+  # message to show at completion
+  local postMessageEnd="Finished post commands for $SERVICE_NAME"
+  # wait
+  sleep $waitTime
+  # execute commands after waiting
+  (
+    # show message
+    __banner "$postMessageST"
+    # commands to execute
+    sleep 5
+    # show exit message
+    __banner "$postMessageEnd: Status $retVal"
+  ) 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt" &
+  # fire-and-forget: backgrounded subshell always succeeds at launch
+  retVal=0
+  # allow custom functions
+  if builtin type -t __post_execute_local | grep -q 'function'; then
+    __post_execute_local
+  fi
+  # exit function
+  return $retVal
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# use this function to update config files - IE: change port
+__pre_message() {
+  local exitCode=0
+  if [ -n "$PRE_EXEC_MESSAGE" ]; then
+    eval echo "$PRE_EXEC_MESSAGE"
+  fi
+  # execute commands
+
+  # allow custom functions
+  if builtin type -t __pre_message_local | grep -q 'function'; then
+    __pre_message_local
+  fi
+  # exit function
+  return $exitCode
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# use this function to setup ssl support
+__update_ssl_conf() {
+  local exitCode=0
+  local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}"
+  # execute commands
+
+  # allow custom functions
+  if builtin type -t __update_ssl_conf_local | grep -q 'function'; then
+    __update_ssl_conf_local
+  fi
+  # set exitCode
+  return $exitCode
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+__create_service_env() {
+  local exitCode=0
+  if [ ! -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" ]; then
+    cat <<EOF | tee -p "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" &>/dev/null
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# root/admin user info [password/random]
+#ENV_ROOT_USER_NAME="${ENV_ROOT_USER_NAME:-$SERVER1_ROOT_USER_NAME}"   # root user name
+#ENV_ROOT_USER_PASS="${ENV_ROOT_USER_NAME:-$SERVER1_ROOT_PASS_WORD}"   # root user password
+#root_user_name="${ENV_ROOT_USER_NAME:-$root_user_name}"                              #
+#root_user_pass="${ENV_ROOT_USER_PASS:-$root_user_pass}"                              #
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+#Normal user info [password/random]
+#ENV_USER_NAME="${ENV_USER_NAME:-$SERVER1_USER_NAME}"                  #
+#ENV_USER_PASS="${ENV_USER_PASS:-$SERVER1_USER_PASS_WORD}"             #
+#user_name="${ENV_USER_NAME:-$user_name}"                                             # normal user name
+#user_pass="${ENV_USER_PASS:-$user_pass}"                                             # normal user password
+
+EOF
+  fi
+  if [ ! -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh" ]; then
+    # - - - - - - - - - - - - - - - - - - - - - - - - -
+    __run_precopy_local() { true; }
+    # - - - - - - - - - - - - - - - - - - - - - - - - -
+    __execute_prerun_local() { true; }
+    # - - - - - - - - - - - - - - - - - - - - - - - - -
+    __run_pre_execute_checks_local() { true; }
+    # - - - - - - - - - - - - - - - - - - - - - - - - -
+    __update_conf_files_local() { true; }
+    # - - - - - - - - - - - - - - - - - - - - - - - - -
+    __pre_execute_local() { true; }
+    # - - - - - - - - - - - - - - - - - - - - - - - - -
+    __post_execute_local() { true; }
+    # - - - - - - - - - - - - - - - - - - - - - - - - -
+    __pre_message_local() { true; }
+    # - - - - - - - - - - - - - - - - - - - - - - - - -
+    __update_ssl_conf_local() { true; }
+    # - - - - - - - - - - - - - - - - - - - - - - - - -
+  fi
+  if ! __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh"; then
+    exitCode=$((exitCode + 1))
+  fi
+  if ! __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh"; then
+    exitCode=$((exitCode + 1))
+  fi
+  return $exitCode
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# script to start server
+__run_start_script() {
+  local runExitCode=0
+  # expand variables
+  local workdir="$(eval echo "${WORK_DIR:-}")"
+  # expand variables
+  local cmd="$(eval echo "${EXEC_CMD_BIN:-}")"
+  # expand variables
+  local args="$(eval echo "${EXEC_CMD_ARGS:-}")"
+  # expand variables
+  local name="$(eval echo "${EXEC_CMD_NAME:-}")"
+  # expand variables
+  local pre="$(eval echo "${EXEC_PRE_SCRIPT:-}")"
+  # expand variables
+  local extra_env="$(eval echo "${CMD_ENV//,/ }")"
+  # expand variables
+  local lc_type="$(eval echo "${LANG:-${LC_ALL:-$LC_CTYPE}}")"
+  # expand variables
+  local home="$(eval echo "${workdir//\/root/\/tmp\/docker}")"
+  # expand variables
+  local path="$(eval echo "$PATH")"
+  # expand variables
+  local message="$(eval echo "")"
+  local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}"
+  if [ -f "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh" ]; then
+    . "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh"
+  fi
+  #
+  if [ -z "$cmd" ]; then
+    __post_execute 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt"
+    retVal=$?
+    __log_info "Initialization of $SCRIPT_NAME has completed"
+    __script_exit $retVal
+  else
+    # ensure the command exists
+    if [ ! -x "$cmd" ]; then
+      __log_error "$name is not a valid executable"
+      return 2
+    fi
+    # check and exit if already running (respects SERVICE_USES_PID in __proc_check)
+    if __proc_check "$name" || __proc_check "$cmd"; then
+      __log_debug "Service $name is already running"
+      return 0
+    else
+      # - - - - - - - - - - - - - - - - - - - - - - - - -
+      # show message if env exists
+      if [ -n "$cmd" ]; then
+        if [ -n "$SERVICE_USER" ]; then
+          __log_info "Setting up $cmd to run as $SERVICE_USER"
+        else
+          SERVICE_USER="root"
+        fi
+        if [ -n "$SERVICE_PORT" ]; then
+          __log_info "$name will be running on port $SERVICE_PORT"
+        else
+          SERVICE_PORT=""
+        fi
+      fi
+      if [ -n "$pre" ] && command -v "$pre" &>/dev/null; then
+        export cmd_exec="$pre $cmd $args"
+        message="Starting service: $name $args through $pre"
+      else
+        export cmd_exec="$cmd $args"
+        message="Starting service: $name $args"
+      fi
+      if [ -n "$su_exec" ]; then
+        __log_debug "Using $su_exec" | tee -a -p "/data/logs/init.txt"
+      fi
+      __log_info "$message" | tee -a -p "/data/logs/init.txt"
+      su_cmd touch "$SERVICE_PID_FILE"
+      # W14: invalidate cached START_SCRIPT if key variables changed
+      local _script_hash_src="$cmd $args $SERVICE_USER $RESET_ENV $su_exec"
+      local _script_hash
+      _script_hash=$(printf '%s' "$_script_hash_src" | md5sum 2>/dev/null | cut -c1-8 || true)
+      if [ -f "${START_SCRIPT}.hash" ] && [ -f "$START_SCRIPT" ]; then
+        if [ "$(cat "${START_SCRIPT}.hash" 2>/dev/null)" != "$_script_hash" ]; then
+          rm -f "$START_SCRIPT" "${START_SCRIPT}.hash"
+        fi
+      fi
+      if [ "$RESET_ENV" = "yes" ]; then
+        # RESET_ENV=yes intentionally strips all inherited vars; only explicit vars are passed
+        if [ ! -f "$START_SCRIPT" ]; then
+          # Use printf %q to safely quote each env component for embedding in the script
+          local _q_home _q_lc _q_path _q_sysname _q_svcuser _q_su _q_cmd _q_args _q_extra
+          _q_home=$(printf '%q' "$home")
+          _q_lc=$(printf '%q' "$lc_type")
+          _q_path=$(printf '%q' "$path")
+          _q_sysname=$(printf '%q' "$sysname")
+          _q_svcuser=$(printf '%q' "${SERVICE_USER:-$RUNAS_USER}")
+          _q_su=$(printf '%q ' $su_exec)
+          _q_cmd=$(printf '%q' "$cmd")
+          _q_args=$(printf '%q ' $args)
+          _q_extra=$(printf '%q ' $extra_env)
+          {
+            printf '#!/usr/bin/env bash\n'
+            printf "trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f \"\$SERVICE_PID_FILE\" ] && rm -Rf \"\$SERVICE_PID_FILE\";exit \$exitCode' EXIT\n"
+            printf 'set -Eeo pipefail\n'
+            printf '# Setting up %s to run as %s with env\n' "$cmd" "${SERVICE_USER:-root}"
+            printf 'retVal=10\n'
+            printf 'SERVICE_NAME=%q\n' "$SERVICE_NAME"
+            printf 'SERVICE_PID_FILE=%q\n' "$SERVICE_PID_FILE"
+            printf 'LOG_DIR=%q\n' "$LOG_DIR"
+            printf '%s env -i HOME=%s LC_CTYPE=%s PATH=%s HOSTNAME=%s USER=%s %s %s %s 2>>"/dev/stderr" >>"$LOG_DIR/$SERVICE_NAME.log" &\n' \
+              "$_q_su" "$_q_home" "$_q_lc" "$_q_path" "$_q_sysname" "$_q_svcuser" "$_q_extra" "$_q_cmd" "$_q_args"
+            printf 'execPid=$!\n'
+            printf 'sleep 1\n'
+            printf 'if [ -n "$execPid" ] && kill -0 "$execPid" 2>/dev/null; then\n'
+            printf '  echo "$execPid" >"$SERVICE_PID_FILE"\n'
+            printf '  retVal=0\n'
+            printf '  printf '"'"'%%s\n'"'"' "$SERVICE_NAME: $execPid" >"/run/healthcheck/$SERVICE_NAME"\n'
+            printf 'else\n'
+            printf '  retVal=10\n'
+            printf '  echo "Failed to start service %s" >&2\n' "$cmd"
+            printf 'fi\n'
+            printf 'exit $retVal\n'
+          } >"$START_SCRIPT"
+          printf '%s' "$_script_hash" >"${START_SCRIPT}.hash"
+        fi
+      else
+        if [ ! -f "$START_SCRIPT" ]; then
+          local _q_su _q_cmd _q_args
+          _q_su=$(printf '%q ' $su_exec)
+          _q_cmd=$(printf '%q' "$cmd")
+          _q_args=$(printf '%q ' $args)
+          {
+            printf '#!/usr/bin/env bash\n'
+            printf "trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f \"\$SERVICE_PID_FILE\" ] && rm -Rf \"\$SERVICE_PID_FILE\";exit \$exitCode' EXIT\n"
+            printf 'set -Eeo pipefail\n'
+            printf '# Setting up %s to run as %s\n' "$cmd" "${SERVICE_USER:-root}"
+            printf 'retVal=10\n'
+            printf 'SERVICE_NAME=%q\n' "$SERVICE_NAME"
+            printf 'SERVICE_PID_FILE=%q\n' "$SERVICE_PID_FILE"
+            printf 'LOG_DIR=%q\n' "$LOG_DIR"
+            printf '%s %s %s 2>>"/dev/stderr" >>"$LOG_DIR/$SERVICE_NAME.log" &\n' \
+              "$_q_su" "$_q_cmd" "$_q_args"
+            printf 'execPid=$!\n'
+            printf 'sleep 1\n'
+            printf 'if [ -n "$execPid" ] && kill -0 "$execPid" 2>/dev/null; then\n'
+            printf '  echo "$execPid" >"$SERVICE_PID_FILE"\n'
+            printf '  retVal=0\n'
+            printf 'else\n'
+            printf '  retVal=10\n'
+            printf '  echo "Failed to start service %s" >&2\n' "$cmd"
+            printf 'fi\n'
+            printf 'exit $retVal\n'
+          } >"$START_SCRIPT"
+          printf '%s' "$_script_hash" >"${START_SCRIPT}.hash"
+        fi
+      fi
+    fi
+    if [ ! -x "$START_SCRIPT" ]; then
+      chmod 755 -Rf "$START_SCRIPT"
+    fi
+    if [ "$CONTAINER_INIT" != "yes" ]; then
+      # W15: launch as bash, not sh, since the generated script uses bash-specific features
+      bash "$START_SCRIPT"
+      runExitCode=$?
+    fi
+  fi
+  return $runExitCode
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# username and password actions
+__run_secure_function() {
+  local filesperms
+  if [ -n "$user_name" ] || [ -n "$user_pass" ]; then
+    for filesperms in "${USER_FILE_PREFIX}"/*; do
+      if [ -e "$filesperms" ]; then
+        chmod -Rf 600 "$filesperms"
+        [ -n "$SERVICE_USER" ] && chown -Rf "$SERVICE_USER:$SERVICE_USER" "$filesperms" 2>/dev/null
+      fi
+    done 2>/dev/null | tee -p -a "/data/logs/init.txt"
+  fi
+  if [ -n "$root_user_name" ] || [ -n "$root_user_pass" ]; then
+    for filesperms in "${ROOT_FILE_PREFIX}"/*; do
+      if [ -e "$filesperms" ]; then
+        chmod -Rf 600 "$filesperms"
+        [ -n "$SERVICE_USER" ] && chown -Rf "$SERVICE_USER:$SERVICE_USER" "$filesperms" 2>/dev/null
+      fi
+    done 2>/dev/null | tee -p -a "/data/logs/init.txt"
+  fi
+  unset filesperms
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Allow ENV_ variable - Import env file
+if __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh"; then
+  . "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh"
+fi
+if __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh"; then
+  . "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh"
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# default exit code
+SERVICE_EXIT_CODE=0
+# application specific
+EXEC_CMD_NAME="${EXEC_CMD_BIN##*/}"
+SERVICE_PID_FILE="/run/init.d/$EXEC_CMD_NAME.pid"
+_resolved="$(type -P "$EXEC_CMD_BIN" 2>/dev/null)"
+[ -n "$_resolved" ] && EXEC_CMD_BIN="$_resolved"
+_resolved="$(type -P "$EXEC_PRE_SCRIPT" 2>/dev/null)"
+[ -n "$_resolved" ] && EXEC_PRE_SCRIPT="$_resolved"
+unset _resolved
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Only run check when explicitly requested
+if [ "$1" = "check" ] && __check_service "$1"; then
+  SERVICE_IS_RUNNING=yes
+elif [ "$1" = "check" ]; then
+  SERVICE_IS_RUNNING="no"
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# ensure needed directories exists
+if [ ! -d "$LOG_DIR" ]; then
+  mkdir -p "$LOG_DIR"
+fi
+if [ ! -d "$RUN_DIR" ]; then
+  mkdir -p "$RUN_DIR"
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# create auth directories
+if [ -n "$USER_FILE_PREFIX" ]; then
+  if [ ! -d "$USER_FILE_PREFIX" ]; then
+    mkdir -p "$USER_FILE_PREFIX"
+  fi
+fi
+if [ -n "$ROOT_FILE_PREFIX" ]; then
+  if [ ! -d "$ROOT_FILE_PREFIX" ]; then
+    mkdir -p "$ROOT_FILE_PREFIX"
+  fi
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+if [ -z "$RUNAS_USER" ]; then
+  RUNAS_USER="root"
+fi
+if [ -z "$SERVICE_USER" ]; then
+  SERVICE_USER="$RUNAS_USER"
+fi
+if [ -z "$SERVICE_GROUP" ]; then
+  SERVICE_GROUP="${SERVICE_USER:-$RUNAS_USER}"
+fi
+if [ "$IS_WEB_SERVER" = "yes" ]; then
+  RESET_ENV="yes"
+  __is_htdocs_mounted
+fi
+if [ "$IS_WEB_SERVER" = "yes" ] && [ -z "$SERVICE_PORT" ]; then
+  SERVICE_PORT="80"
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Database env
+if [ "$IS_DATABASE_SERVICE" = "yes" ] || [ "$USES_DATABASE_SERVICE" = "yes" ]; then
+  RESET_ENV="no"
+  DATABASE_CREATE="${ENV_DATABASE_CREATE:-$DATABASE_CREATE}"
+  DATABASE_USER_NORMAL="${ENV_DATABASE_USER:-${DATABASE_USER_NORMAL:-$user_name}}"
+  DATABASE_PASS_NORMAL="${ENV_DATABASE_PASSWORD:-${DATABASE_PASS_NORMAL:-$user_pass}}"
+  DATABASE_USER_ROOT="${ENV_DATABASE_ROOT_USER:-${DATABASE_USER_ROOT:-$root_user_name}}"
+  DATABASE_PASS_ROOT="${ENV_DATABASE_ROOT_PASSWORD:-${DATABASE_PASS_ROOT:-$root_user_pass}}"
+  if [ -n "$DATABASE_PASS_NORMAL" ]; then
+    if [ ! -f "${USER_FILE_PREFIX}/db_pass_user" ]; then
+      echo "$DATABASE_PASS_NORMAL" >"${USER_FILE_PREFIX}/db_pass_user"
+    fi
+  fi
+  if [ -n "$DATABASE_PASS_ROOT" ]; then
+    if [ ! -f "${ROOT_FILE_PREFIX}/db_pass_root" ]; then
+      echo "$DATABASE_PASS_ROOT" >"${ROOT_FILE_PREFIX}/db_pass_root"
+    fi
+  fi
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# [DATABASE_DIR_[SQLITE,REDIS,POSTGRES,MARIADB,COUCHDB,MONGODB,SUPABASE]]
+if [ "$DATABASE_SERVICE_TYPE" = "custom" ]; then
+  DATABASE_DIR="${DATABASE_DIR_CUSTOM:-/data/db/custom}"
+  DATABASE_BASE_DIR="${DATABASE_DIR_CUSTOM:-/data/db/custom}"
+  DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_CUSTOM:-/usr/local/share/httpd/admin/databases}"
+  if [ -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+    SERVER_ADMIN_URL="${SERVER_ADMIN_URL_CUSTOM:-/admin/dbadmin}"
+  fi
+elif [ "$SERVICE_NAME" = "redis" ] || [ "$DATABASE_SERVICE_TYPE" = "redis" ]; then
+  DATABASE_DIR="${DATABASE_DIR_REDIS:-/data/db/redis}"
+  DATABASE_BASE_DIR="${DATABASE_DIR_REDIS:-/data/db/redis}"
+  DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_REDIS:-/usr/local/share/httpd/admin/redis}"
+  if [ -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+    SERVER_ADMIN_URL="${SERVER_ADMIN_URL_REDIS:-/admin/redis}"
+  fi
+elif [ "$SERVICE_NAME" = "postgres" ] || [ "$DATABASE_SERVICE_TYPE" = "postgres" ]; then
+  DATABASE_DIR="${DATABASE_DIR_POSTGRES:-/data/db/postgres}"
+  DATABASE_BASE_DIR="${DATABASE_DIR_POSTGRES:-/data/db/postgres}"
+  DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_POSTGRES:-/usr/local/share/httpd/admin/postgres}"
+  if [ -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+    SERVER_ADMIN_URL="${SERVER_ADMIN_URL_POSTGRES:-/admin/postgres}"
+  fi
+elif [ "$SERVICE_NAME" = "mariadb" ] || [ "$DATABASE_SERVICE_TYPE" = "mariadb" ]; then
+  DATABASE_DIR="${DATABASE_DIR_MARIADB:-/data/db/mariadb}"
+  DATABASE_BASE_DIR="${DATABASE_DIR_MARIADB:-/data/db/mariadb}"
+  DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_MARIADB:-/usr/local/share/httpd/admin/mysql}"
+  if [ -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+    SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MARIADB:-/admin/mysql}"
+  fi
+elif [ "$SERVICE_NAME" = "mysql" ] || [ "$DATABASE_SERVICE_TYPE" = "mysql" ]; then
+  DATABASE_DIR="${DATABASE_DIR_MYSQL:-/data/db/mysql}"
+  DATABASE_BASE_DIR="${DATABASE_DIR_MYSQL:-/data/db/mysql}"
+  DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_MYSQL:-/usr/local/share/httpd/admin/mysql}"
+  if [ -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+    SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MYSQL:-/admin/mysql}"
+  fi
+elif [ "$SERVICE_NAME" = "couchdb" ] || [ "$DATABASE_SERVICE_TYPE" = "couchdb" ]; then
+  DATABASE_DIR="${DATABASE_DIR_COUCHDB:-/data/db/couchdb}"
+  DATABASE_BASE_DIR="${DATABASE_DIR_COUCHDB:-/data/db/couchdb}"
+  DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_COUCHDB:-/usr/local/share/httpd/admin/couchdb}"
+  if [ -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+    SERVER_ADMIN_URL="${SERVER_ADMIN_URL_COUCHDB:-/admin/couchdb}"
+  fi
+elif [ "$SERVICE_NAME" = "mongodb" ] || [ "$DATABASE_SERVICE_TYPE" = "mongodb" ]; then
+  DATABASE_DIR="${DATABASE_DIR_MONGODB:-/data/db/mongodb}"
+  DATABASE_BASE_DIR="${DATABASE_DIR_MONGODB:-/data/db/mongodb}"
+  DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_MONGODB:-/usr/local/share/httpd/admin/mongodb}"
+  if [ -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+    SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MONGODB:-/admin/mongodb}"
+  fi
+elif [ "$SERVICE_NAME" = "supabase" ] || [ "$DATABASE_SERVICE_TYPE" = "supabase" ]; then
+  DATABASE_DIR="${DATABASE_DIR_SUPABASE:-/data/db/supabase}"
+  DATABASE_BASE_DIR="${DATABASE_DIR_SUPABASE:-/data/db/supabase}"
+  DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_SUPABASE:-/usr/local/share/httpd/admin/supabase}"
+  if [ -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+    SERVER_ADMIN_URL="${SERVER_ADMIN_URL_SUPBASE:-/admin/supabase}"
+  fi
+elif [ "$SERVICE_NAME" = "sqlite" ] || [ "$DATABASE_SERVICE_TYPE" = "sqlite" ]; then
+  DATABASE_DIR="${DATABASE_DIR_SQLITE:-/data/db/sqlite}/$SERVER_NAME"
+  DATABASE_BASE_DIR="${DATABASE_DIR_SQLITE:-/data/db/sqlite}/$SERVER_NAME"
+  DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_SQLITE:-/usr/local/share/httpd/admin/sqlite}"
+  if [ -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+    SERVER_ADMIN_URL="${SERVER_ADMIN_URL_SQLITE:-/admin/sqlite}"
+  fi
+  if [ ! -d "$DATABASE_DIR" ]; then
+    mkdir -p "$DATABASE_DIR"
+  fi
+  chmod 777 "$DATABASE_DIR"
+fi
+if [ -n "$DATABASE_ADMIN_WWW_ROOT" ]; then
+  if [ ! -d "$DATABASE_ADMIN_WWW_ROOT" ]; then
+    mkdir -p "${DATABASE_ADMIN_WWW_ROOT}"
+  fi
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Allow variables via imports - Overwrite existing
+if [ -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" ]; then
+  . "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh"
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# set password to random if variable is random
+if [ "$user_pass" = "random" ]; then
+  user_pass="$(__random_password ${RANDOM_PASS_USER:-16})"
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+if [ "$root_user_pass" = "random" ]; then
+  root_user_pass="$(__random_password ${RANDOM_PASS_ROOT:-16})"
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Allow setting initial users and passwords via environment and save to file
+if [ -n "$user_name" ]; then
+  echo "$user_name" >"${USER_FILE_PREFIX}/${SERVICE_NAME}_name"
+fi
+if [ -n "$user_pass" ]; then
+  echo "$user_pass" >"${USER_FILE_PREFIX}/${SERVICE_NAME}_pass"
+fi
+if [ -n "$root_user_name" ]; then
+  echo "$root_user_name" >"${ROOT_FILE_PREFIX}/${SERVICE_NAME}_name"
+fi
+if [ -n "$root_user_pass" ]; then
+  echo "$root_user_pass" >"${ROOT_FILE_PREFIX}/${SERVICE_NAME}_pass"
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Allow per init script usernames and passwords
+if __file_exists_with_content "${USER_FILE_PREFIX}/${SERVICE_NAME}_name"; then
+  user_name="$(<"${USER_FILE_PREFIX}/${SERVICE_NAME}_name")"
+fi
+if __file_exists_with_content "${USER_FILE_PREFIX}/${SERVICE_NAME}_pass"; then
+  user_pass="$(<"${USER_FILE_PREFIX}/${SERVICE_NAME}_pass")"
+fi
+if __file_exists_with_content "${ROOT_FILE_PREFIX}/${SERVICE_NAME}_name"; then
+  root_user_name="$(<"${ROOT_FILE_PREFIX}/${SERVICE_NAME}_name")"
+fi
+if __file_exists_with_content "${ROOT_FILE_PREFIX}/${SERVICE_NAME}_pass"; then
+  root_user_pass="$(<"${ROOT_FILE_PREFIX}/${SERVICE_NAME}_pass")"
+fi
+if __file_exists_with_content "${USER_FILE_PREFIX}/db_pass_user"; then
+  DATABASE_PASS_NORMAL="$(<"${USER_FILE_PREFIX}/db_pass_user")"
+fi
+if __file_exists_with_content "${ROOT_FILE_PREFIX}/db_pass_root"; then
+  DATABASE_PASS_ROOT="$(<"${ROOT_FILE_PREFIX}/db_pass_root")"
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# set hostname for script
+sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+__create_service_env
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Setup /config directories
+__init_config_etc
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# pre-run function
+__execute_prerun
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# create user if needed
+__create_service_user "$SERVICE_USER" "$SERVICE_GROUP" "${WORK_DIR:-/home/$SERVICE_USER}" "${SERVICE_UID:-}" "${SERVICE_GID:-}"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Modify user if needed
+__set_user_group_id $SERVICE_USER ${SERVICE_UID:-} ${SERVICE_GID:-}
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Create base directories
+__setup_directories
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# set switch user command
+__switch_to_user
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Initialize the home/working dir
+__init_working_dir
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# show init message
+__pre_message
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+#
+__initialize_db_users
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Initialize ssl
+__update_ssl_conf
+__update_ssl_certs
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Set permissions in ${USER_FILE_PREFIX} and ${ROOT_FILE_PREFIX}
+__run_secure_function
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+__run_precopy
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Copy /config to /etc
+for config_2_etc in $CONF_DIR $ADDITIONAL_CONFIG_DIRS; do
+  __initialize_system_etc "$config_2_etc" 2>/dev/stderr | tee -p -a "/data/logs/init.txt"
+done
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Replace variables
+__initialize_replace_variables "$ETC_DIR" "$CONF_DIR" "$ADDITIONAL_CONFIG_DIRS" "$WWW_ROOT_DIR"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+#
+__initialize_database
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Updating config files
+__update_conf_files
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# run the pre execute commands
+__pre_execute
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Set permissions
+__fix_permissions "$SERVICE_USER" "$SERVICE_GROUP"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+#
+__run_pre_execute_checks 2>/dev/stderr | tee -a -p "/data/logs/entrypoint.log" "/data/logs/init.txt" || return 20
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+__run_start_script 2>>/dev/stderr | tee -p -a "/data/logs/entrypoint.log"
+errorCode=${PIPESTATUS[0]}
+if [ -n "$EXEC_CMD_BIN" ]; then
+  if [ "$errorCode" -eq 0 ]; then
+    SERVICE_EXIT_CODE=0
+    SERVICE_IS_RUNNING="yes"
+  else
+    SERVICE_EXIT_CODE=$errorCode
+    SERVICE_IS_RUNNING="${SERVICE_IS_RUNNING:-no}"
+    if [ ! -s "$SERVICE_PID_FILE" ]; then
+      rm -Rf "$SERVICE_PID_FILE"
+    fi
+  fi
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# start the post execute function in background
+__post_execute 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt" &
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+__script_exit $SERVICE_EXIT_CODE
--- a/rootfs/usr/local/etc/docker/init.d/05-dockerd.sh
+++ b/rootfs/usr/local/etc/docker/init.d/05-dockerd.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202511290739-git
+##@Version           :  202605241158-git
 # @@Author           :  Jason Hempstead
 # @@Contact          :  jason@casjaysdev.pro
 # @@License          :  LICENSE.md
 # @@ReadME           :  05-dockerd.sh --help
-# @@Copyright        :  Copyright: (c) 2025 Jason Hempstead, Casjays Developments
-# @@Created          :  Saturday, Nov 29, 2025 07:39 EST
+# @@Copyright        :  Copyright: (c) 2026 Jason Hempstead, Casjays Developments
+# @@Created          :  Sunday, May 24, 2026 11:59 EDT
 # @@File             :  05-dockerd.sh
 # @@Description      :
 # @@Changelog        :  New script
@@ -23,12 +23,35 @@
 set -e
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # run trap command on exit
-trap 'retVal=$?; echo "❌ Fatal error occurred: Exit code $retVal at line $LINENO in command: $BASH_COMMAND"; kill -TERM 1' ERR
-trap 'retVal=$?;if [ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]; then rm -Rf "$SERVICE_PID_FILE"; fi;exit $retVal' SIGINT SIGTERM SIGPWR
+trap '__trap_err_handler' ERR
+trap 'retVal=$?;if [ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]; then rm -Rf "$SERVICE_PID_FILE"; fi;exit $retVal' SIGINT SIGTERM
+trap 'retVal=$?;if [ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]; then rm -Rf "$SERVICE_PID_FILE"; fi;exit $retVal' SIGPWR 2>/dev/null || true
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# ERR trap handler - smart about critical vs non-critical errors
+__trap_err_handler() {
+  local retVal=$?
+  local command="$BASH_COMMAND"
+  # Ignore SIGPIPE and user interrupts
+  [ $retVal -eq 130 ] || [ $retVal -eq 141 ] && return $retVal
+  # Non-critical: file operations, text processing, user/group operations
+  if [[ "$command" =~ (mkdir|touch|chmod|chown|chgrp|ln|cp|mv|rm|echo|printf|cat|tee|sed|awk|grep|find|sort|uniq|adduser|addgroup|usermod|groupmod|id|getent) ]]; then
+    return 0
+  fi
+  # Non-critical: conditional checks that might fail
+  if [[ "$command" =~ (test|\[|\[\[|kill -0|pgrep|pidof|ps) ]]; then
+    return 0
+  fi
+  # Critical error - but only fail if service hasn't started yet
+  if [ "$SERVICE_IS_RUNNING" != "yes" ]; then
+    echo "❌ Critical error (exit $retVal): $command" >&2
+    kill -TERM 1 2>/dev/null || exit $retVal
+  fi
+  return 0
+}
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 SCRIPT_FILE="$0"
 SERVICE_NAME="docker"
-SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)"
+SCRIPT_NAME="${SCRIPT_FILE##*/}"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Function to exit appropriately based on context
 __script_exit() {
@@ -43,11 +66,23 @@ __script_exit() {
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Exit if service is disabled
-[ -z "$DOCKER_APPNAME_ENABLED" ] || if [ "$DOCKER_APPNAME_ENABLED" != "yes" ]; then export SERVICE_DISABLED="$SERVICE_NAME" && __script_exit 0; fi
+if [ -n "$DOCKER_APPNAME_ENABLED" ]; then
+  if [ "$DOCKER_APPNAME_ENABLED" != "yes" ]; then
+    export SERVICE_DISABLED="$SERVICE_NAME"
+    __script_exit 0
+  fi
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # setup debugging - https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
 [ -f "/config/.debug" ] && [ -z "$DEBUGGER_OPTIONS" ] && export DEBUGGER_OPTIONS="$(<"/config/.debug")" || DEBUGGER_OPTIONS="${DEBUGGER_OPTIONS:-}"
-{ [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; } && echo "Enabling debugging" && set -xo pipefail -x$DEBUGGER_OPTIONS && export DEBUGGER="on" || set -o pipefail
+if [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; then
+  echo "Enabling debugging"
+  set -o pipefail
+  [ -n "$DEBUGGER_OPTIONS" ] && set -"$DEBUGGER_OPTIONS"
+  export DEBUGGER="on"
+else
+  set -o pipefail
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 export PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -58,7 +93,9 @@ fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # import variables
 for set_env in "/root/env.sh" "/usr/local/etc/docker/env"/*.sh "/config/env"/*.sh; do
-	[ -f "$set_env" ] && . "$set_env"
+  if [ -f "$set_env" ]; then
+    . "$set_env"
+  fi
 done
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # exit if __start_init_scripts function hasn't been Initialized
@@ -69,7 +106,7 @@ if [ ! -f "/run/.start_init_scripts.pid" ]; then
 fi
 # Clean up any stale PID file for this service on startup
 if [ -n "$SERVICE_NAME" ] && [ -f "/run/init.d/$SERVICE_NAME.pid" ]; then
-	old_pid=$(cat "/run/init.d/$SERVICE_NAME.pid" 2>/dev/null)
+  old_pid=$(<"/run/init.d/$SERVICE_NAME.pid") 2>/dev/null
 	if [ -n "$old_pid" ] && ! kill -0 "$old_pid" 2>/dev/null; then
 		echo "🧹 Removing stale PID file for $SERVICE_NAME"
 		rm -f "/run/init.d/$SERVICE_NAME.pid"
@@ -466,8 +503,8 @@ __post_execute() {
 		# show exit message
 		__banner "$postMessageEnd: Status $retVal"
 	) 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt" &
-	pid=$!
-	ps ax | awk '{print $1}' | grep -v grep | grep -q "$execPid$" && retVal=0 || retVal=10
+	# fire-and-forget: backgrounded subshell always succeeds at launch
+	retVal=0
 	# allow custom functions
 	if builtin type -t __post_execute_local | grep -q 'function'; then __post_execute_local; fi
 	# exit function
@@ -543,111 +580,164 @@ EOF
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # script to start server
 __run_start_script() {
-	local runExitCode=0
-	local workdir="$(eval echo "${WORK_DIR:-}")"                   # expand variables
-	local cmd="$(eval echo "${EXEC_CMD_BIN:-}")"                   # expand variables
-	local args="$(eval echo "${EXEC_CMD_ARGS:-}")"                 # expand variables
-	local name="$(eval echo "${EXEC_CMD_NAME:-}")"                 # expand variables
-	local pre="$(eval echo "${EXEC_PRE_SCRIPT:-}")"                # expand variables
-	local extra_env="$(eval echo "${CMD_ENV//,/ }")"               # expand variables
-	local lc_type="$(eval echo "${LANG:-${LC_ALL:-$LC_CTYPE}}")"   # expand variables
-	local home="$(eval echo "${workdir//\/root/\/tmp\/docker}")"   # expand variables
-	local path="$(eval echo "$PATH")"                              # expand variables
-	local message="$(eval echo "")"                                # expand variables
-	local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
-	[ -f "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh" ] && . "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh"
-	#
-	if [ -z "$cmd" ]; then
-		__post_execute 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt"
-		retVal=$?
-		echo "Initializing $SCRIPT_NAME has completed"
-		__script_exit $retVal
-	else
-		# ensure the command exists
-		if [ ! -x "$cmd" ]; then
-			echo "$name is not a valid executable"
-			return 2
-		fi
-		# check and exit if already running
-		if __proc_check "$name" || __proc_check "$cmd"; then
-			return 0
-		else
-			# - - - - - - - - - - - - - - - - - - - - - - - - -
-			# show message if env exists
-			if [ -n "$cmd" ]; then
-				[ -n "$SERVICE_USER" ] && echo "Setting up $cmd to run as $SERVICE_USER" || SERVICE_USER="root"
-				[ -n "$SERVICE_PORT" ] && echo "$name will be running on port $SERVICE_PORT" || SERVICE_PORT=""
-			fi
-			if [ -n "$pre" ] && [ -n "$(command -v "$pre" 2>/dev/null)" ]; then
-				export cmd_exec="$pre $cmd $args"
-				message="Starting service: $name $args through $pre"
-			else
-				export cmd_exec="$cmd $args"
-				message="Starting service: $name $args"
-			fi
-			[ -n "$su_exec" ] && echo "using $su_exec" | tee -a -p "/data/logs/init.txt"
-			echo "$message" | tee -a -p "/data/logs/init.txt"
-			su_cmd touch "$SERVICE_PID_FILE"
-			if [ "$RESET_ENV" = "yes" ]; then
-				env_command="$(echo "env -i HOME=\"$home\" LC_CTYPE=\"$lc_type\" PATH=\"$path\" HOSTNAME=\"$sysname\" USER=\"${SERVICE_USER:-$RUNAS_USER}\" $extra_env")"
-				execute_command="$(__trim "$su_exec $env_command $cmd_exec")"
-				if [ ! -f "$START_SCRIPT" ]; then
-					cat <<EOF >"$START_SCRIPT"
-#!/usr/bin/env bash
-trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ] && rm -Rf "\$SERVICE_PID_FILE";exit \$exitCode' EXIT
-#
-set -Eeo pipefail
-# Setting up $cmd to run as ${SERVICE_USER:-root} with env
-retVal=10
-cmd="$cmd"
-args="$args"
-SERVICE_NAME="$SERVICE_NAME"
-SERVICE_PID_FILE="$SERVICE_PID_FILE"
-LOG_DIR="$LOG_DIR"
-execute_command="$execute_command"
-\$execute_command 2>"/dev/stderr" >>"\$LOG_DIR/\$SERVICE_NAME.log" &
-execPid=\$!
-sleep 1
-checkPID="\$(ps ax | awk '{print \$1}' | grep -v grep | grep "\$execPid$" || false)"
-[ -n "\$execPid"  ] && [ -n "\$checkPID" ] && echo "\$execPid" >"\$SERVICE_PID_FILE" && retVal=0 || retVal=10
-[ "\$retVal" = 0 ] && printf '%s\n' "\$SERVICE_NAME: \$execPid" >"/run/healthcheck/\$SERVICE_NAME" || echo "Failed to start $execute_command" >&2
-exit \$retVal
-
-EOF
-				fi
-			else
-				if [ ! -f "$START_SCRIPT" ]; then
-					execute_command="$(__trim "$su_exec $cmd_exec")"
-					cat <<EOF >"$START_SCRIPT"
-#!/usr/bin/env bash
-trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ] && rm -Rf "\$SERVICE_PID_FILE";exit \$exitCode' EXIT
-#
-set -Eeo pipefail
-# Setting up $cmd to run as ${SERVICE_USER:-root}
-retVal=10
-cmd="$cmd"
-args="$args"
-SERVICE_NAME="$SERVICE_NAME"
-SERVICE_PID_FILE="$SERVICE_PID_FILE"
-LOG_DIR="$LOG_DIR"
-execute_command="$execute_command"
-\$execute_command 2>>"/dev/stderr" >>"\$LOG_DIR/\$SERVICE_NAME.log" &
-execPid=\$!
-sleep 1
-checkPID="\$(ps ax | awk '{print \$1}' | grep -v grep | grep "\$execPid$" || false)"
-[ -n "\$execPid"  ] && [ -n "\$checkPID" ] && echo "\$execPid" >"\$SERVICE_PID_FILE" && retVal=0 || retVal=10
-[ "\$retVal" = 0 ] || echo "Failed to start $execute_command" >&2
-exit \$retVal
-
-EOF
-				fi
-			fi
-		fi
-		[ -x "$START_SCRIPT" ] || chmod 755 -Rf "$START_SCRIPT"
-		[ "$CONTAINER_INIT" = "yes" ] || eval sh -c "$START_SCRIPT"
-		runExitCode=$?
-	fi
-	return $runExitCode
+  local runExitCode=0
+  # expand variables
+  local workdir="$(eval echo "${WORK_DIR:-}")"
+  # expand variables
+  local cmd="$(eval echo "${EXEC_CMD_BIN:-}")"
+  # expand variables
+  local args="$(eval echo "${EXEC_CMD_ARGS:-}")"
+  # expand variables
+  local name="$(eval echo "${EXEC_CMD_NAME:-}")"
+  # expand variables
+  local pre="$(eval echo "${EXEC_PRE_SCRIPT:-}")"
+  # expand variables
+  local extra_env="$(eval echo "${CMD_ENV//,/ }")"
+  # expand variables
+  local lc_type="$(eval echo "${LANG:-${LC_ALL:-$LC_CTYPE}}")"
+  # expand variables
+  local home="$(eval echo "${workdir//\/root/\/tmp\/docker}")"
+  # expand variables
+  local path="$(eval echo "$PATH")"
+  # expand variables
+  local message="$(eval echo "")"
+  local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}"
+  if [ -f "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh" ]; then
+    . "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh"
+  fi
+  #
+  if [ -z "$cmd" ]; then
+    __post_execute 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt"
+    retVal=$?
+    __log_info "Initialization of $SCRIPT_NAME has completed"
+    __script_exit $retVal
+  else
+    # ensure the command exists
+    if [ ! -x "$cmd" ]; then
+      __log_error "$name is not a valid executable"
+      return 2
+    fi
+    # check and exit if already running (respects SERVICE_USES_PID in __proc_check)
+    if __proc_check "$name" || __proc_check "$cmd"; then
+      __log_debug "Service $name is already running"
+      return 0
+    else
+      # - - - - - - - - - - - - - - - - - - - - - - - - -
+      # show message if env exists
+      if [ -n "$cmd" ]; then
+        if [ -n "$SERVICE_USER" ]; then
+          __log_info "Setting up $cmd to run as $SERVICE_USER"
+        else
+          SERVICE_USER="root"
+        fi
+        if [ -n "$SERVICE_PORT" ]; then
+          __log_info "$name will be running on port $SERVICE_PORT"
+        else
+          SERVICE_PORT=""
+        fi
+      fi
+      if [ -n "$pre" ] && command -v "$pre" &>/dev/null; then
+        export cmd_exec="$pre $cmd $args"
+        message="Starting service: $name $args through $pre"
+      else
+        export cmd_exec="$cmd $args"
+        message="Starting service: $name $args"
+      fi
+      if [ -n "$su_exec" ]; then
+        __log_debug "Using $su_exec" | tee -a -p "/data/logs/init.txt"
+      fi
+      __log_info "$message" | tee -a -p "/data/logs/init.txt"
+      su_cmd touch "$SERVICE_PID_FILE"
+      # W14: invalidate cached START_SCRIPT if key variables changed
+      local _script_hash_src="$cmd $args $SERVICE_USER $RESET_ENV $su_exec"
+      local _script_hash
+      _script_hash=$(printf '%s' "$_script_hash_src" | md5sum 2>/dev/null | cut -c1-8 || true)
+      if [ -f "${START_SCRIPT}.hash" ] && [ -f "$START_SCRIPT" ]; then
+        if [ "$(cat "${START_SCRIPT}.hash" 2>/dev/null)" != "$_script_hash" ]; then
+          rm -f "$START_SCRIPT" "${START_SCRIPT}.hash"
+        fi
+      fi
+      if [ "$RESET_ENV" = "yes" ]; then
+        # RESET_ENV=yes intentionally strips all inherited vars; only explicit vars are passed
+        if [ ! -f "$START_SCRIPT" ]; then
+          # Use printf %q to safely quote each env component for embedding in the script
+          local _q_home _q_lc _q_path _q_sysname _q_svcuser _q_su _q_cmd _q_args _q_extra
+          _q_home=$(printf '%q' "$home")
+          _q_lc=$(printf '%q' "$lc_type")
+          _q_path=$(printf '%q' "$path")
+          _q_sysname=$(printf '%q' "$sysname")
+          _q_svcuser=$(printf '%q' "${SERVICE_USER:-$RUNAS_USER}")
+          _q_su=$(printf '%q ' $su_exec)
+          _q_cmd=$(printf '%q' "$cmd")
+          _q_args=$(printf '%q ' $args)
+          _q_extra=$(printf '%q ' $extra_env)
+          {
+            printf '#!/usr/bin/env bash\n'
+            printf "trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f \"\$SERVICE_PID_FILE\" ] && rm -Rf \"\$SERVICE_PID_FILE\";exit \$exitCode' EXIT\n"
+            printf 'set -Eeo pipefail\n'
+            printf '# Setting up %s to run as %s with env\n' "$cmd" "${SERVICE_USER:-root}"
+            printf 'retVal=10\n'
+            printf 'SERVICE_NAME=%q\n' "$SERVICE_NAME"
+            printf 'SERVICE_PID_FILE=%q\n' "$SERVICE_PID_FILE"
+            printf 'LOG_DIR=%q\n' "$LOG_DIR"
+            printf '%s env -i HOME=%s LC_CTYPE=%s PATH=%s HOSTNAME=%s USER=%s %s %s %s 2>>"/dev/stderr" >>"$LOG_DIR/$SERVICE_NAME.log" &\n' \
+              "$_q_su" "$_q_home" "$_q_lc" "$_q_path" "$_q_sysname" "$_q_svcuser" "$_q_extra" "$_q_cmd" "$_q_args"
+            printf 'execPid=$!\n'
+            printf 'sleep 1\n'
+            printf 'if [ -n "$execPid" ] && kill -0 "$execPid" 2>/dev/null; then\n'
+            printf '  echo "$execPid" >"$SERVICE_PID_FILE"\n'
+            printf '  retVal=0\n'
+            printf '  printf '"'"'%%s\n'"'"' "$SERVICE_NAME: $execPid" >"/run/healthcheck/$SERVICE_NAME"\n'
+            printf 'else\n'
+            printf '  retVal=10\n'
+            printf '  echo "Failed to start service %s" >&2\n' "$cmd"
+            printf 'fi\n'
+            printf 'exit $retVal\n'
+          } >"$START_SCRIPT"
+          printf '%s' "$_script_hash" >"${START_SCRIPT}.hash"
+        fi
+      else
+        if [ ! -f "$START_SCRIPT" ]; then
+          local _q_su _q_cmd _q_args
+          _q_su=$(printf '%q ' $su_exec)
+          _q_cmd=$(printf '%q' "$cmd")
+          _q_args=$(printf '%q ' $args)
+          {
+            printf '#!/usr/bin/env bash\n'
+            printf "trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f \"\$SERVICE_PID_FILE\" ] && rm -Rf \"\$SERVICE_PID_FILE\";exit \$exitCode' EXIT\n"
+            printf 'set -Eeo pipefail\n'
+            printf '# Setting up %s to run as %s\n' "$cmd" "${SERVICE_USER:-root}"
+            printf 'retVal=10\n'
+            printf 'SERVICE_NAME=%q\n' "$SERVICE_NAME"
+            printf 'SERVICE_PID_FILE=%q\n' "$SERVICE_PID_FILE"
+            printf 'LOG_DIR=%q\n' "$LOG_DIR"
+            printf '%s %s %s 2>>"/dev/stderr" >>"$LOG_DIR/$SERVICE_NAME.log" &\n' \
+              "$_q_su" "$_q_cmd" "$_q_args"
+            printf 'execPid=$!\n'
+            printf 'sleep 1\n'
+            printf 'if [ -n "$execPid" ] && kill -0 "$execPid" 2>/dev/null; then\n'
+            printf '  echo "$execPid" >"$SERVICE_PID_FILE"\n'
+            printf '  retVal=0\n'
+            printf 'else\n'
+            printf '  retVal=10\n'
+            printf '  echo "Failed to start service %s" >&2\n' "$cmd"
+            printf 'fi\n'
+            printf 'exit $retVal\n'
+          } >"$START_SCRIPT"
+          printf '%s' "$_script_hash" >"${START_SCRIPT}.hash"
+        fi
+      fi
+    fi
+    if [ ! -x "$START_SCRIPT" ]; then
+      chmod 755 -Rf "$START_SCRIPT"
+    fi
+    if [ "$CONTAINER_INIT" != "yes" ]; then
+      # W15: launch as bash, not sh, since the generated script uses bash-specific features
+      bash "$START_SCRIPT"
+      runExitCode=$?
+    fi
+  fi
+  return $runExitCode
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # username and password actions
@@ -684,8 +774,12 @@ SERVICE_PID_NUMBER="$(__pgrep "$EXEC_CMD_NAME" || echo '')"                # che
 EXEC_CMD_BIN="$(type -P "$EXEC_CMD_BIN" || echo "$EXEC_CMD_BIN")"          # set full path
 EXEC_PRE_SCRIPT="$(type -P "$EXEC_PRE_SCRIPT" || echo "$EXEC_PRE_SCRIPT")" # set full path
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-# Only run check
-__check_service "$1" && SERVICE_IS_RUNNING=yes || SERVICE_IS_RUNNING="no"
+# Only run check when explicitly requested
+if [ "$1" = "check" ] && __check_service "$1"; then
+  SERVICE_IS_RUNNING=yes
+elif [ "$1" = "check" ]; then
+  SERVICE_IS_RUNNING="no"
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ensure needed directories exists
 [ -d "$LOG_DIR" ] || mkdir -p "$LOG_DIR"
@@ -859,17 +953,18 @@ __fix_permissions "$SERVICE_USER" "$SERVICE_GROUP"
 __run_pre_execute_checks 2>/dev/stderr | tee -a -p "/data/logs/entrypoint.log" "/data/logs/init.txt" || return 20
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __run_start_script 2>>/dev/stderr | tee -p -a "/data/logs/entrypoint.log"
-errorCode=$?
+errorCode=${PIPESTATUS[0]}
 if [ -n "$EXEC_CMD_BIN" ]; then
-	if [ "$errorCode" -eq 0 ]; then
-		SERVICE_EXIT_CODE=0
-		SERVICE_IS_RUNNING="yes"
-	else
-		SERVICE_EXIT_CODE=$errorCode
-		SERVICE_IS_RUNNING="${SERVICE_IS_RUNNING:-no}"
-		[ -s "$SERVICE_PID_FILE" ] || rm -Rf "$SERVICE_PID_FILE"
-	fi
-	SERVICE_EXIT_CODE=0
+  if [ "$errorCode" -eq 0 ]; then
+    SERVICE_EXIT_CODE=0
+    SERVICE_IS_RUNNING="yes"
+  else
+    SERVICE_EXIT_CODE=$errorCode
+    SERVICE_IS_RUNNING="${SERVICE_IS_RUNNING:-no}"
+    if [ ! -s "$SERVICE_PID_FILE" ]; then
+      rm -Rf "$SERVICE_PID_FILE"
+    fi
+  fi
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # start the post execute function in background
--- a/rootfs/usr/local/etc/docker/init.d/08-gitea.sh
+++ b/rootfs/usr/local/etc/docker/init.d/08-gitea.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202511290739-git
+##@Version           :  202605241158-git
 # @@Author           :  Jason Hempstead
 # @@Contact          :  jason@casjaysdev.pro
 # @@License          :  LICENSE.md
 # @@ReadME           :  08-gitea.sh --help
-# @@Copyright        :  Copyright: (c) 2025 Jason Hempstead, Casjays Developments
-# @@Created          :  Saturday, Nov 29, 2025 07:39 EST
+# @@Copyright        :  Copyright: (c) 2026 Jason Hempstead, Casjays Developments
+# @@Created          :  Sunday, May 24, 2026 11:59 EDT
 # @@File             :  08-gitea.sh
 # @@Description      :
 # @@Changelog        :  New script
@@ -23,12 +23,35 @@
 set -e
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # run trap command on exit
-trap 'retVal=$?; echo "❌ Fatal error occurred: Exit code $retVal at line $LINENO in command: $BASH_COMMAND"; kill -TERM 1' ERR
-trap 'retVal=$?;if [ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]; then rm -Rf "$SERVICE_PID_FILE"; fi;exit $retVal' SIGINT SIGTERM SIGPWR
+trap '__trap_err_handler' ERR
+trap 'retVal=$?;if [ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]; then rm -Rf "$SERVICE_PID_FILE"; fi;exit $retVal' SIGINT SIGTERM
+trap 'retVal=$?;if [ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]; then rm -Rf "$SERVICE_PID_FILE"; fi;exit $retVal' SIGPWR 2>/dev/null || true
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# ERR trap handler - smart about critical vs non-critical errors
+__trap_err_handler() {
+  local retVal=$?
+  local command="$BASH_COMMAND"
+  # Ignore SIGPIPE and user interrupts
+  [ $retVal -eq 130 ] || [ $retVal -eq 141 ] && return $retVal
+  # Non-critical: file operations, text processing, user/group operations
+  if [[ "$command" =~ (mkdir|touch|chmod|chown|chgrp|ln|cp|mv|rm|echo|printf|cat|tee|sed|awk|grep|find|sort|uniq|adduser|addgroup|usermod|groupmod|id|getent) ]]; then
+    return 0
+  fi
+  # Non-critical: conditional checks that might fail
+  if [[ "$command" =~ (test|\[|\[\[|kill -0|pgrep|pidof|ps) ]]; then
+    return 0
+  fi
+  # Critical error - but only fail if service hasn't started yet
+  if [ "$SERVICE_IS_RUNNING" != "yes" ]; then
+    echo "❌ Critical error (exit $retVal): $command" >&2
+    kill -TERM 1 2>/dev/null || exit $retVal
+  fi
+  return 0
+}
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 SCRIPT_FILE="$0"
 SERVICE_NAME="gitea"
-SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)"
+SCRIPT_NAME="${SCRIPT_FILE##*/}"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Function to exit appropriately based on context
 __script_exit() {
@@ -43,11 +66,23 @@ __script_exit() {
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Exit if service is disabled
-[ -z "$GITEA_APPNAME_ENABLED" ] || if [ "$GITEA_APPNAME_ENABLED" != "yes" ]; then export SERVICE_DISABLED="$SERVICE_NAME" && __script_exit 0; fi
+if [ -n "$GITEA_APPNAME_ENABLED" ]; then
+  if [ "$GITEA_APPNAME_ENABLED" != "yes" ]; then
+    export SERVICE_DISABLED="$SERVICE_NAME"
+    __script_exit 0
+  fi
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # setup debugging - https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
 [ -f "/config/.debug" ] && [ -z "$DEBUGGER_OPTIONS" ] && export DEBUGGER_OPTIONS="$(<"/config/.debug")" || DEBUGGER_OPTIONS="${DEBUGGER_OPTIONS:-}"
-{ [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; } && echo "Enabling debugging" && set -xo pipefail -x$DEBUGGER_OPTIONS && export DEBUGGER="on" || set -o pipefail
+if [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; then
+  echo "Enabling debugging"
+  set -o pipefail
+  [ -n "$DEBUGGER_OPTIONS" ] && set -"$DEBUGGER_OPTIONS"
+  export DEBUGGER="on"
+else
+  set -o pipefail
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 export PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -58,7 +93,9 @@ fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # import variables
 for set_env in "/root/env.sh" "/usr/local/etc/docker/env"/*.sh "/config/env"/*.sh; do
-	[ -f "$set_env" ] && . "$set_env"
+  if [ -f "$set_env" ]; then
+    . "$set_env"
+  fi
 done
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # exit if __start_init_scripts function hasn't been Initialized
@@ -69,11 +106,11 @@ if [ ! -f "/run/.start_init_scripts.pid" ]; then
 fi
 # Clean up any stale PID file for this service on startup
 if [ -n "$SERVICE_NAME" ] && [ -f "/run/init.d/$SERVICE_NAME.pid" ]; then
-	old_pid=$(cat "/run/init.d/$SERVICE_NAME.pid" 2>/dev/null)
-	if [ -n "$old_pid" ] && ! kill -0 "$old_pid" 2>/dev/null; then
-		echo "🧹 Removing stale PID file for $SERVICE_NAME"
-		rm -f "/run/init.d/$SERVICE_NAME.pid"
-	fi
+  old_pid=$(<"/run/init.d/$SERVICE_NAME.pid") 2>/dev/null
+  if [ -n "$old_pid" ] && ! kill -0 "$old_pid" 2>/dev/null; then
+    echo "🧹 Removing stale PID file for $SERVICE_NAME"
+    rm -f "/run/init.d/$SERVICE_NAME.pid"
+  fi
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Custom functions
@@ -367,8 +404,8 @@ __post_execute() {
 		# show exit message
 		__banner "$postMessageEnd: Status $retVal"
 	) 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt" &
-	pid=$!
-	ps ax | awk '{print $1}' | grep -v grep | grep -q "$execPid$" && retVal=0 || retVal=10
+	# fire-and-forget: backgrounded subshell always succeeds at launch
+	retVal=0
 	# allow custom functions
 	if builtin type -t __post_execute_local | grep -q 'function'; then __post_execute_local; fi
 	# exit function
@@ -444,111 +481,164 @@ EOF
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # script to start server
 __run_start_script() {
-	local runExitCode=0
-	local workdir="$(eval echo "${WORK_DIR:-}")"                   # expand variables
-	local cmd="$(eval echo "${EXEC_CMD_BIN:-}")"                   # expand variables
-	local args="$(eval echo "${EXEC_CMD_ARGS:-}")"                 # expand variables
-	local name="$(eval echo "${EXEC_CMD_NAME:-}")"                 # expand variables
-	local pre="$(eval echo "${EXEC_PRE_SCRIPT:-}")"                # expand variables
-	local extra_env="$(eval echo "${CMD_ENV//,/ }")"               # expand variables
-	local lc_type="$(eval echo "${LANG:-${LC_ALL:-$LC_CTYPE}}")"   # expand variables
-	local home="$(eval echo "${workdir//\/root/\/tmp\/docker}")"   # expand variables
-	local path="$(eval echo "$PATH")"                              # expand variables
-	local message="$(eval echo "")"                                # expand variables
-	local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
-	[ -f "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh" ] && . "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh"
-	#
-	if [ -z "$cmd" ]; then
-		__post_execute 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt"
-		retVal=$?
-		echo "Initializing $SCRIPT_NAME has completed"
-		__script_exit $retVal
-	else
-		# ensure the command exists
-		if [ ! -x "$cmd" ]; then
-			echo "$name is not a valid executable"
-			return 2
-		fi
-		# check and exit if already running
-		if __proc_check "$name" || __proc_check "$cmd"; then
-			return 0
-		else
-			# - - - - - - - - - - - - - - - - - - - - - - - - -
-			# show message if env exists
-			if [ -n "$cmd" ]; then
-				[ -n "$SERVICE_USER" ] && echo "Setting up $cmd to run as $SERVICE_USER" || SERVICE_USER="root"
-				[ -n "$SERVICE_PORT" ] && echo "$name will be running on port $SERVICE_PORT" || SERVICE_PORT=""
-			fi
-			if [ -n "$pre" ] && [ -n "$(command -v "$pre" 2>/dev/null)" ]; then
-				export cmd_exec="$pre $cmd $args"
-				message="Starting service: $name $args through $pre"
-			else
-				export cmd_exec="$cmd $args"
-				message="Starting service: $name $args"
-			fi
-			[ -n "$su_exec" ] && echo "using $su_exec" | tee -a -p "/data/logs/init.txt"
-			echo "$message" | tee -a -p "/data/logs/init.txt"
-			su_cmd touch "$SERVICE_PID_FILE"
-			if [ "$RESET_ENV" = "yes" ]; then
-				env_command="$(echo "env -i HOME=\"$home\" LC_CTYPE=\"$lc_type\" PATH=\"$path\" HOSTNAME=\"$sysname\" USER=\"${SERVICE_USER:-$RUNAS_USER}\" $extra_env")"
-				execute_command="$(__trim "$su_exec $env_command $cmd_exec")"
-				if [ ! -f "$START_SCRIPT" ]; then
-					cat <<EOF >"$START_SCRIPT"
-#!/usr/bin/env bash
-trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ] && rm -Rf "\$SERVICE_PID_FILE";exit \$exitCode' EXIT
-#
-set -Eeo pipefail
-# Setting up $cmd to run as ${SERVICE_USER:-root} with env
-retVal=10
-cmd="$cmd"
-args="$args"
-SERVICE_NAME="$SERVICE_NAME"
-SERVICE_PID_FILE="$SERVICE_PID_FILE"
-LOG_DIR="$LOG_DIR"
-execute_command="$execute_command"
-\$execute_command 2>"/dev/stderr" >>"\$LOG_DIR/\$SERVICE_NAME.log" &
-execPid=\$!
-sleep 1
-checkPID="\$(ps ax | awk '{print \$1}' | grep -v grep | grep "\$execPid$" || false)"
-[ -n "\$execPid"  ] && [ -n "\$checkPID" ] && echo "\$execPid" >"\$SERVICE_PID_FILE" && retVal=0 || retVal=10
-[ "\$retVal" = 0 ] && printf '%s\n' "\$SERVICE_NAME: \$execPid" >"/run/healthcheck/\$SERVICE_NAME" || echo "Failed to start $execute_command" >&2
-exit \$retVal
-
-EOF
-				fi
-			else
-				if [ ! -f "$START_SCRIPT" ]; then
-					execute_command="$(__trim "$su_exec $cmd_exec")"
-					cat <<EOF >"$START_SCRIPT"
-#!/usr/bin/env bash
-trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ] && rm -Rf "\$SERVICE_PID_FILE";exit \$exitCode' EXIT
-#
-set -Eeo pipefail
-# Setting up $cmd to run as ${SERVICE_USER:-root}
-retVal=10
-cmd="$cmd"
-args="$args"
-SERVICE_NAME="$SERVICE_NAME"
-SERVICE_PID_FILE="$SERVICE_PID_FILE"
-LOG_DIR="$LOG_DIR"
-execute_command="$execute_command"
-\$execute_command 2>>"/dev/stderr" >>"\$LOG_DIR/\$SERVICE_NAME.log" &
-execPid=\$!
-sleep 1
-checkPID="\$(ps ax | awk '{print \$1}' | grep -v grep | grep "\$execPid$" || false)"
-[ -n "\$execPid"  ] && [ -n "\$checkPID" ] && echo "\$execPid" >"\$SERVICE_PID_FILE" && retVal=0 || retVal=10
-[ "\$retVal" = 0 ] || echo "Failed to start $execute_command" >&2
-exit \$retVal
-
-EOF
-				fi
-			fi
-		fi
-		[ -x "$START_SCRIPT" ] || chmod 755 -Rf "$START_SCRIPT"
-		[ "$CONTAINER_INIT" = "yes" ] || eval sh -c "$START_SCRIPT"
-		runExitCode=$?
-	fi
-	return $runExitCode
+  local runExitCode=0
+  # expand variables
+  local workdir="$(eval echo "${WORK_DIR:-}")"
+  # expand variables
+  local cmd="$(eval echo "${EXEC_CMD_BIN:-}")"
+  # expand variables
+  local args="$(eval echo "${EXEC_CMD_ARGS:-}")"
+  # expand variables
+  local name="$(eval echo "${EXEC_CMD_NAME:-}")"
+  # expand variables
+  local pre="$(eval echo "${EXEC_PRE_SCRIPT:-}")"
+  # expand variables
+  local extra_env="$(eval echo "${CMD_ENV//,/ }")"
+  # expand variables
+  local lc_type="$(eval echo "${LANG:-${LC_ALL:-$LC_CTYPE}}")"
+  # expand variables
+  local home="$(eval echo "${workdir//\/root/\/tmp\/docker}")"
+  # expand variables
+  local path="$(eval echo "$PATH")"
+  # expand variables
+  local message="$(eval echo "")"
+  local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}"
+  if [ -f "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh" ]; then
+    . "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh"
+  fi
+  #
+  if [ -z "$cmd" ]; then
+    __post_execute 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt"
+    retVal=$?
+    __log_info "Initialization of $SCRIPT_NAME has completed"
+    __script_exit $retVal
+  else
+    # ensure the command exists
+    if [ ! -x "$cmd" ]; then
+      __log_error "$name is not a valid executable"
+      return 2
+    fi
+    # check and exit if already running (respects SERVICE_USES_PID in __proc_check)
+    if __proc_check "$name" || __proc_check "$cmd"; then
+      __log_debug "Service $name is already running"
+      return 0
+    else
+      # - - - - - - - - - - - - - - - - - - - - - - - - -
+      # show message if env exists
+      if [ -n "$cmd" ]; then
+        if [ -n "$SERVICE_USER" ]; then
+          __log_info "Setting up $cmd to run as $SERVICE_USER"
+        else
+          SERVICE_USER="root"
+        fi
+        if [ -n "$SERVICE_PORT" ]; then
+          __log_info "$name will be running on port $SERVICE_PORT"
+        else
+          SERVICE_PORT=""
+        fi
+      fi
+      if [ -n "$pre" ] && command -v "$pre" &>/dev/null; then
+        export cmd_exec="$pre $cmd $args"
+        message="Starting service: $name $args through $pre"
+      else
+        export cmd_exec="$cmd $args"
+        message="Starting service: $name $args"
+      fi
+      if [ -n "$su_exec" ]; then
+        __log_debug "Using $su_exec" | tee -a -p "/data/logs/init.txt"
+      fi
+      __log_info "$message" | tee -a -p "/data/logs/init.txt"
+      su_cmd touch "$SERVICE_PID_FILE"
+      # W14: invalidate cached START_SCRIPT if key variables changed
+      local _script_hash_src="$cmd $args $SERVICE_USER $RESET_ENV $su_exec"
+      local _script_hash
+      _script_hash=$(printf '%s' "$_script_hash_src" | md5sum 2>/dev/null | cut -c1-8 || true)
+      if [ -f "${START_SCRIPT}.hash" ] && [ -f "$START_SCRIPT" ]; then
+        if [ "$(cat "${START_SCRIPT}.hash" 2>/dev/null)" != "$_script_hash" ]; then
+          rm -f "$START_SCRIPT" "${START_SCRIPT}.hash"
+        fi
+      fi
+      if [ "$RESET_ENV" = "yes" ]; then
+        # RESET_ENV=yes intentionally strips all inherited vars; only explicit vars are passed
+        if [ ! -f "$START_SCRIPT" ]; then
+          # Use printf %q to safely quote each env component for embedding in the script
+          local _q_home _q_lc _q_path _q_sysname _q_svcuser _q_su _q_cmd _q_args _q_extra
+          _q_home=$(printf '%q' "$home")
+          _q_lc=$(printf '%q' "$lc_type")
+          _q_path=$(printf '%q' "$path")
+          _q_sysname=$(printf '%q' "$sysname")
+          _q_svcuser=$(printf '%q' "${SERVICE_USER:-$RUNAS_USER}")
+          _q_su=$(printf '%q ' $su_exec)
+          _q_cmd=$(printf '%q' "$cmd")
+          _q_args=$(printf '%q ' $args)
+          _q_extra=$(printf '%q ' $extra_env)
+          {
+            printf '#!/usr/bin/env bash\n'
+            printf "trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f \"\$SERVICE_PID_FILE\" ] && rm -Rf \"\$SERVICE_PID_FILE\";exit \$exitCode' EXIT\n"
+            printf 'set -Eeo pipefail\n'
+            printf '# Setting up %s to run as %s with env\n' "$cmd" "${SERVICE_USER:-root}"
+            printf 'retVal=10\n'
+            printf 'SERVICE_NAME=%q\n' "$SERVICE_NAME"
+            printf 'SERVICE_PID_FILE=%q\n' "$SERVICE_PID_FILE"
+            printf 'LOG_DIR=%q\n' "$LOG_DIR"
+            printf '%s env -i HOME=%s LC_CTYPE=%s PATH=%s HOSTNAME=%s USER=%s %s %s %s 2>>"/dev/stderr" >>"$LOG_DIR/$SERVICE_NAME.log" &\n' \
+              "$_q_su" "$_q_home" "$_q_lc" "$_q_path" "$_q_sysname" "$_q_svcuser" "$_q_extra" "$_q_cmd" "$_q_args"
+            printf 'execPid=$!\n'
+            printf 'sleep 1\n'
+            printf 'if [ -n "$execPid" ] && kill -0 "$execPid" 2>/dev/null; then\n'
+            printf '  echo "$execPid" >"$SERVICE_PID_FILE"\n'
+            printf '  retVal=0\n'
+            printf '  printf '"'"'%%s\n'"'"' "$SERVICE_NAME: $execPid" >"/run/healthcheck/$SERVICE_NAME"\n'
+            printf 'else\n'
+            printf '  retVal=10\n'
+            printf '  echo "Failed to start service %s" >&2\n' "$cmd"
+            printf 'fi\n'
+            printf 'exit $retVal\n'
+          } >"$START_SCRIPT"
+          printf '%s' "$_script_hash" >"${START_SCRIPT}.hash"
+        fi
+      else
+        if [ ! -f "$START_SCRIPT" ]; then
+          local _q_su _q_cmd _q_args
+          _q_su=$(printf '%q ' $su_exec)
+          _q_cmd=$(printf '%q' "$cmd")
+          _q_args=$(printf '%q ' $args)
+          {
+            printf '#!/usr/bin/env bash\n'
+            printf "trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f \"\$SERVICE_PID_FILE\" ] && rm -Rf \"\$SERVICE_PID_FILE\";exit \$exitCode' EXIT\n"
+            printf 'set -Eeo pipefail\n'
+            printf '# Setting up %s to run as %s\n' "$cmd" "${SERVICE_USER:-root}"
+            printf 'retVal=10\n'
+            printf 'SERVICE_NAME=%q\n' "$SERVICE_NAME"
+            printf 'SERVICE_PID_FILE=%q\n' "$SERVICE_PID_FILE"
+            printf 'LOG_DIR=%q\n' "$LOG_DIR"
+            printf '%s %s %s 2>>"/dev/stderr" >>"$LOG_DIR/$SERVICE_NAME.log" &\n' \
+              "$_q_su" "$_q_cmd" "$_q_args"
+            printf 'execPid=$!\n'
+            printf 'sleep 1\n'
+            printf 'if [ -n "$execPid" ] && kill -0 "$execPid" 2>/dev/null; then\n'
+            printf '  echo "$execPid" >"$SERVICE_PID_FILE"\n'
+            printf '  retVal=0\n'
+            printf 'else\n'
+            printf '  retVal=10\n'
+            printf '  echo "Failed to start service %s" >&2\n' "$cmd"
+            printf 'fi\n'
+            printf 'exit $retVal\n'
+          } >"$START_SCRIPT"
+          printf '%s' "$_script_hash" >"${START_SCRIPT}.hash"
+        fi
+      fi
+    fi
+    if [ ! -x "$START_SCRIPT" ]; then
+      chmod 755 -Rf "$START_SCRIPT"
+    fi
+    if [ "$CONTAINER_INIT" != "yes" ]; then
+      # W15: launch as bash, not sh, since the generated script uses bash-specific features
+      bash "$START_SCRIPT"
+      runExitCode=$?
+    fi
+  fi
+  return $runExitCode
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # username and password actions
@@ -585,8 +675,12 @@ SERVICE_PID_NUMBER="$(__pgrep "$EXEC_CMD_NAME" || echo '')"                # che
 EXEC_CMD_BIN="$(type -P "$EXEC_CMD_BIN" || echo "$EXEC_CMD_BIN")"          # set full path
 EXEC_PRE_SCRIPT="$(type -P "$EXEC_PRE_SCRIPT" || echo "$EXEC_PRE_SCRIPT")" # set full path
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-# Only run check
-__check_service "$1" && SERVICE_IS_RUNNING=yes || SERVICE_IS_RUNNING="no"
+# Only run check when explicitly requested
+if [ "$1" = "check" ] && __check_service "$1"; then
+  SERVICE_IS_RUNNING=yes
+elif [ "$1" = "check" ]; then
+  SERVICE_IS_RUNNING="no"
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ensure needed directories exists
 [ -d "$LOG_DIR" ] || mkdir -p "$LOG_DIR"
@@ -760,17 +854,18 @@ __fix_permissions "$SERVICE_USER" "$SERVICE_GROUP"
 __run_pre_execute_checks 2>/dev/stderr | tee -a -p "/data/logs/entrypoint.log" "/data/logs/init.txt" || return 20
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __run_start_script 2>>/dev/stderr | tee -p -a "/data/logs/entrypoint.log"
-errorCode=$?
+errorCode=${PIPESTATUS[0]}
 if [ -n "$EXEC_CMD_BIN" ]; then
-	if [ "$errorCode" -eq 0 ]; then
-		SERVICE_EXIT_CODE=0
-		SERVICE_IS_RUNNING="yes"
-	else
-		SERVICE_EXIT_CODE=$errorCode
-		SERVICE_IS_RUNNING="${SERVICE_IS_RUNNING:-no}"
-		[ -s "$SERVICE_PID_FILE" ] || rm -Rf "$SERVICE_PID_FILE"
-	fi
-	SERVICE_EXIT_CODE=0
+  if [ "$errorCode" -eq 0 ]; then
+    SERVICE_EXIT_CODE=0
+    SERVICE_IS_RUNNING="yes"
+  else
+    SERVICE_EXIT_CODE=$errorCode
+    SERVICE_IS_RUNNING="${SERVICE_IS_RUNNING:-no}"
+    if [ ! -s "$SERVICE_PID_FILE" ]; then
+      rm -Rf "$SERVICE_PID_FILE"
+    fi
+  fi
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # start the post execute function in background
--- a/rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh
+++ b/rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202511290740-git
+##@Version           :  202605241158-git
 # @@Author           :  Jason Hempstead
 # @@Contact          :  jason@casjaysdev.pro
 # @@License          :  LICENSE.md
 # @@ReadME           :  zz-act_runner.sh --help
-# @@Copyright        :  Copyright: (c) 2025 Jason Hempstead, Casjays Developments
-# @@Created          :  Saturday, Nov 29, 2025 07:40 EST
+# @@Copyright        :  Copyright: (c) 2026 Jason Hempstead, Casjays Developments
+# @@Created          :  Sunday, May 24, 2026 11:59 EDT
 # @@File             :  zz-act_runner.sh
 # @@Description      :
 # @@Changelog        :  New script
@@ -23,12 +23,35 @@
 set -e
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # run trap command on exit
-trap 'retVal=$?; echo "❌ Fatal error occurred: Exit code $retVal at line $LINENO in command: $BASH_COMMAND"; kill -TERM 1' ERR
-trap 'retVal=$?;if [ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]; then rm -Rf "$SERVICE_PID_FILE"; fi;exit $retVal' SIGINT SIGTERM SIGPWR
+trap '__trap_err_handler' ERR
+trap 'retVal=$?;if [ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]; then rm -Rf "$SERVICE_PID_FILE"; fi;exit $retVal' SIGINT SIGTERM
+trap 'retVal=$?;if [ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]; then rm -Rf "$SERVICE_PID_FILE"; fi;exit $retVal' SIGPWR 2>/dev/null || true
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# ERR trap handler - smart about critical vs non-critical errors
+__trap_err_handler() {
+  local retVal=$?
+  local command="$BASH_COMMAND"
+  # Ignore SIGPIPE and user interrupts
+  [ $retVal -eq 130 ] || [ $retVal -eq 141 ] && return $retVal
+  # Non-critical: file operations, text processing, user/group operations
+  if [[ "$command" =~ (mkdir|touch|chmod|chown|chgrp|ln|cp|mv|rm|echo|printf|cat|tee|sed|awk|grep|find|sort|uniq|adduser|addgroup|usermod|groupmod|id|getent) ]]; then
+    return 0
+  fi
+  # Non-critical: conditional checks that might fail
+  if [[ "$command" =~ (test|\[|\[\[|kill -0|pgrep|pidof|ps) ]]; then
+    return 0
+  fi
+  # Critical error - but only fail if service hasn't started yet
+  if [ "$SERVICE_IS_RUNNING" != "yes" ]; then
+    echo "❌ Critical error (exit $retVal): $command" >&2
+    kill -TERM 1 2>/dev/null || exit $retVal
+  fi
+  return 0
+}
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 SCRIPT_FILE="$0"
 SERVICE_NAME="act_runner"
-SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)"
+SCRIPT_NAME="${SCRIPT_FILE##*/}"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Function to exit appropriately based on context
 __script_exit() {
@@ -43,11 +66,23 @@ __script_exit() {
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Exit if service is disabled
-[ -z "$ACT_RUNNER_APPNAME_ENABLED" ] || if [ "$ACT_RUNNER_APPNAME_ENABLED" != "yes" ]; then export SERVICE_DISABLED="$SERVICE_NAME" && __script_exit 0; fi
+if [ -n "$ACT_RUNNER_APPNAME_ENABLED" ]; then
+  if [ "$ACT_RUNNER_APPNAME_ENABLED" != "yes" ]; then
+    export SERVICE_DISABLED="$SERVICE_NAME"
+    __script_exit 0
+  fi
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # setup debugging - https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
 [ -f "/config/.debug" ] && [ -z "$DEBUGGER_OPTIONS" ] && export DEBUGGER_OPTIONS="$(<"/config/.debug")" || DEBUGGER_OPTIONS="${DEBUGGER_OPTIONS:-}"
-{ [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; } && echo "Enabling debugging" && set -xo pipefail -x$DEBUGGER_OPTIONS && export DEBUGGER="on" || set -o pipefail
+if [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; then
+  echo "Enabling debugging"
+  set -o pipefail
+  [ -n "$DEBUGGER_OPTIONS" ] && set -"$DEBUGGER_OPTIONS"
+  export DEBUGGER="on"
+else
+  set -o pipefail
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 export PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -58,7 +93,9 @@ fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # import variables
 for set_env in "/root/env.sh" "/usr/local/etc/docker/env"/*.sh "/config/env"/*.sh; do
-	[ -f "$set_env" ] && . "$set_env"
+  if [ -f "$set_env" ]; then
+    . "$set_env"
+  fi
 done
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # exit if __start_init_scripts function hasn't been Initialized
@@ -69,11 +106,11 @@ if [ ! -f "/run/.start_init_scripts.pid" ]; then
 fi
 # Clean up any stale PID file for this service on startup
 if [ -n "$SERVICE_NAME" ] && [ -f "/run/init.d/$SERVICE_NAME.pid" ]; then
-	old_pid=$(cat "/run/init.d/$SERVICE_NAME.pid" 2>/dev/null)
-	if [ -n "$old_pid" ] && ! kill -0 "$old_pid" 2>/dev/null; then
-		echo "🧹 Removing stale PID file for $SERVICE_NAME"
-		rm -f "/run/init.d/$SERVICE_NAME.pid"
-	fi
+  old_pid=$(<"/run/init.d/$SERVICE_NAME.pid") 2>/dev/null
+  if [ -n "$old_pid" ] && ! kill -0 "$old_pid" 2>/dev/null; then
+    echo "🧹 Removing stale PID file for $SERVICE_NAME"
+    rm -f "/run/init.d/$SERVICE_NAME.pid"
+  fi
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Custom functions
@@ -416,8 +453,8 @@ __post_execute() {
 		# show exit message
 		__banner "$postMessageEnd: Status $retVal"
 	) 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt" &
-	pid=$!
-	ps ax | awk '{print $1}' | grep -v grep | grep -q "$execPid$" && retVal=0 || retVal=10
+	# fire-and-forget: backgrounded subshell always succeeds at launch
+	retVal=0
 	# allow custom functions
 	if builtin type -t __post_execute_local | grep -q 'function'; then __post_execute_local; fi
 	# exit function
@@ -493,111 +530,164 @@ EOF
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # script to start server
 __run_start_script() {
-	local runExitCode=0
-	local workdir="$(eval echo "${WORK_DIR:-}")"                   # expand variables
-	local cmd="$(eval echo "${EXEC_CMD_BIN:-}")"                   # expand variables
-	local args="$(eval echo "${EXEC_CMD_ARGS:-}")"                 # expand variables
-	local name="$(eval echo "${EXEC_CMD_NAME:-}")"                 # expand variables
-	local pre="$(eval echo "${EXEC_PRE_SCRIPT:-}")"                # expand variables
-	local extra_env="$(eval echo "${CMD_ENV//,/ }")"               # expand variables
-	local lc_type="$(eval echo "${LANG:-${LC_ALL:-$LC_CTYPE}}")"   # expand variables
-	local home="$(eval echo "${workdir//\/root/\/tmp\/docker}")"   # expand variables
-	local path="$(eval echo "$PATH")"                              # expand variables
-	local message="$(eval echo "")"                                # expand variables
-	local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
-	[ -f "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh" ] && . "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh"
-	#
-	if [ -z "$cmd" ]; then
-		__post_execute 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt"
-		retVal=$?
-		echo "Initializing $SCRIPT_NAME has completed"
-		__script_exit $retVal
-	else
-		# ensure the command exists
-		if [ ! -x "$cmd" ]; then
-			echo "$name is not a valid executable"
-			return 2
-		fi
-		# check and exit if already running
-		if __proc_check "$name" || __proc_check "$cmd"; then
-			return 0
-		else
-			# - - - - - - - - - - - - - - - - - - - - - - - - -
-			# show message if env exists
-			if [ -n "$cmd" ]; then
-				[ -n "$SERVICE_USER" ] && echo "Setting up $cmd to run as $SERVICE_USER" || SERVICE_USER="root"
-				[ -n "$SERVICE_PORT" ] && echo "$name will be running on port $SERVICE_PORT" || SERVICE_PORT=""
-			fi
-			if [ -n "$pre" ] && [ -n "$(command -v "$pre" 2>/dev/null)" ]; then
-				export cmd_exec="$pre $cmd $args"
-				message="Starting service: $name $args through $pre"
-			else
-				export cmd_exec="$cmd $args"
-				message="Starting service: $name $args"
-			fi
-			[ -n "$su_exec" ] && echo "using $su_exec" | tee -a -p "/data/logs/init.txt"
-			echo "$message" | tee -a -p "/data/logs/init.txt"
-			su_cmd touch "$SERVICE_PID_FILE"
-			if [ "$RESET_ENV" = "yes" ]; then
-				env_command="$(echo "env -i HOME=\"$home\" LC_CTYPE=\"$lc_type\" PATH=\"$path\" HOSTNAME=\"$sysname\" USER=\"${SERVICE_USER:-$RUNAS_USER}\" $extra_env")"
-				execute_command="$(__trim "$su_exec $env_command $cmd_exec")"
-				if [ ! -f "$START_SCRIPT" ]; then
-					cat <<EOF >"$START_SCRIPT"
-#!/usr/bin/env bash
-trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ] && rm -Rf "\$SERVICE_PID_FILE";exit \$exitCode' EXIT
-#
-set -Eeo pipefail
-# Setting up $cmd to run as ${SERVICE_USER:-root} with env
-retVal=10
-cmd="$cmd"
-args="$args"
-SERVICE_NAME="$SERVICE_NAME"
-SERVICE_PID_FILE="$SERVICE_PID_FILE"
-LOG_DIR="$LOG_DIR"
-execute_command="$execute_command"
-\$execute_command 2>"/dev/stderr" >>"\$LOG_DIR/\$SERVICE_NAME.log" &
-execPid=\$!
-sleep 1
-checkPID="\$(ps ax | awk '{print \$1}' | grep -v grep | grep "\$execPid$" || false)"
-[ -n "\$execPid"  ] && [ -n "\$checkPID" ] && echo "\$execPid" >"\$SERVICE_PID_FILE" && retVal=0 || retVal=10
-[ "\$retVal" = 0 ] && printf '%s\n' "\$SERVICE_NAME: \$execPid" >"/run/healthcheck/\$SERVICE_NAME" || echo "Failed to start $execute_command" >&2
-exit \$retVal
-
-EOF
-				fi
-			else
-				if [ ! -f "$START_SCRIPT" ]; then
-					execute_command="$(__trim "$su_exec $cmd_exec")"
-					cat <<EOF >"$START_SCRIPT"
-#!/usr/bin/env bash
-trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ] && rm -Rf "\$SERVICE_PID_FILE";exit \$exitCode' EXIT
-#
-set -Eeo pipefail
-# Setting up $cmd to run as ${SERVICE_USER:-root}
-retVal=10
-cmd="$cmd"
-args="$args"
-SERVICE_NAME="$SERVICE_NAME"
-SERVICE_PID_FILE="$SERVICE_PID_FILE"
-LOG_DIR="$LOG_DIR"
-execute_command="$execute_command"
-\$execute_command 2>>"/dev/stderr" >>"\$LOG_DIR/\$SERVICE_NAME.log" &
-execPid=\$!
-sleep 1
-checkPID="\$(ps ax | awk '{print \$1}' | grep -v grep | grep "\$execPid$" || false)"
-[ -n "\$execPid"  ] && [ -n "\$checkPID" ] && echo "\$execPid" >"\$SERVICE_PID_FILE" && retVal=0 || retVal=10
-[ "\$retVal" = 0 ] || echo "Failed to start $execute_command" >&2
-exit \$retVal
-
-EOF
-				fi
-			fi
-		fi
-		[ -x "$START_SCRIPT" ] || chmod 755 -Rf "$START_SCRIPT"
-		[ "$CONTAINER_INIT" = "yes" ] || eval sh -c "$START_SCRIPT"
-		runExitCode=$?
-	fi
-	return $runExitCode
+  local runExitCode=0
+  # expand variables
+  local workdir="$(eval echo "${WORK_DIR:-}")"
+  # expand variables
+  local cmd="$(eval echo "${EXEC_CMD_BIN:-}")"
+  # expand variables
+  local args="$(eval echo "${EXEC_CMD_ARGS:-}")"
+  # expand variables
+  local name="$(eval echo "${EXEC_CMD_NAME:-}")"
+  # expand variables
+  local pre="$(eval echo "${EXEC_PRE_SCRIPT:-}")"
+  # expand variables
+  local extra_env="$(eval echo "${CMD_ENV//,/ }")"
+  # expand variables
+  local lc_type="$(eval echo "${LANG:-${LC_ALL:-$LC_CTYPE}}")"
+  # expand variables
+  local home="$(eval echo "${workdir//\/root/\/tmp\/docker}")"
+  # expand variables
+  local path="$(eval echo "$PATH")"
+  # expand variables
+  local message="$(eval echo "")"
+  local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}"
+  if [ -f "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh" ]; then
+    . "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh"
+  fi
+  #
+  if [ -z "$cmd" ]; then
+    __post_execute 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt"
+    retVal=$?
+    __log_info "Initialization of $SCRIPT_NAME has completed"
+    __script_exit $retVal
+  else
+    # ensure the command exists
+    if [ ! -x "$cmd" ]; then
+      __log_error "$name is not a valid executable"
+      return 2
+    fi
+    # check and exit if already running (respects SERVICE_USES_PID in __proc_check)
+    if __proc_check "$name" || __proc_check "$cmd"; then
+      __log_debug "Service $name is already running"
+      return 0
+    else
+      # - - - - - - - - - - - - - - - - - - - - - - - - -
+      # show message if env exists
+      if [ -n "$cmd" ]; then
+        if [ -n "$SERVICE_USER" ]; then
+          __log_info "Setting up $cmd to run as $SERVICE_USER"
+        else
+          SERVICE_USER="root"
+        fi
+        if [ -n "$SERVICE_PORT" ]; then
+          __log_info "$name will be running on port $SERVICE_PORT"
+        else
+          SERVICE_PORT=""
+        fi
+      fi
+      if [ -n "$pre" ] && command -v "$pre" &>/dev/null; then
+        export cmd_exec="$pre $cmd $args"
+        message="Starting service: $name $args through $pre"
+      else
+        export cmd_exec="$cmd $args"
+        message="Starting service: $name $args"
+      fi
+      if [ -n "$su_exec" ]; then
+        __log_debug "Using $su_exec" | tee -a -p "/data/logs/init.txt"
+      fi
+      __log_info "$message" | tee -a -p "/data/logs/init.txt"
+      su_cmd touch "$SERVICE_PID_FILE"
+      # W14: invalidate cached START_SCRIPT if key variables changed
+      local _script_hash_src="$cmd $args $SERVICE_USER $RESET_ENV $su_exec"
+      local _script_hash
+      _script_hash=$(printf '%s' "$_script_hash_src" | md5sum 2>/dev/null | cut -c1-8 || true)
+      if [ -f "${START_SCRIPT}.hash" ] && [ -f "$START_SCRIPT" ]; then
+        if [ "$(cat "${START_SCRIPT}.hash" 2>/dev/null)" != "$_script_hash" ]; then
+          rm -f "$START_SCRIPT" "${START_SCRIPT}.hash"
+        fi
+      fi
+      if [ "$RESET_ENV" = "yes" ]; then
+        # RESET_ENV=yes intentionally strips all inherited vars; only explicit vars are passed
+        if [ ! -f "$START_SCRIPT" ]; then
+          # Use printf %q to safely quote each env component for embedding in the script
+          local _q_home _q_lc _q_path _q_sysname _q_svcuser _q_su _q_cmd _q_args _q_extra
+          _q_home=$(printf '%q' "$home")
+          _q_lc=$(printf '%q' "$lc_type")
+          _q_path=$(printf '%q' "$path")
+          _q_sysname=$(printf '%q' "$sysname")
+          _q_svcuser=$(printf '%q' "${SERVICE_USER:-$RUNAS_USER}")
+          _q_su=$(printf '%q ' $su_exec)
+          _q_cmd=$(printf '%q' "$cmd")
+          _q_args=$(printf '%q ' $args)
+          _q_extra=$(printf '%q ' $extra_env)
+          {
+            printf '#!/usr/bin/env bash\n'
+            printf "trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f \"\$SERVICE_PID_FILE\" ] && rm -Rf \"\$SERVICE_PID_FILE\";exit \$exitCode' EXIT\n"
+            printf 'set -Eeo pipefail\n'
+            printf '# Setting up %s to run as %s with env\n' "$cmd" "${SERVICE_USER:-root}"
+            printf 'retVal=10\n'
+            printf 'SERVICE_NAME=%q\n' "$SERVICE_NAME"
+            printf 'SERVICE_PID_FILE=%q\n' "$SERVICE_PID_FILE"
+            printf 'LOG_DIR=%q\n' "$LOG_DIR"
+            printf '%s env -i HOME=%s LC_CTYPE=%s PATH=%s HOSTNAME=%s USER=%s %s %s %s 2>>"/dev/stderr" >>"$LOG_DIR/$SERVICE_NAME.log" &\n' \
+              "$_q_su" "$_q_home" "$_q_lc" "$_q_path" "$_q_sysname" "$_q_svcuser" "$_q_extra" "$_q_cmd" "$_q_args"
+            printf 'execPid=$!\n'
+            printf 'sleep 1\n'
+            printf 'if [ -n "$execPid" ] && kill -0 "$execPid" 2>/dev/null; then\n'
+            printf '  echo "$execPid" >"$SERVICE_PID_FILE"\n'
+            printf '  retVal=0\n'
+            printf '  printf '"'"'%%s\n'"'"' "$SERVICE_NAME: $execPid" >"/run/healthcheck/$SERVICE_NAME"\n'
+            printf 'else\n'
+            printf '  retVal=10\n'
+            printf '  echo "Failed to start service %s" >&2\n' "$cmd"
+            printf 'fi\n'
+            printf 'exit $retVal\n'
+          } >"$START_SCRIPT"
+          printf '%s' "$_script_hash" >"${START_SCRIPT}.hash"
+        fi
+      else
+        if [ ! -f "$START_SCRIPT" ]; then
+          local _q_su _q_cmd _q_args
+          _q_su=$(printf '%q ' $su_exec)
+          _q_cmd=$(printf '%q' "$cmd")
+          _q_args=$(printf '%q ' $args)
+          {
+            printf '#!/usr/bin/env bash\n'
+            printf "trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f \"\$SERVICE_PID_FILE\" ] && rm -Rf \"\$SERVICE_PID_FILE\";exit \$exitCode' EXIT\n"
+            printf 'set -Eeo pipefail\n'
+            printf '# Setting up %s to run as %s\n' "$cmd" "${SERVICE_USER:-root}"
+            printf 'retVal=10\n'
+            printf 'SERVICE_NAME=%q\n' "$SERVICE_NAME"
+            printf 'SERVICE_PID_FILE=%q\n' "$SERVICE_PID_FILE"
+            printf 'LOG_DIR=%q\n' "$LOG_DIR"
+            printf '%s %s %s 2>>"/dev/stderr" >>"$LOG_DIR/$SERVICE_NAME.log" &\n' \
+              "$_q_su" "$_q_cmd" "$_q_args"
+            printf 'execPid=$!\n'
+            printf 'sleep 1\n'
+            printf 'if [ -n "$execPid" ] && kill -0 "$execPid" 2>/dev/null; then\n'
+            printf '  echo "$execPid" >"$SERVICE_PID_FILE"\n'
+            printf '  retVal=0\n'
+            printf 'else\n'
+            printf '  retVal=10\n'
+            printf '  echo "Failed to start service %s" >&2\n' "$cmd"
+            printf 'fi\n'
+            printf 'exit $retVal\n'
+          } >"$START_SCRIPT"
+          printf '%s' "$_script_hash" >"${START_SCRIPT}.hash"
+        fi
+      fi
+    fi
+    if [ ! -x "$START_SCRIPT" ]; then
+      chmod 755 -Rf "$START_SCRIPT"
+    fi
+    if [ "$CONTAINER_INIT" != "yes" ]; then
+      # W15: launch as bash, not sh, since the generated script uses bash-specific features
+      bash "$START_SCRIPT"
+      runExitCode=$?
+    fi
+  fi
+  return $runExitCode
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # username and password actions
@@ -634,8 +724,12 @@ SERVICE_PID_NUMBER="$(__pgrep "$EXEC_CMD_NAME" || echo '')"                # che
 EXEC_CMD_BIN="$(type -P "$EXEC_CMD_BIN" || echo "$EXEC_CMD_BIN")"          # set full path
 EXEC_PRE_SCRIPT="$(type -P "$EXEC_PRE_SCRIPT" || echo "$EXEC_PRE_SCRIPT")" # set full path
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-# Only run check
-__check_service "$1" && SERVICE_IS_RUNNING=yes || SERVICE_IS_RUNNING="no"
+# Only run check when explicitly requested
+if [ "$1" = "check" ] && __check_service "$1"; then
+  SERVICE_IS_RUNNING=yes
+elif [ "$1" = "check" ]; then
+  SERVICE_IS_RUNNING="no"
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ensure needed directories exists
 [ -d "$LOG_DIR" ] || mkdir -p "$LOG_DIR"
@@ -809,17 +903,18 @@ __fix_permissions "$SERVICE_USER" "$SERVICE_GROUP"
 __run_pre_execute_checks 2>/dev/stderr | tee -a -p "/data/logs/entrypoint.log" "/data/logs/init.txt" || return 20
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __run_start_script 2>>/dev/stderr | tee -p -a "/data/logs/entrypoint.log"
-errorCode=$?
+errorCode=${PIPESTATUS[0]}
 if [ -n "$EXEC_CMD_BIN" ]; then
-	if [ "$errorCode" -eq 0 ]; then
-		SERVICE_EXIT_CODE=0
-		SERVICE_IS_RUNNING="yes"
-	else
-		SERVICE_EXIT_CODE=$errorCode
-		SERVICE_IS_RUNNING="${SERVICE_IS_RUNNING:-no}"
-		[ -s "$SERVICE_PID_FILE" ] || rm -Rf "$SERVICE_PID_FILE"
-	fi
-	SERVICE_EXIT_CODE=0
+  if [ "$errorCode" -eq 0 ]; then
+    SERVICE_EXIT_CODE=0
+    SERVICE_IS_RUNNING="yes"
+  else
+    SERVICE_EXIT_CODE=$errorCode
+    SERVICE_IS_RUNNING="${SERVICE_IS_RUNNING:-no}"
+    if [ ! -s "$SERVICE_PID_FILE" ]; then
+      rm -Rf "$SERVICE_PID_FILE"
+    fi
+  fi
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # start the post execute function in background
--- a/rootfs/usr/local/share/template-files/config/env/default.sample
+++ b/rootfs/usr/local/share/template-files/config/env/default.sample
@@ -116,7 +116,7 @@ DATABASE_DIR_SUPABASE="${DATABASE_DIR_SUPABASE:-$DATABASE_BASE_DIR/supabase}"
 DOCKER_HOST="unix://var/run/docker.sock"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # File locations
-ENTRYPOINT_PID_FILE="${ENTRYPOINT_PID_FILE:-/run/.entrypoint.pid}"
+ENTRYPOINT_PID_FILE="${ENTRYPOINT_PID_FILE:-/run/init.d/entrypoint.pid}"
 ENTRYPOINT_INIT_FILE="${ENTRYPOINT_INIT_FILE:-/config/.entrypoint.done}"
 ENTRYPOINT_DATA_INIT_FILE="${ENTRYPOINT_DATA_INIT_FILE:-/data/.docker_has_run}"
 ENTRYPOINT_CONFIG_INIT_FILE="${ENTRYPOINT_CONFIG_INIT_FILE:-/config/.docker_has_run}"
--- a/rootfs/usr/local/share/template-files/config/env/examples/zz-entrypoint.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/zz-entrypoint.sh
@@ -1,6 +1,6 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # File locations
-ENTRYPOINT_PID_FILE="${ENTRYPOINT_PID_FILE:-/run/.entrypoint.pid}"
+ENTRYPOINT_PID_FILE="${ENTRYPOINT_PID_FILE:-/run/init.d/entrypoint.pid}"
 ENTRYPOINT_INIT_FILE="${ENTRYPOINT_INIT_FILE:-/config/.entrypoint.done}"
 ENTRYPOINT_DATA_INIT_FILE="${ENTRYPOINT_DATA_INIT_FILE:-/data/.docker_has_run}"
 ENTRYPOINT_CONFIG_INIT_FILE="${ENTRYPOINT_CONFIG_INIT_FILE:-/config/.docker_has_run}"