dockersrc/debian
1
0
Fork 0
mirror of https://github.com/dockersrc/debian synced 2025-09-20 15:57:47 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

🗃️ Committing everything that changed 🗃️

Browse Source 
.env.scripts
.gitignore
rootfs/root/docker/setup/00-init.sh
rootfs/root/docker/setup/01-system.sh
rootfs/root/docker/setup/02-packages.sh
rootfs/root/docker/setup/03-files.sh
rootfs/root/docker/setup/04-users.sh
rootfs/root/docker/setup/05-custom.sh
rootfs/root/docker/setup/06-post.sh
rootfs/root/docker/setup/07-cleanup.sh
rootfs/usr/local/bin/entrypoint.sh
rootfs/usr/local/etc/docker/functions/entrypoint.sh
This commit is contained in:
casjay
2025-09-20 05:15:28 -04:00
parent 3e6d973a09
commit 1afe50ff7c
12 changed files with 95 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.scripts
View File

@@ -1,10 +1,10 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
##@Version : 202509162338-git ##@Version : 202509200514-git
# @@Author : CasjaysDev # @@Author : CasjaysDev
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro> # @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
# @@License : MIT # @@License : MIT
# @@Copyright : Copyright 2025 CasjaysDev # @@Copyright : Copyright 2025 CasjaysDev
# @@Created : Tue Sep 16 11:38:15 PM EDT 2025 # @@Created : Sat Sep 20 05:14:01 AM EDT 2025
# @@File : .env.scripts # @@File : .env.scripts
# @@Description : Variables for gen-dockerfile and buildx scripts # @@Description : Variables for gen-dockerfile and buildx scripts
# @@Changelog : newScript # @@Changelog : newScript

2
.gitignore vendored
View File

@@ -1,4 +1,4 @@
# gitignore created on 09/16/25 at 23:38 # gitignore created on 09/20/25 at 05:14
# Disable reminder in prompt # Disable reminder in prompt
ignoredirmessage ignoredirmessage

4
rootfs/root/docker/setup/00-init.sh
View File

@@ -1,12 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck shell=bash # shellcheck shell=bash
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
##@Version : 202509162338-git ##@Version : 202509200514-git
# @@Author : CasjaysDev # @@Author : CasjaysDev
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro> # @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
# @@License : MIT # @@License : MIT
# @@Copyright : Copyright 2025 CasjaysDev # @@Copyright : Copyright 2025 CasjaysDev
# @@Created : Tue Sep 16 11:38:15 PM EDT 2025 # @@Created : Sat Sep 20 05:14:01 AM EDT 2025
# @@File : 00-init.sh # @@File : 00-init.sh
# @@Description : script to run init # @@Description : script to run init
# @@Changelog : newScript # @@Changelog : newScript

4
rootfs/root/docker/setup/01-system.sh
View File

@@ -1,12 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck shell=bash # shellcheck shell=bash
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
##@Version : 202509162338-git ##@Version : 202509200514-git
# @@Author : CasjaysDev # @@Author : CasjaysDev
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro> # @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
# @@License : MIT # @@License : MIT
# @@Copyright : Copyright 2025 CasjaysDev # @@Copyright : Copyright 2025 CasjaysDev
# @@Created : Tue Sep 16 11:38:15 PM EDT 2025 # @@Created : Sat Sep 20 05:14:01 AM EDT 2025
# @@File : 01-system.sh # @@File : 01-system.sh
# @@Description : script to run system # @@Description : script to run system
# @@Changelog : newScript # @@Changelog : newScript

4
rootfs/root/docker/setup/02-packages.sh
View File

@@ -1,12 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck shell=bash # shellcheck shell=bash
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
##@Version : 202509162338-git ##@Version : 202509200514-git
# @@Author : CasjaysDev # @@Author : CasjaysDev
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro> # @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
# @@License : MIT # @@License : MIT
# @@Copyright : Copyright 2025 CasjaysDev # @@Copyright : Copyright 2025 CasjaysDev
# @@Created : Tue Sep 16 11:38:15 PM EDT 2025 # @@Created : Sat Sep 20 05:14:01 AM EDT 2025
# @@File : 02-packages.sh # @@File : 02-packages.sh
# @@Description : script to run packages # @@Description : script to run packages
# @@Changelog : newScript # @@Changelog : newScript

4
rootfs/root/docker/setup/03-files.sh
View File

