🗃️ Committing everything that changed 🗃️

Dockerfile Dockerfile.cherokee Dockerfile.final Dockerfile.nossl Dockerfile.selective Dockerfile.stable Dockerfile.ubuntu Dockerfile.zevenet .dockerignore .gitattributes .gitignore LICENSE.md README.md rootfs/.gitea/ rootfs/root/ rootfs/usr/local/bin/entrypoint.sh rootfs/usr/local/bin/pkmgr rootfs/usr/local/etc/docker/functions/entrypoint.sh rootfs/usr/local/share/template-files/config/env/ rootfs/usr/local/share/template-files/config/.gitkeep rootfs/usr/local/share/template-files/data/.gitkeep
2025-11-04 07:02:12 -05:00 · 2025-09-16 09:09:27 -04:00
parent 8989948a45
commit c95f2d4da9
47 changed files with 2294 additions and 488 deletions
--- 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           :  202408011327-git
+##@Version           :  202509052348-git
 # @@Author           :  Jason Hempstead
 # @@Contact          :  jason@casjaysdev.pro
 # @@License          :  WTFPL
 # @@ReadME           :  entrypoint.sh --help
-# @@Copyright        :  Copyright: (c) 2024 Jason Hempstead, Casjays Developments
-# @@Created          :  Thursday, Aug 01, 2024 13:27 EDT
+# @@Copyright        :  Copyright: (c) 2025 Jason Hempstead, Casjays Developments
+# @@Created          :  Friday, Sep 05, 2025 23:48 EDT
 # @@File             :  entrypoint.sh
 # @@Description      :  Entrypoint file for cherokee
 # @@Changelog        :  New script
@@ -18,12 +18,13 @@
 # @@sudo/root        :  no
 # @@Template         :  other/docker-entrypoint
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# shellcheck disable=SC2016
-# shellcheck disable=SC2031
-# shellcheck disable=SC2120
-# shellcheck disable=SC2155
-# shellcheck disable=SC2199
-# shellcheck disable=SC2317
+# shellcheck disable=SC1003,SC2016,SC2031,SC2120,SC2155,SC2199,SC2317
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+set -e
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# run trap command on exit
+trap 'echo "❌ Fatal error, killing container"; kill -TERM 1' ERR
+trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE";exit $retVal' SIGINT SIGTERM SIGPWR
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # setup debugging - https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
 [ -f "/config/.debug" ] && [ -z "$DEBUGGER_OPTIONS" ] && export DEBUGGER_OPTIONS="$(<"/config/.debug")" || DEBUGGER_OPTIONS="${DEBUGGER_OPTIONS:-}"
@@ -34,7 +35,7 @@ PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
 # Set bash options
 SCRIPT_FILE="$0"
 CONTAINER_NAME="cherokee"
-SCRIPT_NAME="$(basename "$SCRIPT_FILE" 2>/dev/null)"
+SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)"
 CONTAINER_NAME="${ENV_CONTAINER_NAME:-$CONTAINER_NAME}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # remove whitespaces from beginning argument
@@ -53,13 +54,16 @@ fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 case "$1" in
 # Help message
--help)
+-h | --help)
  shift 1
  echo 'Docker container for '$CONTAINER_NAME''
-  echo "Usage: $CONTAINER_NAME [cron exec start init shell certbot ssl procs ports healthcheck backup command]"
+  echo "Usage: $CONTAINER_NAME [help tail cron exec start init shell certbot ssl procs ports healthcheck backup command]"
  echo ""
  exit 0
  ;;
