diff --git a/main/xiaozhi-server/Dockerfile b/main/xiaozhi-server/Dockerfile index cd1fef9e..3ca8ed29 100644 --- a/main/xiaozhi-server/Dockerfile +++ b/main/xiaozhi-server/Dockerfile @@ -1,7 +1,7 @@ # 第一阶段:构建 Python 依赖 FROM kalicyh/poetry:v3.10_xiaozhi AS builder -WORKDIR /app +WORKDIR /opt/xiaozhi-esp32-server # 同时拷贝本地环境.venv COPY . . diff --git a/main/xiaozhi-server/Dockerfile-pip b/main/xiaozhi-server/Dockerfile-pip deleted file mode 100755 index c8f48498..00000000 --- a/main/xiaozhi-server/Dockerfile-pip +++ /dev/null @@ -1,51 +0,0 @@ -# 第一阶段:前端构建 -FROM node:18 AS frontend-builder - -WORKDIR /app/web - -# 配置npm使用淘宝源 -RUN npm config set registry https://registry.npmmirror.com - -COPY web/package*.json ./ - -# 安装axios依赖 -RUN npm install axios -RUN npm install - -COPY web . - -RUN npm run build - -# 第二阶段:构建Python依赖 -FROM python:3.10-slim AS builder - -WORKDIR /app - -COPY requirements.txt . - -# 优化apt安装 -RUN pip install --no-cache-dir -r requirements.txt \ - -i https://mirrors.aliyun.com/pypi/simple/ - -# 第三阶段:生产镜像 -FROM python:3.10-slim - -WORKDIR /opt/xiaozhi-esp32-server - -# 优化apt安装 -RUN echo "deb https://mirrors.aliyun.com/debian/ bookworm main contrib non-free non-free-firmware" > /etc/apt/sources.list && \ - echo "deb https://mirrors.aliyun.com/debian/ bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \ - apt-get update && \ - apt-get install -y --no-install-recommends libopus0 ffmpeg && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# 从构建阶段复制Python包和前端构建产物 -COPY --from=builder /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages -COPY --from=frontend-builder /app/web/dist /opt/xiaozhi-esp32-server/manager/static/webui - -# 复制应用代码 -COPY . . - -# 启动应用 -CMD ["python", "app.py"] \ No newline at end of file diff --git a/main/xiaozhi-server/docker-compose.yml b/main/xiaozhi-server/docker-compose.yml index 32ebcdf6..f9c08ab4 100755 --- a/main/xiaozhi-server/docker-compose.yml +++ b/main/xiaozhi-server/docker-compose.yml @@ -13,6 +13,6 @@ services: - "8002:8002" volumes: # 配置文件目录 - - ./data:/app/data + - ./data:/opt/xiaozhi-esp32-server/data # 模型文件挂接,很重要 - - ./models/SenseVoiceSmall/model.pt:/app/models/SenseVoiceSmall/model.pt \ No newline at end of file + - ./models/SenseVoiceSmall/model.pt:/opt/xiaozhi-esp32-server/models/SenseVoiceSmall/model.pt \ No newline at end of file