Update Dockerfile

Dockerfile

@@ -1,4 +1,4 @@
-FROM ymlisoft/kkfileview
+FROM ymlisoft/kkfileview:4.4.0
 
 USER root
 
@@ -17,26 +17,27 @@ ENV AUTH_USERNAME=admin
 ENV AUTH_PASSWORD=yourpassword
 
 # Nginx 配置
-RUN rm -f /etc/nginx/sites-enabled/default && \
+RUN rm -rf /etc/nginx/sites-enabled/* && \
+    rm -rf /etc/nginx/conf.d/* && \
     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 $host;\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;\n\
-        proxy_redirect off;\n\
+        proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;\n\
         proxy_buffering off;\n\
     }\n\
-}\n' > /etc/nginx/sites-available/kkfileview && \
-    ln -s /etc/nginx/sites-available/kkfileview /etc/nginx/sites-enabled/
+}\n' > /etc/nginx/conf.d/kkfileview.conf
 
 # 启动脚本
 RUN printf '#!/bin/bash\n\
@@ -46,7 +47,8 @@ echo "=== Starting Secure kkFileView ==="\n\
 \n\
 # 1. 找启动脚本路径\n\
 STARTUP_SCRIPT=$(find /opt -name "startup.sh" -o -name "kkFileView" | grep "bin/" | head -n 1)\n\
-echo "Found startup script: $STARTUP_SCRIPT"\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\
@@ -58,18 +60,30 @@ sleep 2\n\
 \n\
 # 4. 启动 kkFileView\n\
 echo "Starting kkFileView on port 8012..."\n\
-# 创建日志文件并开始后台 tail\n\
-touch /var/log/kkfileview.log\n\
-tail -f /var/log/kkfileview.log &\n\
-\n\
 if [[ "$STARTUP_SCRIPT" == *".sh" ]]; then\n\
-    bash "$STARTUP_SCRIPT" >> /var/log/kkfileview.log 2>&1 &\n\
+    bash "$STARTUP_SCRIPT" &\n\
 else\n\
-    "$STARTUP_SCRIPT" --server.port=8012 >> /var/log/kkfileview.log 2>&1 &\n\
+    "$STARTUP_SCRIPT" --server.port=8012 &\n\
 fi\n\
 \n\
-# 5. 等待端口\n\
-echo "Waiting for backend..."\n\
+# 5. 追踪真实日志文件\n\
+# kkFileView 启动后会创建 log/kkFileView.log\n\
+echo "Waiting for log file..."\n\
+LOG_FILE="$KK_ROOT_DIR/log/kkFileView.log"\n\
+\n\
+# 循环等待日志文件生成\n\
+for i in {1..30}; do\n\
+    if [ -f "$LOG_FILE" ]; then\n\
+        echo "✓ Found log file: $LOG_FILE"\n\
+        # 启动后台 tail 进程显示日志\n\
+        tail -f "$LOG_FILE" &\n\
+        break\n\
+    fi\n\
+    sleep 1\n\
+done\n\
+\n\
+# 6. 等待端口就绪\n\
+echo "Waiting for backend port 8012..."\n\
 for i in {1..60}; do\n\
     if netstat -tuln | grep ":8012 " > /dev/null; then\n\
         echo "✓ Port 8012 is ready!"\n\
@@ -79,7 +93,7 @@ for i in {1..60}; do\n\
     sleep 2\n\
 done\n\
 \n\
-# 6. 启动 Nginx\n\
+# 7. 启动 Nginx\n\
 echo "Starting Nginx on 7860..."\n\
 nginx -g "daemon off;"\n' > /start.sh && \
     chmod +x /start.sh