Refactor Dockerfile to use a pre-built image, install necessary packages, and configure PostgreSQL and Redis services. Added supervisord for process management and initialization script for database setup. Updated entrypoint to start all services.

Dockerfile

@@ -1,97 +1,98 @@
-FROM debian:bullseye-slim
+FROM registry.gitlab.com/scripta/escriptorium:latest
 
-# Install required packages
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    git \
-    ca-certificates \
-    curl \
-    gnupg \
-    lsb-release \
-    && rm -rf /var/lib/apt/lists/*
+WORKDIR /usr/src/app
 
-# Install Docker
-RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \
-    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \
-    apt-get update && apt-get install -y --no-install-recommends \
-    docker-ce \
-    docker-ce-cli \
-    containerd.io \
-    docker-compose-plugin \
-    && rm -rf /var/lib/apt/lists/*
+# Install required packages
+RUN apt-get update && apt-get install -y git postgresql postgresql-client redis-server supervisor && \
+    rm -rf /var/lib/apt/lists/* && \
+    git clone https://gitlab.com/scripta/escriptorium.git /tmp/escriptorium && \
+    cp /tmp/escriptorium/variables.env_example variables.env && \
+    rm -rf /tmp/escriptorium
 
-# Create working directory
-WORKDIR /escriptorium
+# Configure PostgreSQL
+RUN echo "host all  all    0.0.0.0/0  md5" >> /etc/postgresql/13/main/pg_hba.conf && \
+    echo "listen_addresses='*'" >> /etc/postgresql/13/main/postgresql.conf
 
-# Create setup script
-RUN echo '#!/bin/bash\n\
-set -e\n\
-\n\
-# Clone the repository if it doesn't exist\n\
-if [ ! -d ".git" ]; then\n\
-  git clone https://gitlab.com/scripta/escriptorium.git .\n\
-fi\n\
-\n\
-# Copy variables.env if it doesn't exist\n\
-if [ ! -f "variables.env" ]; then\n\
-  cp variables.env_example variables.env\n\
-fi\n\
+# Create supervisord configuration
+RUN echo '[supervisord]\n\
+nodaemon=true\n\
+logfile=/var/log/supervisord.log\n\
+logfile_maxbytes=50MB\n\
+logfile_backups=10\n\
 \n\
-# Pull the Docker images\n\
-docker compose pull\n\
+[program:postgresql]\n\
+command=service postgresql start\n\
+autostart=true\n\
+autorestart=true\n\
 \n\
-# Start the services\n\
-docker compose up -d\n\
+[program:redis]\n\
+command=service redis-server start\n\
+autostart=true\n\
+autorestart=true\n\
 \n\
-echo "eScriptorium is now running!"\n\
-echo "You can access it at http://localhost:8080"\n\
-' > /escriptorium/setup.sh && chmod +x /escriptorium/setup.sh
-
-# Create update script
-RUN echo '#!/bin/bash\n\
-set -e\n\
+[program:uwsgi]\n\
+command=uwsgi --ini /usr/src/app/uwsgi.ini\n\
+directory=/usr/src/app\n\
+autostart=true\n\
+autorestart=true\n\
+stdout_logfile=/var/log/uwsgi.log\n\
+stderr_logfile=/var/log/uwsgi.err\n\
 \n\
-echo "Updating eScriptorium..."\n\
+[program:daphne]\n\
+command=daphne --bind 0.0.0.0 --port 5000 -v 1 escriptorium.asgi:application\n\
+directory=/usr/src/app\n\
+autostart=true\n\
+autorestart=true\n\
+stdout_logfile=/var/log/daphne.log\n\
+stderr_logfile=/var/log/daphne.err\n\
 \n\
-# Pull latest changes\n\
-git pull\n\
+[program:celery_default]\n\
+command=celery -A escriptorium worker -l INFO -E -Ofair --prefetch-multiplier 1 -Q default -c 4 --max-tasks-per-child=10\n\
+directory=/usr/src/app\n\
+autostart=true\n\
+autorestart=true\n\
 \n\
-# Pull latest Docker images\n\
-docker compose pull\n\
+[program:celery_live]\n\
+command=celery -A escriptorium worker -l INFO -E -Ofair --prefetch-multiplier 1 -Q live -c 4 --max-tasks-per-child=10\n\
+directory=/usr/src/app\n\
+autostart=true\n\
+autorestart=true\n\
 \n\
-# Restart services\n\
-docker compose up -d\n\
+[program:celery_low_priority]\n\
+command=celery -A escriptorium worker -l INFO -E -Ofair --prefetch-multiplier 1 -Q low-priority -c 4 --max-tasks-per-child=10\n\
+directory=/usr/src/app\n\
+autostart=true\n\
+autorestart=true\n\
 \n\
-echo "Update completed!"\n\
-' > /escriptorium/update.sh && chmod +x /escriptorium/update.sh
+[program:celery_gpu]\n\
+command=celery -A escriptorium worker -l INFO -E -Ofair --prefetch-multiplier 1 -Q gpu -c 1 --max-tasks-per-child=1\n\
+directory=/usr/src/app\n\
+autostart=true\n\
+autorestart=true\n\
+' > /etc/supervisor/conf.d/escriptorium.conf
 
-# Create entrypoint script
+# Create initialization script
 RUN echo '#!/bin/bash\n\
-# Start Docker daemon\n\
-dockerd &\n\
-\n\
-# Wait for Docker to start\n\
-timeout=30\n\
-while ! docker info >/dev/null 2>&1; do\n\
-  timeout=$((timeout - 1))\n\
-  if [ $timeout -eq 0 ]; then\n\
-    echo "Docker daemon failed to start"\n\
-    exit 1\n\
-  fi\n\
-  sleep 1\n\
-done\n\
-\n\
-# Run setup script\n\
-/escriptorium/setup.sh\n\
+# Initialize database if needed\n\
+if [ ! -f "/usr/src/app/.db_initialized" ]; then\n\
+  echo "Initializing database..."\n\
+  service postgresql start\n\
+  su - postgres -c "createuser -s root"\n\
+  su - postgres -c "createdb -O root escriptorium"\n\
+  python manage.py migrate\n\
+  python manage.py collectstatic --noinput\n\
+  touch /usr/src/app/.db_initialized\n\
+fi\n\
 \n\
-# Keep container running\n\
-tail -f /dev/null\n\
-' > /escriptorium/entrypoint.sh && chmod +x /escriptorium/entrypoint.sh
-
-# Set volumes
-VOLUME ["/escriptorium", "/var/lib/docker"]
+# Start all services using supervisor\n\
+exec supervisord -c /etc/supervisor/supervisord.conf\n\
+' > /usr/src/app/start.sh && chmod +x /usr/src/app/start.sh
 
-# Expose ports
+# Expose port 8080
 EXPOSE 8080
 
-# Run the entrypoint script
-ENTRYPOINT ["/escriptorium/entrypoint.sh"]
+# Define volumes for persistence
+VOLUME ["/usr/src/app/static", "/usr/src/app/media", "/var/lib/postgresql/data"]
+
+# Set the entrypoint
+CMD ["/usr/src/app/start.sh"]