Update Dockerfile

Dockerfile

@@ -1,104 +1,30 @@
-FROM ghcr.io/fish2018/pansou-web:latest
-USER root
+# 使用原始镜像作为基础
+FROM ghcr.io/fish2018/spansou-web
 
-# 创建必要的目录并设置权限
-RUN mkdir -p /var/cache/nginx/client_temp \
-    /var/cache/nginx/proxy_temp \
-    /var/cache/nginx/fastcgi_temp \
-    /var/cache/nginx/uwsgi_temp \
-    /var/cache/nginx/scgi_temp \
-    /var/run \
-    /var/log/nginx \
-    /app/cache && \
-    chmod -R 777 /var/cache/nginx \
-    /var/run \
-    /var/log/nginx \
-    /app/cache
+# 环境变量配置
+ENV TZ=Asia/Shanghai
 
-# 删除所有默认的 nginx 配置
-RUN rm -f /etc/nginx/conf.d/*.conf /etc/nginx/sites-enabled/* /etc/nginx/sites-available/* 2>/dev/null || true
+# 工作目录与文件复制
+WORKDIR /app
+COPY start.sh /app/start.sh
 
-# 创建全新的 nginx 配置文件
-RUN cat > /etc/nginx/conf.d/pansou.conf <<'EOF'
-server {
-    listen 7860 default_server;
-    server_name _;
-    
-    # 前端静态文件
-    root /app/frontend/dist;
-    index index.html;
-    
-    # 前端路由
-    location / {
-        try_files $uri $uri/ /index.html;
-    }
-    
-    # API 代理到后端
-    location /api/ {
-        proxy_pass http://127.0.0.1:8888;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_connect_timeout 30s;
-        proxy_send_timeout 30s;
-        proxy_read_timeout 30s;
-    }
-}
-EOF
+# 安装coreutils并设置权限，添加用户映射
+RUN apk add --no-cache coreutils && \
+    echo "pansou:x:1000:1000:pansou user:/app:/sbin/nologin" >> /etc/passwd && \
+    chmod +x /app/start.sh /app/pansou && \
+    mkdir -p /data/pansou_data /data/pansou_logs && \
+    chown -R 1000:1000 /app /data/pansou_data /data/pansou_logs && \
+    chmod 755 /data/pansou_data /data/pansou_logs
 
-# 修改 nginx 主配置
-RUN sed -i 's/^user\s/#user /g' /etc/nginx/nginx.conf && \
-    sed -i 's|pid\s*/var/run/nginx.pid;|pid /tmp/nginx.pid;|g' /etc/nginx/nginx.conf
-
-# 验证配置内容
-RUN echo "=== Nginx config check ===" && \
-    cat /etc/nginx/conf.d/pansou.conf && \
-    echo "=== End of config ===" && \
-    ls -la /etc/nginx/conf.d/
-
-# 创建启动脚本
-RUN cat > /start.sh <<'EOF'
-#!/bin/sh
-set -e
-
-echo "=== Starting PanSou Service ==="
-
-# 显示前端文件
-echo "Checking frontend files..."
-ls -la /app/frontend/dist/ | head -10
-
-# 显示 nginx 配置
-echo "Nginx configuration:"
-cat /etc/nginx/conf.d/pansou.conf
-
-echo "Starting PanSou backend service..."
-# 启动后端 API 服务（后台运行）
-cd /app && ./pansou &
-
-# 等待后端服务启动
-echo "Waiting for backend to start..."
-sleep 3
-
-# 检查后端是否启动
-if ! curl -s http://localhost:8888/api/health > /dev/null 2>&1; then
-    echo "Warning: Backend service may not be running properly"
-else
-    echo "Backend service started successfully on port 8888"
-fi
-
-# 测试 nginx 配置
-echo "Testing nginx configuration..."
-nginx -t
-
-echo "Starting Nginx on port 7860..."
-echo "Frontend root: /app/frontend/dist"
-# 启动 nginx（前台运行）
-exec nginx -g "daemon off;"
-EOF
+# 以UID 1000运行
+USER 1000
 
-RUN chmod +x /start.sh
+# 健康检查（120秒间隔）
+HEALTHCHECK --interval=120s --timeout=10s --start-period=30s --retries=3 \
+  CMD curl -f -m 2 http://127.0.0.1:8888/api/health || exit 1
 
+# 暴露端口
 EXPOSE 7860
-USER 1000
-CMD ["/start.sh"]
+
+# 启动配置
+CMD ["/app/start.sh"]