update deploy

Author: xc2f

.github/workflows/build-and-push.yml

@@ -4,6 +4,32 @@ on:
   push:
     branches:
       - main
+    # 只有当以下路径的文件发生变动时，才触发此工作流
+    paths:
+      - 'src/**'
+      - 'public/**'
+      - 'docker/**'
+      - 'package.json'
+      - 'pnpm-lock.yaml'
+      - 'next.config.js'
+      - 'redirects.js'
+      - 'tailwind.config.mjs'
+      - 'tsconfig.json'
+      - 'components.json'
+      - '.env.example'
+
+    # 以下路径的变动绝对不会触发构建
+    paths-ignore:
+      - 'README.md'
+      - 'AGENTS.md'
+      - '.vscode/**'
+      - '.cursor/**'
+      - '.gitignore'
+      - '.prettier*'
+      - 'eslint.config.mjs'
+      - 'tests/**'
+      - 'playwright.config.ts'
+      - 'vitest.config.mts'
   workflow_dispatch:
 
 permissions:
@@ -122,7 +148,7 @@ jobs:
           REGISTRY=public.ecr.aws/umcai/xc2f/payload
 
           # 2. 构建镜像
-          docker build -f docker/Dockerfile.CI \
+          docker build -f docker/Dockerfile.prod \
             -t $REGISTRY:latest \
             -t $REGISTRY:${SHORT_SHA} .
 

.github/workflows/build-to-branch.yml

@@ -4,6 +4,32 @@ on:
   push:
     branches:
       - main
+    # 只有当以下路径的文件发生变动时，才触发此工作流
+    paths:
+      - 'src/**'
+      - 'public/**'
+      - 'docker/**'
+      - 'package.json'
+      - 'pnpm-lock.yaml'
+      - 'next.config.js'
+      - 'redirects.js'
+      - 'tailwind.config.mjs'
+      - 'tsconfig.json'
+      - 'components.json'
+      - '.env.example'
+
+    # 以下路径的变动绝对不会触发构建
+    paths-ignore:
+      - 'README.md'
+      - 'AGENTS.md'
+      - '.vscode/**'
+      - '.cursor/**'
+      - '.gitignore'
+      - '.prettier*'
+      - 'eslint.config.mjs'
+      - 'tests/**'
+      - 'playwright.config.ts'
+      - 'vitest.config.mts'
   workflow_dispatch:
 
 env:

docker-compose.prod.yml

@@ -0,0 +1,30 @@
+services:
+  payload:
+    restart: always
+    image: public.ecr.aws/umcai/xc2f/payload:latest
+    container_name: payload
+    ports:
+      - '3000:3000'
+    depends_on:
+      - postgres
+    env_file:
+      - .env
+
+  postgres:
+    restart: always
+    image: postgres:latest
+    container_name: postgres
+    command: postgres -c config_file=/var/lib/postgresql/postgresql.conf
+    volumes:
+      - pgdata:/var/lib/postgresql
+      - ./postgres/postgresql.conf:/var/lib/postgresql/postgresql.conf:ro
+      - ./postgres/pg_hba.conf:/var/lib/postgresql/pg_hba.conf:ro
+    environment:
+      - POSTGRES_USER=${DATABASE_USER}
+      - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
+      - POSTGRES_DB=${DATABASE_NAME}
+
+volumes:
+  pgdata:
+    external: true
+    name: xc2f_pgdata

docker-compose.yml

@@ -1,6 +1,5 @@
 services:
   payload:
-    # image: node:24-alpine
     build:
       context: .
       dockerfile: ./docker/Dockerfile
@@ -16,12 +15,8 @@ services:
     environment:
       - NPM_CONFIG_USERCONFIG=/home/node/.npmrc
       - PNPM_STORE_DIR=/home/node/.pnpm-store
-      - APP_CMD=${APP_CMD}
       # - NODE_OPTIONS="--max-old-space-size=4096"