+-*)
+  shift
+  ;;
 esac
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Create the default env files
@@ -69,31 +73,36 @@ __create_env_file "/config/env/default.sh" "/root/env.sh" &>/dev/null
 for set_env in "/root/env.sh" "/usr/local/etc/docker/env"/*.sh "/config/env"/*.sh; do
  [ -f "$set_env" ] && . "$set_env"
 done
+unset set_env
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Define script variables
-RUNAS_USER=""    # Default is root
-SERVICE_UID=""   # set the user id
-SERVICE_GID=""   # set the group id
-SERVICE_USER=""  # execute command as another user
-SERVICE_GROUP="" # Set the service group
+# User to use to launch service - IE: postgres
+RUNAS_USER="root" # normally root
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Primary server port- will be added to server ports
-WEB_SERVER_PORT="" # port : 80,443
+# Set user and group from env
+SERVICE_USER="${PUID:-$SERVICE_USER}"
+SERVICE_GROUP="${PGID:-$SERVICE_GROUP}"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Set user and group ID
+SERVICE_UID="${SERVICE_UID:-0}" # set the user id
+SERVICE_GID="${SERVICE_GID:-0}" # set the group id
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# User and group in which the service switches to - IE: nginx,apache,mysql,postgres
+SERVICE_USER="${SERVICE_USER:-cherokee}"  # execute command as another user
+SERVICE_GROUP="${SERVICE_GROUP:-cherokee}" # Set the service group
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Secondary ports
 SERVER_PORTS="" # specifiy other ports
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Server directories
-WWW_ROOT_DIR="" # set default web dir
-DATABASE_DIR="" # set database dir
+# Primary server port- will be added to server ports
+WEB_SERVER_PORT="" # port : 80,443
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Healthcheck variables
 HEALTH_ENABLED="yes" # enable healthcheck [yes/no]
-SERVICES_LIST="tini"
+SERVICES_LIST="tini" # comma seperated list of processes for the healthcheck
 HEALTH_ENDPOINTS=""  # url endpoints: [http://localhost/health,http://localhost/test]
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Update path var
-export PATH="${PATH:-}"
+export PATH RUNAS_USER SERVICE_USER SERVICE_GROUP SERVICE_UID SERVICE_GID WWW_ROOT_DIR DATABASE_DIR
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Custom variables

@@ -105,11 +114,15 @@ __run_message() {
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ################## END OF CONFIGURATION #####################
+# Lets get containers ip address
+IP4_ADDRESS="$(__get_ip4)"
+IP6_ADDRESS="$(__get_ip6)"
+CONTAINER_IP4_ADDRESS="${CONTAINER_IP4_ADDRESS:-$IP4_ADDRESS}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Startup variables
 export INIT_DATE="${INIT_DATE:-$(date)}"
 export CONTAINER_INIT="${CONTAINER_INIT:-no}"
-export START_SERVICES="${START_SERVICES:-yes}"
+export START_SERVICES="${START_SERVICES:-no}"
 export ENTRYPOINT_MESSAGE="${ENTRYPOINT_MESSAGE:-yes}"
 export ENTRYPOINT_FIRST_RUN="${ENTRYPOINT_FIRST_RUN:-yes}"
 export DATA_DIR_INITIALIZED="${DATA_DIR_INITIALIZED:-no}"
@@ -120,19 +133,24 @@ export CONTAINER_NAME="${ENV_CONTAINER_NAME:-$CONTAINER_NAME}"
 export LANG="${LANG:-C.UTF-8}"
 export LC_ALL="${LANG:-C.UTF-8}"
 export TZ="${TZ:-${TIMEZONE:-America/New_York}}"
-export HOSTNAME="${FULL_DOMAIN_NAME:-${SERVER_HOSTNAME:-$HOSTNAME}}"
+export HOSTNAME="$(hostname -s)"
+export DOMAINNAME="$(hostname -d)"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Default directories
 export SSL_DIR="${SSL_DIR:-/config/ssl}"
 export SSL_CA="${SSL_CERT:-/config/ssl/ca.crt}"
 export SSL_KEY="${SSL_KEY:-/config/ssl/localhost.pem}"
 export SSL_CERT="${SSL_CERT:-/config/ssl/localhost.crt}"
-export BACKUP_DIR="${BACKUP_DIR:-/data/backups}"
 export LOCAL_BIN_DIR="${LOCAL_BIN_DIR:-/usr/local/bin}"
 export DEFAULT_DATA_DIR="${DEFAULT_DATA_DIR:-/usr/local/share/template-files/data}"
 export DEFAULT_CONF_DIR="${DEFAULT_CONF_DIR:-/usr/local/share/template-files/config}"
 export DEFAULT_TEMPLATE_DIR="${DEFAULT_TEMPLATE_DIR:-/usr/local/share/template-files/defaults}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Backup settings
+export BACKUP_MAX_DAYS="${BACKUP_MAX_DAYS:-}"
+export BACKUP_RUN_CRON="${BACKUP_RUN_CRON:-}"
+export BACKUP_DIR="${BACKUP_DIR:-/data/backups}"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Additional
 export PHP_INI_DIR="${PHP_INI_DIR:-$(__find_php_ini)}"
 export PHP_BIN_DIR="${PHP_BIN_DIR:-$(__find_php_bin)}"
@@ -141,19 +159,26 @@ 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:-/run/init.d/entrypoint.pid}"
+export ENTRYPOINT_PID_FILE="${ENTRYPOINT_PID_FILE:-$ENTRYPOINT_PID_FILE}"
 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}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-if [ -f "$ENTRYPOINT_PID_FILE" ] || [ -f "$ENTRYPOINT_INIT_FILE" ]; then
-  START_SERVICES="no" ENTRYPOINT_MESSAGE="no" ENTRYPOINT_FIRST_RUN="no"
+if [ -n "$CONTAINER_WEB_SERVER_WWW_REPO" ]; then
+  www_temp_dir="/tmp/git/$(basename -- "$CONTAINER_WEB_SERVER_WWW_REPO")"
+  rm -Rf "${WWW_ROOT_DIR:?}"/* "${www_temp_dir:?}"/*
+  mkdir -p "$WWW_ROOT_DIR" "$www_temp_dir"
+  git clone -q "$CONTAINER_WEB_SERVER_WWW_REPO" "$www_temp_dir" 2>/dev/null
+  rm -Rf "$www_temp_dir/.git" "$www_temp_dir"/.git*
+  rsync -ra "$www_temp_dir/" "$WWW_ROOT_DIR" --delete >/dev/null 2>&1
+  rm -Rf "$www_temp_dir"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # variables based on env/files
 [ -f "/config/enable/ssl" ] && SSL_ENABLED="yes"
 [ -f "/config/enable/ssh" ] && SSH_ENABLED="yes"
 [ "$WEB_SERVER_PORT" = "443" ] && SSL_ENABLED="yes"
+[ "$CONTAINER_WEB_SERVER_PROTOCOL" = "https" ] && SSL_ENABLED="yes"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # export variables

@@ -181,7 +206,7 @@ ENV_PORTS="$(__format_variables "$ENV_PORTS" || false)"
 WEB_SERVER_PORTS="$(__format_variables "$WEB_SERVER_PORTS" || false)"
 ENV_PORTS="$(__format_variables "$SERVER_PORTS" "$WEB_SERVER_PORTS" "$ENV_PORTS" "$SERVER_PORTS" || false)"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-#
+# Remove the commas from env
 HEALTH_ENDPOINTS="${HEALTH_ENDPOINTS//,/ }"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # create required directories
@@ -229,6 +254,16 @@ EOF
 # Create the backup dir
 [ -n "$BACKUP_DIR" ] && { [ -d "$BACKUP_DIR" ] || mkdir -p "$BACKUP_DIR"; }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+if [ -f "$ENTRYPOINT_PID_FILE" ]; then
+  START_SERVICES="no"
+  touch "$ENTRYPOINT_PID_FILE"
+else
+  echo "$$" >"$ENTRYPOINT_PID_FILE"
+fi
+if [ -f "$ENTRYPOINT_INIT_FILE" ]; then
+  ENTRYPOINT_MESSAGE="no" ENTRYPOINT_FIRST_RUN="no"
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
  # Show start message
  if [ "$CONFIG_DIR_INITIALIZED" = "no" ] || [ "$DATA_DIR_INITIALIZED" = "no" ]; then
@@ -236,9 +271,9 @@ if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
  fi
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  # Set reusable variables
-  { { [ -w "/etc" ] && [ ! -e "/etc/hosts" ]; } || [ -w "/etc/hosts" ]; } && UPDATE_FILE_HOSTS="yes"
-  { { [ -w "/etc" ] && [ ! -e "/etc/timezone" ]; } || [ -w "/etc/timezone" ]; } && UPDATE_FILE_TZ="yes"
-  { { [ -w "/etc" ] && [ ! -e "/etc/resolv.conf" ]; } || [ -w "/etc/resolv.conf" ]; } && UPDATE_FILE_RESOLV="yes"
+  { { [ -w "/etc" ] && [ ! -f "/etc/hosts" ]; } || [ -w "/etc/hosts" ]; } && UPDATE_FILE_HOSTS="yes" && touch "/etc/hosts"
+  { { [ -w "/etc" ] && [ ! -f "/etc/timezone" ]; } || [ -w "/etc/timezone" ]; } && UPDATE_FILE_TZ="yes" && touch "/etc/timezone"
+  { { [ -w "/etc" ] && [ ! -f "/etc/resolv.conf" ]; } || [ -w "/etc/resolv.conf" ]; } && UPDATE_FILE_RESOLV="yes" && touch "/etc/resolv.conf"
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  # Set timezone
  [ -n "$TZ" ] && [ "$UPDATE_FILE_TZ" = "yes" ] && echo "$TZ" >"/etc/timezone"
@@ -255,23 +290,20 @@ if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
    fi
  fi
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  # add .home domain
+  # add .internal domain
  if [ "$UPDATE_FILE_HOSTS" = "yes" ] && [ -n "$HOSTNAME" ]; then
    __grep_test " $HOSTNAME" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "$HOSTNAME" >>"/etc/hosts"
-    __grep_test " ${HOSTNAME%%.*}.home" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.home" >>"/etc/hosts"
+    __grep_test " ${HOSTNAME%%.*}.internal" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.internal" >>"/etc/hosts"
  fi
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  # add domainname
-  if [ "$UPDATE_FILE_HOSTS" = "yes" ] && [ "$DOMAINNAME" != "home" ] && [ -n "$DOMAINNAME" ] && [ "$HOSTNAME.$DOMAINNAME" != "$DOMAINNAME" ]; then
+  if [ "$UPDATE_FILE_HOSTS" = "yes" ] && [ "$DOMAINNAME" != "internal" ] && [ -n "$DOMAINNAME" ] && [ "$HOSTNAME.$DOMAINNAME" != "$DOMAINNAME" ]; then
    __grep_test " ${HOSTNAME%%.*}.$DOMAINNAME" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.$DOMAINNAME" >>"/etc/hosts"
  fi
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  # Set containers hostname
  [ -n "$HOSTNAME" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ] && echo "$HOSTNAME" >"/etc/hostname"
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  # Set containers hostname with domain
-  # [ -n "$DOMAINNAME" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ] && echo "$HOSTNAME.$DOMAINNAME" >"/etc/hostname"
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  if [ -f "/etc/hostname" ]; then
    [ -n "$(type -P hostname)" ] && hostname -F "/etc/hostname" &>/dev/null || HOSTNAME="$(<"/etc/hostname")"
    export HOSTNAME
@@ -283,8 +315,8 @@ if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
  # import resolv.conf file into container
  [ "$CUSTOM_DNS" != "yes" ] && [ -f "/usr/local/etc/resolv.conf" ] && [ "$UPDATE_FILE_RESOLV" = "yes" ] && cat "/usr/local/etc/resolv.conf" >"/etc/resolv.conf"
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  if [ -d "/usr/local/etc/skel" ]; then
-    cp -Rf "/usr/local/etc/skel/." "$HOME/"
+  if [ -n "$HOME" ] && [ -d "/usr/local/etc/skel" ]; then
+    [ -d "$HOME" ] && cp -Rf "/usr/local/etc/skel/." "$HOME/"
  fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 fi
@@ -308,26 +340,28 @@ __initialize_data_dir
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __initialize_ssl_certs
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-if [ -f "$ENTRYPOINT_PID_FILE" ] || [ -f "$ENTRYPOINT_INIT_FILE" ]; then
-  START_SERVICES="no"
-  ENTRYPOINT_MESSAGE="no"
+if [ -f "$ENTRYPOINT_INIT_FILE" ]; then
  ENTRYPOINT_FIRST_RUN="no"
-  touch "$ENTRYPOINT_PID_FILE"
-elif [ -d "/config" ]; then
-  echo "$$" >"$ENTRYPOINT_PID_FILE"
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+if [ -d "/config" ]; then
  echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_INIT_FILE"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Check if this is a new container
 if [ -f "$ENTRYPOINT_DATA_INIT_FILE" ]; then
  DATA_DIR_INITIALIZED="yes"
-elif [ -d "/data" ]; then
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+if [ -d "/data" ]; then
  echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_DATA_INIT_FILE"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ]; then
  CONFIG_DIR_INITIALIZED="yes"
-elif [ -d "/config" ]; then
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+if [ -d "/config" ]; then
  echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_CONFIG_INIT_FILE"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -336,14 +370,8 @@ if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
  __setup_mta
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# if no pid assume container restart - clean stale files on restart
-if [ ! -f "$ENTRYPOINT_PID_FILE" ]; then 
-  START_SERVICES="yes"
-  # Clean stale pid files from previous container runs
-  rm -f /run/__start_init_scripts.pid /run/init.d/*.pid /run/*.pid
-elif [ ! -f "/run/__start_init_scripts.pid" ]; then
-  START_SERVICES="yes" 
-fi
+# if no pid assume container restart
+[ -f "$ENTRYPOINT_PID_FILE" ] && [ -f "/run/__start_init_scripts.pid" ] || START_SERVICES="yes"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 [ "$ENTRYPOINT_MESSAGE" = "yes" ] && __printf_space "40" "Container ip address is:" "$CONTAINER_IP4_ADDRESS"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -358,6 +386,12 @@ fi
 # execute init script
 if [ -f "/tmp/init" ]; then sh "/tmp/init"; fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# 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:-}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Show message
 __run_message
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -365,11 +399,12 @@ __run_message
 START_SERVICES="${START_SERVICES:-SYSTEM_INIT}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Start all services if no pidfile
-if [ "$START_SERVICES" = "yes" ] && [ "$1" != "backup" ] && [ "$1" != "healthcheck" ]; then
+if [ "$START_SERVICES" = "yes" ] && [ "$1" != "backup" ] && [ "$1" != "healthcheck" ] && [ "$1" != "cron" ] && [ "$1" != "tail" ] && [ "$1" != "logs" ] && [ "$1" != "cron" ]; then
  [ "$1" = "start" ] && shift 1
  [ "$1" = "all" ] && shift 1
  [ "$1" = "init" ] && export CONTAINER_INIT="yes"
-  echo "$$" >"/run/init.d/entrypoint.pid"
+  echo "$$" >"$ENTRYPOINT_PID_FILE"
+  rm -Rf "/run"/*/*pid
  __start_init_scripts "/usr/local/etc/docker/init.d"
  START_SERVICES="no"
  CONTAINER_INIT="${CONTAINER_INIT:-no}"
