Update Dockerfile

Dockerfile

@@ -102,6 +102,30 @@ RUN cd /tmp && \
 # 屏蔽警告?: nginx: [warn] the "user" directive makes sense only if the master process runs with super-user privileges, ignored in /etc/nginx/nginx.conf:1
 # RUN echo 'user nginx;' > /etc/nginx/nginx.conf && \
     # echo 'worker_processes auto;' >> /etc/nginx/nginx.conf && \
+# RUN echo 'worker_processes auto;' > /etc/nginx/nginx.conf && \
+#     echo 'error_log /var/log/nginx/error.log;' >> /etc/nginx/nginx.conf && \
+#     echo 'pid /var/run/nginx.pid;' >> /etc/nginx/nginx.conf && \
+#     echo '' >> /etc/nginx/nginx.conf && \
+#     echo 'events {' >> /etc/nginx/nginx.conf && \
+#     echo '    worker_connections 1024;' >> /etc/nginx/nginx.conf && \
+#     echo '}' >> /etc/nginx/nginx.conf && \
+#     echo '' >> /etc/nginx/nginx.conf && \
+#     echo 'http {' >> /etc/nginx/nginx.conf && \
+#     echo '    include       /etc/nginx/mime.types;' >> /etc/nginx/nginx.conf && \
+#     echo '    default_type  application/octet-stream;' >> /etc/nginx/nginx.conf && \
+#     echo '    sendfile        on;' >> /etc/nginx/nginx.conf && \
+#     echo '    keepalive_timeout  65;' >> /etc/nginx/nginx.conf && \
+#     echo '' >> /etc/nginx/nginx.conf && \
+#     echo '    server {' >> /etc/nginx/nginx.conf && \
+#     echo '        listen       7860;' >> /etc/nginx/nginx.conf && \
+#     echo '        server_name  localhost;' >> /etc/nginx/nginx.conf && \
+#     echo '        location / {' >> /etc/nginx/nginx.conf && \
+#     echo '            root   /usr/share/nginx/html;' >> /etc/nginx/nginx.conf && \
+#     echo '            index  index.html index.htm;' >> /etc/nginx/nginx.conf && \
+#     echo '        }' >> /etc/nginx/nginx.conf && \
+#     echo '    }' >> /etc/nginx/nginx.conf && \
+#     echo '}' >> /etc/nginx/nginx.conf
+# 创建nginx配置文件（添加API反向代理）
 RUN echo 'worker_processes auto;' > /etc/nginx/nginx.conf && \
     echo 'error_log /var/log/nginx/error.log;' >> /etc/nginx/nginx.conf && \
     echo 'pid /var/run/nginx.pid;' >> /etc/nginx/nginx.conf && \
@@ -116,15 +140,35 @@ RUN echo 'worker_processes auto;' > /etc/nginx/nginx.conf && \
     echo '    sendfile        on;' >> /etc/nginx/nginx.conf && \
     echo '    keepalive_timeout  65;' >> /etc/nginx/nginx.conf && \
     echo '' >> /etc/nginx/nginx.conf && \
+    echo '    upstream backend {' >> /etc/nginx/nginx.conf && \
+    echo '        server 127.0.0.1:8081;' >> /etc/nginx/nginx.conf && \
+    echo '    }' >> /etc/nginx/nginx.conf && \
+    echo '' >> /etc/nginx/nginx.conf && \
     echo '    server {' >> /etc/nginx/nginx.conf && \
     echo '        listen       7860;' >> /etc/nginx/nginx.conf && \
     echo '        server_name  localhost;' >> /etc/nginx/nginx.conf && \
+    echo '' >> /etc/nginx/nginx.conf && \
+    echo '        # 静态文件服务' >> /etc/nginx/nginx.conf && \
     echo '        location / {' >> /etc/nginx/nginx.conf && \
     echo '            root   /usr/share/nginx/html;' >> /etc/nginx/nginx.conf && \
     echo '            index  index.html index.htm;' >> /etc/nginx/nginx.conf && \
+    echo '            try_files $uri $uri/ /index.html;' >> /etc/nginx/nginx.conf && \
+    echo '        }' >> /etc/nginx/nginx.conf && \
+    echo '' >> /etc/nginx/nginx.conf && \
+    echo '        # API反向代理' >> /etc/nginx/nginx.conf && \
+    echo '        location /api/ {' >> /etc/nginx/nginx.conf && \
+    echo '            proxy_pass http://backend/;' >> /etc/nginx/nginx.conf && \
+    echo '            proxy_set_header Host $host;' >> /etc/nginx/nginx.conf && \
+    echo '            proxy_set_header X-Real-IP $remote_addr;' >> /etc/nginx/nginx.conf && \
+    echo '            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;' >> /etc/nginx/nginx.conf && \
+    echo '            proxy_set_header X-Forwarded-Proto $scheme;' >> /etc/nginx/nginx.conf && \
+    echo '            proxy_connect_timeout 30s;' >> /etc/nginx/nginx.conf && \
+    echo '            proxy_send_timeout 30s;' >> /etc/nginx/nginx.conf && \
+    echo '            proxy_read_timeout 30s;' >> /etc/nginx/nginx.conf && \
     echo '        }' >> /etc/nginx/nginx.conf && \
     echo '    }' >> /etc/nginx/nginx.conf && \
     echo '}' >> /etc/nginx/nginx.conf
