diff --git a/Dockerfile b/Dockerfile index 7f1629e..0049923 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,32 +26,8 @@ COPY . . RUN mkdir -p /data/rooms && \ chown -R celery:celery /data && \ chmod -R 755 /data && \ - chown -R celery:celery /app - -# Create and set up startup script -RUN echo '#!/bin/bash' > /app/start.sh && \ - echo 'echo "Waiting for database..."' >> /app/start.sh && \ - echo 'while ! nc -z db 5432; do' >> /app/start.sh && \ - echo ' sleep 0.1' >> /app/start.sh && \ - echo 'done' >> /app/start.sh && \ - echo 'echo "Database is ready!"' >> /app/start.sh && \ - echo '' >> /app/start.sh && \ - echo 'echo "Waiting for Redis..."' >> /app/start.sh && \ - echo 'while ! nc -z redis 6379; do' >> /app/start.sh && \ - echo ' sleep 0.1' >> /app/start.sh && \ - echo 'done' >> /app/start.sh && \ - echo 'echo "Redis is ready!"' >> /app/start.sh && \ - echo '' >> /app/start.sh && \ - echo 'echo "Running database migrations..."' >> /app/start.sh && \ - echo 'flask db upgrade' >> /app/start.sh && \ - echo '' >> /app/start.sh && \ - echo 'echo "Creating admin user..."' >> /app/start.sh && \ - echo 'flask create-admin' >> /app/start.sh && \ - echo '' >> /app/start.sh && \ - echo 'echo "Starting application..."' >> /app/start.sh && \ - echo 'exec "$@"' >> /app/start.sh && \ - chmod +x /app/start.sh && \ - chown celery:celery /app/start.sh + chown -R celery:celery /app && \ + chmod +x /app/start.sh # Switch to non-root user USER celery