🗃️ Fixed the entrypoint scripts 🗃️
Some checks failed
release-tag / release-image (push) Has been cancelled

rootfs/usr/local/bin/entrypoint.sh
rootfs/usr/local/etc/docker/functions/entrypoint.sh
This commit is contained in:
casjay
2025-11-29 12:37:07 -05:00
parent d454bd1983
commit 3d43b8a912
2 changed files with 1028 additions and 1022 deletions

View File

@@ -1,21 +1,21 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck shell=bash # shellcheck shell=bash
# - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - -
##@Version : GEN_SCRIPT_REPLACE_VERSION ##@Version : 202511290809-git
# @@Author : GEN_SCRIPT_REPLACE_AUTHOR # @@Author : Jason Hempstead
# @@Contact : GEN_SCRIPT_REPLACE_EMAIL # @@Contact : jason@casjaysdev.pro
# @@License : GEN_SCRIPT_REPLACE_LICENSE # @@License : WTFPL
# @@ReadME : entrypoint.sh --help # @@ReadME : entrypoint.sh --help
# @@Copyright : GEN_SCRIPT_REPLACE_COPYRIGHT # @@Copyright : Copyright: (c) 2025 Jason Hempstead, Casjays Developments
# @@Created : GEN_SCRIPT_REPLACE_DATE # @@Created : Saturday, Nov 29, 2025 08:09 EST
# @@File : entrypoint.sh # @@File : entrypoint.sh
# @@Description : Entrypoint file for GEN_SCRIPT_REPLACE_APPNAME # @@Description : Entrypoint file for opengist
# @@Changelog : GEN_SCRIPT_REPLACE_CHANGELOG # @@Changelog : New script
# @@TODO : GEN_SCRIPT_REPLACE_TODO # @@TODO : Better documentation
# @@Other : GEN_SCRIPT_REPLACE_OTHER # @@Other :
# @@Resource : GEN_SCRIPT_REPLACE_RES # @@Resource :
# @@Terminal App : GEN_SCRIPT_REPLACE_TERMINAL # @@Terminal App : no
# @@sudo/root : GEN_SCRIPT_REPLACE_SUDO # @@sudo/root : no
# @@Template : other/docker-entrypoint # @@Template : other/docker-entrypoint
# - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - -
# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329
@@ -31,7 +31,7 @@ PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
# - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - -
# Set bash options # Set bash options
SCRIPT_FILE="$0" SCRIPT_FILE="$0"
CONTAINER_NAME="GEN_SCRIPT_REPLACE_APPNAME" CONTAINER_NAME="opengist"
SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)" SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)"
CONTAINER_NAME="${ENV_CONTAINER_NAME:-$CONTAINER_NAME}" CONTAINER_NAME="${ENV_CONTAINER_NAME:-$CONTAINER_NAME}"
# - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -84,8 +84,8 @@ SERVICE_UID="${SERVICE_UID:-0}" # set the user id
SERVICE_GID="${SERVICE_GID:-0}" # set the group id SERVICE_GID="${SERVICE_GID:-0}" # set the group id
# - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - -
# User and group in which the service switches to - IE: nginx,apache,mysql,postgres # User and group in which the service switches to - IE: nginx,apache,mysql,postgres
SERVICE_USER="${SERVICE_USER:-GEN_SCRIPT_REPLACE_APPNAME}" # execute command as another user SERVICE_USER="${SERVICE_USER:-opengist}" # execute command as another user
SERVICE_GROUP="${SERVICE_GROUP:-GEN_SCRIPT_REPLACE_APPNAME}" # Set the service group SERVICE_GROUP="${SERVICE_GROUP:-opengist}" # Set the service group
# - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - -
# Secondary ports # Secondary ports
SERVER_PORTS="" # specifiy other ports SERVER_PORTS="" # specifiy other ports
@@ -258,7 +258,7 @@ fi
if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
# Show start message # Show start message
if [ "$CONFIG_DIR_INITIALIZED" = "no" ] || [ "$DATA_DIR_INITIALIZED" = "no" ]; then if [ "$CONFIG_DIR_INITIALIZED" = "no" ] || [ "$DATA_DIR_INITIALIZED" = "no" ]; then
[ "$ENTRYPOINT_MESSAGE" = "yes" ] && echo "Executing entrypoint script for GEN_SCRIPT_REPLACE_APPNAME" [ "$ENTRYPOINT_MESSAGE" = "yes" ] && echo "Executing entrypoint script for opengist"
fi fi
# - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - -
# Set reusable variables # Set reusable variables
@@ -371,6 +371,11 @@ else
rm -f /run/__start_init_scripts.pid /run/init.d/*.pid /run/*.pid 2>/dev/null || true rm -f /run/__start_init_scripts.pid /run/init.d/*.pid /run/*.pid 2>/dev/null || true
fi fi
# - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - -
if [ ! -f "/run/__start_init_scripts.pid" ]; then
START_SERVICES="yes"
touch /run/__start_init_scripts.pid
fi
# - - - - - - - - - - - - - - - - - - - - - - - - -
[ "$ENTRYPOINT_MESSAGE" = "yes" ] && __printf_space "40" "The containers ip address is:" "$CONTAINER_IP4_ADDRESS" [ "$ENTRYPOINT_MESSAGE" = "yes" ] && __printf_space "40" "The containers ip address is:" "$CONTAINER_IP4_ADDRESS"
# - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - -
# Show configured listing processes # Show configured listing processes
@@ -396,23 +401,26 @@ __run_message
# Just start services # Just start services
START_SERVICES="${START_SERVICES:-SYSTEM_INIT}" START_SERVICES="${START_SERVICES:-SYSTEM_INIT}"
# - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - -
# Determine if we should start services based on command # Never start services for these options
# Only skip service start for the 'init' command [ "$1" = "cron" ] && START_SERVICES="no"
SKIP_SERVICE_START="no" [ "$1" = "tail" ] && START_SERVICES="no"
[ "$1" = "init" ] && SKIP_SERVICE_START="yes" && CONTAINER_INIT="yes" [ "$1" = "logs" ] && START_SERVICES="no"
[ "$2" = "init" ] && SKIP_SERVICE_START="yes" && CONTAINER_INIT="yes" [ "$1" = "cron" ] && START_SERVICES="no"
[ "$1" = "backup" ] && START_SERVICES="no"
[ "$1" = "healthcheck" ] && START_SERVICES="no"
[ "$1" = "init" ] && START_SERVICES="no" && CONTAINER_INIT="yes"
[ "$2" = "init" ] && START_SERVICES="no" && CONTAINER_INIT="yes"
echo "$1" | grep -qE '^(sh|bash)$|/*/(sh|bash)$' && START_SERVICES="no"
# - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - -
# Start all services if no pidfile and not skipping # Start all services if no pidfile
if [ "$START_SERVICES" = "yes" ] || [ -z "$1" ]; then if [ "$START_SERVICES" = "yes" ] || [ -z "$1" ]; then
if [ "$SKIP_SERVICE_START" = "no" ]; then [ "$1" = "start" ] && shift 1
[ "$1" = "start" ] && shift 1 [ "$1" = "all" ] && shift 1
[ "$1" = "all" ] && shift 1 rm -Rf "/run"/*/*pid 2>/dev/null || true
rm -Rf "/run"/*/*pid 2>/dev/null || true echo "$$" >"$ENTRYPOINT_PID_FILE"
echo "$$" >"$ENTRYPOINT_PID_FILE" __start_init_scripts "/usr/local/etc/docker/init.d"
__start_init_scripts "/usr/local/etc/docker/init.d"
CONTAINER_INIT="${CONTAINER_INIT:-no}"
fi
START_SERVICES="no" START_SERVICES="no"
CONTAINER_INIT="${CONTAINER_INIT:-no}"
fi fi
export START_SERVICES CONTAINER_INIT ENTRYPOINT_PID_FILE export START_SERVICES CONTAINER_INIT ENTRYPOINT_PID_FILE
# - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - -

File diff suppressed because it is too large Load Diff