🗃️ Update codebase 🗃️

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/04-users.sh rootfs/root/docker/setup/06-post.sh rootfs/root/docker/setup/07-cleanup.sh rootfs/usr/local/bin/entrypoint.sh rootfs/usr/local/etc/docker/functions/entrypoint.sh rootfs/usr/local/share/template-files/config/env/default.sample rootfs/usr/local/share/template-files/config/env/examples/00-directory.sh rootfs/usr/local/share/template-files/config/env/examples/addresses.sh rootfs/usr/local/share/template-files/config/env/examples/certbot.sh rootfs/usr/local/share/template-files/config/env/examples/couchdb.sh rootfs/usr/local/share/template-files/config/env/examples/dockerd.sh rootfs/usr/local/share/template-files/config/env/examples/global.sh rootfs/usr/local/share/template-files/config/env/examples/healthcheck.sh rootfs/usr/local/share/template-files/config/env/examples/mariadb.sh rootfs/usr/local/share/template-files/config/env/examples/mongodb.sh rootfs/usr/local/share/template-files/config/env/examples/networking.sh rootfs/usr/local/share/template-files/config/env/examples/other.sh rootfs/usr/local/share/template-files/config/env/examples/php.sh rootfs/usr/local/share/template-files/config/env/examples/postgres.sh rootfs/usr/local/share/template-files/config/env/examples/redis.sh rootfs/usr/local/share/template-files/config/env/examples/services.sh rootfs/usr/local/share/template-files/config/env/examples/ssl.sh rootfs/usr/local/share/template-files/config/env/examples/supabase.sh rootfs/usr/local/share/template-files/config/env/examples/webservers.sh rootfs/usr/local/share/template-files/config/env/examples/zz-entrypoint.sh
2026-05-19 02:47:55 -04:00 · 2026-05-18 15:38:28 -04:00
parent ac20ba443e
commit 7607840554
28 changed files with 505 additions and 426 deletions
--- a/rootfs/root/docker/setup/00-init.sh
+++ b/rootfs/root/docker/setup/00-init.sh
@@ -1,40 +1,45 @@
 #!/usr/bin/env bash
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# shellcheck shell=bash
-##@Version           :  202509161144-git
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 ##@Version           :  202605131431-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
-# @@ReadME           :
+# @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Copyright        :  Copyright 2023 CasjaysDev
+# @@Created          :  Wed May 13 02:31:25 PM EDT 2026
 # @@Created          :  Mon Aug 28 06:48:42 PM EDT 2023
 # @@File             :  00-init.sh
 # @@Description      :  script to run init
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# @@Changelog        :  newScript
-# shellcheck shell=bash
+# @@TODO             :  Refactor code
-# shellcheck disable=SC2016
+# @@Other            :  N/A
-# shellcheck disable=SC2031
+# @@Resource         :  N/A
-# shellcheck disable=SC2120
+# @@Terminal App     :  yes
-# shellcheck disable=SC2155
+# @@sudo/root        :  yes
-# shellcheck disable=SC2199
+# @@Template         :  templates/dockerfiles/init_scripts/00-init.sh
-# shellcheck disable=SC2317
+# - - - - - - - - - - - - - - - - - - - - - - - - -
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set bash options
 set -o pipefail
 [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set env variables
 exitCode=0
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Predefined actions
 if [ -d "/usr/local/share/template-files/data" ]; then rm -Rf "/usr/local/share/template-files/data"/*; fi
 if [ -d "/usr/local/share/template-files/config" ]; then rm -Rf "/usr/local/share/template-files/config"/*; fi
 if [ -d "/usr/local/share/template-files/defaults" ]; then rm -Rf "/usr/local/share/template-files/defaults"/*; fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main script
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set the exit code
 #exitCode=$?
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 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,38 +1,43 @@
 #!/usr/bin/env bash
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# shellcheck shell=bash
-##@Version           :  202509161144-git
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 ##@Version           :  202605131431-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
-# @@ReadME           :
+# @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Copyright        :  Copyright 2023 CasjaysDev
+# @@Created          :  Wed May 13 02:31:25 PM EDT 2026
 # @@Created          :  Mon Aug 28 06:48:42 PM EDT 2023
 # @@File             :  01-system.sh
 # @@Description      :  script to run system
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# @@Changelog        :  newScript
-# shellcheck shell=bash
+# @@TODO             :  Refactor code
-# shellcheck disable=SC2016
+# @@Other            :  N/A
-# shellcheck disable=SC2031
+# @@Resource         :  N/A
-# shellcheck disable=SC2120
+# @@Terminal App     :  yes
-# shellcheck disable=SC2155
+# @@sudo/root        :  yes
-# shellcheck disable=SC2199
+# @@Template         :  templates/dockerfiles/init_scripts/01-system.sh
-# shellcheck disable=SC2317
+# - - - - - - - - - - - - - - - - - - - - - - - - -
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set bash options
 set -o pipefail
 [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set env variables
 exitCode=0
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Predefined actions
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main script
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set the exit code
 #exitCode=$?
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 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,38 +1,43 @@
 #!/usr/bin/env bash
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# shellcheck shell=bash
-##@Version           :  202509161144-git
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 ##@Version           :  202605131431-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
-# @@ReadME           :
+# @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Copyright        :  Copyright 2023 CasjaysDev
+# @@Created          :  Wed May 13 02:31:25 PM EDT 2026
 # @@Created          :  Mon Aug 28 06:48:42 PM EDT 2023
 # @@File             :  02-packages.sh
 # @@Description      :  script to run packages
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# @@Changelog        :  newScript
-# shellcheck shell=bash
+# @@TODO             :  Refactor code
-# shellcheck disable=SC2016
+# @@Other            :  N/A
-# shellcheck disable=SC2031
+# @@Resource         :  N/A
-# shellcheck disable=SC2120
+# @@Terminal App     :  yes
-# shellcheck disable=SC2155
+# @@sudo/root        :  yes
-# shellcheck disable=SC2199
+# @@Template         :  templates/dockerfiles/init_scripts/02-packages.sh
-# shellcheck disable=SC2317
+# - - - - - - - - - - - - - - - - - - - - - - - - -
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set bash options
 set -o pipefail
 [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set env variables
 exitCode=0
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Predefined actions
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main script
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set the exit code
 #exitCode=$?
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 exit $exitCode
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/root/docker/setup/04-users.sh
+++ b/rootfs/root/docker/setup/04-users.sh
@@ -1,38 +1,43 @@
 #!/usr/bin/env bash
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# shellcheck shell=bash
-##@Version           :  202509161144-git
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 ##@Version           :  202605131431-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
-# @@ReadME           :
+# @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Copyright        :  Copyright 2023 CasjaysDev
+# @@Created          :  Wed May 13 02:31:26 PM EDT 2026
 # @@Created          :  Mon Aug 28 06:48:42 PM EDT 2023
 # @@File             :  04-users.sh
 # @@Description      :  script to run users
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# @@Changelog        :  newScript
-# shellcheck shell=bash
+# @@TODO             :  Refactor code
-# shellcheck disable=SC2016
+# @@Other            :  N/A
-# shellcheck disable=SC2031
+# @@Resource         :  N/A
-# shellcheck disable=SC2120
+# @@Terminal App     :  yes
-# shellcheck disable=SC2155
+# @@sudo/root        :  yes
-# shellcheck disable=SC2199
+# @@Template         :  templates/dockerfiles/init_scripts/04-users.sh
-# shellcheck disable=SC2317
+# - - - - - - - - - - - - - - - - - - - - - - - - -
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set bash options
 set -o pipefail
 [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set env variables
 exitCode=0
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Predefined actions
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main script
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set the exit code
 #exitCode=$?
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 exit $exitCode
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/root/docker/setup/06-post.sh
+++ b/rootfs/root/docker/setup/06-post.sh
@@ -1,38 +1,43 @@
 #!/usr/bin/env bash
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# shellcheck shell=bash
-##@Version           :  202509161144-git
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 ##@Version           :  202605131431-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
-# @@ReadME           :
+# @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Copyright        :  Copyright 2023 CasjaysDev
+# @@Created          :  Wed May 13 02:31:26 PM EDT 2026
 # @@Created          :  Mon Aug 28 06:48:42 PM EDT 2023
 # @@File             :  06-post.sh
 # @@Description      :  script to run post
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# @@Changelog        :  newScript
-# shellcheck shell=bash
+# @@TODO             :  Refactor code
-# shellcheck disable=SC2016
+# @@Other            :  N/A
-# shellcheck disable=SC2031
+# @@Resource         :  N/A
-# shellcheck disable=SC2120
+# @@Terminal App     :  yes
-# shellcheck disable=SC2155
+# @@sudo/root        :  yes
-# shellcheck disable=SC2199
+# @@Template         :  templates/dockerfiles/init_scripts/06-post.sh
-# shellcheck disable=SC2317
+# - - - - - - - - - - - - - - - - - - - - - - - - -
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set bash options
 set -o pipefail
 [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set env variables
 exitCode=0
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Predefined actions
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main script
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set the exit code
 #exitCode=$?
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 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,39 +1,47 @@
 #!/usr/bin/env bash
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# shellcheck shell=bash
-##@Version           :  202509161144-git
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 ##@Version           :  202605131431-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
-# @@ReadME           :
+# @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Copyright        :  Copyright 2023 CasjaysDev
+# @@Created          :  Wed May 13 02:31:26 PM EDT 2026
 # @@Created          :  Mon Aug 28 06:48:42 PM EDT 2023
 # @@File             :  07-cleanup.sh
 # @@Description      :  script to run cleanup
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# @@Changelog        :  newScript
-# shellcheck shell=bash
+# @@TODO             :  Refactor code
-# shellcheck disable=SC2016
+# @@Other            :  N/A
-# shellcheck disable=SC2031
+# @@Resource         :  N/A
-# shellcheck disable=SC2120
+# @@Terminal App     :  yes
-# shellcheck disable=SC2155
+# @@sudo/root        :  yes
-# shellcheck disable=SC2199
+# @@Template         :  templates/dockerfiles/init_scripts/07-cleanup.sh
-# shellcheck disable=SC2317
+# - - - - - - - - - - - - - - - - - - - - - - - - -
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set bash options
 set -o pipefail
 [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Load functions
 __find_and_remove() { [ -z "$1" ] || find "${2:-/etc}" -iname "$1" -exec rm -Rf {} \; 2>/dev/null; }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set env variables
 exitCode=0
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Predefined actions
 if [ -d "/tmp" ]; then rm -Rf "/tmp"/*; fi
 if [ -d "$HOME/.cache" ]; then rm -Rf "$HOME/.cache"; fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main script
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set the exit code
 #exitCode=$?
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 exit $exitCode
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/usr/local/bin/entrypoint.sh
+++ b/rootfs/usr/local/bin/entrypoint.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202602061352-git
+##@Version           :  202605052024-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          :  Wednesday, May 13, 2026 14:31 EDT
 # @@File             :  entrypoint.sh
 # @@Description      :  Entrypoint file for buildah
 # @@Changelog        :  New script
@@ -25,7 +25,13 @@ trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # 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 -x$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"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -87,8 +93,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:-buildah}"   # execute command as another user
+#SERVICE_USER="${SERVICE_USER:-example}"   # execute command as another user
-#SERVICE_GROUP="${SERVICE_GROUP:-buildah}" # Set the service group
+#SERVICE_GROUP="${SERVICE_GROUP:-example}" # Set the service group
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Secondary ports
 # specifiy other ports
@@ -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 buildah"
+      echo "Executing entrypoint script for example"
    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"
@@ -581,13 +588,13 @@ healthcheck)
    services="$(echo "${SERVICES_LIST//,/ }")"
    healthMessage="Everything seems to be running"
    [ "$healthEnabled" = "yes" ] || exit 0
-    if [ -d "/run/healthcheck" ] && [ "$(ls -A "/run/healthcheck" | wc -l)" -ne 0 ]; then
+    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
@@ -597,7 +604,7 @@ healthcheck)
      fi
    done
    for port in $ports; do
-      if [ -n "$(type -P netstat)" ] && [ -n "$port" ]; then
+      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
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202511301145-git
+##@Version           :  202605051922-git
 # @@Author           :  Jason Hempstead
 # @@Contact          :  git-admin@casjaysdev.pro
 # @@License          :  LICENSE.md
@@ -31,7 +31,20 @@ else
  set -o pipefail
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-__remove_extra_spaces() { sed 's/\( \)*/\1/g;s|^ ||g'; }
+__remove_extra_spaces() { sed -E 's/  +/ /g; s|^ ||'; }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __log_debug() {
  [ "$DEBUGGER" = "on" ] && echo "[DEBUG] $*" >&2
 }
 __log_info() {
  echo "[INFO] $*"
 }
 __log_warn() {
  echo "[WARN] $*" >&2
 }
 __log_error() {
  echo "[ERROR] $*" >&2
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __printf_space() {
  local pad=$(printf '%0.1s' " "{1..60})
@@ -47,185 +60,137 @@ __printf_space() {
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __mkdir() {
  if [ -n "$1" ]; then
-    mkdir -p "$@" 2>/dev/null || true
+    if ! mkdir -p "$@" 2>/dev/null; then
      [ "$DEBUGGER" = "on" ] && echo "Warning: Failed to create directory: $*" >&2
      return 1
    fi
  fi
  return 0
 }
 __rm() {
  if [ -n "$1" ] && [ -e "$1" ]; then
-    rm -Rf "${1:?}" 2>/dev/null || true
+    if ! rm -Rf "${1:?}" 2>/dev/null; then
-  fi
+      [ "$DEBUGGER" = "on" ] && echo "Warning: Failed to remove: $1" >&2
 }
 __grep_test() {
  if grep -sh "$1" "$2" 2>/dev/null | grep -qwF "${3:-$1}"; then
    return 0
  else
    return 1
  fi
 }
 __netstat() {
  if [ -f "$(type -P netstat 2>/dev/null)" ]; then
    netstat "$@" 2>/dev/null
  else
    return 10
  fi
 }
 __cd() {
  if [ ! -d "$1" ]; then
    mkdir -p "$1" 2>/dev/null || return 1
  fi
  builtin cd "$1" || return 1
 }
 __is_in_file() {
  if [ -e "$2" ] && grep -Rsq "$1" "$2" 2>/dev/null; then
    return 0
  else
    return 1
  fi
 }
 __curl() {
  if curl -q -sfI --max-time 3 -k -o /dev/null "$@" 2>/dev/null; then
    return 0
  else
    return 10
  fi
 }
 __find() {
  if find "$1" -mindepth 1 -type ${2:-f,d} 2>/dev/null | grep '.'; then
    return 0
  else
    return 10
  fi
 }
 __pcheck() {
  if [ -n "$(which pgrep 2>/dev/null)" ] && pgrep -x "$1" &>/dev/null; then
    return 0
  else
    return 10
  fi
 }
 __file_exists_with_content() {
  if [ -n "$1" ] && [ -f "$1" ] && [ -s "$1" ]; then
    return 0
  else
    return 2
  fi
 }
 __sed() {
  if sed -i 's|'$1'|'$2'|g' "$3" 2>/dev/null; then
    return 0
  elif sed -i "s|$1|$2|g" "$3" 2>/dev/null; then
    return 0
  else
    return 0
  fi
 }
 __ps() {
  if [ -f "$(type -P ps 2>/dev/null)" ]; then
    if ps "$@" 2>/dev/null | sed 's|:||g' | grep -Fw " ${1:-$SERVICE_NAME}$"; then
      return 0
    else
      return 10
    fi
  else
    return 10
  fi
 }
 __is_dir_empty() {
  if [ -n "$1" ]; then
    if [ "$(ls -A "$1" 2>/dev/null | wc -l)" -eq 0 ]; then
      return 0
    else
      return 1
    fi
  else
    return 1
  fi
  return 0
 }
 __grep_test() { grep -sh "$1" "$2" 2>/dev/null | grep -qwF "${3:-$1}"; }
 __netstat() {
  command -v netstat &>/dev/null || {
    [ "$DEBUGGER" = "on" ] && echo "Warning: netstat command not found" >&2
    return 10
  }
  netstat "$@" 2>/dev/null
 }
 __cd() {
  [ -d "$1" ] || mkdir -p "$1" 2>/dev/null || return 1
  builtin cd "$1" || return 1
 }
 __is_in_file() { [ -e "$2" ] && grep -Rsq "$1" "$2" 2>/dev/null; }
 __curl() { curl -q -sfI --max-time 3 -k -o /dev/null "$@" 2>/dev/null || return 10; }
 __find() {
  local result
  result=$(find "$1" -mindepth 1 -type "${2:-f,d}" 2>/dev/null)
  [ -n "$result" ] || return 10
  printf '%s\n' "$result"
 }
 __pcheck() {
  command -v pgrep &>/dev/null && pgrep -x "$1" &>/dev/null || return 10
 }
 __file_exists_with_content() { [ -n "$1" ] && [ -f "$1" ] && [ -s "$1" ] || return 2; }
 __sed() { sed -i "s|$1|$2|g" "$3" 2>/dev/null || return 1; }
 __ps() {
  command -v ps &>/dev/null || return 10
  ps "$@" 2>/dev/null | sed 's|:||g' | grep -Fw " ${1:-$SERVICE_NAME}$" || return 10
 }
 __is_dir_empty() {
  [ -n "$1" ] && [ -d "$1" ] || return 1
  [ -z "$(ls -A "$1" 2>/dev/null)" ]
 }
 __get_ip6() {
-  local ip6
+  ip a 2>/dev/null | awk '/^[[:space:]]*inet6 / {
-  ip6="$(ip a 2>/dev/null | grep -w 'inet6' | awk '{print $2}' | grep -vE '^::1|^fe' | sed 's|/.*||g' | head -n1 | grep '.')"
+    split($2, a, "/"); ip = a[1]
-  if [ -n "$ip6" ]; then
+    if (ip !~ /^::1$/ && ip !~ /^fe/) { print ip; exit }
-    echo "$ip6"
+  }'
  else
    echo ''
  fi
 }
 __get_ip4() {
  local ip4
-  ip4="$(ip a 2>/dev/null | grep -w 'inet' | awk '{print $2}' | grep -vE '^127.0.0' | sed 's|/.*||g' | head -n1 | grep '.')"
+  ip4=$(ip a 2>/dev/null | awk '/^[[:space:]]*inet / {
-  if [ -n "$ip4" ]; then
+    split($2, a, "/"); ip = a[1]
-    echo "$ip4"
+    if (ip !~ /^127\.0\.0/) { print ip; exit }
-  else
+  }')
-    echo '127.0.0.1'
+  echo "${ip4:-127.0.0.1}"
  fi
 }
 __find_and_remove() {
  find "${2:-/etc}" -iname "$1" -exec rm -Rfv {} \; 2>/dev/null || true
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __pgrep() {
-  local count=3
+  local srvc="$1" count=3
-  local srvc="${1:-SERVICE_NAME}"
+  [ -z "$srvc" ] && return 10
  while [ $count -ge 0 ]; do
-    # Use exact process name matching, not full command line search
+    pgrep -x "$srvc" &>/dev/null && return 0
-    pgrep -x "$srvc" >/dev/null 2>&1 && return 0
+    pgrep -f "$srvc" &>/dev/null && return 0
-    sleep 1
+    ps -ef 2>/dev/null | grep -v 'grep' | grep -qw "$srvc" && return 0
    [ $count -gt 0 ] && sleep 1
    count=$((count - 1))
  done
  return 10
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __find_file_relative() {
-  if [ ! -e "$1" ]; then
+  [ -e "$1" ] || return 0
-    return 0
+  find "$1"/* -not -path '*env/*' -not -path '.git*' -type f 2>/dev/null \
-  fi
+    | sort -u \
-  find "$1"/* -not -path '*env/*' -not -path '.git*' -type f 2>/dev/null | sed 's|'$1'/||g' | sort -u | grep -v '^$' | grep '.' || true
+    | sed "s|^$1/||" || true
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __find_directory_relative() {
-  if [ ! -d "$1" ]; then
+  [ -d "$1" ] || return 0
-    return 0
+  find "$1"/* -not -path '*env/*' -not -path '.git*' -type d 2>/dev/null \
-  fi
+    | sort -u \
-  find "$1"/* -not -path '*env/*' -not -path '.git*' -type d 2>/dev/null | sed 's|'$1'/||g' | sort -u | grep -v '^$' | grep '.' || true
+    | sed "s|^$1/||" || true
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-__pid_exists() {
+__pid_exists() { [ -n "$1" ] && [ -d "/proc/$1" ]; }
  local result=""
  result="$(ps -ax --no-header 2>/dev/null | sed 's/^[[:space:]]*//g' | awk -F' ' '{print $1}' | sed 's|:||g' | grep '[0-9]' | sort -uV | grep "^$1$" 2>/dev/null || echo '')"
  if [ -n "$result" ]; then
    return 0
  else
    return 1
  fi
 }
 __is_running() {
-  local result=""
+  local pat="$1"
-  result="$(ps -eo args --no-header 2>/dev/null | awk '{print $1,$2,$3}' | sed 's|:||g' | sort -u | grep -vE 'grep|COMMAND|awk|tee|ps|sed|sort|tail' | grep "$1" | grep "${2:-^}" 2>/dev/null || echo '')"
+  [ -n "$2" ] && pat="$pat.*$2"
-  if [ -n "$result" ]; then
+  if command -v pgrep &>/dev/null; then
-    return 0
+    pgrep -f "$pat" &>/dev/null
  else
-    return 1
+    ps -eo args 2>/dev/null | grep -v grep | grep -Eq "$pat"
  fi
 }
 __get_pid() {
-  local result=""
+  if [ -z "$1" ]; then
-  result="$(ps -ax --no-header 2>/dev/null | sed 's/^[[:space:]]*//g;s|;||g;s|:||g' | awk '{print $1,$5}' | sed 's|:||g' | grep "$1$" | grep -v 'grep' | awk -F' ' '{print $1}' | grep '[0-9]' | sort -uV | head -n1 | grep '.' 2>/dev/null || echo '')"
+    [ "$DEBUGGER" = "on" ] && echo "Warning: __get_pid called without process name" >&2
  if [ -n "$result" ]; then
    echo "$result"
    return 0
  else
    return 1
  fi
  local pid
  pid=$(pgrep -x "$1" 2>/dev/null | head -n1)
  if [ -n "$pid" ]; then
    echo "$pid"
    return 0
  fi
  [ "$DEBUGGER" = "on" ] && echo "Debug: No PID found for process: $1" >&2
  return 1
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-__format_variables() { printf '%s\n' "${@//,/ }" | tr ' ' '\n' | sort -RVu | grep -v '^$' | tr '\n' ' ' | __clean_variables | grep '.' || return 0; }
+__format_variables() {
  local input="${*//,/ }"
  [ -z "$input" ] && return 0
  printf '%s\n' $input | sort -Ru | tr '\n' ' '
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __clean_variables() {
  local var="$*"
-  var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters
+  var="${var#"${var%%[![:space:]]*}"}"
-  var="${var%"${var##*[![:space:]]}"}" # remove trailing whitespace characters
+  var="${var%"${var##*[![:space:]]}"}"
-  var="$(printf '%s\n' "$var" | sed 's/\( \)*/\1/g;s|^ ||g')"
+  while [[ 202605051922-gitar == *"  "* ]]; do var="${var//  / }"; done
-  printf '%s' "$var" | grep -v '^$'
+  [ -n "202605051922-gitar" ] && printf '%s' "$var"
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __no_exit() {
@@ -235,7 +200,17 @@ __no_exit() {
  local failed_services=""
  local failure_count=0
-  [ -f "/run/.no_exit.pid" ] && return 0
+  # only return early if the recorded PID is still alive; a leftover
  # pid file from a prior container life (docker restart) would otherwise
  # cause us to exit instead of entering the monitor loop.
  if [ -f "/run/.no_exit.pid" ]; then
    local no_exit_pid
    no_exit_pid=$(<"/run/.no_exit.pid") 2>/dev/null
    if [ -n "$no_exit_pid" ] && kill -0 "$no_exit_pid" 2>/dev/null; then
      return 0
    fi
    rm -f /run/.no_exit.pid 2>/dev/null || true
  fi
  exec bash -c "
    trap 'echo \"Container shutdown requested\"; rm -f /run/.no_exit.pid /run/*.pid; exit 0' TERM INT
@@ -270,10 +245,10 @@ __no_exit() {
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __trim() {
  local var="${*//;/ }"
-  var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters
+  var="${var#"${var%%[![:space:]]*}"}"
-  var="${var%"${var##*[![:space:]]}"}" # remove trailing whitespace characters
+  var="${var%"${var##*[![:space:]]}"}"
-  var="$(echo "$var" | __remove_extra_spaces | sed "s| |; |g;s|;$| |g" | __remove_extra_spaces)"
+  while [[ 202605051922-gitar == *"  "* ]]; do var="${var//  / }"; done
-  printf '%s' "$var" | sed 's|;||g' | grep -v '^$'
+  [ -n "202605051922-gitar" ] && printf '%s' "$var"
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __banner() {
@@ -295,21 +270,25 @@ __service_banner() {
  printf '# - - - %s %-*s %s - - - #\n' "$icon" "$text_width" "$full_message" "$icon"
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-__find_php_bin() { find -L '/usr'/*bin -maxdepth 4 -name 'php-fpm*' 2>/dev/null | head -n1 | grep '.' || echo ''; }
+__find_php_bin() { find -L '/usr'/*bin -maxdepth 4 -name 'php-fpm*' 2>/dev/null | head -n1; }
-__find_php_ini() { find -L '/etc' -maxdepth 4 -name 'php.ini' 2>/dev/null | head -n1 | sed 's|/php.ini||g' | grep '.' || echo ''; }
+__find_php_ini() {
  local f
  f=$(find -L '/etc' -maxdepth 4 -name 'php.ini' 2>/dev/null | head -n1)
  [ -n "$f" ] && printf '%s\n' "${f%/php.ini}"
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-__find_nginx_conf() { find -L '/etc' -maxdepth 4 -name 'nginx.conf' 2>/dev/null | head -n1 | grep '.' || echo ''; }
+__find_nginx_conf() { find -L '/etc' -maxdepth 4 -name 'nginx.conf' 2>/dev/null | head -n1; }
-__find_caddy_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'caddy.conf' 2>/dev/null | head -n1 | grep '.' || echo ''; }
+__find_caddy_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'caddy.conf' 2>/dev/null | head -n1; }
-__find_lighttpd_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'lighttpd.conf' 2>/dev/null | head -n1 | grep '.' || echo ''; }
+__find_lighttpd_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'lighttpd.conf' 2>/dev/null | head -n1; }
-__find_cherokee_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'cherokee.conf' 2>/dev/null | head -n1 | grep '.' || echo ''; }
+__find_cherokee_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'cherokee.conf' 2>/dev/null | head -n1; }
-__find_httpd_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'httpd.conf' -o -iname 'apache2.conf' 2>/dev/null | head -n1 | grep '.' || echo ''; }
+__find_httpd_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'httpd.conf' -o -iname 'apache2.conf' 2>/dev/null | head -n1; }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-__find_mysql_conf() { find -L '/etc' -maxdepth 4 -type f -name 'my.cnf' 2>/dev/null | head -n1 | grep '.' || echo ''; }
+__find_mysql_conf() { find -L '/etc' -maxdepth 4 -type f -name 'my.cnf' 2>/dev/null | head -n1; }
-__find_pgsql_conf() { find -L '/var/lib' '/etc' -maxdepth 8 -type f -name 'postgresql.conf' 2>/dev/null | head -n1 | grep '.' || echo ''; }
+__find_pgsql_conf() { find -L '/var/lib' '/etc' -maxdepth 8 -type f -name 'postgresql.conf' 2>/dev/null | head -n1; }
 __find_couchdb_conf() { return; }
 __find_mongodb_conf() { return; }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-__random_password() { cat "/dev/urandom" | tr -dc '0-9a-zA-Z' | head -c${1:-16} && echo ""; }
+__random_password() { tr -dc '0-9a-zA-Z' < /dev/urandom | head -c${1:-16} && echo ""; }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __init_working_dir() {
  local service_name="$SERVICE_NAME"                           # get service name
@@ -472,7 +451,8 @@ __display_user_info() {
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __init_config_etc() {
  local copy="no"
-  local name="$(find "/etc/$SERVICE_NAME" -maxdepth 0 2>/dev/null | head -n1)"
+  local name=""
  [ -e "/etc/$SERVICE_NAME" ] && name="/etc/$SERVICE_NAME"
  local etc_dir="${ETC_DIR:-/etc/$name}"
  local conf_dir="${CONF_DIR:-/config/$name}"
  __is_dir_empty "$conf_dir" && copy=yes
@@ -614,7 +594,7 @@ __cron() {
  fi
  [ $# -eq 0 ] && echo "Usage: cron [interval] [command]" && exit 1
  local command="$*"
-  local bin="$(basename "${CRON_NAME:-$1}")"
+  local bin="${CRON_NAME:-$1}"; bin="${bin##*/}"
  [ -d "/run/cron" ] || mkdir -p "/run/cron"
  echo "$pid" >"/run/cron/$bin.pid"
  echo "$command" >"/run/cron/$bin.run"
@@ -640,8 +620,8 @@ __find_replace() {
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # /config > /etc
 __copy_templates() {
-  local from="$1" to="$2"
+  local from="$1" to="$2" is_link=""
-  is_link="$(ls -la "$dest" 2>/dev/null | awk '{print $NF}')"
+  [ -L "$to" ] && is_link="$(readlink "$to")"
  [ "$from" != "$is_link" ] || return 0
  if [ -e "$from" ] && __is_dir_empty "$to"; then
    __file_copy "$from" "$to"
@@ -651,16 +631,18 @@ __copy_templates() {
 # /config/file > /etc/file
 __symlink() {
  local from="$1" to="$2"
-  if [ -e "$to" ]; then
+  [ -e "$to" ] || return 0
-    [ -e "$from" ] && __rm "$from"
+  [ "$from" = "$to" ] && return 0
-    ln -sf "$to" "$from" && echo "Created symlink to $from > $to"
+  __rm "$from"
-  fi
+  [ -d "${from%/*}" ] || mkdir -p "${from%/*}" 2>/dev/null
  ln -sf "$to" "$from" && echo "Created symlink to $from > $to"
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __file_copy() {
  local from="$1"
  local dest="$2"
-  is_link="$(ls -la "$dest" 2>/dev/null | awk '{print $NF}')"
+  local is_link=""
  [ -L "$dest" ] && is_link="$(readlink "$dest")"
  if [ "$from" != "$is_link" ]; then
    if [ -n "$from" ] && [ -e "$from" ] && [ -n "$dest" ]; then
      if [ -d "$from" ]; then
@@ -757,20 +739,40 @@ __fix_permissions() {
  fi
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-__get_gid() { grep "^$1:" /etc/group 2>/dev/null | awk -F ':' '{print $3}' || return 1; }
+__get_gid() { awk -F: -v n="$1" '$1==n {print $3; found=1; exit} END {exit !found}' /etc/group 2>/dev/null; }
-__get_uid() { grep "^$1:" /etc/passwd 2>/dev/null | awk -F ':' '{print $3}' || return 1; }
+__get_uid() { awk -F: -v n="$1" '$1==n {print $3; found=1; exit} END {exit !found}' /etc/passwd 2>/dev/null; }
-__check_for_uid() { cat "/etc/passwd" 2>/dev/null | awk -F ':' '{print $3}' | sort -u | grep -q "^$1$" 2>/dev/null || return 1; }
+__check_for_uid() { awk -F: -v n="$1" '$3==n {found=1; exit} END {exit !found}' /etc/passwd 2>/dev/null; }
-__check_for_guid() { cat "/etc/group" 2>/dev/null | awk -F ':' '{print $3}' | sort -u | grep -q "^$1$" 2>/dev/null || return 1; }
+__check_for_guid() { awk -F: -v n="$1" '$3==n {found=1; exit} END {exit !found}' /etc/group 2>/dev/null; }
-__check_for_user() { cat "/etc/passwd" 2>/dev/null | awk -F ':' '{print $1}' | sort -u | grep -q "^$1$" 2>/dev/null || return 1; }
+__check_for_user() { awk -F: -v n="$1" '$1==n {found=1; exit} END {exit !found}' /etc/passwd 2>/dev/null; }
-__check_for_group() { cat "/etc/group" 2>/dev/null | awk -F ':' '{print $1}' | sort -u | grep -q "^$1$" 2>/dev/null || return 1; }
+__check_for_group() { awk -F: -v n="$1" '$1==n {found=1; exit} END {exit !found}' /etc/group 2>/dev/null; }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # check if process is already running
 __proc_check() {
-  cmd_bin="$(type -P "${1:-$EXEC_CMD_BIN}")"
+  # Skip process check for one-shot/configuration services
-  cmd_name="$(basename "${cmd_bin:-$EXEC_CMD_NAME}")"
+  if [ "$SERVICE_USES_PID" = "no" ]; then
-  if __pgrep "$cmd_bin" || __pgrep "$cmd_name"; then
+    return 1
  fi
  local cmd_bin cmd_name check_result
  cmd_bin="$(type -P "${1:-$EXEC_CMD_BIN}" 2>/dev/null || echo "${1:-$EXEC_CMD_BIN}")"
  cmd_name="${cmd_bin:-${1:-$EXEC_CMD_NAME}}"; cmd_name="${cmd_name##*/}"
  if [ -z "$cmd_name" ] || [ "$cmd_name" = "." ]; then
    return 1
  fi
  check_result=1
  if [ -n "$cmd_bin" ] && __pgrep "$cmd_bin" 2>/dev/null; then
    check_result=0
  elif [ -n "$cmd_name" ] && __pgrep "$cmd_name" 2>/dev/null; then
    check_result=0
  elif [ -f "$SERVICE_PID_FILE" ]; then
    local pid_from_file
    pid_from_file=$(<"$SERVICE_PID_FILE") 2>/dev/null
    if [ -n "$pid_from_file" ] && kill -0 "$pid_from_file" 2>/dev/null; then
      check_result=0
    fi
  fi
  if [ $check_result -eq 0 ]; then
    SERVICE_IS_RUNNING="yes"
-    touch "$SERVICE_PID_FILE"
+    touch "$SERVICE_PID_FILE" 2>/dev/null || true
    return 0
  else
    return 1
@@ -824,11 +826,11 @@ __create_service_user() {
    return 0
  fi
  # Validate user/group name format (alphanumeric, underscore, hyphen; must start with letter or underscore)
-  if [ -n "$create_user" ] && ! echo "$create_user" | grep -qE '^[a-z_][a-z0-9_-]*$'; then
+  if [ -n "$create_user" ] && [[ ! "$create_user" =~ ^[a-z_][a-z0-9_-]*$ ]]; then
    echo "Error: Invalid username format '$create_user' - must start with letter/underscore, contain only lowercase alphanumeric, underscore, or hyphen" >&2
    return 1
  fi
-  if [ -n "$create_group" ] && ! echo "$create_group" | grep -qE '^[a-z_][a-z0-9_-]*$'; then
+  if [ -n "$create_group" ] && [[ ! "$create_group" =~ ^[a-z_][a-z0-9_-]*$ ]]; then
    echo "Error: Invalid group name format '$create_group' - must start with letter/underscore, contain only lowercase alphanumeric, underscore, or hyphen" >&2
    return 1
  fi
@@ -858,11 +860,11 @@ __create_service_user() {
    create_gid="$random_id"
  fi
  # Validate UID/GID are numeric and within valid range
-  if ! echo "$create_uid" | grep -qE '^[0-9]+$' || [ "$create_uid" -lt 1 ] || [ "$create_uid" -gt 65534 ]; then
+  if [[ ! "$create_uid" =~ ^[0-9]+$ ]] || [ "$create_uid" -lt 1 ] || [ "$create_uid" -gt 65534 ]; then
    echo "Error: Invalid UID '$create_uid' - must be a number between 1 and 65534" >&2
    return 1
  fi
-  if ! echo "$create_gid" | grep -qE '^[0-9]+$' || [ "$create_gid" -lt 1 ] || [ "$create_gid" -gt 65534 ]; then
+  if [[ ! "$create_gid" =~ ^[0-9]+$ ]] || [ "$create_gid" -lt 1 ] || [ "$create_gid" -gt 65534 ]; then
    echo "Error: Invalid GID '$create_gid' - must be a number between 1 and 65534" >&2
    return 1
  fi
@@ -947,9 +949,7 @@ __create_env_file() {
    dir="$(dirname "$create_env")"
    [ -d "$dir" ] || mkdir -p "$dir"
    if [ -n "$create_env" ] && [ ! -f "$create_env" ]; then
-      cat <<EOF | tee -p "$create_env" >/dev/null
+      cp -f "$sample_file" "$create_env"
 $(<"$sample_file")
 EOF
    fi
    [ -f "$create_env" ] || envStatus=$((1 + envStatus))
  done
@@ -958,17 +958,17 @@ EOF
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __exec_command() {
  local bin=""
  local arg=("$@")
-  local exitCode="0"
+  local exitCode=0
  local cmdExec="${arg:-}"
  local pre_exec="--login -c"
-  local shell="$(type -P bash 2>/dev/null || type -P dash 2>/dev/null || type -P ash 2>/dev/null || type -P sh 2>/dev/null)"
+  local shell bin prog
-  bin="$(echo "${arg[*]}" | tr ' ' '\n' | grep -v '^$' | head -n1 | sed 's| ||g' || echo 'bash')"
+  shell=$(type -P bash || type -P dash || type -P ash || type -P sh) 2>/dev/null
  bin="${arg[0]:-bash}"
  prog="$(type -P "$bin" 2>/dev/null || echo "$bin")"
-  if type -t $bin >/dev/null 2>&1; then
+  if type -t "$bin" &>/dev/null; then
    echo "${exec_message:-Executing command: $cmdExec}"
-    eval $shell $pre_exec "$cmdExec" || exitCode=1
+    eval "$shell" $pre_exec "$cmdExec"
    exitCode=$?
  elif [ -f "$prog" ]; then
    echo "$prog is not executable"
@@ -997,7 +997,9 @@ __start_init_scripts() {
  local critical_failures="0"
  local pidFile="/run/.start_init_scripts.pid"
  local init_dir="${1:-/usr/local/etc/docker/init.d}"
-  local init_count="$(ls -A "$init_dir"/* 2>/dev/null | grep -v '\.sample' | wc -l)"
+  local init_files=("$init_dir"/*.sh)
  local init_count=0
  [ -e "${init_files[0]}" ] && init_count=${#init_files[@]}
  local exit_on_failure="${EXIT_ON_SERVICE_FAILURE:-true}"
  # Clean stale PID files from previous runs
@@ -1013,7 +1015,10 @@ __start_init_scripts() {
    while :; do echo "Running: $(date)" >"/data/logs/init/keep_alive" && sleep 3600; done &
  else
    if [ -d "$init_dir" ]; then
-      [ -f "$init_dir/service.sample" ] && __rm "$init_dir"/*.sample
+      local sample
      for sample in "$init_dir"/*.sample; do
        [ -e "$sample" ] && __rm "$sample"
      done
      chmod -Rf 755 "$init_dir"/*.sh
      echo "🚀 Starting container services initialization"
@@ -1025,9 +1030,9 @@ __start_init_scripts() {
      for init in "$init_dir"/*.sh; do
        if [ -x "$init" ]; then
          touch "$pidFile"
-          name="$(basename "$init")"
+          name="${init##*/}"
-          service="$(printf '%s' "$name" | sed 's/^[^-]*-//;s|.sh$||g')"
+          service="${name#*-}"; service="${service%.sh}"
-          __service_banner "🔧" "Executing service script:" "$(basename "$init")"
+          __service_banner "🔧" "Executing service script:" "${init##*/}"
          # Execute the init script and capture the exit code
          if source "$init"; then
            # Check if service was disabled first
@@ -1044,52 +1049,48 @@ __start_init_scripts() {
              sleep 1
              # Check for service success indicators
              local expected_pid_file="/run/init.d/$service.pid"
              set +e
              # Check if this is a configuration service (no daemon process expected)
              if [ "$SERVICE_USES_PID" = "no" ]; then
-                # Service doesn't use PID files - check if expected PID file exists or assume success
+                # Configuration service - no daemon process expected
-                if [ -f "$expected_pid_file" ]; then
+                initStatus="0"
-                  retPID="$(cat "$expected_pid_file" 2>/dev/null || echo "0")"
+                __service_banner "✅" "Service $service completed successfully -" "configuration service"
                  initStatus="0"
                  __service_banner "✅" "Service $service started successfully -" "PID file"
                else
                  initStatus="0"
                  __service_banner "✅" "Service $service started successfully -" "no PID tracking"
                fi
              else
                # Service uses PID tracking - verify actual running processes
                set +e # Temporarily disable exit on error
                retPID=""
-                # First, try to find actual running process with various name patterns
+                local found_process=""
-                for name_variant in "$service" "${service}84" "${service}d" "$(echo "$service" | sed 's/-//g')" "$(echo "$service" | tr -d '-')"; do
+                # Try multiple name variants to find the process
                for name_variant in "$service" "${service}84" "${service}d" "${service//-/}"; do
                  if [ -z "$retPID" ]; then
                    retPID=$(__get_pid "$name_variant" 2>/dev/null || echo "")
-                    [ -n "$retPID" ] && found_process="$name_variant" && break
+                    if [ -n "$retPID" ] && [ "$retPID" != "0" ]; then
                      found_process="$name_variant"
                      break
                    fi
                  fi
                done
                set -e # Re-enable exit on error
                if [ -n "$retPID" ] && [ "$retPID" != "0" ]; then
                  # Found actual running process
                  initStatus="0"
                  __service_banner "✅" "Service $service started successfully -" "PID: ${retPID} ($found_process)"
                elif [ -f "$expected_pid_file" ]; then
                  # No running process but PID file exists - verify PID is valid
-                  file_pid="$(cat "$expected_pid_file" 2>/dev/null || echo "")"
+                  file_pid=$(<"$expected_pid_file") 2>/dev/null
                  if [ -n "$file_pid" ] && kill -0 "$file_pid" 2>/dev/null; then
                    initStatus="0"
                    __service_banner "✅" "Service $service started successfully -" "PID: $file_pid (from file)"
                  elif [ -n "$file_pid" ]; then
                    initStatus="1"
                    critical_failures=$((critical_failures + 1))
                    __service_banner "⚠️" "Service $service has stale PID file -" "process $file_pid not running"
                  else
                    # PID file exists but process isn't running - treat as warning, not failure
                    initStatus="0"
-                    __service_banner "✅" "Service $service completed initialization -" "no process tracking"
+                    __service_banner "⚠️" "Service $service may not be running -" "no process found (non-critical)"
                  fi
                else
-                  # No process and no PID file - this is likely a configuration-only service
+                  # No process and no PID file - likely a configuration-only service
                  initStatus="0"
                  __service_banner "✅" "Service $service completed successfully -" "configuration service"
                fi
              fi
              set -e
            fi
          else
            initStatus="1"
@@ -1102,15 +1103,19 @@ __start_init_scripts() {
      done
      # Summary
      echo ""
      if [ $critical_failures -gt 0 ]; then
-        echo "⚠️ Warning: $critical_failures service(s) failed to start"
+        echo "⚠️ Warning: $critical_failures critical service(s) reported failures"
-        if [ "$exit_on_failure" = "true" ] && [ $critical_failures -ge 1 ]; then
+        if [ "$exit_on_failure" = "true" ] && [ $critical_failures -ge 2 ]; then
-          echo "❌ Exiting due to critical service failures"
+          echo "❌ Exiting due to multiple critical service failures (threshold: 2)"
          return 1
        else
          echo "ℹ️ Continuing with $critical_failures failure(s) - container may still be functional"
        fi
      else
-        echo "✅ All services started successfully"
+        echo "✅ All service initializations completed successfully"
      fi
      echo ""
    fi
  fi
@@ -1129,14 +1134,14 @@ __setup_mta() {
  local local_hostname="${FULL_DOMAIN_NAME:-}"
  local account_user="${SERVER_ADMIN//@*/}"
  local account_domain="${EMAIL_DOMAIN//*@/}"
-  echo "$EMAIL_RELAY" | grep '[0-9][0-9]' || relay_port="465"
+  [[ $EMAIL_RELAY == *[0-9][0-9]* ]] || relay_port="465"
  ################# sSMTP relay setup
-  if [ -n "$(type -P 'ssmtp')" ]; then
+  if command -v ssmtp &>/dev/null; then
    [ -d "/config/ssmtp" ] || mkdir -p "/config/ssmtp"
    [ -f "/etc/ssmtp/ssmtp.conf" ] && __rm "/etc/ssmtp/ssmtp.conf"
    symlink_files="$(__find_file_relative "/config/ssmtp")"
    if [ ! -f "/config/ssmtp/ssmtp.conf" ]; then
-      cat <<EOF | tee -p "/config/ssmtp/ssmtp.conf" >/dev/null
+      cat >"/config/ssmtp/ssmtp.conf" <<EOF
 # ssmtp configuration.
 root=${account_user:-root}@${account_domain:-$HOSTNAME}
 mailhub=${relay_server:-172.17.0.1}:$relay_port
@@ -1170,13 +1175,13 @@ EOF
    fi
    ################# postfix relay setup
-  elif [ -n "$(type -P 'postfix')" ]; then
+  elif command -v postfix &>/dev/null; then
    [ -d "/etc/postfix" ] || mkdir -p "/etc/postfix"
    [ -d "/config/postfix" ] || mkdir -p "/config/postfix"
    [ -f "/etc/postfix/main.cf" ] && __rm "/etc/postfix/main.cf"
    symlink_files="$(__find_file_relative "/config/postfix")"
    if [ ! -f "/config/postfix/main.cf" ]; then
-      cat <<EOF | tee -p "/config/postfix/main.cf" >/dev/null
+      cat >"/config/postfix/main.cf" <<EOF
 # postfix configuration.
 smtpd_banner = \$myhostname ESMTP email server
 compatibility_level = 2
@@ -1294,7 +1299,7 @@ __initialize_database() {
  __find_replace "REPLACE_DATABASE_ROOT_PASS" "$db_admin_pass" "$dir"
  __find_replace "REPLACE_DATABASE_NAME" "$DATABASE_NAME" "$dir"
  __find_replace "REPLACE_DATABASE_DIR" "$DATABASE_DIR" "$dir"
-  if echo "$dir" | grep -q '^/etc'; then
+  if [[ "$dir" == "/etc"* ]]; then
    __find_replace "REPLACE_USER_NAME" "$db_normal_user" "/etc"
    __find_replace "REPLACE_USER_PASS" "$db_normal_pass" "/etc"
    __find_replace "REPLACE_DATABASE_USER" "$db_normal_user" "/etc"
@@ -1327,8 +1332,8 @@ __initialize_system_etc() {
  local file=()
  local directories=""
  if [ -n "$conf_dir" ] && [ -e "$conf_dir" ]; then
-    files="$(find "$conf_dir"/* -not -path '*/env/*' -type f 2>/dev/null | sed 's|'/config/'||g' | sort -u | grep -v '^$' | grep '.' || false)"
+    files=$(find "$conf_dir"/* -not -path '*/env/*' -type f 2>/dev/null | sort -u | sed 's|/config/||')
-    directories="$(find "$conf_dir"/* -not -path '*/env/*' -type d 2>/dev/null | sed 's|'/config/'||g' | sort -u | grep -v '^$' | grep '.' || false)"
+    directories=$(find "$conf_dir"/* -not -path '*/env/*' -type d 2>/dev/null | sort -u | sed 's|/config/||')
    echo "Copying config files to system: $conf_dir > /etc/${conf_dir//\/config\//}"
    if [ -n "$directories" ]; then
      for d in $directories; do
@@ -1356,7 +1361,7 @@ __initialize_custom_bin_dir() {
    echo "Setting up bin $SET_USR_BIN > $LOCAL_BIN_DIR"
    for create_bin_template in $SET_USR_BIN; do
      if [ -n "$create_bin_template" ]; then
-        create_bin_name="$(basename "$create_bin_template")"
+        create_bin_name="${create_bin_template##*/}"
        if [ -e "$create_bin_template" ]; then
          ln -sf "$create_bin_template" "$LOCAL_BIN_DIR/$create_bin_name"
        fi
@@ -1367,51 +1372,85 @@ __initialize_custom_bin_dir() {
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __initialize_default_templates() {
  local errors=0
  if [ -n "$DEFAULT_TEMPLATE_DIR" ]; then
    if [ "$CONFIG_DIR_INITIALIZED" = "false" ] && [ -d "/config" ]; then
-      echo "Copying default config files $DEFAULT_TEMPLATE_DIR > /config"
+      __log_info "Copying default config files $DEFAULT_TEMPLATE_DIR > /config"
      if [ ! -d "$DEFAULT_TEMPLATE_DIR" ]; then
        __log_warn "Template directory not found: $DEFAULT_TEMPLATE_DIR"
        return 0
      fi
      for create_config_template in "$DEFAULT_TEMPLATE_DIR"/*; do
-        if [ -n "$create_config_template" ]; then
+        if [ -e "$create_config_template" ]; then
-          create_template_name="$(basename "$create_config_template")"
+          create_template_name="${create_config_template##*/}"
          if [ -d "$create_config_template" ]; then
-            mkdir -p "/config/$create_template_name/"
+            mkdir -p "/config/$create_template_name/" || errors=$((errors + 1))
-            __is_dir_empty "/config/$create_template_name" && cp -Rf "$create_config_template/." "/config/$create_template_name/" 2>/dev/null
+            if __is_dir_empty "/config/$create_template_name"; then
-          elif [ -e "$create_config_template" ]; then
+              if ! cp -Rf "$create_config_template/." "/config/$create_template_name/" 2>/dev/null; then
-            [ -e "/config/$create_template_name" ] || cp -Rf "$create_config_template" "/config/$create_template_name" 2>/dev/null
+                __log_warn "Failed to copy template directory: $create_template_name"
                errors=$((errors + 1))
              fi
            fi
          elif [ -f "$create_config_template" ]; then
            if [ ! -e "/config/$create_template_name" ]; then
              if ! cp -Rf "$create_config_template" "/config/$create_template_name" 2>/dev/null; then
                __log_warn "Failed to copy template file: $create_template_name"
                errors=$((errors + 1))
              fi
            fi
          fi
        fi
      done
      unset create_config_template create_template_name
      __log_debug "Template initialization completed with $errors errors"
    fi
  fi
  return 0
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __initialize_config_dir() {
  local errors=0
  if [ -n "$DEFAULT_CONF_DIR" ]; then
    if [ "$CONFIG_DIR_INITIALIZED" = "false" ] && [ -d "/config" ]; then
-      echo "Copying custom config files: $DEFAULT_CONF_DIR > /config"
+      __log_info "Copying custom config files: $DEFAULT_CONF_DIR > /config"
      if [ ! -d "$DEFAULT_CONF_DIR" ]; then
        __log_warn "Config directory not found: $DEFAULT_CONF_DIR"
        return 0
      fi
      for create_config_template in "$DEFAULT_CONF_DIR"/*; do
-        create_config_name="$(basename "$create_config_template")"
+        if [ -e "$create_config_template" ]; then
-        if [ -n "$create_config_template" ]; then
+          create_config_name="${create_config_template##*/}"
          if [ -d "$create_config_template" ]; then
-            mkdir -p "/config/$create_config_name"
+            mkdir -p "/config/$create_config_name" || errors=$((errors + 1))
-            __is_dir_empty "/config/$create_config_name" && cp -Rf "$create_config_template/." "/config/$create_config_name/" 2>/dev/null
+            if __is_dir_empty "/config/$create_config_name"; then
-          elif [ -e "$create_config_template" ]; then
+              if ! cp -Rf "$create_config_template/." "/config/$create_config_name/" 2>/dev/null; then
-            [ -e "/config/$create_config_name" ] || cp -Rf "$create_config_template" "/config/$create_config_name" 2>/dev/null
+                __log_warn "Failed to copy config directory: $create_config_name"
                errors=$((errors + 1))
              fi
            fi
          elif [ -f "$create_config_template" ]; then
            if [ ! -e "/config/$create_config_name" ]; then
              if ! cp -Rf "$create_config_template" "/config/$create_config_name" 2>/dev/null; then
                __log_warn "Failed to copy config file: $create_config_name"
                errors=$((errors + 1))
              fi
            fi
          fi
        fi
      done
      unset create_config_template create_config_name
      __log_debug "Config initialization completed with $errors errors"
    fi
  fi
  return 0
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __initialize_data_dir() {
  if [ -d "/data" ]; then
    if [ "$DATA_DIR_INITIALIZED" = "false" ] && [ -n "$DEFAULT_DATA_DIR" ]; then
-      echo "Copying data files $DEFAULT_DATA_DIR > /data"
+      __log_info "Copying data files $DEFAULT_DATA_DIR > /data"
      for create_data_template in "$DEFAULT_DATA_DIR"/*; do
-        create_data_name="$(basename "$create_data_template")"
+        create_data_name="${create_data_template##*/}"
        if [ -n "$create_data_template" ]; then
          if [ -d "$create_data_template" ]; then
            mkdir -p "/data/$create_data_name"
@@ -1447,11 +1486,11 @@ __is_htdocs_mounted() {
  WWW_ROOT_DIR="${WWW_ROOT_DIR:-/data/htdocs}"
  [ -n "$ENV_WWW_ROOT_DIR" ] && WWW_ROOT_DIR="$ENV_WWW_ROOT_DIR"
  if [ -n "$IMPORT_FROM_GIT" ]; then
-    if ! echo "$IMPORT_FROM_GIT" | grep -qE 'https://|http://|git://|ssh://'; then
+    if [[ ! "$IMPORT_FROM_GIT" =~ (https://|http://|git://|ssh://) ]]; then
      unset IMPORT_FROM_GIT
    fi
  fi
-  if [ -n "$IMPORT_FROM_GIT" ] && [ "$(command -v "git" 2>/dev/null)" ]; then
+  if [ -n "$IMPORT_FROM_GIT" ] && command -v git &>/dev/null; then
    if __is_dir_empty "$WWW_ROOT_DIR"; then
      echo "Importing project from $IMPORT_FROM_GIT to $WWW_ROOT_DIR"
      git clone -q "$IMPORT_FROM_GIT" "$WWW_ROOT_DIR"
@@ -1507,7 +1546,7 @@ __start_php_dev_server() {
      find "/usr/local/share/httpd" -type f -not -path '.git*' -iname '*.php' -exec sed -i 's|[<].*SERVER_ADDR.*[>]|'${CONTAINER_IP4_ADDRESS:-127.0.0.1}'|g' {} \; 2>/dev/null
      php -S 0.0.0.0:$PHP_DEV_SERVER_PORT -t "/usr/local/share/httpd"
    fi
-    if ! echo "$1" | grep -q "^/usr/local/share/httpd"; then
+    if [[ "$1" != "/usr/local/share/httpd"* ]]; then
      find "$1" -type f -not -path '.git*' -iname '*.php' -exec sed -i 's|[<].*SERVER_ADDR.*[>]|'${CONTAINER_IP4_ADDRESS:-127.0.0.1}'|g' {} \; 2>/dev/null
      php -S 0.0.0.0:$PHP_DEV_SERVER_PORT -t "$1"
    fi
@@ -1528,16 +1567,16 @@ __switch_to_user() {
  if [ "$switch_user" = "root" ]; then
    su_exec=""
    su_cmd() { eval "$@" || return 1; }
-  elif [ "$(builtin type -P gosu)" ]; then
+  elif command -v gosu &>/dev/null; then
    su_exec="gosu $switch_user"
    su_cmd() { $su_exec "$@" || return 1; }
-  elif [ "$(builtin type -P runuser)" ]; then
+  elif command -v runuser &>/dev/null; then
    su_exec="runuser -u $switch_user"
    su_cmd() { $su_exec "$@" || return 1; }
-  elif [ "$(builtin type -P sudo)" ]; then
+  elif command -v sudo &>/dev/null; then
    su_exec="sudo -u $switch_user"
    su_cmd() { $su_exec "$@" || return 1; }
-  elif [ "$(builtin type -P su)" ]; then
+  elif command -v su &>/dev/null; then
    su_exec="su -s /bin/sh - $switch_user"
    su_cmd() { $su_exec -c "$@" || return 1; }
  else
--- a/rootfs/usr/local/share/template-files/config/env/default.sample
+++ b/rootfs/usr/local/share/template-files/config/env/default.sample
@@ -113,10 +113,10 @@ DATABASE_DIR_COUCHDB="${DATABASE_DIR_COUCHDB:-$DATABASE_BASE_DIR/couchdb}"
 DATABASE_DIR_SUPABASE="${DATABASE_DIR_SUPABASE:-$DATABASE_BASE_DIR/supabase}"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # docker env
-DOCKER_HOST="unix://var/run/docker.sock"
+DOCKER_HOST="unix:///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/00-directory.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/00-directory.sh
@@ -1,4 +1,4 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # directory settings
 WWW_ROOT_DIR="${ENV_WWW_ROOT_DIR:-${WWW_ROOT_DIR}}"
 BACKUP_DIR="${ENV_BACKUP_DIR:-${BACKUP_DIR:-/data/backups}}"
@@ -7,4 +7,4 @@ DATABASE_BASE_DIR="${ENV_DATABASE_BASE_DIR:-${DATABASE_BASE_DIR:-/data/db}}"
 DEFAULT_DATA_DIR="${ENV_DEFAULT_DATA_DIR:-${DEFAULT_DATA_DIR:-/usr/local/share/template-files/data}}"
 DEFAULT_CONF_DIR="${ENV_DEFAULT_CONF_DIR:-${DEFAULT_CONF_DIR:-/usr/local/share/template-files/config}}"
 DEFAULT_TEMPLATE_DIR="${ENV_DEFAULT_TEMPLATE_DIR:-${EDEFAULT_TEMPLATE_DIR:-/usr/local/share/template-files/defaults}}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/usr/local/share/template-files/config/env/examples/addresses.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/addresses.sh
@@ -1,5 +1,5 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # get ip addresses
 CONTAINER_IP4_ADDRESS="${CONTAINER_IP4_ADDRESS:-$(__get_ip4)}"
 CONTAINER_IP6_ADDRESS="${CONTAINER_IP6_ADDRESS:-$(__get_ip6)}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/usr/local/share/template-files/config/env/examples/certbot.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/certbot.sh
@@ -1,6 +1,6 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # cerbot
 CERT_BOT_MAIL="${ENV_CERT_BOT_MAIL:-$CERT_BOT_MAIL}"
 CERTBOT_DOMAINS="${ENV_CERTBOT_DOMAINS:-$CERTBOT_DOMAINS}"
 CERT_BOT_ENABLED="${ENV_CERT_BOT_ENABLED:-${CERT_BOT_ENABLED:-false}}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/usr/local/share/template-files/config/env/examples/couchdb.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/couchdb.sh
@@ -1,7 +1,7 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # couchdb env
 COUCHDB_NODENAME="${ENV_COUCHDB_NODENAME:-${COUCHDB_NODENAME:-$NODENAME}}"
 COUCHDB_USER="${ENV_COUCHDB_USER:-${COUCHDB_USER:-$DATABASE_USER_ROOT}}"
 COUCHDB_PASSWORD="${ENV_COUCHDB_PASSWORD:-${COUCHDB_PASSWORD:-$DATABASE_PASS_ROOT}}"
 DATABASE_DIR_COUCHDB="${ENV_DATABASE_DIR_COUCHDB:-${DATABASE_DIR_COUCHDB:-/data/db/couchdb}}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/usr/local/share/template-files/config/env/examples/dockerd.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/dockerd.sh
@@ -1,4 +1,4 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # docker env
 DOCKER_HOST="${DOCKER_HOST:-unix://var/run/docker.sock}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/usr/local/share/template-files/config/env/examples/global.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/global.sh
@@ -1,13 +1,13 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # GLOBAL enviroment variables
 USER="${USER:-root}"
 LANG="${LANG:-C.UTF-8}"
 TZ="${TZ:-America/New_York}"
 ENV_PORTS="${ENV_PORTS//\/*/}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # How to set permissions
 SERVICE_USER="${SERVICE_USER:-}"
 SERVICE_GROUP="${SERVICE_GROUP:-}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 SERVICE_UID="${SERVICE_UID:-}" # set the user id
 SERVICE_GID="${SERVICE_GID:-}" # set the group id
--- a/rootfs/usr/local/share/template-files/config/env/examples/healthcheck.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/healthcheck.sh
@@ -1,5 +1,5 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # healthcheck
 HEALTH_ENABLED="${HEALTH_ENABLED:-}"
 HEALTH_URL="${HEALTH_URL:-}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/usr/local/share/template-files/config/env/examples/mariadb.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/mariadb.sh
@@ -1,4 +1,4 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # mariadb env
 MARIADB_ROOT_HOST="${MARIADB_ROOT_HOST:-%}"
 MARIADB_AUTO_UPGRADE="${MARIADB_AUTO_UPGRADE:-yes}"
@@ -11,4 +11,4 @@ MARIADB_ALLOW_EMPTY_ROOT_PASSWORD="${MARIADB_ALLOW_EMPTY_ROOT_PASSWORD:-}"
 MARIADB_INITDB_SKIP_TZINFO="${MARIADB_INITDB_SKIP_TZINFO}:-"
 MARIADB_RANDOM_ROOT_PASSWORD="${MARIADB_RANDOM_ROOT_PASSWORD:-}"
 MARIADB_CONFIG_FILE="${MARIADB_CONFIG_FILE:-$(__find_mysql_conf)}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/usr/local/share/template-files/config/env/examples/mongodb.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/mongodb.sh
@@ -1,4 +1,4 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # mongodb env
 DATABASE_DIR_MONGODB="${DATABASE_DIR_MONGODB:-/data/db/mongodb}"
 INITDB_ROOT_USERNAME="${DATABASE_USER_ROOT:-$INITDB_ROOT_USERNAME}"
@@ -17,4 +17,4 @@ ME_CONFIG_MONGODB_AUTH_PASSWORD_FILE="${ME_CONFIG_MONGODB_AUTH_PASSWORD_FILE:-}"
 ME_CONFIG_MONGODB_CA_FILE="${ME_CONFIG_MONGODB_CA_FILE:-}"
 VCAP_APP_HOST="${VCAP_APP_HOST:-0.0.0.0}"
 VCAP_APP_PORT="${VCAP_APP_PORT:-19054}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/usr/local/share/template-files/config/env/examples/networking.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/networking.sh
@@ -1,4 +1,4 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # networing info
 DOMAINNAME="${DOMAINNAME:-}"
 EMAIL_RELAY="${EMAIL_RELAY:-}"
@@ -6,4 +6,4 @@ HOSTNAME="${HOSTNAME:-casjaysdev-GEN_SCRIPT_REPLACE_APPNAME}"
 EMAIL_DOMAIN="${EMAIL_DOMAIN:-${DOMAINNAME:-$HOSTNAME}}"
 FULL_DOMAIN_NAME="${FULL_DOMAIN_NAME:-${DOMAINNAME:-$HOSTNAME}}"
 SERVER_ADMIN="${SERVER_ADMIN:-root@${EMAIL_DOMAIN:-$FULL_DOMAIN_NAME}}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/usr/local/share/template-files/config/env/examples/other.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/other.sh
@@ -1,4 +1,4 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # other
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/usr/local/share/template-files/config/env/examples/php.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/php.sh
@@ -1,6 +1,6 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # php settings
 PHP_VERSION="${PHP_VERSION//php/}"
 PHP_INI_DIR="${PHP_INI_DIR:-$(__find_php_ini)}"
 PHP_BIN_DIR="${PHP_BIN_DIR:-$(__find_php_bin)}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/usr/local/share/template-files/config/env/examples/postgres.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/postgres.sh
@@ -1,8 +1,8 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # postgresql env
 PGDATA="${DATABASE_DIR_PGSQL:-$PGDATA}"
 DATABASE_DIR_PGSQL="${DATABASE_DIR_PGSQL:-/data/db/postgres}"
 POSTGRES_USER="${DATABASE_USER_ROOT:-$POSTGRES_USER}"
 POSTGRES_PASSWORD="${DATABASE_PASS_ROOT:-$POSTGRES_PASSWORD}"
 POSTGRES_CONFIG_FILE="${POSTGRES_CONFIG_FILE:-$(__find_pgsql_conf)}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/usr/local/share/template-files/config/env/examples/redis.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/redis.sh
@@ -1,4 +1,4 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # redis env
 DATABASE_DIR_REDIS="${DATABASE_DIR_REDIS:-/data/db/redis}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/usr/local/share/template-files/config/env/examples/services.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/services.sh
@@ -1,7 +1,7 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # services/ports
 ENV_PORTS="${ENV_PORTS:-}"
 SERVICE_PORT="${SERVICE_PORT:-$PORT}"
 WEB_SERVER_PORTS="${WEB_SERVER_PORTS:-}"
 SERVICES_LIST="${PROCS_LIST:-$SERVICES_LIST} "
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/usr/local/share/template-files/config/env/examples/ssl.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/ssl.sh
@@ -1,4 +1,4 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # ssl server settings
 SSL_ENABLED="${SSL_ENABLED:-false}"
 SSL_DIR="${SSL_CONTAINER_DIR:-/config/ssl}"
@@ -6,7 +6,7 @@ SSL_DIR="${SSL_DIR:-$SSL_DIR}"
 SSL_CA="${SSL_CA:-$SSL_DIR/ca.crt}"
 SSL_KEY="${SSL_KEY:-$SSL_DIR/server.key}"
 SSL_CERT="${SSL_CERT:-$SSL_DIR/server.crt}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # certificate settings
 RSA="${RSA:-4096}"
 STATE="${STATE:-NY}"
@@ -16,4 +16,4 @@ UNIT="${UNIT:-CasjaysDev}"
 ORG="${ORG:-"Casjays Developments"}"
 DAYS_VALID="${DAYS_VALID:-3650}"
 CN="${CN:-${FULL_DOMAIN_NAME:-$HOSTNAME}}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/usr/local/share/template-files/config/env/examples/supabase.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/supabase.sh
@@ -1,4 +1,4 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Supabase
 DATABASE_DIR_SUPABASE="${DATABASE_DIR_SUPABASE:-/data/db/supabase}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
--- a/rootfs/usr/local/share/template-files/config/env/examples/webservers.sh
+++ b/rootfs/usr/local/share/template-files/config/env/examples/webservers.sh
@@ -1,8 +1,8 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # web server configs
 HTTPD_CONFIG_FILE="${HTTPD_CONFIG_FILE:-$(__find_httpd_conf)}"
 NGINX_CONFIG_FILE="${NGINX_CONFIG_FILE:-$(__find_nginx_conf)}"
 CADDY_CONFIG_FILE="${CHEROKEE_CONFIG_FILE:-$(__find_caddy_conf)}"
 LIGHTTPD_CONFIG_FILE="${LIGHTTPD_CONFIG_FILE:-$(__find_lighttpd_conf)}"
 CHEROKEE_CONFIG_FILE="${CHEROKEE_CONFIG_FILE:-$(__find_cherokee_conf)}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
--- 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,10 +1,10 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # 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}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Startup variables
 INIT_DATE="${INIT_DATE:-$(date)}"
 START_SERVICES="${START_SERVICES:-yes}"
@@ -12,10 +12,10 @@ ENTRYPOINT_MESSAGE="${ENTRYPOINT_MESSAGE:-yes}"
 ENTRYPOINT_FIRST_RUN="${ENTRYPOINT_FIRST_RUN:-yes}"
 DATA_DIR_INITIALIZED="${DATA_DIR_INITIALIZED:-false}"
 CONFIG_DIR_INITIALIZED="${CONFIG_DIR_INITIALIZED:-false}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Check if this is a new container
 [ -f "$ENTRYPOINT_PID_FILE" ] && START_SERVICES="no"
 [ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ] && ENTRYPOINT_FIRST_RUN="no"
 [ -f "$ENTRYPOINT_DATA_INIT_FILE" ] && DATA_DIR_INITIALIZED="true"
 [ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ] && CONFIG_DIR_INITIALIZED="true"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -