updaet sht

Dockerfile-server

@@ -1,9 +1,6 @@
 # 第一阶段：构建Python依赖
 FROM condaforge/mambaforge:latest AS builder
 
-# 声明构建参数，用于可选的私有源凭据
-ARG GIT_USER
-ARG GIT_PASSWORD
 
 WORKDIR /app
 
@@ -45,6 +42,9 @@ ENV PATH="/opt/conda/bin:${PATH}"
 COPY --from=builder /opt/conda/lib/python3.12/site-packages /opt/conda/lib/python3.12/site-packages
 COPY --from=builder /opt/conda/bin/mcp-proxy /opt/conda/bin/mcp-proxy
 
+# 复制应用代码
+COPY main/xiaozhi-server .
+
 # 复制lang-agent源码到最终镜像，确保可开发与egg-link有效
 COPY --from=builder /opt/lang-agent /opt/lang-agent
 RUN curl -o /opt/lang-agent/.env http://6.6.6.86:8888/download/resources/.env
@@ -52,12 +52,10 @@ RUN curl -o /opt/lang-agent/asset.zip http://6.6.6.86:8888/download/resources/as
 RUN unzip /opt/lang-agent/asset.zip -d /opt/lang-agent
 RUN rm /opt/lang-agent/asset.zip
 
-# 复制应用代码
-COPY main/xiaozhi-server .
-
 # 下载SenseVoiceSmall模型文件（删除可能存在的目录或旧文件后下载）
-RUN mkdir -p /opt/xiaozhi-esp32-server/main/xiaozhi-server/models/SenseVoiceSmall
-RUN curl -L -o /opt/xiaozhi-esp32-server/main/xiaozhi-server/models/SenseVoiceSmall/model.pt https://modelscope.cn/models/iic/SenseVoiceSmall/resolve/master/model.pt
+RUN rm -rf models/SenseVoiceSmall/model.pt
+RUN mkdir -p models/SenseVoiceSmall
+RUN curl -L -o models/SenseVoiceSmall/model.pt https://modelscope.cn/models/iic/SenseVoiceSmall/resolve/master/model.pt
 
 
 # 启动应用

docker-compose.local.yml

@@ -4,9 +4,6 @@ services:
     build:
       context: .
       dockerfile: Dockerfile-server
-      args:
-        GIT_USER: ${GIT_USER:-}
-        GIT_PASSWORD: ${GIT_PASSWORD:-}
     container_name: xiaozhi-esp32-server
     depends_on:
       - xiaozhi-esp32-server-web