修复docker部署错误 (#44)

* build: fix docker deploy error

* 更新依赖管理

* 更新docker相关配置

* 修复配置文件

* 优化docker脚本文件

* 添加fsm_server镜像版本

Author: downdawn

.pre-commit-config.yaml

@@ -26,5 +26,7 @@ repos:
           - '-o'
           - 'requirements.txt'
           - '--without-hashes'
+          - '-G'
+          - 'lint'
         files: ^pdm.lock$
       - id: pdm-lock-check

Dockerfile

@@ -8,16 +8,23 @@ RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debi
     && sed -i 's|security.debian.org/debian-security|mirrors.ustc.edu.cn/debian-security|g' /etc/apt/sources.list.d/debian.sources
 
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends gcc python3-dev \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN pip install --upgrade pip -i https://mirrors.aliyun.com/pypi/simple \
+    && apt-get install -y --no-install-recommends gcc python3-dev supervisor \
+    && rm -rf /var/lib/apt/lists/* \
+    # 某些包可能存在同步不及时导致安装失败的情况，可更改为官方源：https://pypi.org/simple
+    && pip install --upgrade pip -i https://mirrors.aliyun.com/pypi/simple \
     && pip install -r requirements.txt -i https://mirrors.aliyun.com/pypi/simple \
+    && pip install gunicorn wait-for-it -i https://mirrors.aliyun.com/pypi/simple
+
+ENV TZ="Asia/Shanghai"
+
+RUN mkdir -p /var/log/fastapi_server \
+    && mkdir -p /var/log/supervisor \
+    && mkdir -p /etc/supervisor/conf.d
 
-ENV TZ = Asia/Shanghai
+COPY deploy/supervisor.conf /etc/supervisor/supervisord.conf
 
-RUN mkdir -p /var/log/fastapi_server
+COPY deploy/fastapi_server.conf /etc/supervisor/conf.d/
 
 EXPOSE 8001
 
-CMD ["uvicorn", "backend.main:app", "--host", "127.0.0.1", "--port", "8000"]
+CMD ["uvicorn", "backend.main:app", "--host", "0.0.0.0", "--port", "8001"]

README.md

@@ -48,7 +48,7 @@
    fastapi dev main.py
    ```
 
-9. 浏览器访问: http://127.0.0.1:8000/api/v1/docs
+9. 浏览器访问: http://127.0.0.1:8000/docs
 
 ---
 
@@ -59,12 +59,13 @@
    ```shell
    cd deploy/docker-compose/
    
-   cp .env.server ../../../backend/.env
+   cp .env.server ../../backend/.env
    ```
 
 2. 执行一键启动命令
 
    ```shell
+   # 根据情况使用 sudo
    docker-compose up -d --build
    ```
 

backend/core/conf.py

@@ -10,7 +10,7 @@
 
 
 class Settings(BaseSettings):
-    model_config = SettingsConfigDict(env_file=f'{BasePath}/.env', env_file_encoding='utf-8', case_sensitive=True)
+    model_config = SettingsConfigDict(env_file=f'{BasePath}/.env', env_file_encoding='utf-8', extra='ignore')
 
     # Env Config
     ENVIRONMENT: Literal['dev', 'pro']

deploy/docker-compose/.env.server

@@ -1,10 +1,10 @@
 # Env: dev、pro
 ENVIRONMENT='dev'
 # MySQL
-MYSQL_HOST='fsm_mysql'
-MYSQL_PORT=3306
-MYSQL_USER='root'
-MYSQL_PASSWORD='123456'
+DATABASE_HOST='fsm_mysql'
+DATABASE_PORT=3306
+DATABASE_USER='root'
+DATABASE_PASSWORD='123456'
 # Redis
 REDIS_HOST='fsm_redis'
 REDIS_PORT=6379

deploy/docker-compose/docker-compose.yml

@@ -1,19 +1,9 @@
-version: "3.10"
-
-networks:
-  fsm_network:
-    driver: bridge
-
-volumes:
-  fsm_mysql:
-  fsm_redis:
-  fsm_static:
-
 services:
   fsm_server:
     build:
       context: ../../
       dockerfile: Dockerfile
+    image: fsm_server:latest
     container_name: fsm_server
     restart: always
     depends_on:
@@ -27,8 +17,9 @@ services:
       - bash
       - -c
       - |
-        wait-for-it -s mysql:3306 -s redis:6379 -t 300
-        supervisord -c /fsm/deploy/supervisor.conf
+        wait-for-it -s fsm_mysql:3306 -s fsm_redis:6379 -t 300
+        supervisord -c /etc/supervisor/supervisord.conf
+        supervisorctl restart
 
   fsm_mysql:
     image: mysql:8.0.29
@@ -41,7 +32,7 @@ services:
       MYSQL_ROOT_PASSWORD: 123456
       TZ: Asia/Shanghai
     volumes:
-      - fba_mysql:/var/lib/mysql
+      - fsm_mysql:/var/lib/mysql
     networks:
       - fsm_network
     command:
@@ -64,13 +55,32 @@ services:
       - fsm_network
 
   fsm_nginx:
-    image: nginx
+    image: nginx:stable
     ports:
       - "8000:80"
     container_name: fsm_nginx
     restart: always
+    depends_on:
+      - fsm_server
     volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf:ro
-      - fsm_static:/www/fsm/backend/static
+      - ../nginx.conf:/etc/nginx/conf.d/default.conf:ro
+      - fsm_static:/www/fsm_server/backend/static
     networks:
       - fsm_network
+
+networks:
+  fsm_network:
+    name: fsm_network
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 172.10.10.0/24
+
+volumes:
+  fsm_mysql:
+    name: fsm_mysql
+  fsm_redis:
+    name: fsm_redis
+  fsm_static:
+    name: fsm_static

deploy/fastapi_server.conf

@@ -0,0 +1,9 @@
+[program:fastapi_server]
+directory=/fsm
+command=/usr/local/bin/gunicorn -c /fsm/deploy/gunicorn.conf.py main:app
+user=root
+autostart=true
+autorestart=true
+startretries=5
+redirect_stderr=true
+stdout_logfile=/var/log/fastapi_server/fsm_server.log

deploy/gunicorn.conf.py

@@ -1,11 +1,12 @@
+# fmt: off
 # 监听内网端口
 bind = '0.0.0.0:8001'
 
 # 工作目录
 chdir = '/fsm/backend/'
 
 # 并行工作进程数
-workers = 4
+workers = 1
 
 # 指定每个工作者的线程数
 threads = 4
@@ -41,6 +42,6 @@
 loglevel = 'debug'
 
 # python程序
-pythonpath = '/usr/local/lib/python3.8/site-packages'
+pythonpath = '/usr/local/lib/python3.10/site-packages'
 
 # 启动 gunicorn -c gunicorn.conf.py main:app

deploy/nginx.conf

@@ -1,25 +1,10 @@
-# For more information on configuration, see:
-#   * Official English Documentation: http://nginx.org/en/docs/
-#   * Official Russian Documentation: http://nginx.org/ru/docs/
+server {
+    listen       80 default_server;
+    listen       [::]:80 default_server;
+    server_name  127.0.0.1;
 
-user nginx;
-worker_processes auto;
-error_log /var/log/nginx/error.log;
-pid /run/nginx.pid;
+    root /fsm;
 
-# Load dynamic modules. See /usr/share/doc/nginx/README.dynamic.
-include /usr/share/nginx/modules/*.conf;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-
-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
-
-    sendfile on;
     client_max_body_size 5M;
     client_body_buffer_size 5M;
 
@@ -30,27 +15,19 @@ http {
 
     keepalive_timeout 300;
 
-    server {
-        listen       80 default_server;
-        listen       [::]:80 default_server;
-        server_name  127.0.0.1;
-
-        root /fsm;
+    location / {
+        proxy_pass http://fsm_server:8001;
 
-        location / {
-                proxy_pass http://fsm_server:8001;
-
-                proxy_set_header Host $http_host;
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                proxy_set_header X-Forwarded-Proto $scheme;
-                proxy_connect_timeout 300s;
-                proxy_send_timeout 300s;
-                proxy_read_timeout 300s;
-        }
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_connect_timeout 300s;
+        proxy_send_timeout 300s;
+        proxy_read_timeout 300s;
+    }
 
-        location /static {
-                alias /www/fsm/backend/static;
-        }
+    location /static {
+        alias /www/fsm_server/backend/static;
     }
 }

deploy/supervisor.conf

@@ -42,7 +42,7 @@ file=/tmp/supervisor.sock   ; the path to the socket file
 ;password=123               ; default is no password (open server)
 
 [supervisord]
-logfile=/tmp/supervisord.log ; main log file; default $CWD/supervisord.log
+logfile=/var/log/supervisor/supervisord.log ; main log file; default $CWD/supervisord.log
 logfile_maxbytes=50MB        ; max main logfile bytes b4 rotation; default 50MB
 logfile_backups=10           ; # of main logfile backups; 0 means none, default 10
 loglevel=info                ; log level; default info; others: debug,warn,trace
@@ -151,15 +151,5 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket
 ; interpreted as relative to this file.  Included files *cannot*
 ; include files themselves.
 
-;[include]
-;files = relative/directory/*.ini
-
-[program:fastapi_server]
-directory=/fsm/deploy
-command=/usr/local/bin/gunicorn -c gunicorn.conf.py main:app
-user=root
-autostart=true
-autorestart=true
-startretries=5
-redirect_stderr=true
-stdout_logfile=/var/log/fastapi_server/fastapi_server.log
+[include]
+files = /etc/supervisor/conf.d/*.conf

pdm.lock

@@ -6,10 +6,7 @@ authors = [
     {name = "Wu Clan", email = "jianhengwu0407@gmail.com"},
 ]
 dependencies = [
-    "aiofiles==23.2.1",
-    "aiosmtplib==3.0.1",
     "alembic==1.13.1",
-    "asgiref==3.8.1",
     "asyncmy==0.2.9",
     "bcrypt==4.1.3",
     "cryptography==42.0.7",
@@ -36,12 +33,12 @@ requires-python = ">=3.10"
 readme = "README.md"
 license = {text = "MIT"}
 
-[tool.pdm.dev-dependencies]
+[dependency-groups]
 lint = [
     "ruff>=0.8.2",
 ]
-deploy = [
-    "supervisor>=4.2.5",
+server = [
+    "gunicorn==21.2.0",
     "wait-for-it>=2.2.2",
 ]
 

pyproject.toml

@@ -67,22 +67,19 @@ rich==13.9.4
 rich-toolkit==0.12.0
 rsa==4.9
 ruff==0.8.2
-setuptools==75.6.0
 shellingham==1.5.4
 six==1.17.0
 sniffio==1.3.1
 sqlalchemy==2.0.30
 sqlalchemy-crud-plus==1.6.0
 starlette==0.37.2
-supervisor==4.2.5
 typer==0.15.1
 typing-extensions==4.12.2
 tzdata==2024.1
 ujson==5.10.0
 uvicorn[standard]==0.29.0
 uvloop==0.21.0; (sys_platform != "cygwin" and sys_platform != "win32") and platform_python_implementation != "PyPy"
 virtualenv==20.28.0
-wait-for-it==2.3.0
 watchfiles==1.0.0
 websockets==14.1
 win32-setctime==1.1.0; sys_platform == "win32"