Merge pull request #90 from jkaninda/dev

Upgrade images to PHP 8.5 and fix php-fpm not starting as root

src/entrypoint.sh

@@ -1,13 +1,12 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
 # Logging functions
 log() {
-    local level=$1
+    level=$1
     shift
-    { set +x; } 2> /dev/null
-    echo "[$level] $@"
+    echo "[$level] $*"
 }
 
 info() {
@@ -23,6 +22,32 @@ fatal() {
     exit 1
 }
 
+is_true() {
+    case "$1" in
+        1|true|TRUE|True|yes|YES|on|ON) return 0 ;;
+        *) return 1 ;;
+    esac
+}
+
+APP_DIR="${APP_DIR:-/var/www/html}"
+USER_NAME="${USER_NAME:-www-data}"
+LARAVEL_PROCS_NUMBER="${LARAVEL_PROCS_NUMBER:-1}"
+LARAVEL_QUEUE_OPTIONS="${LARAVEL_QUEUE_OPTIONS:---sleep=3 --tries=3}"
+
+# Check if custom php.ini file exists
+PHP_INI_SOURCE="$APP_DIR/conf/php/php.ini"
+PHP_INI_TARGET="$PHP_INI_DIR/conf.d/php.ini"
+
+if [ -f "$PHP_INI_SOURCE" ]; then
+    cp "$PHP_INI_SOURCE" "$PHP_INI_TARGET"
+    info "Custom php.ini file found and copied to $PHP_INI_TARGET"
+fi
+
+# Run any other command (e.g. "php artisan migrate", "composer install", "bash")
+if [ $# -gt 0 ] && [ "$1" != "entrypoint" ] && [ "$1" != "supervisord" ]; then
+    exec "$@"
+fi
+
 # Banner
 echo ""
 echo "***********************************************************"
@@ -30,13 +55,14 @@ echo "   Starting LARAVEL PHP-FPM Container                      "
 echo "***********************************************************"
 
 # Check if the artisan file exists
-ARTISAN_PATH="/var/www/html/artisan"
-if [[ -f "$ARTISAN_PATH" ]]; then
+ARTISAN_PATH="$APP_DIR/artisan"
+SUPERVISOR_TASK="/etc/supervisor/conf.d/laravel-worker.conf"
+if [ -f "$ARTISAN_PATH" ]; then
     info "Artisan file found, creating Laravel supervisor config..."
+    : > "$SUPERVISOR_TASK"
 
-    # Create Laravel Supervisor config
-    SUPERVISOR_TASK="/etc/supervisor/conf.d/laravel-worker.conf"
-    cat > "$SUPERVISOR_TASK" <<EOF
+    if is_true "${LARAVEL_SCHEDULER_ENABLED:-true}"; then
+        cat >> "$SUPERVISOR_TASK" <<EOF
 [program:Laravel-scheduler]
 process_name=%(program_name)s_%(process_num)02d
 command=/bin/sh -c "while true; do php $ARTISAN_PATH schedule:run --verbose --no-interaction & sleep 60; done"
@@ -47,33 +73,36 @@ user=$USER_NAME
 stdout_logfile=/var/log/laravel_scheduler.out.log
 redirect_stderr=true
 
+EOF
+        info "Laravel scheduler enabled"
+    fi
+
+    if is_true "${LARAVEL_QUEUE_WORKER_ENABLED:-true}"; then
+        cat >> "$SUPERVISOR_TASK" <<EOF
 [program:Laravel-worker]
 process_name=%(program_name)s_%(process_num)02d
-command=php $ARTISAN_PATH queue:work --sleep=3 --tries=3
+command=php $ARTISAN_PATH queue:work $LARAVEL_QUEUE_OPTIONS
 autostart=true
 autorestart=true
+; Keep retrying while the database/queue backend is not ready yet
+startretries=20
+stopwaitsecs=3600
 numprocs=$LARAVEL_PROCS_NUMBER
 user=$USER_NAME
 redirect_stderr=true
 stdout_logfile=/var/log/laravel_worker.log
 EOF
+        info "Laravel queue worker enabled ($LARAVEL_PROCS_NUMBER process(es))"
+    fi
 
     info "Laravel supervisor config created at $SUPERVISOR_TASK"
 else
+    rm -f "$SUPERVISOR_TASK" 2>/dev/null || true
     info "Artisan file not found at $ARTISAN_PATH"
 fi
 
-# Check if custom php.ini file exists
-PHP_INI_SOURCE="/var/www/html/conf/php/php.ini"
-PHP_INI_TARGET="$PHP_INI_DIR/conf.d/php.ini"
-
-if [[ -f "$PHP_INI_SOURCE" ]]; then
-    cp "$PHP_INI_SOURCE" "$PHP_INI_TARGET"
-    info "Custom php.ini file found and copied to $PHP_INI_TARGET"
-else
-    info "Custom php.ini file not found at $PHP_INI_SOURCE"
-    info "To use a custom php.ini file, place it at $PHP_INI_SOURCE"
+# Start Supervisor (programs drop privileges to $USER_NAME themselves)
+if [ "$(id -u)" = "0" ]; then
+    exec supervisord -c /etc/supervisor/supervisord.conf -u root
 fi
-
-# Start Supervisor
-supervisord -c /etc/supervisor/supervisord.conf
+exec supervisord -c /etc/supervisor/supervisord.conf