Update Dockerfile

Dockerfile

@@ -40,93 +40,54 @@ ENV JAVA_OPTS="-server \
 -Dserver.tomcat.max-connections=200"
 
 # 4. Nginx 配置
-RUN rm -rf /etc/nginx/sites-enabled/* /etc/nginx/conf.d/* /etc/nginx/nginx.conf && \
-    printf 'worker_processes 2;\n\
-worker_rlimit_nofile 8192;\n\
-error_log /dev/stderr warn;\n\
-pid /var/run/nginx.pid;\n\
-\n\
-events {\n\
-    worker_connections 2048;\n\
-    multi_accept on;\n\
-    use epoll;\n\
-}\n\
-\n\
-http {\n\
-    include /etc/nginx/mime.types;\n\
-    default_type application/octet-stream;\n\
-    \n\
-    log_format main '"'"'$remote_addr - $remote_user [$time_local] "$request" '"'"'\n\
-                    '"'"'$status $body_bytes_sent "$http_referer" '"'"'\n\
-                    '"'"'"$http_user_agent" rt=$request_time'"'"';\n\
+RUN rm -rf /etc/nginx/sites-enabled/* /etc/nginx/conf.d/* && \
+    printf 'server {\n\
+    listen 7860 default_server;\n\
+    server_name _;\n\
     \n\
-    access_log /dev/stdout main;\n\
-    \n\
-    sendfile on;\n\
-    tcp_nopush on;\n\
-    tcp_nodelay on;\n\
-    keepalive_timeout 65;\n\
-    keepalive_requests 100;\n\
+    # 默认需要认证\n\
+    auth_basic "Restricted Access";\n\
+    auth_basic_user_file /etc/nginx/.htpasswd;\n\
     \n\
+    # 文件上传限制\n\
     client_max_body_size 500M;\n\
-    client_body_buffer_size 1M;\n\
-    client_body_timeout 300s;\n\
-    \n\
-    proxy_buffering on;\n\
-    proxy_buffer_size 8k;\n\
-    proxy_buffers 4 16k;\n\
-    proxy_connect_timeout 60s;\n\
-    proxy_send_timeout 300s;\n\
-    proxy_read_timeout 300s;\n\
     \n\
-    gzip on;\n\
-    gzip_vary on;\n\
-    gzip_min_length 1024;\n\
-    gzip_comp_level 5;\n\
-    gzip_types text/plain text/css text/xml text/javascript application/json application/javascript;\n\
+    # 静态文件目录\n\
+    location ~ ^/(demo|file|static)/ {\n\
+        auth_basic off;\n\
+        proxy_pass http://127.0.0.1:8012;\n\
+        proxy_set_header Host $http_host;\n\
+        proxy_set_header X-Real-IP $remote_addr;\n\
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;\n\
+        proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;\n\
+        proxy_buffering off;\n\
+        proxy_read_timeout 300s;\n\
+    }\n\
     \n\
-    upstream kkfileview {\n\
-        server 127.0.0.1:8012;\n\
-        keepalive 16;\n\
-        keepalive_requests 100;\n\
-        keepalive_timeout 60s;\n\
+    # 反向代理到\n\
+    location / {\n\
+        proxy_pass http://127.0.0.1:8012;\n\
+        proxy_set_header Host $http_host;\n\
+        proxy_set_header X-Real-IP $remote_addr;\n\
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;\n\
+        proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;\n\
+        proxy_buffering off;\n\
+        proxy_read_timeout 300s;\n\
     }\n\
     \n\
-    server {\n\
-        listen 7860 default_server;\n\
-        server_name _;\n\
-        \n\
-        auth_basic "Restricted Access";\n\
-        auth_basic_user_file /etc/nginx/.htpasswd;\n\
-        \n\
-        location / {\n\
-            proxy_pass http://kkfileview;\n\
-            proxy_http_version 1.1;\n\
-            proxy_set_header Connection "";\n\
-            proxy_set_header Host $http_host;\n\
-            proxy_set_header X-Real-IP $remote_addr;\n\
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;\n\
-            proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;\n\
-            \n\
-            proxy_buffering on;\n\
-            proxy_buffer_size 8k;\n\
-            proxy_buffers 4 16k;\n\
-            proxy_read_timeout 300s;\n\
-        }\n\
-        \n\
-        location /health {\n\
-            auth_basic off;\n\
-            return 200 "OK";\n\
-            add_header Content-Type text/plain;\n\
-        }\n\
+    # 健康检查端点\n\
+    location /health {\n\
+        auth_basic off;\n\
+        return 200 "OK";\n\
+        add_header Content-Type text/plain;\n\
     }\n\
-}\n' > /etc/nginx/nginx.conf
+}\n' > /etc/nginx/conf.d/kkfileview.conf
 
 # 5. 启动脚本
 RUN printf '#!/bin/bash\n\
 set -e\n\
 \n\
-echo "=== Starting KKFileView (Tuned) for HuggingFace Spaces ==="\n\
+echo "=== Starting KKFileView (EPS Fix) for HuggingFace Spaces ==="\n\
 \n\
 # 查找 KKFileView 启动脚本\n\
 STARTUP_SCRIPT=$(find /opt -name "startup.sh" -o -name "kkFileView" | grep "bin/" | head -n 1)\n\
@@ -135,7 +96,7 @@ KK_ROOT_DIR=$(dirname $(dirname "$STARTUP_SCRIPT"))\n\
 # 生成 htpasswd 文件\n\
 htpasswd -cb /etc/nginx/.htpasswd "$AUTH_USERNAME" "$AUTH_PASSWORD"\n\
 \n\
-# 启动 Xvfb\n\
+# 启动 Xvfb（虚拟显示）\n\
 echo "Starting Xvfb..."\n\
 Xvfb :99 -screen 0 1024x768x24 >/dev/null 2>&1 &\n\
 export DISPLAY=:99\n\
@@ -165,16 +126,16 @@ done\n\
 \n\
 # 等待 KKFileView 启动\n\
 echo "Waiting for KKFileView to start..."\n\
-for i in {1..40}; do\n\
+for i in {1..60}; do\n\
     if curl -s http://127.0.0.1:8012 >/dev/null 2>&1; then\n\
         echo "✓ KKFileView is ready on port 8012!"\n\
         break\n\
     fi\n\
-    if [ $i -eq 40 ]; then\n\
-        echo "ERROR: KKFileView failed to start within 80 seconds"\n\
+    if [ $i -eq 60 ]; then\n\
+        echo "ERROR: KKFileView failed to start within 120 seconds"\n\
         exit 1\n\
     fi\n\
-    echo "Waiting... ($i/40)"\n\
+    echo "Waiting... ($i/60)"\n\
     sleep 2\n\
 done\n\
 \n\
@@ -192,4 +153,4 @@ EXPOSE 7860
 
 # 8. 启动命令
 ENTRYPOINT []
-CMD ["/start.sh"]
+CMD ["/start.sh"]