-    # for dev
-    # command: sh -c "pnpm ${APP_CMD}"
-    # for product
-    command: sh -c "pnpm build && pnpm start"
+    command: sh -c "pnpm ${APP_CMD}"
     working_dir: /app
     depends_on:
       - postgres
@@ -37,14 +32,14 @@ services:
       - pgdata:/var/lib/postgresql
       - ./postgres/postgresql.conf:/var/lib/postgresql/postgresql.conf:ro
       - ./postgres/pg_hba.conf:/var/lib/postgresql/pg_hba.conf:ro
-    # ports:
-    #   - '5432:5432'
     environment:
       - POSTGRES_USER=${DATABASE_USER}
       - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
       - POSTGRES_DB=${DATABASE_NAME}
 
 volumes:
   pgdata:
+    external: true
+    name: xc2f_pgdata
   node_modules:
   pnpm_store:

docker/Dockerfile.CI docker/Dockerfile.proddocker/Dockerfile.CI renamed to docker/Dockerfile.prod

@@ -20,7 +20,8 @@
     "test": "pnpm run test:int && pnpm run test:e2e",
     "test:e2e": "cross-env NODE_OPTIONS=\"--no-deprecation --no-experimental-strip-types\" pnpm exec playwright test --config=playwright.config.ts",
     "test:int": "cross-env NODE_OPTIONS=--no-deprecation vitest run --config ./vitest.config.mts",
-    "deploy": "bash scripts/deploy.sh"
+    "deploy": "bash scripts/deploy.sh",
+    "deploy-to-dev": "bash scripts/deploy-to-dev.sh"
   },
   "dependencies": {
     "@aws-sdk/client-sesv2": "^3.962.0",

package.json

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+set -e
+
+PROJECT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
+
+cd "$PROJECT_DIR"
+
+echo "👉 Pull main"
+git pull origin main
+
+echo "👉 Fetch build"
+git fetch origin build
+
+echo "👉 Clean build artifacts"
+rm -rf .next public
+
+echo "👉 Restore build artifacts"
+git restore --source origin/build .next public
+
+echo "👉 Start docker"
+docker-compose up -d

scripts/deploy-to-dev.sh

@@ -5,26 +5,21 @@ PROJECT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
 
 cd "$PROJECT_DIR"
 
-echo "👉 Stop docker"
-docker-compose down
+# 定义文件路径变量
+COMPOSE_FILE="docker/docker-compose.prod.yml"
 
-# echo "👉 Stash docker-compose.yml"
-# git stash push -- docker-compose.yml || true
+echo "🚀 Starting deployment..."
 
-echo "👉 Pull main"
-git pull origin main
+# 1. 拉取最新镜像
+echo "📥 Pulling latest images..."
+docker compose -f $COMPOSE_FILE pull
 
-echo "👉 Fetch build"
-git fetch origin build
+# 2. 启动/更新容器
+echo "🆙 Starting containers..."
+docker compose -f $COMPOSE_FILE up -d
 
-echo "👉 Clean build artifacts"
-rm -rf .next public
+# 3. 清理旧镜像
+echo "🧹 Cleaning up old images..."
+docker image prune -f
 
-echo "👉 Restore build artifacts"
-git restore --source origin/build .next public
-
-# echo "👉 Restore stash"
-# git stash pop || true
-
-echo "👉 Start docker"
-docker-compose up -d
+echo "✅ Deployment completed successfully!"

scripts/deploy.sh

@@ -26,6 +26,8 @@ import { sendEmailTask } from './tasks/sendEmail'
 import { en } from '@payloadcms/translations/languages/en'
 import { zh } from '@payloadcms/translations/languages/zh'
 
+import { migrations } from './migrations'
+
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
 
@@ -81,6 +83,7 @@ export default buildConfig({
       connectionString: process.env.DATABASE_URL,
     },
     // push: true,
+    // prodMigrations: migrations,
   }),
   collections: [Pages, Posts, Media, Categories, Notes, Feeds, Mails, Users],
   cors: [getServerSideURL()].filter(Boolean),