@@ -382,36 +417,75 @@ init)
  echo "Container has been Initialized"
  exit 0
  ;;
-
+tail)
+  shift 1
+  case "$1" in
+  null)
+    shift $#
+    tail -F "/dev/null"
+    ;;
+  app)
+    shift $#
+    tail -F /data/logs/*/*.log
+    ;;
+  -*)
+    tail "$@"
+    ;;
+  *)
+    tail -F "${@:-/dev/null}"
+    ;;
+  esac
+  ;;
+logs)
+  shift 1
+  case "$1" in
+  follow)
+    tail -Fq /data/logs/*/*
+    ;;
+  clean)
+    log_files="$(find "/data/logs" -type f)"
+    for log in "${log_files[@]}"; do
+      echo "clearing $log"
+      printf '' >$log
+    done
+    ;;
+  *)
+    echo "Usage: logs [follow,clean]"
+    exit 0
+    ;;
+  esac
+  ;;
 cron)
  shift 1
  __cron "$@" &
+  echo "cron script is running with pid: $!"
  exit
  ;;
 # backup data and config dirs
 backup)
  shift 1
-  save="${1:-$BACKUP_DIR}"
-  backupExit=0
-  date="$(date '+%Y%m%d-%H%M')"
-  file="$save/$date.tar.gz"
-  echo "Backing up /data /config to $file"
-  sleep 1
-  tar cfvz "$file" --exclude="$save" "/data" "/config" || false
-  backupExit=$?
-  [ $backupExit -eq 0 ] && echo "Backed up /data /config has finished" || echo "Backup of /data /config has failed"
-  exit $backupExit
+  __backup $BACKUP_MAX_DAYS $1
+  exit $?
  ;;
 # Docker healthcheck
 healthcheck)
