Merge pull request #105 from Rabithua/develop

Develop

Author: Rabithua

README.md

@@ -19,7 +19,7 @@
 
 ```bash
 # Use latest version (default config file)
-VITE_API_BASE=http://<your-ip-address>:3000 docker-compose up -d
+VITE_API_BASE=http://<your-ip-address>:18000 docker-compose up -d
 
 # Use specific version
 IMAGE_TAG=v1.0.0 docker-compose up -d
@@ -33,8 +33,8 @@ git clone https://github.com/Rabithua/Rote.git
 cd Rote
 
 # Build and start from source
-# VITE_API_BASE is injected into frontend code at build time (optional, default http://localhost:3000)
-VITE_API_BASE=http://localhost:3000 docker-compose -f docker-compose.build.yml up -d --build
+# VITE_API_BASE is injected into frontend code at build time (optional, default http://localhost:18000)
+VITE_API_BASE=http://localhost:18000 docker-compose -f docker-compose.build.yml up -d --build
 ```
 
 ### Detailed Instructions

README.zh.md

@@ -19,7 +19,7 @@
 
 ```bash
 # 使用最新版本（默认配置文件）
-VITE_API_BASE=http://<your-ip-address>:3000 docker-compose up -d
+VITE_API_BASE=http://<your-ip-address>:18000 docker-compose up -d
 
 # 使用特定版本
 IMAGE_TAG=v1.0.0 docker-compose up -d
@@ -33,8 +33,8 @@ git clone https://github.com/Rabithua/Rote.git
 cd Rote
 
 # 从源码构建并启动
-# VITE_API_BASE 在构建时注入到前端代码中（可选，默认 http://localhost:3000）
-VITE_API_BASE=http://localhost:3000 docker-compose -f docker-compose.build.yml up -d --build
+# VITE_API_BASE 在构建时注入到前端代码中（可选，默认 http://localhost:18000）
+VITE_API_BASE=http://localhost:18000 docker-compose -f docker-compose.build.yml up -d --build
 ```
 
 ### 详细说明

docker-compose.build.yml

@@ -7,36 +7,40 @@ services:
       # 基础配置 - 必需
       - POSTGRESQL_URL=postgresql://rote:${POSTGRES_PASSWORD:-rote_password_123}@rote-postgres:5432/rote
     ports:
-      - "3000:3000"
+      - "18000:3000"
     depends_on:
       rote-postgres:
         condition: service_healthy
     restart: unless-stopped
     # 启动命令：等待数据库就绪后执行数据库迁移并启动服务
-    command: ["sh", "-c", "sleep 15 && bun run dist/server.js"]
+    # 使用程序化迁移（不依赖 drizzle-kit CLI，适用于生产环境）
+    command:
+      [
+        "sh",
+        "-c",
+        "sleep 15 && bun run dist/scripts/runMigrations.js && bun run dist/server.js",
+      ]
 
   rote-frontend:
     build:
       context: ./web
       dockerfile: Dockerfile
       args:
         # 构建时传递 VITE_API_BASE（构建时注入到代码中）
-        - VITE_API_BASE=${VITE_API_BASE:-http://localhost:3000}
+        - VITE_API_BASE=${VITE_API_BASE:-http://localhost:18000}
     ports:
-      - "3001:80"
+      - "18001:80"
     depends_on:
       - rote-backend
     environment:
       # 运行时环境变量，用于启动脚本注入配置（如果需要覆盖构建时配置）
-      - VITE_API_BASE=${VITE_API_BASE:-http://localhost:3000}
+      - VITE_API_BASE=${VITE_API_BASE:-http://localhost:18000}
     restart: unless-stopped
 
   rote-postgres:
     image: postgres:17
     container_name: rote-postgres
     restart: unless-stopped
-    ports:
-      - "5432:5432"
     environment:
       POSTGRES_USER: rote
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-rote_password_123}

docker-compose.yml

@@ -10,40 +10,51 @@
 # - develop: Latest from develop branch (supports multi-platform: amd64, arm64)
 # - main: Latest from main branch
 # - v1.0.0: Specific version (if released)
+#
+# ⚠️ IMPORTANT ⚠️
+# Don't forget to set VITE_API_BASE
+# Example: VITE_API_BASE=http://<your-ip-address>:18000 or VITE_API_BASE=http://<your-domain>
+# Note: If you use a reverse proxy, VITE_API_BASE should be your backend address after the reverse proxy
 
 services:
   rote-backend:
     image: rabithua/rote-backend:${IMAGE_TAG:-develop}
+    pull_policy: always
     container_name: rote-backend
     environment:
       # 基础配置 - 必需
       - POSTGRESQL_URL=postgresql://rote:${POSTGRES_PASSWORD:-rote_password_123}@rote-postgres:5432/rote
     ports:
-      - "3000"
+      - "18000:3000"
     depends_on:
       rote-postgres:
         condition: service_healthy
     restart: unless-stopped
-    # 启动命令：等待数据库就绪后执行数据库迁移并启动服务
-    command: ["sh", "-c", "sleep 15 && bun run db:migrate && bun run server.ts"]
+    # Startup command: wait for the database to be ready, then run migrations and start the backend service
+    # Uses programmatic migrations (does not rely on drizzle-kit CLI, suitable for production)
+    command:
+      [
+        "sh",
+        "-c",
+        "sleep 15 && bun run dist/scripts/runMigrations.js && bun run dist/server.js",
+      ]
 
   rote-frontend:
     image: rabithua/rote-frontend:${IMAGE_TAG:-develop}
+    pull_policy: always
     container_name: rote-frontend
     ports:
-      - "3001"
+      - "18001:80"
     depends_on:
       - rote-backend
     environment:
-      - VITE_API_BASE=${VITE_API_BASE:-http://localhost:3000}
+      - VITE_API_BASE=${VITE_API_BASE:-http://<your-ip-address>:18000}
     restart: unless-stopped
 
   rote-postgres:
     image: postgres:17
     container_name: rote-postgres
     restart: unless-stopped
-    ports:
-      - "5432"
     environment:
       POSTGRES_USER: rote
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-rote_password_123}