Update Dockerfile

Dockerfile

@@ -1,11 +1,8 @@
-FROM ymlisoft/kkfileview
+FROM ymlisoft/kkfileview:4.4.0
 
 USER root
 
-# 1. 安装工具
-# net-tools: 检测端口
-# nginx: 反向代理和密码保护
-# apache2-utils: 生成密码文件
+# 安装工具
 RUN apt-get update && apt-get install -y \
     nginx \
     apache2-utils \
@@ -14,27 +11,19 @@ RUN apt-get update && apt-get install -y \
     curl \
     && rm -rf /var/lib/apt/lists/*
 
-# 2. 环境变量
-# kkFileView 内部端口
 ENV SERVER_PORT=8012
 ENV KKFILEVIEW_SECURITY_TRUST_HOST=default
-# 默认账号密码（可以在 HF Spaces 设置中覆盖）
 ENV AUTH_USERNAME=admin
-ENV AUTH_PASSWORD=123456
+ENV AUTH_PASSWORD=yourpassword
 
-# 3. 配置 Nginx
+# Nginx 配置
 RUN rm -f /etc/nginx/sites-enabled/default && \
     printf 'server {\n\
     listen 7860;\n\
     server_name _;\n\
-    \n\
-    # 开启密码验证\n\
     auth_basic "Restricted Access";\n\
     auth_basic_user_file /etc/nginx/.htpasswd;\n\
-    \n\
-    # 上传大小限制\n\
     client_max_body_size 500M;\n\
-    \n\
     location / {\n\
         proxy_pass http://127.0.0.1:8012;\n\
         proxy_set_header Host $host;\n\
@@ -46,31 +35,43 @@ RUN rm -f /etc/nginx/sites-enabled/default && \
 }\n' > /etc/nginx/sites-available/kkfileview && \
     ln -s /etc/nginx/sites-available/kkfileview /etc/nginx/sites-enabled/
 
-# 4. 创建启动脚本
+# 启动脚本
 RUN printf '#!/bin/bash\n\
 set -e\n\
 \n\
 echo "=== Starting Secure kkFileView ==="\n\
 \n\
-# A. 生成密码文件\n\
-echo "Configuring password..."\n\
+# 1. 找启动脚本路径\n\
+# 自动查找 startup.sh 或 kkFileView 启动文件\n\
+STARTUP_SCRIPT=$(find /opt -name "startup.sh" -o -name "kkFileView" | grep "bin/" | head -n 1)\n\
+if [ -z "$STARTUP_SCRIPT" ]; then\n\
+    echo "ERROR: Could not find startup script in /opt"\n\
+    echo "Listing /opt:"\n\
+    ls -R /opt\n\
+    exit 1\n\
+fi\n\
+echo "Found startup script: $STARTUP_SCRIPT"\n\
+\n\
+# 2. 配置密码\n\
 htpasswd -cb /etc/nginx/.htpasswd "$AUTH_USERNAME" "$AUTH_PASSWORD"\n\
 \n\
-# B. 启动虚拟显示 (LibreOffice 需要)\n\
-echo "Starting Xvfb..."\n\
+# 3. 启动 Xvfb\n\
 Xvfb :99 -screen 0 1024x768x24 >/dev/null 2>&1 &\n\
 export DISPLAY=:99\n\
 sleep 2\n\
 \n\
-# C. 启动 kkFileView (后台运行)\n\
+# 4. 启动 kkFileView\n\
 echo "Starting kkFileView on port 8012..."\n\
-# 关键：使用 tee 将日志同时输出到文件和控制台，确保你能看到报错\n\
-/opt/kkFileView/bin/kkFileView --server.port=8012 2>&1 | tee /var/log/kkfileview.log &\n\
+# 如果是 startup.sh，通常需要 bash 执行\n\
+if [[ "$STARTUP_SCRIPT" == *".sh" ]]; then\n\
+    bash "$STARTUP_SCRIPT" > /var/log/kkfileview.log 2>&1 &\n\
+else\n\
+    "$STARTUP_SCRIPT" --server.port=8012 > /var/log/kkfileview.log 2>&1 &\n\
+fi\n\
 \n\
-# D. 等待 kkFileView 就绪\n\
+# 5. 等待端口\n\
 echo "Waiting for backend..."\n\
 for i in {1..60}; do\n\
-    # 使用 netstat 检测端口是否监听，比 curl 更可靠\n\
     if netstat -tuln | grep ":8012 " > /dev/null; then\n\
         echo "✓ Port 8012 is ready!"\n\
         break\n\
@@ -79,12 +80,11 @@ for i in {1..60}; do\n\
     sleep 2\n\
 done\n\
 \n\
-# E. 启动 Nginx (前台运行)\n\
+# 6. 启动 Nginx\n\
 echo "Starting Nginx on 7860..."\n\
 nginx -g "daemon off;"\n' > /start.sh && \
     chmod +x /start.sh
 
-# 5. 暴露端口
 EXPOSE 7860
 
 ENTRYPOINT []