make Dokploy happy

Author: Rabithua

docker-compose.build.yml

@@ -4,11 +4,11 @@ services:
       context: ./server
     environment:
       # 基础配置 - 必需
-      - POSTGRESQL_URL=postgresql://prisma:${POSTGRES_PASSWORD:-rote_password_123}@postgres:5432/rote
+      - POSTGRESQL_URL=postgresql://prisma:${POSTGRES_PASSWORD:-rote_password_123}@rote-postgres:5432/rote
     ports:
       - "3000:3000"
     depends_on:
-      - postgres
+      - rote-postgres
     restart: unless-stopped
 
   rote-frontend:
@@ -26,7 +26,7 @@ services:
       # 运行时环境变量，用于启动脚本注入配置
       - VITE_API_BASE=${VITE_API_BASE:-http://localhost:3000}
     restart: unless-stopped
-  postgres:
+  rote-postgres:
     image: postgres:17
     container_name: rote-postgres
     restart: unless-stopped

docker-compose.yml

@@ -17,48 +17,33 @@ services:
     container_name: rote-backend
     environment:
       # 基础配置 - 必需
-      - POSTGRESQL_URL=postgresql://prisma:${POSTGRES_PASSWORD:-rote_password_123}@postgres:5432/rote
+      - POSTGRESQL_URL=postgresql://prisma:${POSTGRES_PASSWORD:-rote_password_123}@rote-postgres:5432/rote
     ports:
-      - "3000:3000"
+      - "3000"
     depends_on:
-      postgres:
+      rote-postgres:
         condition: service_healthy
-    healthcheck:
-      test:
-        [
-          "CMD-SHELL",
-          'node -e "require(''http'').get(''http://localhost:3000/v2/api/health'', (r) => {process.exit(r.statusCode === 200 ? 0 : 1)}).on(''error'', () => process.exit(1))" || exit 1',
-        ]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 30s
     restart: unless-stopped
+    command: ["sh", "-c", "sleep 15 && npx prisma db push && npm start"]
+
 
   rote-frontend:
     image: rabithua/rote-frontend:${IMAGE_TAG:-latest}
     container_name: rote-frontend
     ports:
-      - "3001:3001"
+      - "3001"
     depends_on:
-      rote-backend:
-        condition: service_healthy
+      - rote-backend
     environment:
       - VITE_API_BASE=${VITE_API_BASE:-http://localhost:3000}
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:3001 || exit 1"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 10s
     restart: unless-stopped
 
-  postgres:
+  rote-postgres:
     image: postgres:17
     container_name: rote-postgres
     restart: unless-stopped
     ports:
-      - "5432:5432"
+      - "5432"
     environment:
       POSTGRES_USER: prisma
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-rote_password_123}
@@ -67,10 +52,15 @@ services:
       - rote-postgres-data:/var/lib/postgresql/data
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U prisma -d rote"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 10s
+      interval: 5s
+      timeout: 3s
+      retries: 10
+      start_period: 30s
 
 volumes:
   rote-postgres-data:
+
+networks:
+  default:
+    name: rote-network
+    driver: bridge

server/Dockerfile

@@ -7,6 +7,10 @@ RUN npm install --silent
 COPY . .
 RUN npx prisma generate
 EXPOSE 3000
+
+# 💡 修正点：以 root 身份安装 netcat，供后续动态等待使用
+RUN apk add --no-cache netcat-openbsd 
+
 RUN chown -R node /usr/src
 USER node
 CMD ["sh", "-c", "npx prisma db push && npm start"]

server/server.ts

@@ -13,6 +13,7 @@ import {
 } from './utils/config';
 import { errorHandler } from './utils/handlers';
 import { injectDynamicUrls } from './utils/main';
+import { waitForDatabase } from './utils/prisma';
 import { recorderIpAndTime } from './utils/recoder';
 import { StartupMigration } from './utils/startupMigration';
 
@@ -124,23 +125,35 @@ app.use((req, res) => {
   });
 });
 
