Ryanfafa commited on
Commit
8c5b9b8
·
verified ·
1 Parent(s): 3856c4a

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +7 -7
Dockerfile CHANGED
@@ -20,17 +20,17 @@ RUN pip install --no-cache-dir --upgrade pip && \
20
  COPY --chown=appuser:appuser . .
21
 
22
  # Writable dirs
23
- RUN mkdir -p /app/chroma_db /app/sample_docs /var/log/supervisor && \
24
- chown -R appuser:appuser /app/chroma_db /app/sample_docs
25
 
26
- # Supervisor config to run both services
27
- RUN echo '[supervisord]\nnodaemon=true\nuser=root\n\n\
28
- [program:streamlit]\ncommand=streamlit run app.py --server.port=7860 --server.address=0.0.0.0 --server.headless=true --server.enableCORS=false --server.enableXsrfProtection=false --browser.gatherUsageStats=false\ndirectory=/app\nuser=appuser\nautostart=true\nautorestart=true\nstdout_logfile=/var/log/supervisor/streamlit.log\nstderr_logfile=/var/log/supervisor/streamlit_err.log\n\n\
29
- [program:fastapi]\ncommand=uvicorn api:app --host=0.0.0.0 --port=7861\ndirectory=/app\nuser=appuser\nautostart=true\nautorestart=true\nstdout_logfile=/var/log/supervisor/fastapi.log\nstderr_logfile=/var/log/supervisor/fastapi_err.log\n' > /etc/supervisor/conf.d/docmind.conf
30
 
31
  USER appuser
32
 
33
  EXPOSE 7860
34
  EXPOSE 7861
35
 
36
- CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/docmind.conf"]
 
20
  COPY --chown=appuser:appuser . .
21
 
22
  # Writable dirs
23
+ RUN mkdir -p /app/chroma_db /app/sample_docs /app/logs && \
24
+ chown -R appuser:appuser /app/chroma_db /app/sample_docs /app/logs
25
 
26
+ # Supervisor config no user= directives since we run as appuser already
27
+ RUN mkdir -p /app/supervisor && \
28
+ printf '[supervisord]\nnodaemon=true\nlogfile=/app/logs/supervisord.log\npidfile=/app/logs/supervisord.pid\n\n[program:streamlit]\ncommand=streamlit run app.py --server.port=7860 --server.address=0.0.0.0 --server.headless=true --server.enableCORS=false --server.enableXsrfProtection=false --browser.gatherUsageStats=false\ndirectory=/app\nautostart=true\nautorestart=true\nstdout_logfile=/app/logs/streamlit.log\nstderr_logfile=/app/logs/streamlit_err.log\n\n[program:fastapi]\ncommand=uvicorn api:app --host=0.0.0.0 --port=7861\ndirectory=/app\nautostart=true\nautorestart=true\nstdout_logfile=/app/logs/fastapi.log\nstderr_logfile=/app/logs/fastapi_err.log\n' > /app/supervisor/supervisord.conf && \
29
+ chown -R appuser:appuser /app/supervisor
30
 
31
  USER appuser
32
 
33
  EXPOSE 7860
34
  EXPOSE 7861
35
 
36
+ CMD ["/usr/bin/supervisord", "-c", "/app/supervisor/supervisord.conf"]