diff --git a/Dockerfile b/Dockerfile index 4c4e493..4b42f12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,19 +39,11 @@ WORKDIR /app RUN apt-get update && apt-get install -y --no-install-recommends \ libpq5 postgresql-client curl tini supervisor nginx \ - libnss3 libatk1.0-0 libatk-bridge2.0-0 libcups2 libdbus-1-3 \ - libdrm2 libgbm1 libgtk-3-0 libnspr4 libxcomposite1 libxdamage1 \ - libxfixes3 libxrandr2 libxshmfence1 libpango-1.0-0 libcairo2 \ - libasound2 libatspi2.0-0 libx11-xcb1 fonts-liberation \ && rm -rf /var/lib/apt/lists/* \ && apt-get clean -# Copy Python deps and Playwright/Chromium browser from builder +# Copy Python deps from builder COPY --from=builder /install /usr/local -COPY --from=builder /root/.cache/ms-playwright /root/.cache/ms-playwright - -# Tell Playwright where to find Chromium (baked from builder) -ENV PLAYWRIGHT_BROWSERS_PATH=/root/.cache/ms-playwright # Copy application code COPY apps/api/src ./src diff --git a/supervisord.conf b/supervisord.conf index c7cf3d4..83616d7 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -4,6 +4,16 @@ logfile=/var/log/supervisor/supervisord.log pidfile=/var/run/supervisord.pid user=root +[unix_http_server] +file=/var/run/supervisor.sock +chmod=0700 + +[supervisorctl] +serverurl=unix:///var/run/supervisor.sock + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + [program:nginx] command=nginx -g "daemon off;" -c /etc/nginx/conf.d/default.conf autostart=true @@ -61,9 +71,9 @@ directory=/app autostart=true autorestart=true startsecs=10 -stdout_logfile=/dev/stdout +stdout_logfile=/var/log/scanner.log stdout_logfile_maxbytes=0 -stderr_logfile=/dev/stderr +stderr_logfile=/var/log/scanner.log stderr_logfile_maxbytes=0 stopwaitsecs=10 killasgroup=true