-app.listen(port, async () => {
-  console.log(`Rote Node backend server listening on port ${port}!`);
-
+// 启动服务器前等待数据库就绪
+(async () => {
   try {
-    // 初始化配置管理器
-    await initializeConfig();
+    // 等待数据库连接就绪
+    await waitForDatabase();
+
+    // 启动服务器
+    app.listen(port, async () => {
+      console.log(`Rote Node backend server listening on port ${port}!`);
+
+      try {
+        // 初始化配置管理器
+        await initializeConfig();
 
-    // 配置管理器初始化后，重新初始化 CORS 配置（从数据库读取）
-    initializeCorsConfig();
+        // 配置管理器初始化后，重新初始化 CORS 配置（从数据库读取）
+        initializeCorsConfig();
 
-    // 验证关键配置是否正确加载
-    validateSystemConfiguration();
+        // 验证关键配置是否正确加载
+        validateSystemConfiguration();
 
-    // 启动时检查系统状态
-    await StartupMigration.checkStartupStatus();
-    await StartupMigration.showConfigStatus();
+        // 启动时检查系统状态
+        await StartupMigration.checkStartupStatus();
+        await StartupMigration.showConfigStatus();
+      } catch (error) {
+        console.error('❌ Failed to initialize system:', error);
+      }
+    });
   } catch (error) {
-    console.error('❌ Failed to initialize system:', error);
+    console.error('❌ Failed to start server:', error);
+    process.exit(1);
   }
-});
+})();

server/utils/prisma.ts

@@ -5,7 +5,7 @@ const prisma = new PrismaClient({
     { level: "warn", emit: "event" },
     { level: "info", emit: "event" },
     { level: "error", emit: "event" },
-  ],
+  },
 });
 
 prisma.$on("warn", (e) => {
@@ -20,17 +20,53 @@ prisma.$on("error", (e) => {
   // console.log("Prisma Error:", e);
 });
 
-// Check if Prisma connection is successful
-(async () => {
-  try {
-    console.log("Checking Prisma connection...");
-    await prisma.$connect();
-    await prisma.rote.findFirst();
-    console.log("Prisma connected successfully!");
-  } catch (error) {
-    console.info("Failed to connect to Prisma.", error);
-    process.exit(1); // 如果连接失败，终止进程
+/**
+ * 等待数据库连接就绪，带重试机制
+ * @param maxRetries 最大重试次数，默认 30 次
+ * @param retryDelay 重试延迟（毫秒），默认 2 秒
+ */
+export async function waitForDatabase(
+  maxRetries: number = 30,
+  retryDelay: number = 2000
+): Promise<void> {
+  for (let attempt = 1; attempt <= maxRetries; attempt++) {
+    try {
+      console.log(`🔄 Attempting to connect to database (${attempt}/${maxRetries})...`);
+      
+      // 如果之前有连接尝试，先断开
+      try {
+        await prisma.$disconnect();
+      } catch {
+        // 忽略断开连接的错误
+      }
+      
+      // 尝试连接
+      await prisma.$connect();
+      
+      // 尝试执行一个简单的查询来验证连接
+      await prisma.$queryRaw`SELECT 1`;
+      console.log("✅ Prisma connected successfully!");
+      return;
+    } catch (error: any) {
+      // 确保在错误时断开连接
+      try {
+        await prisma.$disconnect();
+      } catch {
+        // 忽略断开连接的错误
+      }
+      
+      if (attempt === maxRetries) {
+        console.error("❌ Failed to connect to database after all retries:", error);
+        throw new Error(
+          `Database connection failed after ${maxRetries} attempts. Please check your database configuration. Error: ${error?.message || error}`
+        );
+      }
+      console.log(
+        `⏳ Database not ready yet, retrying in ${retryDelay / 1000}s... (${attempt}/${maxRetries})`
+      );
+      await new Promise((resolve) => setTimeout(resolve, retryDelay));
+    }
   }
-})();
+}
 
 export default prisma;