kris/ForcePilot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

修改环境要求，确保在 ARM 架构的设备上也能正常使用 Docker 启动

Browse Source
This commit is contained in:
Wenjie Zhang 2025-02-24 11:14:00 +08:00
parent 198ea233d5
commit fa0794ebff
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/api.Dockerfile
View File

@ -1,5 +1,5 @@
# 使用基础镜像 # 使用基础镜像
FROM pytorch/pytorch:2.4.1-cuda11.8-cudnn9-runtime FROM python:3.12
# 设置工作目录 # 设置工作目录
WORKDIR /app WORKDIR /app
@ -9,14 +9,8 @@ COPY ../requirements.txt /app/requirements.txt
# 安装依赖（Docker 会缓存这一步，除非 requirements.txt 发生变化） # 安装依赖（Docker 会缓存这一步，除非 requirements.txt 发生变化）
RUN pip install -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple RUN pip install -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple
RUN pip install -U gunicorn -i https://pypi.tuna.tsinghua.edu.cn/simple RUN pip install -U gunicorn -i https://pypi.tuna.tsinghua.edu.cn/simple
RUN sed -i s@/archive.ubuntu.com/@/mirrors.aliyun.com/@g /etc/apt/sources.list
RUN sed -i s@/security.ubuntu.com/@/mirrors.aliyun.com/@g /etc/apt/sources.list
RUN apt-get clean
RUN apt-get update && apt-get install ffmpeg libsm6 libxext6 -y
# 复制代码到容器中 # 复制代码到容器中
COPY ../src /app/src COPY ../src /app/src

6
docker/docker-compose.dev.yml
View File

@ -11,7 +11,7 @@ services:
- ../src/static/config.dev.yaml:/app/src/static/config.yaml - ../src/static/config.dev.yaml:/app/src/static/config.yaml
- ${MODEL_DIR}:${MODEL_DIR} # 如果出现 undefined volume MODEL_DIR: invalid compose project，请添加此环境变量或者注释此行 - ${MODEL_DIR}:${MODEL_DIR} # 如果出现 undefined volume MODEL_DIR: invalid compose project，请添加此环境变量或者注释此行
ports: ports:
- "5000:5000" - "5050:5050"
depends_on: depends_on:
- graph - graph
- milvus - milvus
@ -23,7 +23,7 @@ services:
- NEO4J_PASSWORD=0123456789 - NEO4J_PASSWORD=0123456789
- MILVUS_URI=http://milvus:19530 - MILVUS_URI=http://milvus:19530
- MODEL_DIR=${MODEL_DIR} # 优先级高于 .env 中的 MODEL_DIR - MODEL_DIR=${MODEL_DIR} # 优先级高于 .env 中的 MODEL_DIR
command: uvicorn src.main:app --host 0.0.0.0 --port 5000 --reload command: uvicorn src.main:app --host 0.0.0.0 --port 5050 --reload
web: web:
build: build:
@ -42,7 +42,7 @@ services:
- app-network - app-network
environment: environment:
- NODE_ENV=development - NODE_ENV=development
- VITE_API_URL=http://api:5000 # 添加这行 - VITE_API_URL=http://api:5050 # 添加这行
command: npm run server command: npm run server
graph: graph:

4
docker/web.Dockerfile
View File

@ -1,5 +1,5 @@
# 开发阶段 # 开发阶段
FROM node:22.10.0 AS development FROM node:latest AS development
WORKDIR /app WORKDIR /app
# 复制 package.json 和 package-lock.json（如果存在） # 复制 package.json 和 package-lock.json（如果存在）
@ -17,7 +17,7 @@ EXPOSE 5173
# 启动开发服务器的命令在 docker-compose 文件中定义 # 启动开发服务器的命令在 docker-compose 文件中定义
# 生产阶段 # 生产阶段
FROM node:22.10.0 AS build-stage FROM node:latest AS build-stage
WORKDIR /app WORKDIR /app
COPY ./web/package*.json ./ COPY ./web/package*.json ./

2
requirements.txt
View File

@ -18,7 +18,7 @@ torch>=2.4.0
tqdm>=4.66.1 tqdm>=4.66.1
zhipuai>=2.1.2 zhipuai>=2.1.2
neo4j>=5.22.0 neo4j>=5.22.0
sentencepiece==0.1.99 sentencepiece>=0.1.99
llama-index-readers-file llama-index-readers-file
opencv-python-headless opencv-python-headless
docx2txt docx2txt

4
src/.env.template
View File

@ -1 +1,3 @@
ZHIPUAI_API_KEY=<ZHIPUAI_API_KEY> ZHIPUAI_API_KEY=270ea71e9******97.e3XOMdWKuZb7Q1Sk
SILICONFLOW_API_KEY=sk-aeoamptic****vdmozbpdsofstmoqnvsmbvql
MODEL_DIR=/home/user/Documents/projects/Yuxi-Know/models