@@ -1,12 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck shell=bash # shellcheck shell=bash
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
##@Version : 202509162338-git ##@Version : 202509200514-git
# @@Author : CasjaysDev # @@Author : CasjaysDev
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro> # @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
# @@License : MIT # @@License : MIT
# @@Copyright : Copyright 2025 CasjaysDev # @@Copyright : Copyright 2025 CasjaysDev
# @@Created : Tue Sep 16 11:38:15 PM EDT 2025 # @@Created : Sat Sep 20 05:14:01 AM EDT 2025
# @@File : 03-files.sh # @@File : 03-files.sh
# @@Description : script to run files # @@Description : script to run files
# @@Changelog : newScript # @@Changelog : newScript

4
rootfs/root/docker/setup/04-users.sh
View File

@@ -1,12 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck shell=bash # shellcheck shell=bash
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
##@Version : 202509162338-git ##@Version : 202509200514-git
# @@Author : CasjaysDev # @@Author : CasjaysDev
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro> # @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
# @@License : MIT # @@License : MIT
# @@Copyright : Copyright 2025 CasjaysDev # @@Copyright : Copyright 2025 CasjaysDev
# @@Created : Tue Sep 16 11:38:15 PM EDT 2025 # @@Created : Sat Sep 20 05:14:01 AM EDT 2025
# @@File : 04-users.sh # @@File : 04-users.sh
# @@Description : script to run users # @@Description : script to run users
# @@Changelog : newScript # @@Changelog : newScript

4
rootfs/root/docker/setup/05-custom.sh
View File

@@ -1,12 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck shell=bash # shellcheck shell=bash
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
##@Version : 202509162338-git ##@Version : 202509200514-git
# @@Author : CasjaysDev # @@Author : CasjaysDev
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro> # @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
# @@License : MIT # @@License : MIT
# @@Copyright : Copyright 2025 CasjaysDev # @@Copyright : Copyright 2025 CasjaysDev
# @@Created : Tue Sep 16 11:38:15 PM EDT 2025 # @@Created : Sat Sep 20 05:14:01 AM EDT 2025
# @@File : 05-custom.sh # @@File : 05-custom.sh
# @@Description : script to run custom # @@Description : script to run custom
# @@Changelog : newScript # @@Changelog : newScript

4
rootfs/root/docker/setup/06-post.sh
View File

@@ -1,12 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck shell=bash # shellcheck shell=bash
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
##@Version : 202509162338-git ##@Version : 202509200514-git
# @@Author : CasjaysDev # @@Author : CasjaysDev
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro> # @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
# @@License : MIT # @@License : MIT
# @@Copyright : Copyright 2025 CasjaysDev # @@Copyright : Copyright 2025 CasjaysDev
# @@Created : Tue Sep 16 11:38:15 PM EDT 2025 # @@Created : Sat Sep 20 05:14:01 AM EDT 2025
# @@File : 06-post.sh # @@File : 06-post.sh
# @@Description : script to run post # @@Description : script to run post
# @@Changelog : newScript # @@Changelog : newScript

4
rootfs/root/docker/setup/07-cleanup.sh
View File

@@ -1,12 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck shell=bash # shellcheck shell=bash
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
##@Version : 202509162338-git ##@Version : 202509200514-git
# @@Author : CasjaysDev # @@Author : CasjaysDev
# @@Contact : CasjaysDev <docker-admin@casjaysdev.pro> # @@Contact : CasjaysDev <docker-admin@casjaysdev.pro>
# @@License : MIT # @@License : MIT
# @@Copyright : Copyright 2025 CasjaysDev # @@Copyright : Copyright 2025 CasjaysDev
# @@Created : Tue Sep 16 11:38:15 PM EDT 2025 # @@Created : Sat Sep 20 05:14:01 AM EDT 2025
# @@File : 07-cleanup.sh # @@File : 07-cleanup.sh
# @@Description : script to run cleanup # @@Description : script to run cleanup
# @@Changelog : newScript # @@Changelog : newScript

25
rootfs/usr/local/bin/entrypoint.sh
View File

