From c7f705b274fe0c5275dd5bf02cb47491c493fa7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AC=A3=E5=8D=97=E7=A7=91=E6=8A=80?= Date: Thu, 6 Mar 2025 09:05:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fixed:=E5=85=BC=E5=AE=B9=E6=97=A7=E7=89=88?= =?UTF-8?q?=E6=9C=ACdocker=20(#216)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: hrz <1710360675@qq.com> --- docs/docker-build.md | 2 ++ main/README.md | 2 ++ main/manager-api/README.md | 1 + main/manager-web/README.md | 5 +++++ main/xiaozhi-server/config.yaml | 8 ++++++++ 5 files changed, 18 insertions(+) diff --git a/docs/docker-build.md b/docs/docker-build.md index ac14dab2..bbce9de5 100644 --- a/docs/docker-build.md +++ b/docs/docker-build.md @@ -8,6 +8,8 @@ sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin ``` 2、编译docker镜像 ``` +#进入xiaozhi-server目录 +cd main/xiaozhi-server/ # 普通编译 docker build -t xiaozhi-esp32-server:local -f ./Dockerfile-pip . ``` diff --git a/main/README.md b/main/README.md index f9033930..78c5f4a0 100644 --- a/main/README.md +++ b/main/README.md @@ -1,3 +1,5 @@ +本文档是开发类文档，如需部署小智服务端，[点击这里查看部署教程](../README.md#%E4%BD%BF%E7%94%A8%E6%96%B9%E5%BC%8F-) + # 项目目录介绍 当你看到这份文件的时候，这个这个项目还没完善好。我们还有很多东西要做。 diff --git a/main/manager-api/README.md b/main/manager-api/README.md index d7539db0..0435956e 100755 --- a/main/manager-api/README.md +++ b/main/manager-api/README.md @@ -1,3 +1,4 @@ +本文档是开发类文档，如需部署小智服务端，[点击这里查看部署教程](../../README.md#%E4%BD%BF%E7%94%A8%E6%96%B9%E5%BC%8F-) # 项目介绍 manager-api 该项目基于SpringBoot框架开发。 diff --git a/main/manager-web/README.md b/main/manager-web/README.md index 30bdbd97..a81c8ff6 100644 --- a/main/manager-web/README.md +++ b/main/manager-web/README.md @@ -1,3 +1,5 @@ +本文档是开发类文档，如需部署小智服务端，[点击这里查看部署教程](../../README.md#%E4%BD%BF%E7%94%A8%E6%96%B9%E5%BC%8F-) + # xiaozhi ## Project setup @@ -11,14 +13,17 @@ npm install ``` ### Compiles and hot-reloads for development + ``` npm run serve ``` ### Compiles and minifies for production + ``` npm run build ``` ### Customize configuration + See [Configuration Reference](https://cli.vuejs.org/config/). diff --git a/main/xiaozhi-server/config.yaml b/main/xiaozhi-server/config.yaml index 48059b2c..f795d8c7 100644 --- a/main/xiaozhi-server/config.yaml +++ b/main/xiaozhi-server/config.yaml @@ -343,3 +343,11 @@ music: - ".wav" - ".p3" refresh_time: 300 # 刷新音乐列表的时间间隔，单位为秒 + +# 以下配置在小于等于0.0.9版本中的docker容器中可用 +# 0.0.9以后的新版本源码部署已经无法奏效 +manager: + enabled: false + ip: 0.0.0.0 + port: 8002 +use_private_config: false \ No newline at end of file From 26763318045bddbbe048b11b25b17a5f77c67f5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AC=A3=E5=8D=97=E7=A7=91=E6=8A=80?= Date: Thu, 6 Mar 2025 10:55:01 +0800 Subject: [PATCH 2/3] Fix docker config bug (#217) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fixed:兼容旧版本docker * update：增加前端设计图 * update:dockerfile --------- Co-authored-by: hrz <1710360675@qq.com> --- Dockerfile | 29 +++++++++++++++++++++++++++++ main/README.md | 1 + 2 files changed, 30 insertions(+) create mode 100755 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100755 index 00000000..aaa43103 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,29 @@ +# 第一阶段：构建Python依赖 +FROM python:3.10-slim AS builder + +WORKDIR /app + +COPY main/xiaozhi-server/requirements.txt . + +# 优化apt安装 +RUN pip install --no-cache-dir -r requirements.txt + +# 第三阶段：生产镜像 +FROM python:3.10-slim + +WORKDIR /opt/xiaozhi-esp32-server + +# 优化apt安装 +RUN 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 main/xiaozhi-server/ . + +# 启动应用 +CMD ["python", "app.py"] \ No newline at end of file diff --git a/main/README.md b/main/README.md index 78c5f4a0..2e164954 100644 --- a/main/README.md +++ b/main/README.md @@ -20,3 +20,4 @@ xiaozhi-esp32-server [manager前后端接口协议](https://app.apifox.com/invite/project?token=H_8qhgfjUeaAL0wybghgU) +[前端页面设计图](https://codesign.qq.com/app/s/526108506410828) From 1f722477cefbbef798ce8bef200d4dd42e6d78aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AC=A3=E5=8D=97=E7=A7=91=E6=8A=80?= Date: Thu, 6 Mar 2025 13:12:32 +0800 Subject: [PATCH 3/3] Fix docker config bug (#220) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fixed:兼容旧版本docker * update：增加前端设计图 * update:dockerfile * fix:修复新版docker目录不对bug * fix: 修复docker快速启动方式中无法读取配置的问题 #207 (#219) Co-authored-by: 欣南科技 --------- Co-authored-by: hrz <1710360675@qq.com> Co-authored-by: yanyige <232218719@qq.com> --- main/xiaozhi-server/Dockerfile | 2 +- main/xiaozhi-server/Dockerfile-pip | 51 -------------------------- main/xiaozhi-server/docker-compose.yml | 4 +- 3 files changed, 3 insertions(+), 54 deletions(-) delete mode 100755 main/xiaozhi-server/Dockerfile-pip 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