feat: improve docker setup

- mount files for development and enable streamlit live reloading
- add multi-stage builds to dockerfile
- separate supervisord configs for prod and dev
- correctly load env vars
- use data and log volumes for production setup
- optimize docker build by effectively using layer cache

Author: mashb1t

.dockerignore

@@ -0,0 +1,3 @@
+.venv
+data
+log

.env.dist

@@ -1,6 +1,9 @@
 #服务端口
 SERVER_PORT=5001
 
+#Timezone
+TZ=Asia/Shanghai
+
 #大模型供应商配置,支持 zhipuai , openai , deepseek or ollama
 LLM_PROVIDER=deepseek
 

.gitignore

@@ -5,9 +5,9 @@ test/
 docker
 
 log/*
-!log/
+!log/.gitkeep
 data/*
-!data/
+!data/.gitkeep
 
 .env
 .pyc

Dockerfile

@@ -1,27 +1,33 @@
 # 使用官方的 Python 基础镜像
-FROM python:3.10-slim
+FROM python:3.10-slim AS base
 
 # 设置工作目录
 WORKDIR /app
 
-# 复制项目文件&创建必要的文件夹
-COPY requirements.txt .
-COPY biz /app/biz
-COPY core /app/core
-COPY api.py /app/api.py
-COPY ui.py /app/ui.py
-COPY prompt_templates.yml /app/prompt_templates.yml
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-RUN mkdir -p /app/log /app/data
-
 # 安装 supervisord 作为进程管理工具
 RUN apt-get update && apt-get install -y --no-install-recommends supervisor && rm -rf /var/lib/apt/lists/*
 
+# 复制项目文件&创建必要的文件夹
+COPY requirements.txt .
+
 # 安装依赖
 RUN pip install --no-cache-dir -r requirements.txt
 
+COPY biz .
+COPY core .
+COPY api.py .
+COPY ui.py .
+COPY prompt_templates.yml .
+RUN mkdir -p log data
+
 # 暴露 Flask 和 Streamlit 的端口
 EXPOSE 5001 5002
 
 # 使用 supervisord 作为启动命令
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
+
+FROM base AS dev
+COPY supervisord.dev.conf /etc/supervisor/conf.d/supervisord.conf
+
+FROM base AS prod
+COPY supervisord.prod.conf /etc/supervisor/conf.d/supervisord.conf

docker-compose.prod.yml

@@ -0,0 +1,20 @@
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+      target: prod
+    image: sunmh207/ai-codereview-gitlab:1.2.2
+    ports:
+      - "5001:5001"
+      - "5002:5002"
+    volumes:
+      - data:/app/data
+      - log:/app/log
+    env_file:
+      - .env
+    restart: unless-stopped
+
+volumes:
+    data:
+    log:

docker-compose.yml

@@ -1,13 +1,23 @@
 services:
-  flask-app:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+      target: dev
     image: sunmh207/ai-codereview-gitlab:1.2.2
     ports:
       - "5001:5001"
       - "5002:5002"
     volumes:
-      - ./.env:/app/.env
-      - ./log:/app/log
+      - ./biz:/app/biz
+      - ./core:/app/core
       - ./data:/app/data
-    environment:
-      - TZ=Asia/Shanghai
+      - ./log:/app/log
+      - ./api.py:/app/api.py
+      - ./prompt_templates.yml:/app/prompt_templates.yml
+      - ./requirements.txt:/app/requirements.txt
+      - ./supervisord.dev.conf:/etc/supervisor/conf.d/supervisord.conf
+      - ./ui.py:/app/ui.py
+    env_file:
+      - .env
     restart: unless-stopped

supervisord.dev.conf

@@ -0,0 +1,27 @@
+[supervisord]
+nodaemon=true
+user=root
+
+[program:flask]
+command=python /app/api.py
+autostart=true
+autorestart=true
+numprocs=1
+stdout_logfile=/dev/stdout
+stderr_logfile=/dev/stderr
+stdout_maxbytes=0
+stderr_maxbytes=0
+stdout_logfile_maxbytes = 0
+stderr_logfile_maxbytes = 0
+
+[program:streamlit]
+command=streamlit run /app/ui.py --server.port=5002 --server.address=0.0.0.0 --server.headless true --server.fileWatcherType=poll
+autostart=true
+autorestart=true
+numprocs=1
+stdout_logfile=/dev/stdout
+stderr_logfile=/dev/stderr
+stdout_maxbytes=0
+stderr_maxbytes=0
+stdout_logfile_maxbytes = 0
+stderr_logfile_maxbytes = 0

supervisord.conf renamed to supervisord.prod.conf

@@ -4,6 +4,9 @@ user=root
 
 [program:flask]
 command=python /app/api.py
+autostart=true
+autorestart=true
+numprocs=1
 stdout_logfile=/dev/stdout
 stderr_logfile=/dev/stderr
 stdout_maxbytes=0
@@ -12,7 +15,10 @@ stdout_logfile_maxbytes = 0
 stderr_logfile_maxbytes = 0
 
 [program:streamlit]
-command=streamlit run /app/ui.py --server.port=5002 --server.address=0.0.0.0
+command=streamlit run /app/ui.py --server.port=5002 --server.address=0.0.0.0 --server.headless true
+autostart=true
+autorestart=true
+numprocs=1
 stdout_logfile=/dev/stdout
 stderr_logfile=/dev/stderr
 stdout_maxbytes=0