From 3b7a269c45c3c6a0d117e5d18dada166f1911cf2 Mon Sep 17 00:00:00 2001 From: zhangtao <9480807882@qq.com> Date: Sat, 17 May 2025 03:44:21 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=92=8CDocker=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将前端和后端的环境变量中的端口号从8000改为8001 - 更新Dockerfile中的文件路径和构建上下文 - 修改docker-compose.yaml中的版本和端口映射 - 简化nginx.conf配置并调整日志级别 --- backend/env/.env.dev | 2 +- backend/env/.env.prod | 4 ++-- devops/README.md | 0 devops/backend/Dockerfile | 4 ++-- devops/docker-compose.yaml | 8 ++++---- devops/frontend/Dockerfile | 4 ++-- devops/frontend/nginx.conf | 5 ++--- frontend/.env.development | 2 +- 8 files changed, 14 insertions(+), 15 deletions(-) mode change 100755 => 100644 devops/README.md diff --git a/backend/env/.env.dev b/backend/env/.env.dev index 12e0ee63..3bea3593 100644 --- a/backend/env/.env.dev +++ b/backend/env/.env.dev @@ -6,7 +6,7 @@ ENVIRONMENT = "dev" # 服务器配置 SERVER_HOST = '0.0.0.0' # 允许访问的IP地址 -SERVER_PORT = 8000 # 服务端口 +SERVER_PORT = 8001 # 服务端口 RELOAD = True # 是否自动重启 WORKERS = 1 # 启动进程数 FACTORY = True # 是否使用异步模式 diff --git a/backend/env/.env.prod b/backend/env/.env.prod index b565f151..13c75217 100644 --- a/backend/env/.env.prod +++ b/backend/env/.env.prod @@ -5,8 +5,8 @@ ENVIRONMENT = "prod" # 服务器配置 -SERVER_HOST = '172.18.52.77' # 允许访问的IP地址 -SERVER_PORT = 8000 # 服务端口 +SERVER_HOST = '0.0.0.0' # 允许访问的IP地址 +SERVER_PORT = 8001 # 服务端口 RELOAD = False # 是否自动重启 WORKERS = 1 # 启动进程数 FACTORY = True # 是否使用异步模式 diff --git a/devops/README.md b/devops/README.md old mode 100755 new mode 100644 diff --git a/devops/backend/Dockerfile b/devops/backend/Dockerfile index ac4817d5..18d5079b 100644 --- a/devops/backend/Dockerfile +++ b/devops/backend/Dockerfile @@ -11,10 +11,10 @@ ENV TZ Asia/Shanghai WORKDIR /home # 将当前主机目录全部文件复制至容器工作目录 -COPY /home/fastapi_vue3_admin/backend . +COPY ../backend . # 安装依赖 -RUN pip install --no-cache-dir -r ./backend/requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple +RUN pip install --no-cache-dir -r ./requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple # 运行应用 CMD ["python", "main.py", "run", "--env=prod"] diff --git a/devops/docker-compose.yaml b/devops/docker-compose.yaml index 91b8ddf8..f192bc87 100644 --- a/devops/docker-compose.yaml +++ b/devops/docker-compose.yaml @@ -1,4 +1,4 @@ -version: "3.0" +version: "3.10" # 应用服务 services: @@ -42,11 +42,11 @@ services: container_name: backend # 构建镜像 build: - context: ./backend - dockerfile: Dockerfile + context: .. + dockerfile: devops/backend/Dockerfile # 端口映射 ports: - - "8000:8000" + - "8001:8001" volumes: - /home/backend/static:/home/backend/static - /home/backend/logs:/home/backend/logs diff --git a/devops/frontend/Dockerfile b/devops/frontend/Dockerfile index 6a3dd149..ef8b0bc2 100644 --- a/devops/frontend/Dockerfile +++ b/devops/frontend/Dockerfile @@ -11,10 +11,10 @@ ENV TZ Asia/Shanghai WORKDIR /home # 将当前主机目录全部文件复制至容器工作目录 -COPY /home/fastapi_vue3_admin/devops/frontend/dist /usr/share/nginx/html +COPY ./dist /usr/share/nginx/html # 用本地的nginx配置文件覆盖镜像的Nginx配置 -COPY /home/fastapi_vue3_admin/devops/frontend/nginx.conf /etc/nginx/nginx.conf +COPY ./nginx.conf /etc/nginx/nginx.conf # 暴露端口 EXPOSE 80 diff --git a/devops/frontend/nginx.conf b/devops/frontend/nginx.conf index 6a7a5f0d..97e2b94a 100644 --- a/devops/frontend/nginx.conf +++ b/devops/frontend/nginx.conf @@ -1,6 +1,5 @@ ########### 每个指令必须有分号结束。################# -user administrator administrators; # 配置用户或组，默认为nobody nobody -worker_processes 1; # 允许生成的进程数，默认为1 +worker_processes 1; # 允许生成的进程数，默认为1: pid /nginx/pid/nginx.pid; # 指定 Nginx 进程运行文件存放地址 error_log /var/log/nginx/error.log warn; @@ -18,7 +17,7 @@ http { # 访问服务日志 access_log on; - access_log /var/log/nginx/host.access.log main; + access_log /var/log/nginx/host.access.log info; sendfile on; # 允许sendfile方式传输文件，默认为off，可以在http块、server块、location块 diff --git a/frontend/.env.development b/frontend/.env.development index 7adc7ca7..a9bf0e1b 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -10,7 +10,7 @@ VITE_APP_TITLE=开发环境 VITE_APP_BASE_API=/api/v1 # 网络请求公用地址 -VITE_API_BASE_URL=http://localhost:8000 +VITE_API_BASE_URL=http://localhost:8001 # 请求超时时间 VITE_TIMEOUT=10000 \ No newline at end of file