Update Dockerfile

Dockerfile

@@ -11,6 +11,10 @@ RUN apt-get update && apt-get install -y \
     libfreetype6 \
     fontconfig \
     fonts-wqy-zenhei \
+    libreoffice \
+    libreoffice-writer \
+    libreoffice-calc \
+    libreoffice-impress \
     && rm -rf /var/lib/apt/lists/* \
     && fc-cache -fv
 
@@ -20,7 +24,7 @@ ENV KKFILEVIEW_SECURITY_TRUST_HOST=default
 ENV AUTH_USERNAME=admin
 ENV AUTH_PASSWORD=yourpassword
 
-# 3. JVM配置
+# 3. JVM 配置
 # - 堆内存: 4GB
 # - G1GC: 低延迟垃圾回收
 # - 元空间: 256MB
@@ -39,7 +43,14 @@ ENV JAVA_OPTS="-server \
 -Dserver.tomcat.accept-count=50 \
 -Dserver.tomcat.max-connections=200"
 
-# 4. Nginx 配置
+# 4. LibreOffice 配置
+ENV office.plugin.server.ports=2001,2002,2003,2004,2005
+ENV office.plugin.task.timeout=5m
+ENV office.preview.type=pdf
+ENV office.timeout=300000
+ENV file.dir=/opt/kkFileView/file/
+
+# 5. Nginx 配置
 RUN rm -rf /etc/nginx/sites-enabled/* /etc/nginx/conf.d/* && \
     printf 'server {\n\
     listen 7860 default_server;\n\
@@ -52,7 +63,7 @@ RUN rm -rf /etc/nginx/sites-enabled/* /etc/nginx/conf.d/* && \
     # 文件上传限制\n\
     client_max_body_size 500M;\n\
     \n\
-    # 静态文件目录\n\
+    # 静态文件目录）\n\
     location ~ ^/(demo|file|static)/ {\n\
         auth_basic off;\n\
         proxy_pass http://127.0.0.1:8012;\n\
@@ -64,7 +75,7 @@ RUN rm -rf /etc/nginx/sites-enabled/* /etc/nginx/conf.d/* && \
         proxy_read_timeout 300s;\n\
     }\n\
     \n\
-    # 反向代理到\n\
+    # 反向代理到 KKFileView\n\
     location / {\n\
         proxy_pass http://127.0.0.1:8012;\n\
         proxy_set_header Host $http_host;\n\
@@ -83,11 +94,11 @@ RUN rm -rf /etc/nginx/sites-enabled/* /etc/nginx/conf.d/* && \
     }\n\
 }\n' > /etc/nginx/conf.d/kkfileview.conf
 
-# 5. 启动脚本
+# 6. 启动脚本
 RUN printf '#!/bin/bash\n\
 set -e\n\
 \n\
-echo "=== Starting KKFileView (EPS Fix) for HuggingFace Spaces ==="\n\
+echo "=== Starting KKFileView (EPS + CAD Fix) for HuggingFace Spaces ==="\n\
 \n\
 # 查找 KKFileView 启动脚本\n\
 STARTUP_SCRIPT=$(find /opt -name "startup.sh" -o -name "kkFileView" | grep "bin/" | head -n 1)\n\
@@ -96,11 +107,25 @@ KK_ROOT_DIR=$(dirname $(dirname "$STARTUP_SCRIPT"))\n\
 # 生成 htpasswd 文件\n\
 htpasswd -cb /etc/nginx/.htpasswd "$AUTH_USERNAME" "$AUTH_PASSWORD"\n\
 \n\
-# 启动 Xvfb（虚拟显示）\n\
+# 创建文件存储目录\n\
+mkdir -p /opt/kkFileView/file\n\
+chmod 755 /opt/kkFileView/file\n\
+\n\
+# 启动 Xvfb\n\
 echo "Starting Xvfb..."\n\
 Xvfb :99 -screen 0 1024x768x24 >/dev/null 2>&1 &\n\
 export DISPLAY=:99\n\
 sleep 2\n\
+echo "✓ Xvfb started on DISPLAY=:99"\n\
+\n\
+# 启动 LibreOffice 进程池\n\
+echo "Starting LibreOffice process pool..."\n\
+for port in 2001 2002 2003 2004 2005; do\n\
+    soffice --headless --accept="socket,host=127.0.0.1,port=$port;urp;" --nofirststartwizard >/dev/null 2>&1 &\n\
+    echo "  - LibreOffice process started on port $port"\n\
+done\n\
+sleep 3\n\
+echo "✓ LibreOffice process pool ready"\n\
 \n\
 # 启动 KKFileView\n\
 echo "Starting KKFileView on port 8012..."\n\
@@ -139,18 +164,23 @@ for i in {1..60}; do\n\
     sleep 2\n\
 done\n\
 \n\
+# 验证 LibreOffice 进程池\n\
+echo "Verifying LibreOffice process pool..."\n\
+LIBREOFFICE_COUNT=$(ps aux | grep soffice | grep -v grep | wc -l)\n\
+echo "  - LibreOffice processes running: $LIBREOFFICE_COUNT"\n\
+\n\
 # 启动 Nginx\n\
 echo "Starting Nginx on port 7860..."\n\
 nginx -g "daemon off;"\n' > /start.sh && \
     chmod +x /start.sh
 
-# 6. 健康检查
+# 7. 健康检查
 HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 \
     CMD curl -f http://localhost:7860/health || exit 1
 
-# 7. 暴露端口
+# 8. 暴露端口
 EXPOSE 7860
 
-# 8. 启动命令
+# 9. 启动命令
 ENTRYPOINT []
 CMD ["/start.sh"]