Update Dockerfile

Dockerfile

@@ -2,39 +2,35 @@ FROM ymlisoft/kkfileview
 
 USER root
 
-# 安装工具
+# 1. 安装所有必要依赖
+# ffmpeg: 用于视频转码
+# fonts-*: 解决 CAD
+# libfreetype6, fontconfig: 字体支持库
 RUN apt-get update && apt-get install -y \
     nginx \
     apache2-utils \
     xvfb \
     net-tools \
     curl \
+    ffmpeg \
+    libfreetype6 \
+    fontconfig \
     fonts-wqy-microhei \
     fonts-wqy-zenhei \
     fonts-arphic-ukai \
     fonts-arphic-uming \
     xfonts-75dpi \
     xfonts-100dpi \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* && \
+    fc-cache -fv
 
 ENV SERVER_PORT=8012
 ENV KKFILEVIEW_SECURITY_TRUST_HOST=default
 ENV AUTH_USERNAME=admin
 ENV AUTH_PASSWORD=yourpassword
 
-# === 性能配置 ===
-# 1. 转换线程数
-ENV OFFICE_HOME_THREAD_COUNT=3
-
-# 2. 任务队列大小
-# 当并发请求超过线程数时，任务会进入队列等待
-ENV QUEUE_SIZE=300
-
-# 3. 缓存开关
-ENV CACHE_ENABLED=true
-
-# 4. 预览文件大小限制
-ENV FILE_UPLOAD_MAX_SIZE=200MB
+# 修复 Aspose 字体问题
+ENV JAVA_OPTS="-Dsun.java2d.fontpath=/usr/share/fonts -Djava.awt.headless=true"
 
 # Nginx 配置
 RUN rm -rf /etc/nginx/sites-enabled/* && \
@@ -42,13 +38,9 @@ RUN rm -rf /etc/nginx/sites-enabled/* && \
     printf 'server {\n\
     listen 7860 default_server;\n\
     server_name _;\n\
-    \n\
-    # 密码保护\n\
     auth_basic "Restricted Access";\n\
     auth_basic_user_file /etc/nginx/.htpasswd;\n\
-    \n\
     client_max_body_size 500M;\n\
-    \n\
     location / {\n\
         proxy_pass http://127.0.0.1:8012;\n\
         proxy_set_header Host $http_host;\n\
@@ -59,36 +51,32 @@ RUN rm -rf /etc/nginx/sites-enabled/* && \
     }\n\
 }\n' > /etc/nginx/conf.d/kkfileview.conf
 
-# 启动脚本 (保持不变)
+# 启动脚本
 RUN printf '#!/bin/bash\n\
 set -e\n\
 \n\
 echo "=== Starting Secure kkFileView ==="\n\
 \n\
-# 1. 找启动脚本路径\n\
 STARTUP_SCRIPT=$(find /opt -name "startup.sh" -o -name "kkFileView" | grep "bin/" | head -n 1)\n\
 KK_ROOT_DIR=$(dirname $(dirname "$STARTUP_SCRIPT"))\n\
-echo "Found root dir: $KK_ROOT_DIR"\n\
 \n\
-# 2. 配置密码\n\
 htpasswd -cb /etc/nginx/.htpasswd "$AUTH_USERNAME" "$AUTH_PASSWORD"\n\
 \n\
-# 3. 启动 Xvfb\n\
 Xvfb :99 -screen 0 1024x768x24 >/dev/null 2>&1 &\n\
 export DISPLAY=:99\n\
 sleep 2\n\
 \n\
-# 4. 启动 kkFileView\n\
 echo "Starting kkFileView on port 8012..."\n\
-# 传递 JVM 参数以优化内存 (可选)\n\
-# export JAVA_OPTS="-Xmx2g -Xms512m"\n\
+# 关键：确保 JAVA_OPTS 被传递\n\
+# 如果脚本不支持 JAVA_OPTS 变量，我们尝试通过 export 注入\n\
+export JAVA_OPTS="$JAVA_OPTS"\n\
+\n\
 if [[ "$STARTUP_SCRIPT" == *".sh" ]]; then\n\
-    bash "$STARTUP_SCRIPT" &\n\
+    bash "$STARTUP_SCRIPT" 2>&1 | tee /var/log/kkfileview.log &\n\
 else\n\
-    "$STARTUP_SCRIPT" --server.port=8012 &\n\
+    "$STARTUP_SCRIPT" --server.port=8012 2>&1 | tee /var/log/kkfileview.log &\n\
 fi\n\
 \n\
-# 5. 追踪真实日志文件\n\
 echo "Waiting for log file..."\n\
 LOG_FILE="$KK_ROOT_DIR/log/kkFileView.log"\n\
 for i in {1..30}; do\n\
@@ -100,8 +88,7 @@ for i in {1..30}; do\n\
     sleep 1\n\
 done\n\
 \n\
-# 6. 等待端口就绪\n\
-echo "Waiting for backend port 8012..."\n\
+echo "Waiting for backend..."\n\
 for i in {1..60}; do\n\
     if netstat -tuln | grep ":8012 " > /dev/null; then\n\
         echo "✓ Port 8012 is ready!"\n\
@@ -111,7 +98,6 @@ for i in {1..60}; do\n\
     sleep 2\n\
 done\n\
 \n\
-# 7. 启动 Nginx\n\
 echo "Starting Nginx on 7860..."\n\
 nginx -g "daemon off;"\n' > /start.sh && \
     chmod +x /start.sh