refactor: remove unused filesystem configuration and streamline Dockerfile arguments

Author: yoyo930021

.env.example

@@ -23,7 +23,6 @@ PRETALX_PORT=8080
 
 # Filesystem Configuration
 # PRETALX_FILESYSTEM_MEDIA=/public/media
-# PRETALX_FILESYSTEM_STATIC=/public/static
 
 # Gunicorn Configuration (Optional)
 # GUNICORN_WORKERS=4

Dockerfile

@@ -1,7 +1,5 @@
 # syntax=docker/dockerfile:1
 ARG PRETALX_VERSION=main
-ARG PRETALX_UID=1000
-ARG PRETALX_GID=1000
 
 # Base image with Python 3.12
 FROM python:3.12-slim as base
@@ -47,16 +45,14 @@ ENV LC_ALL=en_US.UTF-8 \
 FROM base
 
 ARG PRETALX_VERSION
-ARG PRETALX_UID
-ARG PRETALX_GID
 
 # Clone target pretalx repository
 WORKDIR /build
 RUN git clone --depth 1 --branch ${PRETALX_VERSION} https://github.com/COSCUP/pretalx.git .
 
 # Install build deps
 RUN --mount=type=cache,target=/root/.cache/pip \
-    python -m pip install uv && uv pip install --system wheel -Ue ".[dev]"
+    python -m pip install uv && uv pip install --system wheel psycopg2 redis gunicorn -Ue ".[dev]"
 
 RUN --mount=type=cache,target=/root/.cache/pip \
     python -m build
@@ -66,10 +62,12 @@ RUN --mount=type=cache,target=/root/.cache/pip \
     python -m pip install dist/pretalx*whl
 
 # Create pretalx user
-RUN groupadd -f -g ${PRETALX_GID} pretalx && \
-    useradd -u ${PRETALX_UID} -g ${PRETALX_GID} -m -d /pretalx -s /bin/bash pretalx && \
-    mkdir -p /data/media /data/static /data/logs /public/media /public/static && \
-    chown -R pretalx:pretalx /data /public
+RUN mkdir /data && \
+    mkdir /static && \
+    groupadd -g 999 pretalx && \
+    useradd -r -u 999 -g pretalx -d /pretalx -ms /bin/bash pretalx && \
+    chown -R pretalx:pretalx /data && \
+    chown -R pretalx:pretalx /static
 
 # Create deployment directory
 RUN mkdir -p /etc/pretalx
@@ -100,28 +98,28 @@ ssl = False\n\
 #backend = redis://redis:6379/2\n\
 #broker = redis://redis:6379/3\n\
 [filesystem]\n\
-media = /public/media\n\
-static = /public/static" > /tmp/pretalx.build.cfg
+static = /static" > /tmp/pretalx.build.cfg
 
 # Set environment to use the temporary config
 ENV PRETALX_CONFIG_FILE=/tmp/pretalx.build.cfg \
     DJANGO_SETTINGS_MODULE=pretalx.settings
 
 # Run migrate and rebuild using the default (SQLite) settings
-RUN python -m pretalx migrate
+# RUN python -m pretalx migrate
 RUN python -m pretalx rebuild --npm-install
 
 # Now, copy the real configuration file for runtime
 COPY --chmod=644 deployment/pretalx.cfg /etc/pretalx/pretalx.cfg
 ENV PRETALX_CONFIG_FILE=/etc/pretalx/pretalx.cfg
 
+
 WORKDIR /pretalx
 
 # Expose ports
 EXPOSE 8000
 
 # Set volumes
-VOLUME ["/data", "/public"]
+VOLUME ["/data", "/static"]
 
 # Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \

deployment/README.md

@@ -37,10 +37,6 @@ All configuration is done via environment variables.
 - `GUNICORN_BIND_ADDR`: Bind address (default: 0.0.0.0:8000)
 - `GUNICORN_FORWARDED_ALLOW_IPS`: Trusted proxy IPs (default: *)
 
-### Filesystem Configuration (Optional)
-- `PRETALX_FILESYSTEM_MEDIA`: Media files path (default: /public/media)
-- `PRETALX_FILESYSTEM_STATIC`: Static files path (default: /public/static)
-
 ### Database
 - `POSTGRES_DB`: Database name (default: pretalx)
 - `POSTGRES_USER`: Database user (default: pretalx)

docker-compose.yml

@@ -6,8 +6,7 @@ x-pretalx-image: &pretalx-image
     context: .
     args:
       PRETALX_VERSION: ${PRETALX_VERSION:-main}
-      PRETALX_UID: ${PRETALX_UID:-1000}
-      PRETALX_GID: ${PRETALX_GID:-1000}
+
 
 x-pretalx-env: &pretalx-env
   POSTGRES_DB: ${POSTGRES_DB:-pretalx}
@@ -21,8 +20,6 @@ x-pretalx-env: &pretalx-env
   CELERY_BROKER: ${CELERY_BROKER:-redis://redis:6379/3}
   PRETALX_SITE_URL: ${PRETALX_SITE_URL:-http://localhost}
   PRETALX_SECRET_KEY: ${PRETALX_SECRET_KEY:?Please set PRETALX_SECRET_KEY}
-  PRETALX_FILESYSTEM_MEDIA: ${PRETALX_FILESYSTEM_MEDIA:-/public/media}
-  PRETALX_FILESYSTEM_STATIC: ${PRETALX_FILESYSTEM_STATIC:-/public/static}
   PRETALX_MAIL_FROM: ${PRETALX_MAIL_FROM:-pretalx@localhost}
   PRETALX_MAIL_HOST: ${PRETALX_MAIL_HOST:-localhost}
   PRETALX_MAIL_PORT: ${PRETALX_MAIL_PORT:-25}
@@ -33,7 +30,6 @@ x-pretalx-env: &pretalx-env
 
 x-pretalx-volumes: &pretalx-volumes
   - pretalx_data:/data
-  - pretalx_public:/public
 
 services:
   db:
@@ -62,6 +58,7 @@ services:
       interval: 10s
       timeout: 3s
       retries: 3
+      start_period: 1s
 
   migrate:
     <<: *pretalx-image