Mirrors/Dispatcharr
1
0
Fork 1
mirror of https://github.com/Dispatcharr/Dispatcharr.git synced 2026-01-23 02:35:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Trying a different approach to fix LXC issues.

Browse source
This commit is contained in:
SergeantPanda 2025-10-22 08:26:15 -05:00
parent 645c1ec9df
commit 73bb1ecd2d
4 changed files with 21 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

26
docker/entrypoint.sh
View file

@ -183,32 +183,12 @@ if [ "$DISPATCHARR_DEBUG" != "true" ]; then
uwsgi_args+=" --disable-logging"
fi
# Start Redis before uwsgi to ensure it's available when Django apps initialize
echo "🚀 Starting Redis..."
setpriv --reuid=$POSTGRES_USER --regid=$POSTGRES_USER --clear-groups -- redis-server --daemonize yes
# Wait for Redis to be ready
echo "⏳ Waiting for Redis to be ready..."
python /app/scripts/wait_for_redis.py
if [ $? -ne 0 ]; then
echo "❌ Redis failed to start properly!"
exit 1
fi
redis_pid=$(pgrep -x redis-server)
if [ -n "$redis_pid" ]; then
echo "✅ Redis started with PID $redis_pid"
pids+=("$redis_pid")
else
echo "❌ Redis process not found after startup!"
exit 1
fi
# Launch uwsgi with configurable nice level (default: -10 for high priority)
# Launch uwsgi with configurable nice level (default: 0 for normal priority)
# Users can override via UWSGI_NICE_LEVEL environment variable in docker-compose
# Start with nice as root, then use setpriv to drop privileges to dispatch user
# This preserves both the nice value and environment variables
cd /app && nice -n $UWSGI_NICE_LEVEL setpriv --reuid=$POSTGRES_USER --regid=$POSTGRES_USER --clear-groups -- uwsgi $uwsgi_args &
# Use --keep-groups instead of --clear-groups for LXC compatibility with attach-daemons
cd /app && nice -n $UWSGI_NICE_LEVEL setpriv --reuid=$POSTGRES_USER --regid=$POSTGRES_USER --keep-groups -- uwsgi $uwsgi_args &
uwsgi_pid=$!
echo "✅ uwsgi started with PID $uwsgi_pid (nice $UWSGI_NICE_LEVEL)"
pids+=("$uwsgi_pid")

8
docker/uwsgi.debug.ini
View file

@ -2,8 +2,12 @@
; exec-before = python manage.py collectstatic --noinput
; exec-before = python manage.py migrate --noinput
; Redis is now started in entrypoint.sh before uwsgi to prevent race conditions
; Start services with configurable nice level (default: 5 for low priority)
; First run Redis availability check script once
exec-before = python /app/scripts/wait_for_redis.py
; Start Redis first
attach-daemon = redis-server
; Then start other services with configurable nice level (default: 5 for low priority)
; Users can override via CELERY_NICE_LEVEL environment variable in docker-compose
attach-daemon = nice -n $(CELERY_NICE_LEVEL) celery -A dispatcharr worker --autoscale=6,1
attach-daemon = nice -n $(CELERY_NICE_LEVEL) celery -A dispatcharr beat

8
docker/uwsgi.dev.ini
View file

@ -4,8 +4,12 @@
; exec-pre = touch /data/logs/uwsgi-dev.log
; exec-pre = chmod 666 /data/logs/uwsgi-dev.log
; Redis is now started in entrypoint.sh before uwsgi to prevent race conditions
; Start services with configurable nice level (default: 5 for low priority)
; First run Redis availability check script once
exec-pre = python /app/scripts/wait_for_redis.py
; Start Redis first
attach-daemon = redis-server
; Then start other services with configurable nice level (default: 5 for low priority)
; Users can override via CELERY_NICE_LEVEL environment variable in docker-compose
attach-daemon = nice -n $(CELERY_NICE_LEVEL) celery -A dispatcharr worker --autoscale=6,1
attach-daemon = nice -n $(CELERY_NICE_LEVEL) celery -A dispatcharr beat

8
docker/uwsgi.ini
View file

@ -4,8 +4,12 @@
; exec-pre = touch /data/logs/uwsgi.log
; exec-pre = chmod 666 /data/logs/uwsgi.log
; Redis is now started in entrypoint.sh before uwsgi to prevent race conditions
; Start services with configurable nice level (default: 5 for low priority)
; First run Redis availability check script once
exec-pre = python /app/scripts/wait_for_redis.py
; Start Redis first
attach-daemon = redis-server
; Then start other services with configurable nice level (default: 5 for low priority)
; Users can override via CELERY_NICE_LEVEL environment variable in docker-compose
attach-daemon = nice -n $(CELERY_NICE_LEVEL) celery -A dispatcharr worker --autoscale=6,1
attach-daemon = nice -n $(CELERY_NICE_LEVEL) celery -A dispatcharr beat