Upload 5 files

Dockerfile

@@ -96,8 +96,9 @@ RUN sed -i 's/www-data/user/g' /etc/php/7.4/fpm/pool.d/www.conf
 
 # Fix Icecast config to disable changeowner
 RUN sed -i 's/<changeowner>/<!--<changeowner>/g' /etc/icecast2/icecast.xml
-RUN sed -i 's/}<\/changeowner>/}<\/changeowner>-->/g' /etc/icecast2/icecast.xml
+RUN sed -i 's/<\/changeowner>/<\/changeowner>-->/g' /etc/icecast2/icecast.xml
 
+ENV RABBITMQ_NODENAME=rabbit@localhost
 EXPOSE 7860
 
 USER user

start.sh

@@ -38,15 +38,32 @@ if [ ! -s "$PG_DATA/PG_VERSION" ]; then
 fi
 
 # 3. Setup RabbitMQ
-# Ensure log dir exists and is writable (just in case Dockerfile missed it or volume overwrote it)
-mkdir -p /var/log/rabbitmq
-echo "Configuring RabbitMQ..."
+export RABBITMQ_NODENAME=rabbit@localhost
+export RABBITMQ_LOG_BASE=/var/log/rabbitmq
+export RABBITMQ_MNESIA_BASE=/var/lib/rabbitmq/mnesia
+mkdir -p /var/log/rabbitmq /var/lib/rabbitmq/mnesia
+chown -R user:user /var/log/rabbitmq /var/lib/rabbitmq
+
+echo "Starting RabbitMQ for setup..."
 /usr/sbin/rabbitmq-server -detached
-sleep 10
+
+echo "Waiting for RabbitMQ to be ready..."
+for i in {1..30}; do
+    if rabbitmqctl status >/dev/null 2>&1; then
+        echo "RabbitMQ is ready."
+        break
+    fi
+    echo "Waiting... ($i/30)"
+    sleep 2
+done
+
+echo "Configuring RabbitMQ users..."
 rabbitmqctl add_user libretime libretime || true
 rabbitmqctl set_permissions -p / libretime ".*" ".*" ".*" || true
 rabbitmqctl add_vhost /libretime || true
 rabbitmqctl set_permissions -p /libretime libretime ".*" ".*" ".*" || true
+
+echo "Stopping RabbitMQ..."
 rabbitmqctl stop
 
 # 4. Migrations
@@ -55,11 +72,12 @@ echo "Starting PostgreSQL for migration..."
 
 echo "Running LibreTime Migrations..."
 export LIBRETIME_CONFIG_FILEPATH=/etc/libretime/config.yml
-libretime-api collectstatic --noinput
-libretime-api migrate --noinput
+# Use python -m to be safe if the script isn't in PATH
+python3 -m libretime_api collectstatic --noinput
+python3 -m libretime_api migrate --noinput
 
 echo "Stopping PostgreSQL..."
 /usr/lib/postgresql/13/bin/pg_ctl -D "$PG_DATA" stop
 
-echo "Starting Supervisor..."
+echo "Setup complete. Starting Supervisor..."
 exec supervisord -c /etc/supervisor/conf.d/supervisord.conf

supervisord.conf

@@ -13,7 +13,7 @@ priority=1
 [program:rabbitmq]
 command=/usr/sbin/rabbitmq-server
 user=user
-environment=HOME="/var/lib/rabbitmq"
+environment=HOME="/var/lib/rabbitmq",RABBITMQ_NODENAME="rabbit@localhost"
 autorestart=true
 priority=2