Update Dockerfile

Dockerfile

@@ -1,65 +1,51 @@
-# Start with a base image
 FROM ubuntu:22.04
-
-# Set environment variables for non-interactive installs
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Install core dependencies including git
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-    git python3 python3-pip python3-dev \
-    imagemagick fonts-liberation gnupg \
-    libpq-dev default-libmysqlclient-dev pkg-config \
-    libmagic-dev libzbar0 poppler-utils \
-    unpaper ghostscript icc-profiles-free qpdf liblept5 libxml2 \
-    pngquant zlib1g tesseract-ocr tesseract-ocr-eng \
-    build-essential python3-setuptools python3-wheel \
-    redis-server postgresql postgresql-client \
-    sudo nodejs npm supervisor nano curl && \
+      git python3 python3-pip python3-dev \
+      imagemagick fonts-liberation gnupg \
+      libpq-dev default-libmysqlclient-dev pkg-config \
+      libmagic-dev libzbar0 poppler-utils \
+      unpaper ghostscript icc-profiles-free qpdf liblept5 libxml2 \
+      pngquant zlib1g tesseract-ocr tesseract-ocr-eng \
+      build-essential python3-setuptools python3-wheel \
+      redis-server postgresql postgresql-client \
+      sudo nodejs npm supervisor nano curl && \
     rm -rf /var/lib/apt/lists/*
 
-# Install uv package installer
 RUN curl -sSf https://astral.sh/uv/install.sh | bash
 
-# Create user and directories for Paperless-ngx
 RUN adduser --system --home /opt/paperless --group paperless
 WORKDIR /opt/paperless
-
-# Mark working directory as safe for git
 RUN git config --global --add safe.directory /opt/paperless
 
-# Clone Paperless-ngx
 RUN git clone https://github.com/paperless-ngx/paperless-ngx.git . && \
     git checkout v2.17.1
 
-# Install frontend dependencies and build
-RUN npm install -g yarn && \
-    cd src/paperless_frontend && \
-    yarn install && \
-    yarn build && \
-    cd ../..
+# Build frontend (new structure uses src-ui/)
+RUN cd src-ui && npm install && npm run build -- --configuration production
 
-# Install Python dependencies using uv
+# Python dependencies
 RUN /root/.cargo/bin/uv pip install -r requirements.txt
 
-# Configure PostgreSQL (startup and init)
+# Initialize Postgres
 RUN service postgresql start && \
     su - postgres -c "psql -c \"CREATE USER paperless WITH PASSWORD 'your_db_password';\"" && \
     su - postgres -c "psql -c \"CREATE DATABASE paperless OWNER paperless;\"" && \
     service postgresql stop
 
-# Create Paperless-ngx specific directories
+# Paperless-specific directories
 RUN mkdir -p media data consume export && \
     chown -R paperless:paperless media data consume export
 
-# Environment configuration
 ENV PAPERLESS_REDIS="redis://localhost:6379/0" \
     PAPERLESS_DBENGINE="postgresql" \
     PAPERLESS_DBHOST="localhost" \
     PAPERLESS_DBNAME="paperless" \
     PAPERLESS_DBUSER="paperless" \
     PAPERLESS_DBPASS="your_db_password" \
-    PAPERLESS_SECRET_KEY="a_very_long_and_random_string_for_huggingface" \
+    PAPERLESS_SECRET_KEY="a_very_long_random_string" \
     PAPERLESS_CONSUMPTION_DIR="/opt/paperless/consume" \
     PAPERLESS_DATA_DIR="/opt/paperless/data" \
     PAPERLESS_MEDIA_ROOT="/opt/paperless/media" \
@@ -70,27 +56,16 @@ ENV PAPERLESS_REDIS="redis://localhost:6379/0" \
     PAPERLESS_ENABLE_NLTK=false \
     PAPERLESS_OCR_CLEAN="none"
 
-# Create a basic supervisord config
-RUN echo "[supervisord]\nnodaemon=true\n\n\
+RUN printf "[supervisord]\nnodaemon=true\n\n\
 [program:postgresql]\ncommand=/usr/lib/postgresql/*/bin/postgres -D /var/lib/postgresql/*/main\nuser=postgres\n\n\
 [program:redis]\ncommand=/usr/bin/redis-server\n\n\
 [program:paperless-webserver]\ncommand=/opt/paperless/src/manage.py runserver 0.0.0.0:7860\nuser=paperless\n\n\
 [program:paperless-consumer]\ncommand=/opt/paperless/src/manage.py document_consumer\nuser=paperless\n\n\
-[program:paperless-scheduler]\ncommand=/opt/paperless/src/manage.py qcluster\nuser=paperless" > /etc/supervisor/conf.d/supervisord.conf
+[program:paperless-scheduler]\ncommand=/opt/paperless/src/manage.py qcluster\nuser=paperless\n" > /etc/supervisor/conf.d/supervisord.conf
 
-# Add uv to PATH
 ENV PATH="/root/.cargo/bin:${PATH}"
 
-# Run initial migrations and create superuser during container startup
-RUN echo "#!/bin/bash\n\
-service postgresql start\n\
-service redis-server start\n\
-cd /opt/paperless\n\
-python3 src/manage.py migrate\n\
-python3 src/manage.py createsuperuser --noinput --username admin --email admin@example.com || true\n\
-exec /usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf" > /startup.sh && \
-    chmod +x /startup.sh
+RUN printf "#!/bin/bash\nservice postgresql start\nservice redis-server start\ncd /opt/paperless\npython3 src/manage.py migrate\npython3 src/manage.py createsuperuser --noinput --username admin --email admin@example.com || true\nexec /usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf\n" > /startup.sh && chmod +x /startup.sh
 
 EXPOSE 7860
-
 CMD ["/startup.sh"]