fix: improve Docker build process and fix postgres package issue

- Fix Dockerfile cleanup logic to prevent deletion of critical dependencies (postgres, drizzle-orm)
- Test and verify docker-compose.build.yml build workflow
- Remove duplicate drizzle.config.js file, keep only drizzle.config.ts
- Add programmatic database migration script (runMigrations.ts)
- Update docker-compose.build.yml with correct startup commands
- All services now build and run successfully

Author: Rabithua

docker-compose.build.yml

@@ -13,8 +13,7 @@ services:
         condition: service_healthy
     restart: unless-stopped
     # 启动命令：等待数据库就绪后执行数据库迁移并启动服务
-    command:
-      ["sh", "-c", "sleep 15 && bun run db:migrate && bun run dist/server.js"]
+    command: ["sh", "-c", "sleep 15 && bun run dist/server.js"]
 
   rote-frontend:
     build:

server/.dockerignore

@@ -66,6 +66,7 @@ LICENSE*
 jest.config.*
 vitest.config.*
 
-# 脚本文件（运行时不需要）
-scripts
+# 脚本文件（运行时不需要，但保留迁移脚本）
+scripts/*
+!scripts/runMigrations.ts
 *.sh

server/Dockerfile

@@ -43,29 +43,46 @@ RUN addgroup --system --gid 1001 nodejs && \
 COPY --from=builder --chown=bunuser:nodejs /app/package.json ./
 COPY --from=builder --chown=bunuser:nodejs /app/bun.lock* ./
 
-# 🚨 关键优化：在 runner 阶段重新安装生产依赖
-# 这样可以确保完全没有 devDependencies，并且只安装运行时需要的包
+# 🚨 关键优化：只安装生产依赖（已改用程序化迁移，不需要 drizzle-kit）
 RUN bun install --production --frozen-lockfile
 
-# 从 builder 阶段复制编译后的代码
+# 从 builder 阶段复制编译后的代码和迁移文件
 COPY --from=builder --chown=bunuser:nodejs /app/dist ./dist
-
-# 🔥 终极清理：删除所有不必要的文件
-RUN rm -rf /app/node_modules/.cache && \
-    rm -rf /tmp/* && \
-    rm -rf /var/cache/apk/* && \
-    # 🚨 强制删除 TypeScript 及其相关包（生产环境不需要）
-    rm -rf /app/node_modules/typescript && \
-    rm -rf /app/node_modules/@typescript-eslint && \
-    rm -rf /app/node_modules/typescript-eslint && \
-    # 删除测试相关目录
-    find /app/node_modules -type d \( -name "test" -o -name "tests" -o -name "__tests__" -o -name "*.test.*" -o -name "*.spec.*" -o -name "docs" -o -name "doc" -o -name "examples" -o -name "example" -o -name "benchmark" -o -name "benchmarks" \) -exec rm -rf {} + 2>/dev/null || true && \
-    # 删除文档和配置文件
-    find /app/node_modules -type f \( -name "*.md" -o -name "*.map" -o -name "CHANGELOG*" -o -name "LICENSE*" -o -name "README*" -o -name "*.ts" -o -name "*.tsx" -o -name "*.json" ! -name "package.json" \) ! -path "*/node_modules/@types/*" -delete 2>/dev/null || true && \
-    # 删除类型定义文件（运行时不需要）
-    find /app/node_modules -type f -name "*.d.ts" ! -path "*/node_modules/@types/*" -delete 2>/dev/null || true && \
-    # 删除源码文件（只保留编译后的代码）
-    find /app/node_modules -type f \( -name "*.js" ! -name "*.min.js" \) -path "*/src/*" -delete 2>/dev/null || true
+COPY --from=builder --chown=bunuser:nodejs /app/drizzle ./drizzle
+
+# 🔥 终极清理：删除所有不必要的文件以减小镜像大小
+# 注意：避免删除关键依赖包（如 postgres）的必要文件
+RUN rm -rf /app/node_modules/.cache /tmp/* /var/cache/apk/* && \
+    # 删除测试、文档、示例等目录（排除关键依赖包）
+    find /app/node_modules -type d \( \
+        -name "test" -o -name "tests" -o -name "__tests__" -o \
+        -name "*.test.*" -o -name "*.spec.*" -o \
+        -name "docs" -o -name "doc" -o \
+        -name "examples" -o -name "example" -o \
+        -name "benchmark" -o -name "benchmarks" \
+    \) ! -path "*/node_modules/postgres/*" \
+      ! -path "*/node_modules/drizzle-orm/*" \
+      -exec rm -rf {} + 2>/dev/null || true && \
+    # 删除文档、源码映射等（排除关键依赖包）
+    find /app/node_modules -type f \( \
+        -name "*.md" -o -name "*.map" -o \
+        -name "CHANGELOG*" -o -name "LICENSE*" -o -name "README*" \
+    \) ! -path "*/node_modules/postgres/*" \
+      ! -path "*/node_modules/drizzle-orm/*" \
+      -delete 2>/dev/null || true && \
+    # 删除 TypeScript 源文件（但保留 .d.ts 类型定义文件，某些包可能需要）
+    find /app/node_modules -type f \( \
+        -name "*.ts" -o -name "*.tsx" \
+    \) ! -name "*.d.ts" \
+      ! -path "*/node_modules/@types/*" \
+      ! -path "*/node_modules/postgres/*" \
+      ! -path "*/node_modules/drizzle-orm/*" \
+      -delete 2>/dev/null || true && \
+    # 删除 package.json 以外的 JSON 配置文件（排除关键依赖包）
+    find /app/node_modules -type f -name "*.json" ! -name "package.json" ! -path "*/node_modules/@types/*" \
+      ! -path "*/node_modules/postgres/*" \
+      ! -path "*/node_modules/drizzle-orm/*" \
+      -delete 2>/dev/null || true
 
 # 设置环境变量，提升性能
 ENV NODE_ENV=production

server/package.json

@@ -19,6 +19,7 @@
     "lint:fix": "eslint . --fix",
     "db:generate": "drizzle-kit generate",
     "db:migrate": "drizzle-kit migrate",
+    "db:migrate:programmatic": "bun run scripts/runMigrations.ts",
     "db:push": "drizzle-kit push",
     "db:studio": "drizzle-kit studio"
   },

server/scripts/runMigrations.ts

@@ -0,0 +1,45 @@
+/**
+ * 程序化运行数据库迁移
+ * 使用 drizzle-orm 的 migrate 函数，不依赖 drizzle-kit CLI
+ */
+import { drizzle } from 'drizzle-orm/postgres-js';
+import { migrate } from 'drizzle-orm/postgres-js/migrator';
+import postgres from 'postgres';
+import * as schema from '../drizzle/schema';
+
+const connectionString = process.env.POSTGRESQL_URL || '';
+
+if (!connectionString) {
+  console.error('❌ POSTGRESQL_URL environment variable is not set');
+  process.exit(1);
+}
+
+async function runMigrations() {
+  try {
+    console.log('🔄 Starting database migrations...');
+    console.log(`📝 Database URL: ${connectionString.replace(/:[^:@]+@/, ':****@')}`);
+
+    // 创建 postgres 客户端
+    const queryClient = postgres(connectionString, {
+      max: 1, // 迁移时只需要一个连接
+      idle_timeout: 20,
+      connect_timeout: 10,
+    });
+
+    // 创建 Drizzle 实例
+    const db = drizzle(queryClient, { schema });
+
+    // 运行迁移
+    await migrate(db, { migrationsFolder: './drizzle/migrations' });
+
+    console.log('✅ Database migrations completed successfully!');
+
+    // 关闭连接
+    await queryClient.end();
+  } catch (error: any) {
+    console.error('❌ Migration failed:', error);
+    process.exit(1);
+  }
+}
+
+runMigrations();

server/server.ts

@@ -118,6 +118,10 @@ subscribeConfigChange('site', (_group, newConfig) => {
     // 等待数据库连接就绪
     await waitForDatabase();
 
+    // 运行数据库迁移
+    const { runMigrations } = await import('./utils/drizzle');
+    await runMigrations();
+
     // 初始化配置管理器
     await initializeConfig();
 

server/utils/drizzle.ts

@@ -54,6 +54,21 @@ export async function waitForDatabase(
   }
 }
 
+/**
+ * 运行数据库迁移
+ */
+export async function runMigrations(): Promise<void> {
+  try {
+    console.log('🔄 Running database migrations...');
+    const { migrate } = await import('drizzle-orm/postgres-js/migrator');
+    await migrate(db, { migrationsFolder: './drizzle/migrations' });
+    console.log('✅ Database migrations completed successfully!');
+  } catch (error: any) {
+    console.error('❌ Migration failed:', error);
+    throw error;
+  }
+}
+
 /**
  * 关闭数据库连接
  */