diff --git a/rootfs/usr/local/etc/docker/functions/entrypoint.sh b/rootfs/usr/local/etc/docker/functions/entrypoint.sh
index e0d5db5..b44ed1b 100644
--- a/rootfs/usr/local/etc/docker/functions/entrypoint.sh
+++ b/rootfs/usr/local/etc/docker/functions/entrypoint.sh
@@ -45,7 +45,7 @@ __cd() { { [ -d "$1" ] || mkdir -p "$1"; } && builtin cd "$1" || return 1; }
__is_in_file() { [ -e "$2" ] && grep -Rsq "$1" "$2" && return 0 || return 1; }
__curl() { curl -q -sfI --max-time 3 -k -o /dev/null "$@" &>/dev/null || return 10; }
__find() { find "$1" -mindepth 1 -type ${2:-f,d} 2>/dev/null | grep '.' || return 10; }
-__pcheck() { [ -n "$(which pgrep 2>/dev/null)" ] && pgrep -o "$1$" &>/dev/null || return 10; }
+__pcheck() { [ -n "$(which pgrep 2>/dev/null)" ] && pgrep -x "$1" &>/dev/null || return 10; }
__file_exists_with_content() { [ -n "$1" ] && [ -f "$1" ] && [ -s "$1" ] && return 0 || return 2; }
__sed() { sed -i 's|'$1'|'$2'|g' "$3" &>/dev/null || sed -i "s|$1|$2|g" "$3" &>/dev/null || return 1; }
__ps() { [ -f "$(type -P ps)" ] && ps "$@" 2>/dev/null | sed 's|:||g' | grep -Fw " ${1:-$SERVICE_NAME}$" || return 10; }
@@ -57,11 +57,12 @@ __pgrep() {
local count=3
local srvc="${1:-SERVICE_NAME}"
while [ $count -ge 0 ]; do
- __pcheck "${1:-SERVICE_NAME}" || __ps "${1:-$SERVICE_NAME}" | grep -qv ' grep'
+ # Use exact process name matching, not full command line search
+ pgrep -x "$srvc" >/dev/null 2>&1 && return 0
sleep 1
count=$((count - 1))
done
- [ $count -ne 0 ] && return 0 || return 10
+ return 10
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
__find_file_relative() {
@@ -74,9 +75,26 @@ __find_directory_relative() {
find "$1"/* -not -path '*env/*' -not -path '.git*' -type d 2>/dev/null | sed 's|'$1'/||g' | sort -u | grep -v '^$' | grep '.' || false
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-__pid_exists() { ps -ax --no-header | sed 's/^[[:space:]]*//g' | awk -F' ' '{print $1}' | sed 's|:||g' | grep '[0-9]' | sort -uV | grep "^$1$" && return 0 || return 1; }
-__is_running() { ps -eo args --no-header | awk '{print $1,$2,$3}' | sed 's|:||g' | sort -u | grep -vE 'grep|COMMAND|awk|tee|ps|sed|sort|tail' | grep "$1" | grep -q "${2:-^}" && return 0 || return 1; }
-__get_pid() { ps -ax --no-header | sed 's/^[[:space:]]*//g;s|;||g;s|:||g' | awk '{print $1,$5}' | sed 's|:||g' | grep "$1$" | grep -v 'grep' | awk -F' ' '{print $1}' | grep '[0-9]' | sort -uV | head -n1 | grep '.' && return 0 || return 1; }
+__pid_exists() {
+ 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 '')"
+ [ -n "$result" ] && return 0 || return 1
+}
+__is_running() {
+ local result=""
+ 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 "$result" ] && return 0 || return 1
+}
+__get_pid() {
+ local result=""
+ 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 '')"
+ if [ -n "$result" ]; then
+ echo "$result"
+ return 0
+ else
+ return 1
+ fi
+}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
__format_variables() { printf '%s\n' "${@//,/ }" | tr ' ' '\n' | sort -RVu | grep -v '^$' | tr '\n' ' ' | __clean_variables | grep '.' || return 0; }
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -577,7 +595,6 @@ __proc_check() {
if __pgrep "$cmd_bin" || __pgrep "$cmd_name"; then
SERVICE_IS_RUNNING="yes"
touch "$SERVICE_PID_FILE"
- echo "$cmd_name is already running"
return 0
else
return 1
@@ -777,19 +794,42 @@ __start_init_scripts() {
__service_banner "✅" "Service $service started successfully -" "no PID tracking"
fi
else
- # Service uses PID tracking - get actual PID
- retPID=$(__get_pid "$service")
+ # 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
+ for name_variant in "$service" "${service}84" "${service}d" "$(echo "$service" | sed 's/-//g')" "$(echo "$service" | tr -d '-')"; do
+ if [ -z "$retPID" ]; then
+ retPID=$(__get_pid "$name_variant" 2>/dev/null || echo "")
+ [ -n "$retPID" ] && found_process="$name_variant" && break
+ 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}"
+ __service_banner "✅" "Service $service started successfully -" "PID: ${retPID} ($found_process)"
elif [ -f "$expected_pid_file" ]; then
- retPID="$(cat "$expected_pid_file" 2>/dev/null || echo "0")"
- initStatus="0"
- __service_banner "✅" "Service $service started successfully -" "PID file"
+ # No running process but PID file exists - verify PID is valid
+ file_pid="$(cat "$expected_pid_file" 2>/dev/null || echo "")"
+ 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
+ initStatus="0"
+ __service_banner "✅" "Service $service completed initialization -" "no process tracking"
+ fi
else
- initStatus="1"
- critical_failures=$((critical_failures + 1))
- __service_banner "⚠️" "Service $service appears to have started but" "no process found"
+ # No process and no PID file - this is likely a configuration-only service
+ initStatus="0"
+ __service_banner "✅" "Service $service completed successfully -" "configuration service"
fi
fi
fi
diff --git a/rootfs/usr/local/etc/docker/init.d/01-php.sh b/rootfs/usr/local/etc/docker/init.d/01-php.sh
old mode 100755
new mode 100644
index e0c04b6..3fe4ea3
--- a/rootfs/usr/local/etc/docker/init.d/01-php.sh
+++ b/rootfs/usr/local/etc/docker/init.d/01-php.sh
@@ -31,27 +31,37 @@ export PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/s
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SCRIPT_FILE="$0"
SERVICE_NAME="php"
+# Function to exit appropriately based on context
+__script_exit() {
+ local exit_code="${1:-0}"
+ if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
+ # Script is being sourced - use return
+ return "$exit_code"
+ else
+ # Script is being executed - use exit
+ exit "$exit_code"
+ fi
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# exit if __start_init_scripts function hasn't been Initialized
if [ ! -f "/run/__start_init_scripts.pid" ]; then
- echo "__start_init_scripts function hasn't been Initialized" >&2
- SERVICE_IS_RUNNING="no"
- exit 1
+ echo "__start_init_scripts function hasn't been Initialized" >&2
+ SERVICE_IS_RUNNING="no"
+ __script_exit 1
fi
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# import the functions file
if [ -f "/usr/local/etc/docker/functions/entrypoint.sh" ]; then
- . "/usr/local/etc/docker/functions/entrypoint.sh"
+ . "/usr/local/etc/docker/functions/entrypoint.sh"
fi
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# import variables
for set_env in "/root/env.sh" "/usr/local/etc/docker/env"/*.sh "/config/env"/*.sh; do
- [ -f "$set_env" ] && . "$set_env"
+ [ -f "$set_env" ] && . "$set_env"
done
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-printf '%s\n' "# - - - Initializing $SERVICE_NAME - - - #"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Custom functions
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -174,163 +184,163 @@ CMD_ENV=""
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Custom commands to run before copying to /config
__run_precopy() {
- # Define environment
- local hostname=${HOSTNAME}
- # Define actions/commands
+ # Define environment
+ local hostname=${HOSTNAME}
+ # Define actions/commands
- # allow custom functions
- if builtin type -t __run_precopy_local | grep -q 'function'; then __run_precopy_local; fi
+ # allow custom functions
+ if builtin type -t __run_precopy_local | grep -q 'function'; then __run_precopy_local; fi
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Custom prerun functions - IE setup WWW_ROOT_DIR
__execute_prerun() {
- # Define environment
- local hostname=${HOSTNAME}
- # Define actions/commands
+ # Define environment
+ local hostname=${HOSTNAME}
+ # Define actions/commands
- # allow custom functions
- if builtin type -t __execute_prerun_local | grep -q 'function'; then __execute_prerun_local; fi
+ # allow custom functions
+ if builtin type -t __execute_prerun_local | grep -q 'function'; then __execute_prerun_local; fi
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Run any pre-execution checks
__run_pre_execute_checks() {
- # Set variables
- local exitStatus=0
- local pre_execute_checks_MessageST="Running preexecute check for $SERVICE_NAME" # message to show at start
- local pre_execute_checks_MessageEnd="Finished preexecute check for $SERVICE_NAME" # message to show at completion
- __banner "$pre_execute_checks_MessageST"
- # Put command to execute in parentheses
- {
- { [ -d "/data/htdocs/www" ] && PHP_DEV_SERVER_ROOT="/data/htdocs/www"; } || { [ -d "/data/www" ] && PHP_DEV_SERVER_ROOT="/data/www"; }
- WWW_ROOT_DIR="$PHP_DEV_SERVER_ROOT"
- [ -d "$WWW_ROOT_DIR" ] || mkdir -p "$WWW_ROOT_DIR"
- if [ -d "/usr/local/share/httpd/default" ]; then
- if [ ! -d "$WWW_ROOT_DIR" ] || __is_dir_empty "$WWW_ROOT_DIR"; then
- __file_copy "/usr/local/share/httpd/default" "$WWW_ROOT_DIR"
- fi
- elif [ ! -d "$WWW_ROOT_DIR" ]; then
- mkdir -p "$WWW_ROOT_DIR"
- chmod 777 -Rf "$WWW_ROOT_DIR"
- fi
- }
- exitStatus=$?
- __banner "$pre_execute_checks_MessageEnd: Status $exitStatus"
+ # Set variables
+ local exitStatus=0
+ local pre_execute_checks_MessageST="Running preexecute check for $SERVICE_NAME" # message to show at start
+ local pre_execute_checks_MessageEnd="Finished preexecute check for $SERVICE_NAME" # message to show at completion
+ __banner "$pre_execute_checks_MessageST"
+ # Put command to execute in parentheses
+ {
+ { [ -d "/data/htdocs/www" ] && PHP_DEV_SERVER_ROOT="/data/htdocs/www"; } || { [ -d "/data/www" ] && PHP_DEV_SERVER_ROOT="/data/www"; }
+ WWW_ROOT_DIR="$PHP_DEV_SERVER_ROOT"
+ [ -d "$WWW_ROOT_DIR" ] || mkdir -p "$WWW_ROOT_DIR"
+ if [ -d "/usr/local/share/httpd/default" ]; then
+ if [ ! -d "$WWW_ROOT_DIR" ] || __is_dir_empty "$WWW_ROOT_DIR"; then
+ __file_copy "/usr/local/share/httpd/default" "$WWW_ROOT_DIR"
+ fi
+ elif [ ! -d "$WWW_ROOT_DIR" ]; then
+ mkdir -p "$WWW_ROOT_DIR"
+ chmod 777 -Rf "$WWW_ROOT_DIR"
+ fi
+ }
+ exitStatus=$?
+ __banner "$pre_execute_checks_MessageEnd: Status $exitStatus"
- # show exit message
- if [ $exitStatus -ne 0 ]; then
- echo "The pre-execution check has failed" >&2
- [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE"
- exit 1
- fi
- # allow custom functions
- if builtin type -t __run_pre_execute_checks_local | grep -q 'function'; then __run_pre_execute_checks_local; fi
- # exit function
- return $exitStatus
+ # show exit message
+ if [ $exitStatus -ne 0 ]; then
+ echo "The pre-execution check has failed" >&2
+ [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE"
+ __script_exit 1
+ fi
+ # allow custom functions
+ if builtin type -t __run_pre_execute_checks_local | grep -q 'function'; then __run_pre_execute_checks_local; fi
+ # exit function
+ return $exitStatus
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# use this function to update config files - IE: change port
__update_conf_files() {
- local exitCode=0 # default exit code
- local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- # delete files
- #__rm ""
+ local exitCode=0 # default exit code
+ local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ # delete files
+ #__rm ""
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- # custom commands
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ # custom commands
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- # replace variables
- # __replace "" "" "$CONF_DIR/php.conf"
- # replace variables recursively
- # __find_replace "" "" "$CONF_DIR"
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ # replace variables
+ # __replace "" "" "$CONF_DIR/php.conf"
+ # replace variables recursively
+ # __find_replace "" "" "$CONF_DIR"
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- # define actions
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ # define actions
- # allow custom functions
- if builtin type -t __update_conf_files_local | grep -q 'function'; then __update_conf_files_local; fi
- # exit function
- return $exitCode
+ # allow custom functions
+ if builtin type -t __update_conf_files_local | grep -q 'function'; then __update_conf_files_local; fi
+ # exit function
+ return $exitCode
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# function to run before executing
__pre_execute() {
- local exitCode=0 # default exit code
- local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
- # execute if directories is empty
- # __is_dir_empty "$CONF_DIR" && true
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- # define actions to run after copying to /config
- if __is_dir_empty "$WWW_ROOT_DIR"; then
- printf '%s\n%s\n%s\n' "Welcome to $CONTAINER_NAME" '
' '' >"$WWW_ROOT_DIR/index.php"
- fi
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- # unset unneeded variables
- unset sysname
- # Lets wait a few seconds before continuing
- sleep 5
- # allow custom functions
- if builtin type -t __pre_execute_local | grep -q 'function'; then __pre_execute_local; fi
- # exit function
- return $exitCode
+ local exitCode=0 # default exit code
+ local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
+ # execute if directories is empty
+ # __is_dir_empty "$CONF_DIR" && true
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ # define actions to run after copying to /config
+ if __is_dir_empty "$WWW_ROOT_DIR"; then
+ printf '%s\n%s\n%s\n' "Welcome to $CONTAINER_NAME" '
' '' >"$WWW_ROOT_DIR/index.php"
+ fi
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ # unset unneeded variables
+ unset sysname
+ # Lets wait a few seconds before continuing
+ sleep 5
+ # allow custom functions
+ if builtin type -t __pre_execute_local | grep -q 'function'; then __pre_execute_local; fi
+ # exit function
+ return $exitCode
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# function to run after executing
__post_execute() {
- local pid="" # init pid var
- local retVal=0 # set default exit code
- local ctime=${POST_EXECUTE_WAIT_TIME:-1} # how long to wait before executing
- local waitTime=$((ctime * 60)) # convert minutes to seconds
- local postMessageST="Running post commands for $SERVICE_NAME" # message to show at start
- local postMessageEnd="Finished post commands for $SERVICE_NAME" # message to show at completion
- # wait
- sleep $waitTime
- # execute commands after waiting
- (
- # show message
- __banner "$postMessageST"
- # commands to execute
- __cd "$WWW_ROOT_DIR" && __start_php_dev_server "$WWW_ROOT_DIR" "$PHP_DEV_SERVER_START" &
- # show exit message
- __banner "$postMessageEnd: Status $retVal"
- ) 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt" &
- pid=$!
- ps ax | awk '{print $1}' | grep -v grep | grep -q "$execPid$" && retVal=0 || retVal=10
- # allow custom functions
- if builtin type -t __post_execute_local | grep -q 'function'; then __post_execute_local; fi
- # exit function
- return $retVal
+ local pid="" # init pid var
+ local retVal=0 # set default exit code
+ local ctime=${POST_EXECUTE_WAIT_TIME:-1} # how long to wait before executing
+ local waitTime=$((ctime * 60)) # convert minutes to seconds
+ local postMessageST="Running post commands for $SERVICE_NAME" # message to show at start
+ local postMessageEnd="Finished post commands for $SERVICE_NAME" # message to show at completion
+ # wait
+ sleep $waitTime
+ # execute commands after waiting
+ (
+ # show message
+ __banner "$postMessageST"
+ # commands to execute
+ __cd "$WWW_ROOT_DIR" && __start_php_dev_server "$WWW_ROOT_DIR" "$PHP_DEV_SERVER_START" &
+ # show exit message
+ __banner "$postMessageEnd: Status $retVal"
+ ) 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt" &
+ pid=$!
+ ps ax | awk '{print $1}' | grep -v grep | grep -q "$execPid$" && retVal=0 || retVal=10
+ # allow custom functions
+ if builtin type -t __post_execute_local | grep -q 'function'; then __post_execute_local; fi
+ # exit function
+ return $retVal
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# use this function to update config files - IE: change port
__pre_message() {
- local exitCode=0
- [ -n "$PRE_EXEC_MESSAGE" ] && eval echo "$PRE_EXEC_MESSAGE"
- # execute commands
+ local exitCode=0
+ [ -n "$PRE_EXEC_MESSAGE" ] && eval echo "$PRE_EXEC_MESSAGE"
+ # execute commands
- # allow custom functions
- if builtin type -t __pre_message_local | grep -q 'function'; then __pre_message_local; fi
- # exit function
- return $exitCode
+ # allow custom functions
+ if builtin type -t __pre_message_local | grep -q 'function'; then __pre_message_local; fi
+ # exit function
+ return $exitCode
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# use this function to setup ssl support
__update_ssl_conf() {
- local exitCode=0
- local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
- # execute commands
+ local exitCode=0
+ local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
+ # execute commands
- # allow custom functions
- if builtin type -t __update_ssl_conf_local | grep -q 'function'; then __update_ssl_conf_local; fi
- # set exitCode
- return $exitCode
+ # allow custom functions
+ if builtin type -t __update_ssl_conf_local | grep -q 'function'; then __update_ssl_conf_local; fi
+ # set exitCode
+ return $exitCode
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
__create_service_env() {
- local exitCode=0
- if [ ! -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" ]; then
- cat </dev/null
+ local exitCode=0
+ if [ ! -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" ]; then
+ cat </dev/null
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# root/admin user info [password/random]
#ENV_ROOT_USER_NAME="${ENV_ROOT_USER_NAME:-$PHP_ROOT_USER_NAME}" # root user name
@@ -345,86 +355,86 @@ __create_service_env() {
#user_pass="${ENV_USER_PASS:-$user_pass}" # normal user password
EOF
- fi
- if [ ! -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh" ]; then
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- __run_precopy_local() { true; }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- __execute_prerun_local() { true; }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- __run_pre_execute_checks_local() { true; }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- __update_conf_files_local() { true; }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- __pre_execute_local() { true; }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- __post_execute_local() { true; }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- __pre_message_local() { true; }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- __update_ssl_conf_local() { true; }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- fi
- __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" || exitCode=$((exitCode + 1))
- __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh" || exitCode=$((exitCode + 1))
- return $exitCode
+ fi
+ if [ ! -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh" ]; then
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ __run_precopy_local() { true; }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ __execute_prerun_local() { true; }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ __run_pre_execute_checks_local() { true; }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ __update_conf_files_local() { true; }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ __pre_execute_local() { true; }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ __post_execute_local() { true; }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ __pre_message_local() { true; }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ __update_ssl_conf_local() { true; }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ fi
+ __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" || exitCode=$((exitCode + 1))
+ __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh" || exitCode=$((exitCode + 1))
+ return $exitCode
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# script to start server
__run_start_script() {
- local runExitCode=0
- local workdir="$(eval echo "${WORK_DIR:-}")" # expand variables
- local cmd="$(eval echo "${EXEC_CMD_BIN:-}")" # expand variables
- local args="$(eval echo "${EXEC_CMD_ARGS:-}")" # expand variables
- local name="$(eval echo "${EXEC_CMD_NAME:-}")" # expand variables
- local pre="$(eval echo "${EXEC_PRE_SCRIPT:-}")" # expand variables
- local extra_env="$(eval echo "${CMD_ENV//,/ }")" # expand variables
- local lc_type="$(eval echo "${LANG:-${LC_ALL:-$LC_CTYPE}}")" # expand variables
- local home="$(eval echo "${workdir//\/root/\/tmp\/docker}")" # expand variables
- local path="$(eval echo "$PATH")" # expand variables
- local message="$(eval echo "")" # expand variables
- local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
- [ -f "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh" ] && . "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh"
- #
- if [ -z "$cmd" ]; then
- __post_execute 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt"
- retVal=$?
- echo "Initializing $SCRIPT_NAME has completed"
- exit $retVal
- else
- # ensure the command exists
- if [ ! -x "$cmd" ]; then
- echo "$name is not a valid executable"
- return 2
- fi
- # check and exit if already running
- if __proc_check "$name" || __proc_check "$cmd"; then
- echo "$name is already running" >&2
- return 0
- else
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- # show message if env exists
- if [ -n "$cmd" ]; then
- [ -n "$SERVICE_USER" ] && echo "Setting up $cmd to run as $SERVICE_USER" || SERVICE_USER="root"
- [ -n "$SERVICE_PORT" ] && echo "$name will be running on port $SERVICE_PORT" || SERVICE_PORT=""
- fi
- if [ -n "$pre" ] && [ -n "$(command -v "$pre" 2>/dev/null)" ]; then
- export cmd_exec="$pre $cmd $args"
- message="Starting service: $name $args through $pre"
- else
- export cmd_exec="$cmd $args"
- message="Starting service: $name $args"
- fi
- [ -n "$su_exec" ] && echo "using $su_exec" | tee -a -p "/data/logs/init.txt"
- echo "$message" | tee -a -p "/data/logs/init.txt"
- su_cmd touch "$SERVICE_PID_FILE"
- if [ "$RESET_ENV" = "yes" ]; then
- env_command="$(echo "env -i HOME=\"$home\" LC_CTYPE=\"$lc_type\" PATH=\"$path\" HOSTNAME=\"$sysname\" USER=\"${SERVICE_USER:-$RUNAS_USER}\" $extra_env")"
- execute_command="$(__trim "$su_exec $env_command $cmd_exec")"
- if [ ! -f "$START_SCRIPT" ]; then
- cat <"$START_SCRIPT"
+ local runExitCode=0
+ local workdir="$(eval echo "${WORK_DIR:-}")" # expand variables
+ local cmd="$(eval echo "${EXEC_CMD_BIN:-}")" # expand variables
+ local args="$(eval echo "${EXEC_CMD_ARGS:-}")" # expand variables
+ local name="$(eval echo "${EXEC_CMD_NAME:-}")" # expand variables
+ local pre="$(eval echo "${EXEC_PRE_SCRIPT:-}")" # expand variables
+ local extra_env="$(eval echo "${CMD_ENV//,/ }")" # expand variables
+ local lc_type="$(eval echo "${LANG:-${LC_ALL:-$LC_CTYPE}}")" # expand variables
+ local home="$(eval echo "${workdir//\/root/\/tmp\/docker}")" # expand variables
+ local path="$(eval echo "$PATH")" # expand variables
+ local message="$(eval echo "")" # expand variables
+ local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
+ [ -f "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh" ] && . "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh"
+ #
+ if [ -z "$cmd" ]; then
+ __post_execute 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt"
+ retVal=$?
+ echo "Initializing $SCRIPT_NAME has completed"
+ __script_exit $retVal
+ else
+ # ensure the command exists
+ if [ ! -x "$cmd" ]; then
+ echo "$name is not a valid executable"
+ return 2
+ fi
+ # check and exit if already running
+ if __proc_check "$name" || __proc_check "$cmd"; then
+ echo "$name is already running" >&2
+ return 0
+ else
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ # show message if env exists
+ if [ -n "$cmd" ]; then
+ [ -n "$SERVICE_USER" ] && echo "Setting up $cmd to run as $SERVICE_USER" || SERVICE_USER="root"
+ [ -n "$SERVICE_PORT" ] && echo "$name will be running on port $SERVICE_PORT" || SERVICE_PORT=""
+ fi
+ if [ -n "$pre" ] && [ -n "$(command -v "$pre" 2>/dev/null)" ]; then
+ export cmd_exec="$pre $cmd $args"
+ message="Starting service: $name $args through $pre"
+ else
+ export cmd_exec="$cmd $args"
+ message="Starting service: $name $args"
+ fi
+ [ -n "$su_exec" ] && echo "using $su_exec" | tee -a -p "/data/logs/init.txt"
+ echo "$message" | tee -a -p "/data/logs/init.txt"
+ su_cmd touch "$SERVICE_PID_FILE"
+ if [ "$RESET_ENV" = "yes" ]; then
+ env_command="$(echo "env -i HOME=\"$home\" LC_CTYPE=\"$lc_type\" PATH=\"$path\" HOSTNAME=\"$sysname\" USER=\"${SERVICE_USER:-$RUNAS_USER}\" $extra_env")"
+ execute_command="$(__trim "$su_exec $env_command $cmd_exec")"
+ if [ ! -f "$START_SCRIPT" ]; then
+ cat <"$START_SCRIPT"
#!/usr/bin/env bash
-trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ] && rm -Rf "\$SERVICE_PID_FILE";exit \$exitCode' EXIT
+trap 'exitCode=\$?;if [ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ]; then rm -Rf "\$SERVICE_PID_FILE"; fi; exit \$exitCode' EXIT
#
set -Eeo pipefail
# Setting up $cmd to run as ${SERVICE_USER:-root} with env
@@ -441,13 +451,13 @@ checkPID="\$(ps ax | awk '{print \$1}' | grep -v grep | grep "\$execPid$" || fal
exit \$retVal
EOF
- fi
- else
- if [ ! -f "$START_SCRIPT" ]; then
- execute_command="$(__trim "$su_exec $cmd_exec")"
- cat <"$START_SCRIPT"
+ fi
+ else
+ if [ ! -f "$START_SCRIPT" ]; then
+ execute_command="$(__trim "$su_exec $cmd_exec")"
+ cat <"$START_SCRIPT"
#!/usr/bin/env bash
-trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ] && rm -Rf "\$SERVICE_PID_FILE";exit \$exitCode' EXIT
+trap 'exitCode=\$?;if [ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ]; then rm -Rf "\$SERVICE_PID_FILE"; fi; exit \$exitCode' EXIT
#
set -Eeo pipefail
# Setting up $cmd to run as ${SERVICE_USER:-root}
@@ -464,36 +474,36 @@ checkPID="\$(ps ax | awk '{print \$1}' | grep -v grep | grep "\$execPid$" || fal
exit \$retVal
EOF
- fi
- fi
- fi
- [ -x "$START_SCRIPT" ] || chmod 755 -Rf "$START_SCRIPT"
- [ "$CONTAINER_INIT" = "yes" ] || eval sh -c "$START_SCRIPT"
- runExitCode=$?
- fi
- return $runExitCode
+ fi
+ fi
+ fi
+ [ -x "$START_SCRIPT" ] || chmod 755 -Rf "$START_SCRIPT"
+ [ "$CONTAINER_INIT" = "yes" ] || eval sh -c "$START_SCRIPT"
+ runExitCode=$?
+ fi
+ return $runExitCode
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# username and password actions
__run_secure_function() {
- local filesperms
- if [ -n "$user_name" ] || [ -n "$user_pass" ]; then
- for filesperms in "${USER_FILE_PREFIX}"/*; do
- if [ -e "$filesperms" ]; then
- chmod -Rf 600 "$filesperms"
- chown -Rf $SERVICE_USER:$SERVICE_USER "$filesperms" 2>/dev/null
- fi
- done 2>/dev/null | tee -p -a "/data/logs/init.txt"
- fi
- if [ -n "$root_user_name" ] || [ -n "$root_user_pass" ]; then
- for filesperms in "${ROOT_FILE_PREFIX}"/*; do
- if [ -e "$filesperms" ]; then
- chmod -Rf 600 "$filesperms"
- chown -Rf $SERVICE_USER:$SERVICE_USER "$filesperms" 2>/dev/null
- fi
- done 2>/dev/null | tee -p -a "/data/logs/init.txt"
- fi
- unset filesperms
+ local filesperms
+ if [ -n "$user_name" ] || [ -n "$user_pass" ]; then
+ for filesperms in "${USER_FILE_PREFIX}"/*; do
+ if [ -e "$filesperms" ]; then
+ chmod -Rf 600 "$filesperms"
+ chown -Rf $SERVICE_USER:$SERVICE_USER "$filesperms" 2>/dev/null
+ fi
+ done 2>/dev/null | tee -p -a "/data/logs/init.txt"
+ fi
+ if [ -n "$root_user_name" ] || [ -n "$root_user_pass" ]; then
+ for filesperms in "${ROOT_FILE_PREFIX}"/*; do
+ if [ -e "$filesperms" ]; then
+ chmod -Rf 600 "$filesperms"
+ chown -Rf $SERVICE_USER:$SERVICE_USER "$filesperms" 2>/dev/null
+ fi
+ done 2>/dev/null | tee -p -a "/data/logs/init.txt"
+ fi
+ unset filesperms
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Allow ENV_ variable - Import env file
@@ -527,68 +537,68 @@ __check_service "$1" && SERVICE_IS_RUNNING=yes
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Database env
if [ "$IS_DATABASE_SERVICE" = "yes" ] || [ "$USES_DATABASE_SERVICE" = "yes" ]; then
- RESET_ENV="no"
- DATABASE_CREATE="${ENV_DATABASE_CREATE:-$DATABASE_CREATE}"
- DATABASE_USER_NORMAL="${ENV_DATABASE_USER:-${DATABASE_USER_NORMAL:-$user_name}}"
- DATABASE_PASS_NORMAL="${ENV_DATABASE_PASSWORD:-${DATABASE_PASS_NORMAL:-$user_pass}}"
- DATABASE_USER_ROOT="${ENV_DATABASE_ROOT_USER:-${DATABASE_USER_ROOT:-$root_user_name}}"
- DATABASE_PASS_ROOT="${ENV_DATABASE_ROOT_PASSWORD:-${DATABASE_PASS_ROOT:-$root_user_pass}}"
- if [ -n "$DATABASE_PASS_NORMAL" ] && [ ! -f "${USER_FILE_PREFIX}/db_pass_user" ]; then
- echo "$DATABASE_PASS_NORMAL" >"${USER_FILE_PREFIX}/db_pass_user"
- fi
- if [ -n "$DATABASE_PASS_ROOT" ] && [ ! -f "${ROOT_FILE_PREFIX}/db_pass_root" ]; then
- echo "$DATABASE_PASS_ROOT" >"${ROOT_FILE_PREFIX}/db_pass_root"
- fi
+ RESET_ENV="no"
+ DATABASE_CREATE="${ENV_DATABASE_CREATE:-$DATABASE_CREATE}"
+ DATABASE_USER_NORMAL="${ENV_DATABASE_USER:-${DATABASE_USER_NORMAL:-$user_name}}"
+ DATABASE_PASS_NORMAL="${ENV_DATABASE_PASSWORD:-${DATABASE_PASS_NORMAL:-$user_pass}}"
+ DATABASE_USER_ROOT="${ENV_DATABASE_ROOT_USER:-${DATABASE_USER_ROOT:-$root_user_name}}"
+ DATABASE_PASS_ROOT="${ENV_DATABASE_ROOT_PASSWORD:-${DATABASE_PASS_ROOT:-$root_user_pass}}"
+ if [ -n "$DATABASE_PASS_NORMAL" ] && [ ! -f "${USER_FILE_PREFIX}/db_pass_user" ]; then
+ echo "$DATABASE_PASS_NORMAL" >"${USER_FILE_PREFIX}/db_pass_user"
+ fi
+ if [ -n "$DATABASE_PASS_ROOT" ] && [ ! -f "${ROOT_FILE_PREFIX}/db_pass_root" ]; then
+ echo "$DATABASE_PASS_ROOT" >"${ROOT_FILE_PREFIX}/db_pass_root"
+ fi
fi
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# [DATABASE_DIR_[SQLITE,REDIS,POSTGRES,MARIADB,COUCHDB,MONGODB,SUPABASE]]
if [ "$DATABASE_SERVICE_TYPE" = "custom" ]; then
- DATABASE_DIR="${DATABASE_DIR_CUSTOM:-/data/db/custom}"
- DATABASE_BASE_DIR="${DATABASE_DIR_CUSTOM:-/data/db/custom}"
- DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_CUSTOM:-/usr/local/share/httpd/admin/databases}"
- [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_CUSTOM:-/admin/dbadmin}"
+ DATABASE_DIR="${DATABASE_DIR_CUSTOM:-/data/db/custom}"
+ DATABASE_BASE_DIR="${DATABASE_DIR_CUSTOM:-/data/db/custom}"
+ DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_CUSTOM:-/usr/local/share/httpd/admin/databases}"
+ [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_CUSTOM:-/admin/dbadmin}"
elif [ "$SERVICE_NAME" = "redis" ] || [ "$DATABASE_SERVICE_TYPE" = "redis" ]; then
- DATABASE_DIR="${DATABASE_DIR_REDIS:-/data/db/redis}"
- DATABASE_BASE_DIR="${DATABASE_DIR_REDIS:-/data/db/redis}"
- DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_REDIS:-/usr/local/share/httpd/admin/redis}"
- [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_REDIS:-/admin/redis}"
+ DATABASE_DIR="${DATABASE_DIR_REDIS:-/data/db/redis}"
+ DATABASE_BASE_DIR="${DATABASE_DIR_REDIS:-/data/db/redis}"
+ DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_REDIS:-/usr/local/share/httpd/admin/redis}"
+ [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_REDIS:-/admin/redis}"
elif [ "$SERVICE_NAME" = "postgres" ] || [ "$DATABASE_SERVICE_TYPE" = "postgres" ]; then
- DATABASE_DIR="${DATABASE_DIR_POSTGRES:-/data/db/postgres}"
- DATABASE_BASE_DIR="${DATABASE_DIR_POSTGRES:-/data/db/postgres}"
- DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_POSTGRES:-/usr/local/share/httpd/admin/postgres}"
- [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_POSTGRES:-/admin/postgres}"
+ DATABASE_DIR="${DATABASE_DIR_POSTGRES:-/data/db/postgres}"
+ DATABASE_BASE_DIR="${DATABASE_DIR_POSTGRES:-/data/db/postgres}"
+ DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_POSTGRES:-/usr/local/share/httpd/admin/postgres}"
+ [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_POSTGRES:-/admin/postgres}"
elif [ "$SERVICE_NAME" = "mariadb" ] || [ "$DATABASE_SERVICE_TYPE" = "mariadb" ]; then
- DATABASE_DIR="${DATABASE_DIR_MARIADB:-/data/db/mariadb}"
- DATABASE_BASE_DIR="${DATABASE_DIR_MARIADB:-/data/db/mariadb}"
- DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_MARIADB:-/usr/local/share/httpd/admin/mysql}"
- [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MARIADB:-/admin/mysql}"
+ DATABASE_DIR="${DATABASE_DIR_MARIADB:-/data/db/mariadb}"
+ DATABASE_BASE_DIR="${DATABASE_DIR_MARIADB:-/data/db/mariadb}"
+ DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_MARIADB:-/usr/local/share/httpd/admin/mysql}"
+ [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MARIADB:-/admin/mysql}"
elif [ "$SERVICE_NAME" = "mysql" ] || [ "$DATABASE_SERVICE_TYPE" = "mysql" ]; then
- DATABASE_DIR="${DATABASE_DIR_MYSQL:-/data/db/mysql}"
- DATABASE_BASE_DIR="${DATABASE_DIR_MYSQL:-/data/db/mysql}"
- DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_MYSQL:-/usr/local/share/httpd/admin/mysql}"
- [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MYSQL:-/admin/mysql}"
+ DATABASE_DIR="${DATABASE_DIR_MYSQL:-/data/db/mysql}"
+ DATABASE_BASE_DIR="${DATABASE_DIR_MYSQL:-/data/db/mysql}"
+ DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_MYSQL:-/usr/local/share/httpd/admin/mysql}"
+ [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MYSQL:-/admin/mysql}"
elif [ "$SERVICE_NAME" = "couchdb" ] || [ "$DATABASE_SERVICE_TYPE" = "couchdb" ]; then
- DATABASE_DIR="${DATABASE_DIR_COUCHDB:-/data/db/couchdb}"
- DATABASE_BASE_DIR="${DATABASE_DIR_COUCHDB:-/data/db/couchdb}"
- DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_COUCHDB:-/usr/local/share/httpd/admin/couchdb}"
- [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_COUCHDB:-/admin/couchdb}"
+ DATABASE_DIR="${DATABASE_DIR_COUCHDB:-/data/db/couchdb}"
+ DATABASE_BASE_DIR="${DATABASE_DIR_COUCHDB:-/data/db/couchdb}"
+ DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_COUCHDB:-/usr/local/share/httpd/admin/couchdb}"
+ [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_COUCHDB:-/admin/couchdb}"
elif [ "$SERVICE_NAME" = "mongodb" ] || [ "$DATABASE_SERVICE_TYPE" = "mongodb" ]; then
- DATABASE_DIR="${DATABASE_DIR_MONGODB:-/data/db/mongodb}"
- DATABASE_BASE_DIR="${DATABASE_DIR_MONGODB:-/data/db/mongodb}"
- DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_MONGODB:-/usr/local/share/httpd/admin/mongodb}"
- [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MONGODB:-/admin/mongodb}"
+ DATABASE_DIR="${DATABASE_DIR_MONGODB:-/data/db/mongodb}"
+ DATABASE_BASE_DIR="${DATABASE_DIR_MONGODB:-/data/db/mongodb}"
+ DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_MONGODB:-/usr/local/share/httpd/admin/mongodb}"
+ [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MONGODB:-/admin/mongodb}"
elif [ "$SERVICE_NAME" = "supabase" ] || [ "$DATABASE_SERVICE_TYPE" = "supabase" ]; then
- DATABASE_DIR="${DATABASE_DIR_SUPABASE:-/data/db/supabase}"
- DATABASE_BASE_DIR="${DATABASE_DIR_SUPABASE:-/data/db/supabase}"
- DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_SUPABASE:-/usr/local/share/httpd/admin/supabase}"
- [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_SUPBASE:-/admin/supabase}"
+ DATABASE_DIR="${DATABASE_DIR_SUPABASE:-/data/db/supabase}"
+ DATABASE_BASE_DIR="${DATABASE_DIR_SUPABASE:-/data/db/supabase}"
+ DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_SUPABASE:-/usr/local/share/httpd/admin/supabase}"
+ [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_SUPBASE:-/admin/supabase}"
elif [ "$SERVICE_NAME" = "sqlite" ] || [ "$DATABASE_SERVICE_TYPE" = "sqlite" ]; then
- DATABASE_DIR="${DATABASE_DIR_SQLITE:-/data/db/sqlite}/$SERVER_NAME"
- DATABASE_BASE_DIR="${DATABASE_DIR_SQLITE:-/data/db/sqlite}/$SERVER_NAME"
- DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_SQLITE:-/usr/local/share/httpd/admin/sqlite}"
- [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_SQLITE:-/admin/sqlite}"
- [ -d "$DATABASE_DIR" ] || mkdir -p "$DATABASE_DIR"
- chmod 777 "$DATABASE_DIR"
+ DATABASE_DIR="${DATABASE_DIR_SQLITE:-/data/db/sqlite}/$SERVER_NAME"
+ DATABASE_BASE_DIR="${DATABASE_DIR_SQLITE:-/data/db/sqlite}/$SERVER_NAME"
+ DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_SQLITE:-/usr/local/share/httpd/admin/sqlite}"
+ [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_SQLITE:-/admin/sqlite}"
+ [ -d "$DATABASE_DIR" ] || mkdir -p "$DATABASE_DIR"
+ chmod 777 "$DATABASE_DIR"
fi
[ -n "$DATABASE_ADMIN_WWW_ROOT" ] && { [ ! -d "$DATABASE_ADMIN_WWW_ROOT" ] || mkdir -p "${DATABASE_ADMIN_WWW_ROOT}"; }
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -661,7 +671,7 @@ __run_precopy
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Copy /config to /etc
for config_2_etc in $CONF_DIR $ADDITIONAL_CONFIG_DIRS; do
- __initialize_system_etc "$config_2_etc" 2>/dev/stderr | tee -p -a "/data/logs/init.txt"
+ __initialize_system_etc "$config_2_etc" 2>/dev/stderr | tee -p -a "/data/logs/init.txt"
done
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Replace variables
@@ -685,15 +695,15 @@ __run_pre_execute_checks 2>/dev/stderr | tee -a -p "/data/logs/entrypoint.log" "
__run_start_script 2>>/dev/stderr | tee -p -a "/data/logs/entrypoint.log"
errorCode=$?
if [ -n "$EXEC_CMD_BIN" ]; then
- if [ "$errorCode" -eq 0 ]; then
- SERVICE_EXIT_CODE=0
- SERVICE_IS_RUNNING="yes"
- else
- SERVICE_EXIT_CODE=$errorCode
- SERVICE_IS_RUNNING="${SERVICE_IS_RUNNING:-no}"
- [ -s "$SERVICE_PID_FILE" ] || rm -Rf "$SERVICE_PID_FILE"
- fi
- SERVICE_EXIT_CODE=0
+ if [ "$errorCode" -eq 0 ]; then
+ SERVICE_EXIT_CODE=0
+ SERVICE_IS_RUNNING="yes"
+ else
+ SERVICE_EXIT_CODE=$errorCode
+ SERVICE_IS_RUNNING="${SERVICE_IS_RUNNING:-no}"
+ [ -s "$SERVICE_PID_FILE" ] || rm -Rf "$SERVICE_PID_FILE"
+ fi
+ SERVICE_EXIT_CODE=0
fi
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# start the post execute function in background
@@ -701,4 +711,4 @@ __post_execute 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt" &
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
__banner "Initializing of $SERVICE_NAME has completed with statusCode: $SERVICE_EXIT_CODE" | tee -p -a "/data/logs/entrypoint.log" "/data/logs/init.txt"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-exit $SERVICE_EXIT_CODE
+__script_exit $SERVICE_EXIT_CODE
diff --git a/rootfs/usr/local/etc/docker/init.d/05-php-fpm.sh b/rootfs/usr/local/etc/docker/init.d/05-php-fpm.sh
old mode 100755
new mode 100644
index 346500d..31569a3
--- a/rootfs/usr/local/etc/docker/init.d/05-php-fpm.sh
+++ b/rootfs/usr/local/etc/docker/init.d/05-php-fpm.sh
@@ -31,27 +31,37 @@ export PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/s
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SCRIPT_FILE="$0"
SERVICE_NAME="php-fpm"
+# Function to exit appropriately based on context
+__script_exit() {
+ local exit_code="${1:-0}"
+ if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
+ # Script is being sourced - use return
+ return "$exit_code"
+ else
+ # Script is being executed - use exit
+ exit "$exit_code"
+ fi
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# exit if __start_init_scripts function hasn't been Initialized
if [ ! -f "/run/__start_init_scripts.pid" ]; then
- echo "__start_init_scripts function hasn't been Initialized" >&2
- SERVICE_IS_RUNNING="no"
- exit 1
+ echo "__start_init_scripts function hasn't been Initialized" >&2
+ SERVICE_IS_RUNNING="no"
+ __script_exit 1
fi
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# import the functions file
if [ -f "/usr/local/etc/docker/functions/entrypoint.sh" ]; then
- . "/usr/local/etc/docker/functions/entrypoint.sh"
+ . "/usr/local/etc/docker/functions/entrypoint.sh"
fi
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# import variables
for set_env in "/root/env.sh" "/usr/local/etc/docker/env"/*.sh "/config/env"/*.sh; do
- [ -f "$set_env" ] && . "$set_env"
+ [ -f "$set_env" ] && . "$set_env"
done
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-printf '%s\n' "# - - - Initializing $SERVICE_NAME - - - #"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Custom functions
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -172,151 +182,151 @@ CMD_ENV=""
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Custom commands to run before copying to /config
__run_precopy() {
- # Define environment
- local hostname=${HOSTNAME}
- # Define actions/commands
+ # Define environment
+ local hostname=${HOSTNAME}
+ # Define actions/commands
- # allow custom functions
- if builtin type -t __run_precopy_local | grep -q 'function'; then __run_precopy_local; fi
+ # allow custom functions
+ if builtin type -t __run_precopy_local | grep -q 'function'; then __run_precopy_local; fi
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Custom prerun functions - IE setup WWW_ROOT_DIR
__execute_prerun() {
- # Define environment
- local hostname=${HOSTNAME}
- # Define actions/commands
+ # Define environment
+ local hostname=${HOSTNAME}
+ # Define actions/commands
- # allow custom functions
- if builtin type -t __execute_prerun_local | grep -q 'function'; then __execute_prerun_local; fi
+ # allow custom functions
+ if builtin type -t __execute_prerun_local | grep -q 'function'; then __execute_prerun_local; fi
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Run any pre-execution checks
__run_pre_execute_checks() {
- # Set variables
- local exitStatus=0
- local pre_execute_checks_MessageST="Running preexecute check for $SERVICE_NAME" # message to show at start
- local pre_execute_checks_MessageEnd="Finished preexecute check for $SERVICE_NAME" # message to show at completion
- __banner "$pre_execute_checks_MessageST"
- # Put command to execute in parentheses
- {
- true
- }
- exitStatus=$?
- __banner "$pre_execute_checks_MessageEnd: Status $exitStatus"
+ # Set variables
+ local exitStatus=0
+ local pre_execute_checks_MessageST="Running preexecute check for $SERVICE_NAME" # message to show at start
+ local pre_execute_checks_MessageEnd="Finished preexecute check for $SERVICE_NAME" # message to show at completion
+ __banner "$pre_execute_checks_MessageST"
+ # Put command to execute in parentheses
+ {
+ true
+ }
+ exitStatus=$?
+ __banner "$pre_execute_checks_MessageEnd: Status $exitStatus"
- # show exit message
- if [ $exitStatus -ne 0 ]; then
- echo "The pre-execution check has failed" >&2
- [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE"
- exit 1
- fi
- # allow custom functions
- if builtin type -t __run_pre_execute_checks_local | grep -q 'function'; then __run_pre_execute_checks_local; fi
- # exit function
- return $exitStatus
+ # show exit message
+ if [ $exitStatus -ne 0 ]; then
+ echo "The pre-execution check has failed" >&2
+ [ -f "$SERVICE_PID_FILE" ] && rm -Rf "$SERVICE_PID_FILE"
+ __script_exit 1
+ fi
+ # allow custom functions
+ if builtin type -t __run_pre_execute_checks_local | grep -q 'function'; then __run_pre_execute_checks_local; fi
+ # exit function
+ return $exitStatus
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# use this function to update config files - IE: change port
__update_conf_files() {
- local exitCode=0 # default exit code
- local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- # delete files
- #__rm ""
+ local exitCode=0 # default exit code
+ local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ # delete files
+ #__rm ""
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- # custom commands
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ # custom commands
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- # replace variables
- # __replace "" "" "$CONF_DIR/php-fpm.conf"
- # replace variables recursively
- # __find_replace "" "" "$CONF_DIR"
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ # replace variables
+ # __replace "" "" "$CONF_DIR/php-fpm.conf"
+ # replace variables recursively
+ # __find_replace "" "" "$CONF_DIR"
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- # define actions
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ # define actions
- # allow custom functions
- if builtin type -t __update_conf_files_local | grep -q 'function'; then __update_conf_files_local; fi
- # exit function
- return $exitCode
+ # allow custom functions
+ if builtin type -t __update_conf_files_local | grep -q 'function'; then __update_conf_files_local; fi
+ # exit function
+ return $exitCode
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# function to run before executing
__pre_execute() {
- local exitCode=0 # default exit code
- local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
- # execute if directories is empty
- # __is_dir_empty "$CONF_DIR" && true
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- # define actions to run after copying to /config
+ local exitCode=0 # default exit code
+ local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
+ # execute if directories is empty
+ # __is_dir_empty "$CONF_DIR" && true
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ # define actions to run after copying to /config
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- # unset unneeded variables
- unset sysname
- # Lets wait a few seconds before continuing
- sleep 5
- # allow custom functions
- if builtin type -t __pre_execute_local | grep -q 'function'; then __pre_execute_local; fi
- # exit function
- return $exitCode
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ # unset unneeded variables
+ unset sysname
+ # Lets wait a few seconds before continuing
+ sleep 5
+ # allow custom functions
+ if builtin type -t __pre_execute_local | grep -q 'function'; then __pre_execute_local; fi
+ # exit function
+ return $exitCode
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# function to run after executing
__post_execute() {
- local pid="" # init pid var
- local retVal=0 # set default exit code
- local ctime=${POST_EXECUTE_WAIT_TIME:-1} # how long to wait before executing
- local waitTime=$((ctime * 60)) # convert minutes to seconds
- local postMessageST="Running post commands for $SERVICE_NAME" # message to show at start
- local postMessageEnd="Finished post commands for $SERVICE_NAME" # message to show at completion
- # wait
- sleep $waitTime
- # execute commands after waiting
- (
- # show message
- __banner "$postMessageST"
- # commands to execute
- sleep 5
- # show exit message
- __banner "$postMessageEnd: Status $retVal"
- ) 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt" &
- pid=$!
- ps ax | awk '{print $1}' | grep -v grep | grep -q "$execPid$" && retVal=0 || retVal=10
- # allow custom functions
- if builtin type -t __post_execute_local | grep -q 'function'; then __post_execute_local; fi
- # exit function
- return $retVal
+ local pid="" # init pid var
+ local retVal=0 # set default exit code
+ local ctime=${POST_EXECUTE_WAIT_TIME:-1} # how long to wait before executing
+ local waitTime=$((ctime * 60)) # convert minutes to seconds
+ local postMessageST="Running post commands for $SERVICE_NAME" # message to show at start
+ local postMessageEnd="Finished post commands for $SERVICE_NAME" # message to show at completion
+ # wait
+ sleep $waitTime
+ # execute commands after waiting
+ (
+ # show message
+ __banner "$postMessageST"
+ # commands to execute
+ sleep 5
+ # show exit message
+ __banner "$postMessageEnd: Status $retVal"
+ ) 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt" &
+ pid=$!
+ ps ax | awk '{print $1}' | grep -v grep | grep -q "$execPid$" && retVal=0 || retVal=10
+ # allow custom functions
+ if builtin type -t __post_execute_local | grep -q 'function'; then __post_execute_local; fi
+ # exit function
+ return $retVal
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# use this function to update config files - IE: change port
__pre_message() {
- local exitCode=0
- [ -n "$PRE_EXEC_MESSAGE" ] && eval echo "$PRE_EXEC_MESSAGE"
- # execute commands
+ local exitCode=0
+ [ -n "$PRE_EXEC_MESSAGE" ] && eval echo "$PRE_EXEC_MESSAGE"
+ # execute commands
- # allow custom functions
- if builtin type -t __pre_message_local | grep -q 'function'; then __pre_message_local; fi
- # exit function
- return $exitCode
+ # allow custom functions
+ if builtin type -t __pre_message_local | grep -q 'function'; then __pre_message_local; fi
+ # exit function
+ return $exitCode
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# use this function to setup ssl support
__update_ssl_conf() {
- local exitCode=0
- local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
- # execute commands
+ local exitCode=0
+ local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
+ # execute commands
- # allow custom functions
- if builtin type -t __update_ssl_conf_local | grep -q 'function'; then __update_ssl_conf_local; fi
- # set exitCode
- return $exitCode
+ # allow custom functions
+ if builtin type -t __update_ssl_conf_local | grep -q 'function'; then __update_ssl_conf_local; fi
+ # set exitCode
+ return $exitCode
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
__create_service_env() {
- local exitCode=0
- if [ ! -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" ]; then
- cat </dev/null
+ local exitCode=0
+ if [ ! -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" ]; then
+ cat </dev/null
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# root/admin user info [password/random]
#ENV_ROOT_USER_NAME="${ENV_ROOT_USER_NAME:-$PHP_FPM_ROOT_USER_NAME}" # root user name
@@ -331,86 +341,86 @@ __create_service_env() {
#user_pass="${ENV_USER_PASS:-$user_pass}" # normal user password
EOF
- fi
- if [ ! -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh" ]; then
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- __run_precopy_local() { true; }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- __execute_prerun_local() { true; }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- __run_pre_execute_checks_local() { true; }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- __update_conf_files_local() { true; }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- __pre_execute_local() { true; }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- __post_execute_local() { true; }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- __pre_message_local() { true; }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- __update_ssl_conf_local() { true; }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- fi
- __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" || exitCode=$((exitCode + 1))
- __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh" || exitCode=$((exitCode + 1))
- return $exitCode
+ fi
+ if [ ! -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh" ]; then
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ __run_precopy_local() { true; }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ __execute_prerun_local() { true; }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ __run_pre_execute_checks_local() { true; }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ __update_conf_files_local() { true; }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ __pre_execute_local() { true; }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ __post_execute_local() { true; }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ __pre_message_local() { true; }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ __update_ssl_conf_local() { true; }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ fi
+ __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" || exitCode=$((exitCode + 1))
+ __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh" || exitCode=$((exitCode + 1))
+ return $exitCode
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# script to start server
__run_start_script() {
- local runExitCode=0
- local workdir="$(eval echo "${WORK_DIR:-}")" # expand variables
- local cmd="$(eval echo "${EXEC_CMD_BIN:-}")" # expand variables
- local args="$(eval echo "${EXEC_CMD_ARGS:-}")" # expand variables
- local name="$(eval echo "${EXEC_CMD_NAME:-}")" # expand variables
- local pre="$(eval echo "${EXEC_PRE_SCRIPT:-}")" # expand variables
- local extra_env="$(eval echo "${CMD_ENV//,/ }")" # expand variables
- local lc_type="$(eval echo "${LANG:-${LC_ALL:-$LC_CTYPE}}")" # expand variables
- local home="$(eval echo "${workdir//\/root/\/tmp\/docker}")" # expand variables
- local path="$(eval echo "$PATH")" # expand variables
- local message="$(eval echo "")" # expand variables
- local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
- [ -f "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh" ] && . "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh"
- #
- if [ -z "$cmd" ]; then
- __post_execute 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt"
- retVal=$?
- echo "Initializing $SCRIPT_NAME has completed"
- exit $retVal
- else
- # ensure the command exists
- if [ ! -x "$cmd" ]; then
- echo "$name is not a valid executable"
- return 2
- fi
- # check and exit if already running
- if __proc_check "$name" || __proc_check "$cmd"; then
- echo "$name is already running" >&2
- return 0
- else
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- # show message if env exists
- if [ -n "$cmd" ]; then
- [ -n "$SERVICE_USER" ] && echo "Setting up $cmd to run as $SERVICE_USER" || SERVICE_USER="root"
- [ -n "$SERVICE_PORT" ] && echo "$name will be running on port $SERVICE_PORT" || SERVICE_PORT=""
- fi
- if [ -n "$pre" ] && [ -n "$(command -v "$pre" 2>/dev/null)" ]; then
- export cmd_exec="$pre $cmd $args"
- message="Starting service: $name $args through $pre"
- else
- export cmd_exec="$cmd $args"
- message="Starting service: $name $args"
- fi
- [ -n "$su_exec" ] && echo "using $su_exec" | tee -a -p "/data/logs/init.txt"
- echo "$message" | tee -a -p "/data/logs/init.txt"
- su_cmd touch "$SERVICE_PID_FILE"
- if [ "$RESET_ENV" = "yes" ]; then
- env_command="$(echo "env -i HOME=\"$home\" LC_CTYPE=\"$lc_type\" PATH=\"$path\" HOSTNAME=\"$sysname\" USER=\"${SERVICE_USER:-$RUNAS_USER}\" $extra_env")"
- execute_command="$(__trim "$su_exec $env_command $cmd_exec")"
- if [ ! -f "$START_SCRIPT" ]; then
- cat <"$START_SCRIPT"
+ local runExitCode=0
+ local workdir="$(eval echo "${WORK_DIR:-}")" # expand variables
+ local cmd="$(eval echo "${EXEC_CMD_BIN:-}")" # expand variables
+ local args="$(eval echo "${EXEC_CMD_ARGS:-}")" # expand variables
+ local name="$(eval echo "${EXEC_CMD_NAME:-}")" # expand variables
+ local pre="$(eval echo "${EXEC_PRE_SCRIPT:-}")" # expand variables
+ local extra_env="$(eval echo "${CMD_ENV//,/ }")" # expand variables
+ local lc_type="$(eval echo "${LANG:-${LC_ALL:-$LC_CTYPE}}")" # expand variables
+ local home="$(eval echo "${workdir//\/root/\/tmp\/docker}")" # expand variables
+ local path="$(eval echo "$PATH")" # expand variables
+ local message="$(eval echo "")" # expand variables
+ local sysname="${SERVER_NAME:-${FULL_DOMAIN_NAME:-$HOSTNAME}}" # set hostname
+ [ -f "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh" ] && . "$CONF_DIR/$SERVICE_NAME.exec_cmd.sh"
+ #
+ if [ -z "$cmd" ]; then
+ __post_execute 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt"
+ retVal=$?
+ echo "Initializing $SCRIPT_NAME has completed"
+ __script_exit $retVal
+ else
+ # ensure the command exists
+ if [ ! -x "$cmd" ]; then
+ echo "$name is not a valid executable"
+ return 2
+ fi
+ # check and exit if already running
+ if __proc_check "$name" || __proc_check "$cmd"; then
+ echo "$name is already running" >&2
+ return 0
+ else
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ # show message if env exists
+ if [ -n "$cmd" ]; then
+ [ -n "$SERVICE_USER" ] && echo "Setting up $cmd to run as $SERVICE_USER" || SERVICE_USER="root"
+ [ -n "$SERVICE_PORT" ] && echo "$name will be running on port $SERVICE_PORT" || SERVICE_PORT=""
+ fi
+ if [ -n "$pre" ] && [ -n "$(command -v "$pre" 2>/dev/null)" ]; then
+ export cmd_exec="$pre $cmd $args"
+ message="Starting service: $name $args through $pre"
+ else
+ export cmd_exec="$cmd $args"
+ message="Starting service: $name $args"
+ fi
+ [ -n "$su_exec" ] && echo "using $su_exec" | tee -a -p "/data/logs/init.txt"
+ echo "$message" | tee -a -p "/data/logs/init.txt"
+ su_cmd touch "$SERVICE_PID_FILE"
+ if [ "$RESET_ENV" = "yes" ]; then
+ env_command="$(echo "env -i HOME=\"$home\" LC_CTYPE=\"$lc_type\" PATH=\"$path\" HOSTNAME=\"$sysname\" USER=\"${SERVICE_USER:-$RUNAS_USER}\" $extra_env")"
+ execute_command="$(__trim "$su_exec $env_command $cmd_exec")"
+ if [ ! -f "$START_SCRIPT" ]; then
+ cat <"$START_SCRIPT"
#!/usr/bin/env bash
-trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ] && rm -Rf "\$SERVICE_PID_FILE";exit \$exitCode' EXIT
+trap 'exitCode=\$?;if [ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ]; then rm -Rf "\$SERVICE_PID_FILE"; fi; exit \$exitCode' EXIT
#
set -Eeo pipefail
# Setting up $cmd to run as ${SERVICE_USER:-root} with env
@@ -427,13 +437,13 @@ checkPID="\$(ps ax | awk '{print \$1}' | grep -v grep | grep "\$execPid$" || fal
exit \$retVal
EOF
- fi
- else
- if [ ! -f "$START_SCRIPT" ]; then
- execute_command="$(__trim "$su_exec $cmd_exec")"
- cat <"$START_SCRIPT"
+ fi
+ else
+ if [ ! -f "$START_SCRIPT" ]; then
+ execute_command="$(__trim "$su_exec $cmd_exec")"
+ cat <"$START_SCRIPT"
#!/usr/bin/env bash
-trap 'exitCode=\$?;[ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ] && rm -Rf "\$SERVICE_PID_FILE";exit \$exitCode' EXIT
+trap 'exitCode=\$?;if [ \$exitCode -ne 0 ] && [ -f "\$SERVICE_PID_FILE" ]; then rm -Rf "\$SERVICE_PID_FILE"; fi; exit \$exitCode' EXIT
#
set -Eeo pipefail
# Setting up $cmd to run as ${SERVICE_USER:-root}
@@ -450,36 +460,36 @@ checkPID="\$(ps ax | awk '{print \$1}' | grep -v grep | grep "\$execPid$" || fal
exit \$retVal
EOF
- fi
- fi
- fi
- [ -x "$START_SCRIPT" ] || chmod 755 -Rf "$START_SCRIPT"
- [ "$CONTAINER_INIT" = "yes" ] || eval sh -c "$START_SCRIPT"
- runExitCode=$?
- fi
- return $runExitCode
+ fi
+ fi
+ fi
+ [ -x "$START_SCRIPT" ] || chmod 755 -Rf "$START_SCRIPT"
+ [ "$CONTAINER_INIT" = "yes" ] || eval sh -c "$START_SCRIPT"
+ runExitCode=$?
+ fi
+ return $runExitCode
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# username and password actions
__run_secure_function() {
- local filesperms
- if [ -n "$user_name" ] || [ -n "$user_pass" ]; then
- for filesperms in "${USER_FILE_PREFIX}"/*; do
- if [ -e "$filesperms" ]; then
- chmod -Rf 600 "$filesperms"
- chown -Rf $SERVICE_USER:$SERVICE_USER "$filesperms" 2>/dev/null
- fi
- done 2>/dev/null | tee -p -a "/data/logs/init.txt"
- fi
- if [ -n "$root_user_name" ] || [ -n "$root_user_pass" ]; then
- for filesperms in "${ROOT_FILE_PREFIX}"/*; do
- if [ -e "$filesperms" ]; then
- chmod -Rf 600 "$filesperms"
- chown -Rf $SERVICE_USER:$SERVICE_USER "$filesperms" 2>/dev/null
- fi
- done 2>/dev/null | tee -p -a "/data/logs/init.txt"
- fi
- unset filesperms
+ local filesperms
+ if [ -n "$user_name" ] || [ -n "$user_pass" ]; then
+ for filesperms in "${USER_FILE_PREFIX}"/*; do
+ if [ -e "$filesperms" ]; then
+ chmod -Rf 600 "$filesperms"
+ chown -Rf $SERVICE_USER:$SERVICE_USER "$filesperms" 2>/dev/null
+ fi
+ done 2>/dev/null | tee -p -a "/data/logs/init.txt"
+ fi
+ if [ -n "$root_user_name" ] || [ -n "$root_user_pass" ]; then
+ for filesperms in "${ROOT_FILE_PREFIX}"/*; do
+ if [ -e "$filesperms" ]; then
+ chmod -Rf 600 "$filesperms"
+ chown -Rf $SERVICE_USER:$SERVICE_USER "$filesperms" 2>/dev/null
+ fi
+ done 2>/dev/null | tee -p -a "/data/logs/init.txt"
+ fi
+ unset filesperms
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Allow ENV_ variable - Import env file
@@ -513,68 +523,68 @@ __check_service "$1" && SERVICE_IS_RUNNING=yes
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Database env
if [ "$IS_DATABASE_SERVICE" = "yes" ] || [ "$USES_DATABASE_SERVICE" = "yes" ]; then
- RESET_ENV="no"
- DATABASE_CREATE="${ENV_DATABASE_CREATE:-$DATABASE_CREATE}"
- DATABASE_USER_NORMAL="${ENV_DATABASE_USER:-${DATABASE_USER_NORMAL:-$user_name}}"
- DATABASE_PASS_NORMAL="${ENV_DATABASE_PASSWORD:-${DATABASE_PASS_NORMAL:-$user_pass}}"
- DATABASE_USER_ROOT="${ENV_DATABASE_ROOT_USER:-${DATABASE_USER_ROOT:-$root_user_name}}"
- DATABASE_PASS_ROOT="${ENV_DATABASE_ROOT_PASSWORD:-${DATABASE_PASS_ROOT:-$root_user_pass}}"
- if [ -n "$DATABASE_PASS_NORMAL" ] && [ ! -f "${USER_FILE_PREFIX}/db_pass_user" ]; then
- echo "$DATABASE_PASS_NORMAL" >"${USER_FILE_PREFIX}/db_pass_user"
- fi
- if [ -n "$DATABASE_PASS_ROOT" ] && [ ! -f "${ROOT_FILE_PREFIX}/db_pass_root" ]; then
- echo "$DATABASE_PASS_ROOT" >"${ROOT_FILE_PREFIX}/db_pass_root"
- fi
+ RESET_ENV="no"
+ DATABASE_CREATE="${ENV_DATABASE_CREATE:-$DATABASE_CREATE}"
+ DATABASE_USER_NORMAL="${ENV_DATABASE_USER:-${DATABASE_USER_NORMAL:-$user_name}}"
+ DATABASE_PASS_NORMAL="${ENV_DATABASE_PASSWORD:-${DATABASE_PASS_NORMAL:-$user_pass}}"
+ DATABASE_USER_ROOT="${ENV_DATABASE_ROOT_USER:-${DATABASE_USER_ROOT:-$root_user_name}}"
+ DATABASE_PASS_ROOT="${ENV_DATABASE_ROOT_PASSWORD:-${DATABASE_PASS_ROOT:-$root_user_pass}}"
+ if [ -n "$DATABASE_PASS_NORMAL" ] && [ ! -f "${USER_FILE_PREFIX}/db_pass_user" ]; then
+ echo "$DATABASE_PASS_NORMAL" >"${USER_FILE_PREFIX}/db_pass_user"
+ fi
+ if [ -n "$DATABASE_PASS_ROOT" ] && [ ! -f "${ROOT_FILE_PREFIX}/db_pass_root" ]; then
+ echo "$DATABASE_PASS_ROOT" >"${ROOT_FILE_PREFIX}/db_pass_root"
+ fi
fi
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# [DATABASE_DIR_[SQLITE,REDIS,POSTGRES,MARIADB,COUCHDB,MONGODB,SUPABASE]]
if [ "$DATABASE_SERVICE_TYPE" = "custom" ]; then
- DATABASE_DIR="${DATABASE_DIR_CUSTOM:-/data/db/custom}"
- DATABASE_BASE_DIR="${DATABASE_DIR_CUSTOM:-/data/db/custom}"
- DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_CUSTOM:-/usr/local/share/httpd/admin/databases}"
- [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_CUSTOM:-/admin/dbadmin}"
+ DATABASE_DIR="${DATABASE_DIR_CUSTOM:-/data/db/custom}"
+ DATABASE_BASE_DIR="${DATABASE_DIR_CUSTOM:-/data/db/custom}"
+ DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_CUSTOM:-/usr/local/share/httpd/admin/databases}"
+ [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_CUSTOM:-/admin/dbadmin}"
elif [ "$SERVICE_NAME" = "redis" ] || [ "$DATABASE_SERVICE_TYPE" = "redis" ]; then
- DATABASE_DIR="${DATABASE_DIR_REDIS:-/data/db/redis}"
- DATABASE_BASE_DIR="${DATABASE_DIR_REDIS:-/data/db/redis}"
- DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_REDIS:-/usr/local/share/httpd/admin/redis}"
- [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_REDIS:-/admin/redis}"
+ DATABASE_DIR="${DATABASE_DIR_REDIS:-/data/db/redis}"
+ DATABASE_BASE_DIR="${DATABASE_DIR_REDIS:-/data/db/redis}"
+ DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_REDIS:-/usr/local/share/httpd/admin/redis}"
+ [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_REDIS:-/admin/redis}"
elif [ "$SERVICE_NAME" = "postgres" ] || [ "$DATABASE_SERVICE_TYPE" = "postgres" ]; then
- DATABASE_DIR="${DATABASE_DIR_POSTGRES:-/data/db/postgres}"
- DATABASE_BASE_DIR="${DATABASE_DIR_POSTGRES:-/data/db/postgres}"
- DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_POSTGRES:-/usr/local/share/httpd/admin/postgres}"
- [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_POSTGRES:-/admin/postgres}"
+ DATABASE_DIR="${DATABASE_DIR_POSTGRES:-/data/db/postgres}"
+ DATABASE_BASE_DIR="${DATABASE_DIR_POSTGRES:-/data/db/postgres}"
+ DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_POSTGRES:-/usr/local/share/httpd/admin/postgres}"
+ [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_POSTGRES:-/admin/postgres}"
elif [ "$SERVICE_NAME" = "mariadb" ] || [ "$DATABASE_SERVICE_TYPE" = "mariadb" ]; then
- DATABASE_DIR="${DATABASE_DIR_MARIADB:-/data/db/mariadb}"
- DATABASE_BASE_DIR="${DATABASE_DIR_MARIADB:-/data/db/mariadb}"
- DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_MARIADB:-/usr/local/share/httpd/admin/mysql}"
- [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MARIADB:-/admin/mysql}"
+ DATABASE_DIR="${DATABASE_DIR_MARIADB:-/data/db/mariadb}"
+ DATABASE_BASE_DIR="${DATABASE_DIR_MARIADB:-/data/db/mariadb}"
+ DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_MARIADB:-/usr/local/share/httpd/admin/mysql}"
+ [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MARIADB:-/admin/mysql}"
elif [ "$SERVICE_NAME" = "mysql" ] || [ "$DATABASE_SERVICE_TYPE" = "mysql" ]; then
- DATABASE_DIR="${DATABASE_DIR_MYSQL:-/data/db/mysql}"
- DATABASE_BASE_DIR="${DATABASE_DIR_MYSQL:-/data/db/mysql}"
- DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_MYSQL:-/usr/local/share/httpd/admin/mysql}"
- [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MYSQL:-/admin/mysql}"
+ DATABASE_DIR="${DATABASE_DIR_MYSQL:-/data/db/mysql}"
+ DATABASE_BASE_DIR="${DATABASE_DIR_MYSQL:-/data/db/mysql}"
+ DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_MYSQL:-/usr/local/share/httpd/admin/mysql}"
+ [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MYSQL:-/admin/mysql}"
elif [ "$SERVICE_NAME" = "couchdb" ] || [ "$DATABASE_SERVICE_TYPE" = "couchdb" ]; then
- DATABASE_DIR="${DATABASE_DIR_COUCHDB:-/data/db/couchdb}"
- DATABASE_BASE_DIR="${DATABASE_DIR_COUCHDB:-/data/db/couchdb}"
- DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_COUCHDB:-/usr/local/share/httpd/admin/couchdb}"
- [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_COUCHDB:-/admin/couchdb}"
+ DATABASE_DIR="${DATABASE_DIR_COUCHDB:-/data/db/couchdb}"
+ DATABASE_BASE_DIR="${DATABASE_DIR_COUCHDB:-/data/db/couchdb}"
+ DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_COUCHDB:-/usr/local/share/httpd/admin/couchdb}"
+ [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_COUCHDB:-/admin/couchdb}"
elif [ "$SERVICE_NAME" = "mongodb" ] || [ "$DATABASE_SERVICE_TYPE" = "mongodb" ]; then
- DATABASE_DIR="${DATABASE_DIR_MONGODB:-/data/db/mongodb}"
- DATABASE_BASE_DIR="${DATABASE_DIR_MONGODB:-/data/db/mongodb}"
- DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_MONGODB:-/usr/local/share/httpd/admin/mongodb}"
- [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MONGODB:-/admin/mongodb}"
+ DATABASE_DIR="${DATABASE_DIR_MONGODB:-/data/db/mongodb}"
+ DATABASE_BASE_DIR="${DATABASE_DIR_MONGODB:-/data/db/mongodb}"
+ DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_MONGODB:-/usr/local/share/httpd/admin/mongodb}"
+ [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_MONGODB:-/admin/mongodb}"
elif [ "$SERVICE_NAME" = "supabase" ] || [ "$DATABASE_SERVICE_TYPE" = "supabase" ]; then
- DATABASE_DIR="${DATABASE_DIR_SUPABASE:-/data/db/supabase}"
- DATABASE_BASE_DIR="${DATABASE_DIR_SUPABASE:-/data/db/supabase}"
- DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_SUPABASE:-/usr/local/share/httpd/admin/supabase}"
- [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_SUPBASE:-/admin/supabase}"
+ DATABASE_DIR="${DATABASE_DIR_SUPABASE:-/data/db/supabase}"
+ DATABASE_BASE_DIR="${DATABASE_DIR_SUPABASE:-/data/db/supabase}"
+ DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_SUPABASE:-/usr/local/share/httpd/admin/supabase}"
+ [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_SUPBASE:-/admin/supabase}"
elif [ "$SERVICE_NAME" = "sqlite" ] || [ "$DATABASE_SERVICE_TYPE" = "sqlite" ]; then
- DATABASE_DIR="${DATABASE_DIR_SQLITE:-/data/db/sqlite}/$SERVER_NAME"
- DATABASE_BASE_DIR="${DATABASE_DIR_SQLITE:-/data/db/sqlite}/$SERVER_NAME"
- DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_SQLITE:-/usr/local/share/httpd/admin/sqlite}"
- [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_SQLITE:-/admin/sqlite}"
- [ -d "$DATABASE_DIR" ] || mkdir -p "$DATABASE_DIR"
- chmod 777 "$DATABASE_DIR"
+ DATABASE_DIR="${DATABASE_DIR_SQLITE:-/data/db/sqlite}/$SERVER_NAME"
+ DATABASE_BASE_DIR="${DATABASE_DIR_SQLITE:-/data/db/sqlite}/$SERVER_NAME"
+ DATABASE_ADMIN_WWW_ROOT="${DATABASE_ADMIN_WWW_ROOT_SQLITE:-/usr/local/share/httpd/admin/sqlite}"
+ [ -d "$DATABASE_ADMIN_WWW_ROOT" ] && SERVER_ADMIN_URL="${SERVER_ADMIN_URL_SQLITE:-/admin/sqlite}"
+ [ -d "$DATABASE_DIR" ] || mkdir -p "$DATABASE_DIR"
+ chmod 777 "$DATABASE_DIR"
fi
[ -n "$DATABASE_ADMIN_WWW_ROOT" ] && { [ ! -d "$DATABASE_ADMIN_WWW_ROOT" ] || mkdir -p "${DATABASE_ADMIN_WWW_ROOT}"; }
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -647,7 +657,7 @@ __run_precopy
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Copy /config to /etc
for config_2_etc in $CONF_DIR $ADDITIONAL_CONFIG_DIRS; do
- __initialize_system_etc "$config_2_etc" 2>/dev/stderr | tee -p -a "/data/logs/init.txt"
+ __initialize_system_etc "$config_2_etc" 2>/dev/stderr | tee -p -a "/data/logs/init.txt"
done
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Replace variables
@@ -671,15 +681,15 @@ __run_pre_execute_checks 2>/dev/stderr | tee -a -p "/data/logs/entrypoint.log" "
__run_start_script 2>>/dev/stderr | tee -p -a "/data/logs/entrypoint.log"
errorCode=$?
if [ -n "$EXEC_CMD_BIN" ]; then
- if [ "$errorCode" -eq 0 ]; then
- SERVICE_EXIT_CODE=0
- SERVICE_IS_RUNNING="yes"
- else
- SERVICE_EXIT_CODE=$errorCode
- SERVICE_IS_RUNNING="${SERVICE_IS_RUNNING:-no}"
- [ -s "$SERVICE_PID_FILE" ] || rm -Rf "$SERVICE_PID_FILE"
- fi
- SERVICE_EXIT_CODE=0
+ if [ "$errorCode" -eq 0 ]; then
+ SERVICE_EXIT_CODE=0
+ SERVICE_IS_RUNNING="yes"
+ else
+ SERVICE_EXIT_CODE=$errorCode
+ SERVICE_IS_RUNNING="${SERVICE_IS_RUNNING:-no}"
+ [ -s "$SERVICE_PID_FILE" ] || rm -Rf "$SERVICE_PID_FILE"
+ fi
+ SERVICE_EXIT_CODE=0
fi
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# start the post execute function in background
@@ -687,4 +697,4 @@ __post_execute 2>"/dev/stderr" | tee -p -a "/data/logs/init.txt" &
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
__banner "Initializing of $SERVICE_NAME has completed with statusCode: $SERVICE_EXIT_CODE" | tee -p -a "/data/logs/entrypoint.log" "/data/logs/init.txt"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-exit $SERVICE_EXIT_CODE
+__script_exit $SERVICE_EXIT_CODE