+  arguments="$*"
  healthStatus=0
-  services="${SERVICES_LIST:-$@}"
  healthEnabled="${HEALTH_ENABLED:-}"
  healthPorts="${WEB_SERVER_PORTS:-}"
  healthEndPoints="${HEALTH_ENDPOINTS:-}"
+  SERVICES_LIST="${arguments:-$SERVICES_LIST}"
+  services="$(echo "${SERVICES_LIST//,/ }")"
  healthMessage="Everything seems to be running"
-  services="${services//,/ }"
  [ "$healthEnabled" = "yes" ] || exit 0
+  if [ -d "/run/healthcheck" ] && [ "$(ls -A "/run/healthcheck" | wc -l)" -ne 0 ]; then
+    for service in /run/healthcheck/*; do
+      name=$(basename -- $service)
+      services+="$name "
+    done
+  fi
+  services="$(echo "$services" | tr ' ' '\n' | sort -u | grep -v '^$')"
+  { [ "$1" = "init" ] || [ "$1" = "test" ]; } && exit 0
  for proc in $services; do
    if [ -n "$proc" ]; then
      if ! __pgrep "$proc"; then
@@ -498,21 +572,20 @@ start)
  elif [ "$1" = "all" ]; then
    shift $#
    if [ "$START_SERVICES" = "yes" ]; then
-      echo "$$" >"/run/init.d/entrypoint.pid"
+      echo "$$" >"$ENTRYPOINT_PID_FILE"
      __start_init_scripts "/usr/local/etc/docker/init.d"
      __no_exit
    elif [ -f "/usr/local/etc/docker/init.d/$1" ]; then
      eval "/usr/local/etc/docker/init.d/$1" &
      __no_exit
-
    fi
  fi
  ;;
 # Execute primary command
 *)
  if [ $# -eq 0 ]; then
-    if [ ! -f "/run/init.d/entrypoint.pid" ]; then
-      echo "$$" >"/run/init.d/entrypoint.pid"
+    if [ ! -f "$ENTRYPOINT_PID_FILE" ]; then
+      echo "$$" >"$ENTRYPOINT_PID_FILE"
      [ "$START_SERVICES" = "no" ] && [ "$CONTAINER_INIT" = "yes" ] || __start_init_scripts "/usr/local/etc/docker/init.d"
    fi
    __no_exit
--- a/rootfs/usr/local/bin/pkmgr
+++ b/rootfs/usr/local/bin/pkmgr
@@ -0,0 +1,142 @@
+#!/usr/bin/env sh
+# shellcheck shell=sh
+# shellcheck disable=SC2016
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+USER_UID="$(id -u)"
+USER_GID="$(id -g)"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+if [ -x "$(command -v apt 2>/dev/null)" ]; then
+  export DEBIAN_FRONTEND=noninteractive
+  pkmgr_cmd="apt"
+  pkmgr_clean_cmd="$pkmgr_cmd clean"
+  pkmgr_mkcache_cmd="$pkmgr_cmd update"
+  pkmgr_update_cmd="$pkmgr_cmd upgrade -yy"
+  pkmgr_install_cmd="$pkmgr_cmd install -yy $PKMGR_OPTS"
+  pkmgr_install_post="$pkmgr_cmd --fix-broken install"
+elif [ -x "$(command -v apt-get 2>/dev/null)" ]; then
+  export DEBIAN_FRONTEND=noninteractive
+  pkmgr_cmd="apt-get"
+  pkmgr_clean_cmd="$pkmgr_cmd clean"
+  pkmgr_mkcache_cmd="$pkmgr_cmd update"
+  pkmgr_update_cmd="$pkmgr_cmd upgrade -yy"
+  pkmgr_install_cmd="$pkmgr_cmd install -yy $PKMGR_OPTS"
+  pkmgr_install_post="$pkmgr_cmd --fix-broken install"
+elif [ -x "$(command -v dnf 2>/dev/null)" ]; then
+  pkmgr_cmd="dnf"
+  pkmgr_clean_cmd="$pkmgr_cmd clean all"
+  pkmgr_mkcache_cmd="$pkmgr_cmd makecache"
+  pkmgr_update_cmd="$pkmgr_cmd update -y --skip-broken $PKMGR_OPTS"
+  pkmgr_install_cmd="$pkmgr_cmd install -y --skip-broken $PKMGR_OPTS"
+elif [ -x "$(command -v yum 2>/dev/null)" ]; then
+  pkmgr_cmd="yum"
+  pkmgr_clean_cmd="$pkmgr_cmd clean all"
+  pkmgr_mkcache_cmd="$pkmgr_cmd makecache"
+  pkmgr_update_cmd="$pkmgr_cmd update -y --skip-broken $PKMGR_OPTS"
+  pkmgr_install_cmd="$pkmgr_cmd install -y --skip-broken $PKMGR_OPTS"
+elif [ -n "$(command -v pacman 2>/dev/null)" ]; then
+  pkmgr_cmd="pacman"
+  pkmgr_mkcache_cmd="true"
+  pkmgr_clean_cmd="$pkmgr_cmd -Scc --noconfirm"
+  pkmgr_update_cmd="$pkmgr_cmd -Syyu --noconfirm $PKMGR_OPTS"
+  pkmgr_install_cmd="$pkmgr_cmd -Syy --noconfirm $PKMGR_OPTS"
+elif [ -x "$(command -v apk 2>/dev/null)" ]; then
+  pkmgr_cmd="apk"
+  pkmgr_mkcache_cmd="true"
+  pkmgr_clean_cmd="$pkmgr_cmd cache clean"
+  pkmgr_update_cmd="$pkmgr_cmd -U upgrade --no-cache $PKMGR_OPTS"
+  pkmgr_install_cmd="$pkmgr_cmd add --no-cache $PKMGR_OPTS"
+elif [ -x "$(command -v zypper 2>/dev/null)" ]; then
+  pkmgr_cmd="zypper"
+  pkmgr_mkcache_cmd="true"
+  pkmgr_clean_cmd="$pkmgr_cmd clean --all"
+  pkmgr_update_cmd="$pkmgr_cmd update -y $PKMGR_OPTS"
+  pkmgr_install_cmd="$pkmgr_cmd install -y $PKMGR_OPTS"
+else
+  pkmgr_cmd="true"
+  pkmgr_mkcache_cmd="$pkmgr_cmd"
+  pkmgr_clean_cmd="$pkmgr_cmd"
+  pkmgr_update_cmd="$pkmgr_cmd"
+  pkmgr_install_cmd="$pkmgr_cmd"
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+if [ -f "/config/pkmgr/settings.conf" ]; then
+  . "/config/pkmgr/settings.conf"
+elif [ -f "/etc/pkmgr/settings.conf" ]; then
+  . "/etc/pkmgr/settings.conf"
+else
+  mkdir -p "/config/pkmgr"
+  cat <<EEOF >"/config/pkmgr/settings.conf"
+pkmgr_cmd="$pkmgr_cmd"
+pkmgr_clean_cmd="$pkmgr_clean_cmd"
+pkmgr_update_cmd="$pkmgr_update_cmd"
+pkmgr_install_cmd="$pkmgr_install_cmd"
+pkmgr_mkcache_cmd="$pkmgr_mkcache_cmd"
+EEOF
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+[ -n "$pkmgr_cmd" ] || { echo "Can not determine the package manager" && exit 1; }
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+case "$1" in
+pip)
+  shift 1
+  pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || echo "")"
+  py_version="$($pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || echo "0")"
+  [ "$py_version" -gt "310" ] && pip_opts="--break-system-packages " || pip_opts=""
+  case "$1" in
+  install)
+    shift 1
+    pkg_list="$*"
+    for pkg in $pkg_list; do
+      $pip_bin -m pip $pip_opts "$pkg"
+    done
+    ;;
+  *)
+    for pkg in "$@"; do
+      $pip_bin -m pip "$pkg"
+    done
+    ;;
+  esac
+  exit
+  ;;
+install)
+  shift 1
+  [ -n "$1" ] || exit 0
+  [ "$USER_UID" -eq 0 ] || [ "$USER" = "root" ] || pkmgr_install_cmd="sudo $pkmgr_install_cmd"
+  if [ -f "$1" ]; then
+    install_list="$(cat "$1")"
+  else
+    install_list="$*"
+  fi
+  for pkg in $install_list;do
+    echo "installing packages command: $pkmgr_install_cmd $pkg"
+    $pkmgr_install_cmd $pkg
+    if [ -n "$pkmgr_install_post" ]; then eval $pkmgr_install_post; fi
+  done
+  exit
+  ;;
+update | upgrade)
+  shift $#
+  [ "$USER_UID" -eq 0 ] || [ "$USER" = "root" ] || pkmgr_update_cmd="sudo $pkmgr_install_cmd"
+  echo "Updating packages command: $pkmgr_update_cmd"
+  $pkmgr_mkcache_cmd
+  $pkmgr_update_cmd
+  exit $?
+  ;;
+clean)
+  shift $#
+  [ -n "$1" ] || exit 0
+  [ "$USER_UID" -eq 0 ] || [ "$USER" = "root" ] || pkmgr_clean_cmd="sudo $pkmgr_clean_cmd"
+  echo "Cleaning package cache: $pkmgr_clean_cmd"
+  $pkmgr_clean_cmd
+  exit $?
+  ;;
+*)
+  [ -n "$1" ] || exit 0
+  [ "$USER_UID" -eq 0 ] || [ "$USER" = "root" ] || pkmgr_cmd="sudo $pkmgr_cmd"
+  echo "executing packages command: $pkmgr_cmd $*"
+  $pkmgr_cmd "$@"
+  exit $?
+  ;;
+esac
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# end