@@ -1,13 +1,13 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck shell=bash # shellcheck shell=bash
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
##@Version : 202509162338-git ##@Version : 202509200514-git
# @@Author : Jason Hempstead # @@Author : Jason Hempstead
# @@Contact : jason@casjaysdev.pro # @@Contact : jason@casjaysdev.pro
# @@License : LICENSE.md # @@License : LICENSE.md
# @@ReadME : entrypoint.sh --help # @@ReadME : entrypoint.sh --help
# @@Copyright : Copyright: (c) 2025 Jason Hempstead, Casjays Developments # @@Copyright : Copyright: (c) 2025 Jason Hempstead, Casjays Developments
# @@Created : Tuesday, Sep 16, 2025 23:38 EDT # @@Created : Saturday, Sep 20, 2025 05:14 EDT
# @@File : entrypoint.sh # @@File : entrypoint.sh
# @@Description : Entrypoint file for debian # @@Description : Entrypoint file for debian
# @@Changelog : New script # @@Changelog : New script
@@ -251,14 +251,6 @@ EOF
# Create the backup dir # Create the backup dir
[ -n "$BACKUP_DIR" ] && { [ -d "$BACKUP_DIR" ] || mkdir -p "$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"
# Clean any stale PID files on first run
rm -f /run/init.d/*.pid 2>/dev/null || true
fi
if [ -f "$ENTRYPOINT_INIT_FILE" ]; then if [ -f "$ENTRYPOINT_INIT_FILE" ]; then
ENTRYPOINT_MESSAGE="no" ENTRYPOINT_FIRST_RUN="no" ENTRYPOINT_MESSAGE="no" ENTRYPOINT_FIRST_RUN="no"
fi fi
@@ -370,11 +362,16 @@ if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
fi fi
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# if no pid assume container restart - clean stale files on restart # if no pid assume container restart - clean stale files on restart
if [ ! -f "$ENTRYPOINT_PID_FILE" ]; then if [ -f "$ENTRYPOINT_PID_FILE" ]; then
START_SERVICES="yes" START_SERVICES="no"
# Clean stale pid files from previous container runs touch "$ENTRYPOINT_PID_FILE"
else
START_SERVICES=yes
# Clean any stale PID files on first run
rm -f /run/__start_init_scripts.pid /run/init.d/*.pid /run/*.pid 2>/dev/null || true rm -f /run/__start_init_scripts.pid /run/init.d/*.pid /run/*.pid 2>/dev/null || true
elif [ ! -f "/run/__start_init_scripts.pid" ]; then fi
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
if [ ! -f "/run/__start_init_scripts.pid" ]; then
START_SERVICES="yes" START_SERVICES="yes"
touch /run/__start_init_scripts.pid touch /run/__start_init_scripts.pid
fi fi

94
rootfs/usr/local/etc/docker/functions/entrypoint.sh
View File

@@ -58,7 +58,7 @@ __pgrep() {
local srvc="${1:-SERVICE_NAME}" local srvc="${1:-SERVICE_NAME}"
while [ $count -ge 0 ]; do while [ $count -ge 0 ]; do
__pcheck "${1:-SERVICE_NAME}" || __ps "${1:-$SERVICE_NAME}" | grep -qv ' grep' __pcheck "${1:-SERVICE_NAME}" || __ps "${1:-$SERVICE_NAME}" | grep -qv ' grep'
sleep 3 sleep 1
count=$((count - 1)) count=$((count - 1))
done done
[ $count -ne 0 ] && return 0 || return 10 [ $count -ne 0 ] && return 0 || return 10
@@ -136,7 +136,24 @@ __trim() {
printf '%s' "$var" | sed 's|;||g' | grep -v '^$' printf '%s' "$var" | sed 's|;||g' | grep -v '^$'
} }
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
__banner() { printf '# - - - %-60s - - - #\n' "$*"; } __banner() {
local message="$*"
local total_width=80
local content_width=$((total_width - 14)) # Account for "# - - - " and " - - - #"
printf '# - - - %-*s - - - #\n' "$content_width" "$message"
}
__service_banner() {
local icon="${1:-🔧}"
local message="${2:-Processing}"
local service="${3:-service}"
local full_message="$message $service"
local total_width=80
local content_width=$((total_width - 14)) # Account for "# - - - " and " - - - #"
local icon_width=2 # Most emojis are 2 chars wide
local text_width=$((content_width - icon_width * 2 - 2)) # Account for both icons and spaces
printf '# - - - %s %-*s %s - - - #\n' "$icon" "$text_width" "$full_message" "$icon"
}
__find_php_bin() { find -L '/usr'/*bin -maxdepth 4 -name 'php-fpm*' 2>/dev/null | head -n1 | grep '.' || echo ''; } __find_php_bin() { find -L '/usr'/*bin -maxdepth 4 -name 'php-fpm*' 2>/dev/null | head -n1 | grep '.' || echo ''; }
__find_php_ini() { find -L '/etc' -maxdepth 4 -name 'php.ini' 2>/dev/null | head -n1 | sed 's|/php.ini||g' | grep '.' || echo ''; } __find_php_ini() { find -L '/etc' -maxdepth 4 -name 'php.ini' 2>/dev/null | head -n1 | sed 's|/php.ini||g' | grep '.' || echo ''; }
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -168,8 +185,8 @@ __init_working_dir() {
# create needed directories # create needed directories
[ -n "$home" ] && { [ -d "$home" ] || mkdir -p "$home"; } [ -n "$home" ] && { [ -d "$home" ] || mkdir -p "$home"; }
[ -n "$workdir" ] && { [ -d "$workdir" ] || mkdir -p "$workdir"; } [ -n "$workdir" ] && { [ -d "$workdir" ] || mkdir -p "$workdir"; }
[ "$SERVICE_USER" = "root " ] || [ -d "$home" ] && chmod -f 777 "$home" [ "$SERVICE_USER" = "root" ] || [ -d "$home" ] && chmod -f 777 "$home"
[ "$SERVICE_USER" = "root " ] || [ -d "$workdir" ] && chmod -f 777 "$workdir" [ "$SERVICE_USER" = "root" ] || [ -d "$workdir" ] && chmod -f 777 "$workdir"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# cd to dir # cd to dir
__cd "${workdir:-$home}" __cd "${workdir:-$home}"
@@ -184,7 +201,7 @@ __exec_service() {
echo "Starting $1" echo "Starting $1"
eval "$@" 2>>/dev/stderr >>/data/logs/start.log & eval "$@" 2>>/dev/stderr >>/data/logs/start.log &
while [ $count -ne 0 ]; do while [ $count -ne 0 ]; do
sleep 10 sleep 3
__pgrep $1 && touch "/run/init.d/$1.pid" && break || count=$((count - 1)) __pgrep $1 && touch "/run/init.d/$1.pid" && break || count=$((count - 1))
done done
} }
@@ -211,7 +228,7 @@ __certbot() {
local certbot_key_opts="--key-path $SSL_KEY --fullchain-path $SSL_CERT" local certbot_key_opts="--key-path $SSL_KEY --fullchain-path $SSL_CERT"
mkdir -p "/config/letsencrypt" mkdir -p "/config/letsencrypt"
__symlink "/etc/letsencrypt" "/config/letsencrypt" __symlink "/etc/letsencrypt" "/config/letsencrypt"
is_renewal="$(find /etc/letsencrypt/renewal -type -f 2>/dev/null || false)" is_renewal="$(find /etc/letsencrypt/renewal -type f 2>/dev/null || false)"
[ -f "/config/env/ssl.sh" ] && . "/config/env/ssl.sh" [ -f "/config/env/ssl.sh" ] && . "/config/env/ssl.sh"
[ -f "/config/certbot/env.sh" ] && . "/config/certbot/env.sh" [ -f "/config/certbot/env.sh" ] && . "/config/certbot/env.sh"
[ -n "$SSL_KEY" ] && { mkdir -p "$(dirname "$SSL_KEY")" || true; } || { echo "The variable $SSL_KEY is not set" >&2 && return 1; } [ -n "$SSL_KEY" ] && { mkdir -p "$(dirname "$SSL_KEY")" || true; } || { echo "The variable $SSL_KEY is not set" >&2 && return 1; }
@@ -221,7 +238,7 @@ __certbot() {
[ "$CERT_BOT_ENABLED" = "true" ] || { export CERT_BOT_ENABLED="" && return 10; } [ "$CERT_BOT_ENABLED" = "true" ] || { export CERT_BOT_ENABLED="" && return 10; }
[ -n "$CERT_BOT_MAIL" ] || { echo "The variable CERT_BOT_MAIL is not set" >&2 && return 1; } [ -n "$CERT_BOT_MAIL" ] || { echo "The variable CERT_BOT_MAIL is not set" >&2 && return 1; }
[ -n "$CERTBOT_DOMAINS" ] || { echo "The variable CERTBOT_DOMAINS is not set" >&2 && return 1; } [ -n "$CERTBOT_DOMAINS" ] || { echo "The variable CERTBOT_DOMAINS is not set" >&2 && return 1; }
for domain in $$CERTBOT_DOMAINS; do for domain in $CERTBOT_DOMAINS; do
[ -n "$domain" ] && ADD_CERTBOT_DOMAINS+="-d $domain " [ -n "$domain" ] && ADD_CERTBOT_DOMAINS+="-d $domain "
done done
[ -n "$is_renewal" ] && options="renew" ADD_CERTBOT_DOMAINS="" || options="certonly" [ -n "$is_renewal" ] && options="renew" ADD_CERTBOT_DOMAINS="" || options="certonly"
@@ -575,7 +592,7 @@ __set_user_group_id() {
local random_id="$(__generate_random_uids)" local random_id="$(__generate_random_uids)"
set_uid="$(__get_uid "$set_user" || echo "$set_uid")" set_uid="$(__get_uid "$set_user" || echo "$set_uid")"
set_gid="$(__get_gid "$set_user" || echo "$set_gid")" set_gid="$(__get_gid "$set_user" || echo "$set_gid")"
grep -shq "^$create_user:" "/etc/passwd" "/etc/group" || return 0 grep -shq "^$set_user:" "/etc/passwd" "/etc/group" || return 0
[ -n "$set_user" ] && [ "$set_user" != "root" ] || return [ -n "$set_user" ] && [ "$set_user" != "root" ] || return
if grep -shq "^$set_user:" "/etc/passwd" "/etc/group"; then if grep -shq "^$set_user:" "/etc/passwd" "/etc/group"; then
if __check_for_guid "$set_gid"; then if __check_for_guid "$set_gid"; then
@@ -606,8 +623,8 @@ __create_service_user() {
create_uid="${create_uid:-1000}" create_uid="${create_uid:-1000}"
create_gid="${create_gid:-1000}" create_gid="${create_gid:-1000}"
fi fi
create_uid="$(__get_uid "$set_user" || echo "$create_uid")" create_uid="$(__get_uid "$create_user" || echo "$create_uid")"
create_gid="$(__get_gid "$set_user" || echo "$create_gid")" create_gid="$(__get_gid "$create_user" || echo "$create_gid")"
[ -n "$create_uid" ] && [ "$create_uid" != "0" ] || create_uid="$random_id" [ -n "$create_uid" ] && [ "$create_uid" != "0" ] || create_uid="$random_id"
[ -n "$create_gid" ] && [ "$create_gid" != "0" ] || create_gid="$random_id" [ -n "$create_gid" ] && [ "$create_gid" != "0" ] || create_gid="$random_id"
while :; do while :; do
@@ -626,7 +643,7 @@ __create_service_user() {
echo "creating system user $create_user" echo "creating system user $create_user"
useradd --system -u $create_uid -g $create_group -c "Account for $create_user" -d "$create_home_dir" -s /bin/false $create_user 2>/dev/stderr | tee -p -a "/data/logs/init.txt" >/dev/null useradd --system -u $create_uid -g $create_group -c "Account for $create_user" -d "$create_home_dir" -s /bin/false $create_user 2>/dev/stderr | tee -p -a "/data/logs/init.txt" >/dev/null
fi fi
grep -shq "$create_group" "/etc/group" || exitStatus=$((exitCode + 1)) grep -shq "$create_group" "/etc/group" || exitStatus=$((exitStatus + 1))
grep -shq "$create_user" "/etc/passwd" || exitStatus=$((exitCode + 1)) grep -shq "$create_user" "/etc/passwd" || exitStatus=$((exitCode + 1))
if [ $exitStatus -eq 0 ]; then if [ $exitStatus -eq 0 ]; then
export WORK_DIR="${create_home_dir:-}" export WORK_DIR="${create_home_dir:-}"
@@ -636,7 +653,7 @@ __create_service_user() {
fi fi
if [ -d "/etc/sudoers.d" ] && [ ! -f "/etc/sudoers.d/$create_user" ]; then if [ -d "/etc/sudoers.d" ] && [ ! -f "/etc/sudoers.d/$create_user" ]; then
echo "$create_user ALL=(ALL) NOPASSWD: ALL" >"/etc/sudoers.d/$create_user" echo "$create_user ALL=(ALL) NOPASSWD: ALL" >"/etc/sudoers.d/$create_user"
elif [ -f "/etc/sudoers" ] && grep -qs "$create_user" "/etc/sudoers"; then elif [ -f "/etc/sudoers" ] && ! grep -qs "$create_user" "/etc/sudoers"; then
echo "$create_user ALL=(ALL) NOPASSWD: ALL" >"/etc/sudoers" echo "$create_user ALL=(ALL) NOPASSWD: ALL" >"/etc/sudoers"
fi fi
export SERVICE_UID="$create_uid" export SERVICE_UID="$create_uid"
@@ -710,20 +727,12 @@ __start_init_scripts() {
local init_count="$(ls -A "$init_dir"/* 2>/dev/null | grep -v '\.sample' | wc -l)" local init_count="$(ls -A "$init_dir"/* 2>/dev/null | grep -v '\.sample' | wc -l)"
local exit_on_failure="${EXIT_ON_SERVICE_FAILURE:-true}" local exit_on_failure="${EXIT_ON_SERVICE_FAILURE:-true}"
if [ -n "$SERVICE_DISABLED" ]; then
unset SERVICE_DISABLED
echo "$SERVICE_DISABLED is disabled"
return 0
fi
# Clean stale PID files from previous runs # Clean stale PID files from previous runs
if [ ! -f "/run/__start_init_scripts.pid" ]; then if [ ! -f "/run/__start_init_scripts.pid" ]; then
echo "🧹 Cleaning stale PID files from previous container run" echo "🧹 Cleaning stale PID files from previous container run"
rm -f /run/*.pid /run/init.d/*.pid 2>/dev/null || true rm -f /run/*.pid /run/init.d/*.pid 2>/dev/null || true
fi fi
mkdir -p "/tmp" "/run" "/run/init.d" "/usr/local/etc/docker/exec"
chmod -R 777 "/tmp" "/run" "/run/init.d" "/usr/local/etc/docker/exec"
touch /run/__start_init_scripts.pid touch /run/__start_init_scripts.pid
if [ "$init_count" -eq 0 ] || [ ! -d "$init_dir" ]; then if [ "$init_count" -eq 0 ] || [ ! -d "$init_dir" ]; then
@@ -744,27 +753,50 @@ __start_init_scripts() {
if [ -x "$init" ]; then if [ -x "$init" ]; then
name="$(basename "$init")" name="$(basename "$init")"
service="$(printf '%s' "$name" | sed 's/^[^-]*-//;s|.sh$||g')" service="$(printf '%s' "$name" | sed 's/^[^-]*-//;s|.sh$||g')"
__service_banner "🔧" "Executing service script:" "$(basename "$init")"
echo "🔧 Executing service script: $init (service: $service)"
# Execute the init script and capture the exit code # Execute the init script and capture the exit code
if eval "$init"; then if source "$init"; then
sleep 5 # Check if service was disabled first
retPID=$(__get_pid "$service") if [ -n "$SERVICE_DISABLED" ]; then
if [ -n "$retPID" ]; then
initStatus="0" initStatus="0"
echo "✅ Service $service started successfully - PID: ${retPID}" __service_banner "🚫" "Service $service is disabled -" "skipping"
unset SERVICE_DISABLED
else
sleep 2
# Check for service success indicators
local expected_pid_file="/run/init.d/$service.pid"
if [ "$SERVICE_USES_PID" = "no" ]; then
# Service doesn't use PID files - check if expected PID file exists or assume success
if [ -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"
else
initStatus="0"
__service_banner "✅" "Service $service started successfully -" "no PID tracking"
fi
else
# Service uses PID tracking - get actual PID
retPID=$(__get_pid "$service")
if [ -n "$retPID" ] && [ "$retPID" != "0" ]; then
initStatus="0"
__service_banner "✅" "Service $service started successfully -" "PID: ${retPID}"
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"
else else
initStatus="1" initStatus="1"
critical_failures=$((critical_failures + 1)) critical_failures=$((critical_failures + 1))
echo "⚠️ Service $service appears to have started but no process found" __service_banner "⚠️" "Service $service appears to have started but" "no process found"
fi
fi
fi fi
else else
initStatus="1" initStatus="1"
critical_failures=$((critical_failures + 1)) critical_failures=$((critical_failures + 1))
echo "❌ Service $service failed to start - check logs: docker logs $CONTAINER_NAME" __service_banner "❌" "Service $service failed to start -" "check logs"
fi fi
echo "" echo ""
fi fi
retstatus=$((retstatus + initStatus)) retstatus=$((retstatus + initStatus))