+
 # # 创建nginx配置文件（修改端口为7860）
 # RUN cat > /etc/nginx/nginx.conf << 'EOF'
 # worker_processes auto;
@@ -199,6 +243,24 @@ RUN nginx -t && \
 # 暴露端口7860和443（HTTPS）
 EXPOSE 7860
 
+# 创建启动脚本
+# RUN echo '#!/bin/sh' > /start.sh && \
+#     echo 'echo "=== Container Starting ==="' >> /start.sh && \
+#     echo 'echo "Java version:"' >> /start.sh && \
+#     echo 'java -version' >> /start.sh && \
+#     echo 'echo ""' >> /start.sh && \
+#     echo 'echo "Nginx version:"' >> /start.sh && \
+#     echo 'nginx -v' >> /start.sh && \
+#     echo 'echo ""' >> /start.sh && \
+#     echo 'echo "Testing nginx configuration..."' >> /start.sh && \
+#     echo 'nginx -t' >> /start.sh && \
+#     echo 'echo ""' >> /start.sh && \
+#     echo 'echo "Starting nginx on port 7860..."' >> /start.sh && \
+#     # echo 'exec gosu root nginx -g "daemon off;"' >> /start.sh && \  # hf不允许提权
+#     echo 'exec java -jar /app/app.jar > /app/app-run.log 2>&1 & ' >> /start.sh && \
+#     echo 'exec nginx -g "daemon on;" &' >> /start.sh && \
+#     echo 'exec tail -n 1000 -f /app/app-run.log' >> /start.sh && \
+#     chmod +x /start.sh
 # 创建启动脚本
 RUN echo '#!/bin/sh' > /start.sh && \
     echo 'echo "=== Container Starting ==="' >> /start.sh && \
@@ -211,13 +273,34 @@ RUN echo '#!/bin/sh' > /start.sh && \
     echo 'echo "Testing nginx configuration..."' >> /start.sh && \
     echo 'nginx -t' >> /start.sh && \
     echo 'echo ""' >> /start.sh && \
+    echo 'echo "Starting Java application on port 8081..."' >> /start.sh && \
+    echo 'java -jar /app/app.jar > /app/app-run.log 2>&1 &' >> /start.sh && \
+    echo 'JAVA_PID=$!' >> /start.sh && \
+    echo 'echo "Java application PID: $JAVA_PID"' >> /start.sh && \
+    echo '' >> /start.sh && \
+    echo '# 等待Java应用启动' >> /start.sh && \
+    echo 'echo "Waiting for Java application to start..."' >> /start.sh && \
+    echo 'for i in $(seq 1 30); do' >> /start.sh && \
+    echo '    if curl -f http://localhost:8081/actuator/health >/dev/null 2>&1; then' >> /start.sh && \
+    echo '        echo "Java application is ready!"' >> /start.sh && \
+    echo '        break' >> /start.sh && \
+    echo '    fi' >> /start.sh && \
+    echo '    echo "Waiting... ($i/30)"' >> /start.sh && \
+    echo '    sleep 2' >> /start.sh && \
+    echo 'done' >> /start.sh && \
+    echo '' >> /start.sh && \
     echo 'echo "Starting nginx on port 7860..."' >> /start.sh && \
-    # echo 'exec gosu root nginx -g "daemon off;"' >> /start.sh && \  # hf不允许提权
-    echo 'exec java -jar /app/app.jar > /app/app-run.log 2>&1 & ' >> /start.sh && \
-    echo 'exec nginx -g "daemon on;" &' >> /start.sh && \
-    echo 'exec tail -n 1000 -f /app/app-run.log' >> /start.sh && \
+    echo 'nginx -g "daemon on;" &' >> /start.sh && \
+    echo 'NGINX_PID=$!' >> /start.sh && \
+    echo 'echo "Nginx PID: $NGINX_PID"' >> /start.sh && \
+    echo '' >> /start.sh && \
+    echo '# 监控两个进程' >> /start.sh && \
+    echo 'trap "kill $JAVA_PID $NGINX_PID; exit" TERM INT' >> /start.sh && \
+    echo 'tail -f /app/app-run.log &' >> /start.sh && \
+    echo 'wait' >> /start.sh && \
     chmod +x /start.sh
 
+
 # 设置工作目录
 WORKDIR /usr/share/nginx/html
 RUN unzip dist.zip