添加对vllm的支持

.github/workflows/docker-image.yml

@@ -0,0 +1,46 @@
+name: Docker Image CI
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'  # 只在以 v 开头的标签推送时触发，例如 v1.0.0
+
+jobs:
+  release:
+    name: Release Docker image
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: write
+      id-token: write
+      issues: write
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.TOKEN }}
+
+      - name: Extract version from tag
+        id: get_version
+        run: |
+          echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+
+      - name: Build and push Docker image
+        id: build_push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository }}:${{ env.VERSION }}
+            ghcr.io/${{ github.repository }}:latest
+          platforms: linux/amd64,linux/arm64

.gitignore

@@ -1,5 +1,6 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
+.idea/
 *.py[cod]
 *$py.class
 
@@ -9,6 +10,7 @@ __pycache__/
 # Distribution / packaging
 .Python
 build/
+data/
 develop-eggs/
 dist/
 downloads/
@@ -143,4 +145,5 @@ tmp
 .config.yaml
 .secrets.yaml
 .private_config.yaml
+.env.development
 docker-compose.yml

Dockerfile

@@ -1,46 +1,45 @@
 # 第一阶段：前端构建
-FROM node:18 AS frontend-builder
+
+FROM kalicyh/node:v18-alpine AS frontend-builder
 
 WORKDIR /app/ZhiKongTaiWeb
 
-RUN corepack enable && yarn config set registry https://registry.npmmirror.com
+# RUN corepack enable && yarn config set registry https://registry.npmmirror.com
 
 COPY ZhiKongTaiWeb/package.json ZhiKongTaiWeb/yarn.lock ./
 
-RUN mkdir node_modules && yarn install --frozen-lockfile
+RUN yarn install --frozen-lockfile
 
 COPY ZhiKongTaiWeb . 
 RUN yarn build
 
 # 第二阶段：构建 Python 依赖
-FROM ccr.ccs.tencentyun.com/kalicyh/poetry:v3.10_latest AS builder
-WORKDIR /app
-COPY pyproject.toml poetry.lock  /app/
-RUN poetry install --no-root
 
-# 第三阶段：生产镜像
-FROM python:3.10-slim
+FROM kalicyh/poetry:v3.10_xiaozhi AS builder
+
+WORKDIR /app
 
-WORKDIR /opt/xiaozhi-esp32-server
+# 同时拷贝本地环境.venv
+COPY . .
+# 检查是否有缺失
+RUN poetry install --no-root
 
-# 使用清华源加速apt安装
-RUN rm -rf /etc/apt/sources.list.d/* && \
-    echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm main contrib non-free non-free-firmware" > /etc/apt/sources.list && \
-    echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
-    echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
-    echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian-security bookworm-security 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
+# 使用清华源加速apt安装，该镜像内置所以注释
+# RUN rm -rf /etc/apt/sources.list.d/* && \
+#     echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm main contrib non-free non-free-firmware" > /etc/apt/sources.list && \
+#     echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
+#     echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
+#     echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian-security bookworm-security 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
 
 # 从构建阶段复制虚拟环境和前端构建产物
-COPY --from=builder /app/.venv /opt/venv
-COPY --from=frontend-builder /app/ZhiKongTaiWeb/dist /opt/xiaozhi-esp32-server/manager/static/webui
-# 设置虚拟环境路径
-ENV PATH="/opt/venv/bin:$PATH"
+COPY --from=frontend-builder /app/ZhiKongTaiWeb/dist /app/manager/static/webui
 
-# 复制应用代码
-COPY . .
+# 设置虚拟环境路径
+ENV PATH="/app/.venv/bin:$PATH"
 
 # 启动应用
-CMD ["python", "app.py"]
+ENTRYPOINT ["poetry", "run", "python"]
+CMD ["app.py"]

Dockerfile-pip

@@ -0,0 +1,51 @@
+# 第一阶段：前端构建
+FROM node:18 AS frontend-builder
+
+WORKDIR /app/ZhiKongTaiWeb
+
+# 配置npm使用淘宝源
+RUN npm config set registry https://registry.npmmirror.com
+
+COPY ZhiKongTaiWeb/package*.json ./
+
+# 安装axios依赖
+RUN npm install axios
+RUN npm install
+
+COPY ZhiKongTaiWeb .
+
+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/ZhiKongTaiWeb/dist /opt/xiaozhi-esp32-server/manager/static/webui
+
+# 复制应用代码
+COPY . .
+
+# 启动应用
+CMD ["python", "app.py"]