Add one-command dev and production compose
This commit is contained in:
parent
5d5be69603
commit
1cc5c54471
|
|
@ -0,0 +1,11 @@
|
||||||
|
.git
|
||||||
|
.env
|
||||||
|
.env.*
|
||||||
|
node_modules
|
||||||
|
dist
|
||||||
|
apps/*/dist
|
||||||
|
services/*/dist
|
||||||
|
packages/*/dist
|
||||||
|
legacy-cent-app
|
||||||
|
codex-tmux-scroll
|
||||||
|
*.log
|
||||||
15
.env.example
15
.env.example
|
|
@ -2,7 +2,7 @@
|
||||||
DOMAIN=cents.homemade.net.cn
|
DOMAIN=cents.homemade.net.cn
|
||||||
|
|
||||||
# App install identity. Use "dev" for cents-dev and "pro" for cents-pro.
|
# App install identity. Use "dev" for cents-dev and "pro" for cents-pro.
|
||||||
APP_VARIANT=dev
|
APP_VARIANT=pro
|
||||||
# Optional overrides for the PWA install name/id.
|
# Optional overrides for the PWA install name/id.
|
||||||
# VITE_APP_NAME=Cents Dev
|
# VITE_APP_NAME=Cents Dev
|
||||||
# VITE_APP_SHORT_NAME=Cents Dev
|
# VITE_APP_SHORT_NAME=Cents Dev
|
||||||
|
|
@ -12,15 +12,10 @@ APP_VARIANT=dev
|
||||||
FRPC_SERVER_HOST=119.28.12.24
|
FRPC_SERVER_HOST=119.28.12.24
|
||||||
FRPC_SERVER_PORT=7000
|
FRPC_SERVER_PORT=7000
|
||||||
|
|
||||||
# Production target. For host-debug mode, keep host.docker.internal.
|
|
||||||
APP_HOST=host.docker.internal
|
|
||||||
APP_PORT=6064
|
|
||||||
APP_PROTOCOL=http
|
|
||||||
|
|
||||||
# Use false only after the tunnel is known to work.
|
# Use false only after the tunnel is known to work.
|
||||||
TEST_MODE=false
|
TEST_MODE=false
|
||||||
|
|
||||||
# API and PostgreSQL. The development database is provided by compose.dev.yaml.
|
# PostgreSQL. Use a strong secret in real production.
|
||||||
DATABASE_URL=postgres://cents:cents-dev-only@127.0.0.1:55432/cents
|
POSTGRES_DB=cents
|
||||||
PUBLIC_ORIGIN=https://dev.cents.homemade.net.cn
|
POSTGRES_USER=cents
|
||||||
COOKIE_SECURE=true
|
POSTGRES_PASSWORD=change-me
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ npm install
|
||||||
npm run dev
|
npm run dev
|
||||||
```
|
```
|
||||||
|
|
||||||
前端默认运行在 `http://localhost:5173/`。
|
`npm run dev` 会同时启动 API 和前端。前端运行在 `http://localhost:6064/`,并与 `compose.dev.yaml` 的 frp 调试入口保持一致。
|
||||||
|
|
||||||
常用检查:
|
常用检查:
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
FROM node:22-alpine AS build
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY package.json package-lock.json tsconfig.base.json ./
|
||||||
|
COPY apps/web/package.json apps/web/package.json
|
||||||
|
COPY packages/domain/package.json packages/domain/package.json
|
||||||
|
COPY services/api/package.json services/api/package.json
|
||||||
|
RUN npm ci
|
||||||
|
|
||||||
|
COPY packages/domain packages/domain
|
||||||
|
COPY apps/web apps/web
|
||||||
|
|
||||||
|
ARG APP_VARIANT=pro
|
||||||
|
ENV APP_VARIANT=$APP_VARIANT
|
||||||
|
RUN npm run build --workspace @cents/web
|
||||||
|
|
||||||
|
FROM nginx:1.27-alpine
|
||||||
|
|
||||||
|
COPY apps/web/nginx.conf /etc/nginx/conf.d/default.conf
|
||||||
|
COPY --from=build /app/apps/web/dist /usr/share/nginx/html
|
||||||
|
|
||||||
|
EXPOSE 80
|
||||||
|
|
@ -0,0 +1,20 @@
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name _;
|
||||||
|
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
index index.html;
|
||||||
|
|
||||||
|
location /api/ {
|
||||||
|
proxy_pass http://api:3000;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
location / {
|
||||||
|
try_files $uri $uri/ /index.html;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
services:
|
|
||||||
frpc:
|
|
||||||
image: homemade/auto-cert/proxy:latest
|
|
||||||
restart: unless-stopped
|
|
||||||
environment:
|
|
||||||
DOMAIN: ${DOMAIN}
|
|
||||||
APP_HOST: ${APP_HOST}
|
|
||||||
APP_PORT: ${APP_PORT}
|
|
||||||
APP_PROTOCOL: ${APP_PROTOCOL}
|
|
||||||
FRPC_SERVER_HOST: ${FRPC_SERVER_HOST}
|
|
||||||
FRPC_SERVER_PORT: ${FRPC_SERVER_PORT}
|
|
||||||
extra_hosts:
|
|
||||||
- "host.docker.internal:host-gateway"
|
|
||||||
volumes:
|
|
||||||
- frp_cert_volume:/etc/letsencrypt
|
|
||||||
networks:
|
|
||||||
- frp_prod
|
|
||||||
|
|
||||||
cert:
|
|
||||||
image: homemade/auto-cert/cert:latest
|
|
||||||
restart: "no"
|
|
||||||
command: --domain ${DOMAIN} --test-mode ${TEST_MODE}
|
|
||||||
volumes:
|
|
||||||
- frp_cert_volume:/etc/letsencrypt
|
|
||||||
networks:
|
|
||||||
- frp_prod
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
frp_cert_volume:
|
|
||||||
|
|
||||||
networks:
|
|
||||||
frp_prod:
|
|
||||||
driver: bridge
|
|
||||||
|
|
||||||
|
|
@ -0,0 +1,83 @@
|
||||||
|
services:
|
||||||
|
db:
|
||||||
|
image: postgres:17-alpine
|
||||||
|
restart: unless-stopped
|
||||||
|
environment:
|
||||||
|
POSTGRES_DB: ${POSTGRES_DB:-cents}
|
||||||
|
POSTGRES_USER: ${POSTGRES_USER:-cents}
|
||||||
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||||
|
volumes:
|
||||||
|
- cents_prod_db:/var/lib/postgresql/data
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-cents} -d ${POSTGRES_DB:-cents}"]
|
||||||
|
interval: 3s
|
||||||
|
timeout: 3s
|
||||||
|
retries: 20
|
||||||
|
networks:
|
||||||
|
- app
|
||||||
|
|
||||||
|
api:
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: services/api/Dockerfile
|
||||||
|
restart: unless-stopped
|
||||||
|
environment:
|
||||||
|
DATABASE_URL: postgres://${POSTGRES_USER:-cents}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB:-cents}
|
||||||
|
PUBLIC_ORIGIN: https://${DOMAIN}
|
||||||
|
COOKIE_SECURE: "true"
|
||||||
|
PORT: "3000"
|
||||||
|
depends_on:
|
||||||
|
db:
|
||||||
|
condition: service_healthy
|
||||||
|
networks:
|
||||||
|
- app
|
||||||
|
|
||||||
|
web:
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: apps/web/Dockerfile
|
||||||
|
args:
|
||||||
|
APP_VARIANT: ${APP_VARIANT:-pro}
|
||||||
|
restart: unless-stopped
|
||||||
|
depends_on:
|
||||||
|
- api
|
||||||
|
networks:
|
||||||
|
- app
|
||||||
|
|
||||||
|
frpc:
|
||||||
|
image: homemade/auto-cert/proxy:latest
|
||||||
|
restart: unless-stopped
|
||||||
|
environment:
|
||||||
|
DOMAIN: ${DOMAIN}
|
||||||
|
APP_HOST: web
|
||||||
|
APP_PORT: "80"
|
||||||
|
APP_PROTOCOL: http
|
||||||
|
FRPC_SERVER_HOST: ${FRPC_SERVER_HOST}
|
||||||
|
FRPC_SERVER_PORT: ${FRPC_SERVER_PORT}
|
||||||
|
volumes:
|
||||||
|
- frp_cert_volume:/etc/letsencrypt
|
||||||
|
depends_on:
|
||||||
|
- web
|
||||||
|
- cert
|
||||||
|
networks:
|
||||||
|
- app
|
||||||
|
- frp_prod
|
||||||
|
|
||||||
|
cert:
|
||||||
|
image: homemade/auto-cert/cert:latest
|
||||||
|
restart: "no"
|
||||||
|
command: --domain ${DOMAIN} --test-mode ${TEST_MODE:-false}
|
||||||
|
volumes:
|
||||||
|
- frp_cert_volume:/etc/letsencrypt
|
||||||
|
networks:
|
||||||
|
- frp_prod
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
cents_prod_db:
|
||||||
|
frp_cert_volume:
|
||||||
|
|
||||||
|
networks:
|
||||||
|
app:
|
||||||
|
driver: bridge
|
||||||
|
frp_prod:
|
||||||
|
driver: bridge
|
||||||
|
|
@ -37,10 +37,10 @@
|
||||||
|
|
||||||
## 启动
|
## 启动
|
||||||
|
|
||||||
先启动前端:
|
启动 API 和前端:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npm run dev --workspace @cents/web -- --port 6064
|
npm run dev
|
||||||
```
|
```
|
||||||
|
|
||||||
再启动内网穿透:
|
再启动内网穿透:
|
||||||
|
|
@ -74,7 +74,7 @@ curl -vkI https://$DOMAIN
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cp .env.example .env
|
cp .env.example .env
|
||||||
docker compose -f compose.frp-prod.yml up -d
|
docker compose -f compose.pro.yaml up -d --build
|
||||||
```
|
```
|
||||||
|
|
||||||
不要提交真实 `.env`。
|
不要提交真实 `.env`。
|
||||||
|
|
@ -83,5 +83,5 @@ docker compose -f compose.frp-prod.yml up -d
|
||||||
|
|
||||||
- 证书申请失败:检查域名 DNS、VPS 80 端口、frps vhost HTTP 配置。
|
- 证书申请失败:检查域名 DNS、VPS 80 端口、frps vhost HTTP 配置。
|
||||||
- HTTPS 访问失败:检查 frps 443 端口和 frpc 日志。
|
- HTTPS 访问失败:检查 frps 443 端口和 frpc 日志。
|
||||||
- 后端连不上:确认本机 Vite 服务正在监听 `6064`。
|
- 后端连不上:确认 `npm run dev` 已启动 API 和监听 `6064` 的 Vite 服务。
|
||||||
- frps 有 token:需要同步配置 frps 和 frpc,不要把真实 token 提交到仓库。
|
- frps 有 token:需要同步配置 frps 和 frpc,不要把真实 token 提交到仓库。
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,9 @@
|
||||||
"packages/*"
|
"packages/*"
|
||||||
],
|
],
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "npm run dev --workspace @cents/web",
|
"dev": "npm run dev:api & npm run dev:web:tunnel & wait",
|
||||||
|
"dev:web": "npm run dev --workspace @cents/web",
|
||||||
|
"dev:web:tunnel": "npm run dev --workspace @cents/web -- --port 6064",
|
||||||
"dev:api": "npm run dev --workspace @cents/api",
|
"dev:api": "npm run dev --workspace @cents/api",
|
||||||
"build": "npm run build --workspaces --if-present",
|
"build": "npm run build --workspaces --if-present",
|
||||||
"typecheck": "npm run typecheck --workspaces --if-present",
|
"typecheck": "npm run typecheck --workspaces --if-present",
|
||||||
|
|
@ -19,4 +21,3 @@
|
||||||
"node": ">=22"
|
"node": ">=22"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
FROM node:22-alpine
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY package.json package-lock.json tsconfig.base.json ./
|
||||||
|
COPY apps/web/package.json apps/web/package.json
|
||||||
|
COPY packages/domain/package.json packages/domain/package.json
|
||||||
|
COPY services/api/package.json services/api/package.json
|
||||||
|
RUN npm ci
|
||||||
|
|
||||||
|
COPY packages/domain packages/domain
|
||||||
|
COPY services/api services/api
|
||||||
|
RUN npm run typecheck --workspace @cents/api
|
||||||
|
|
||||||
|
EXPOSE 3000
|
||||||
|
CMD ["npm", "run", "start", "--workspace", "@cents/api"]
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "tsx watch src/server.ts",
|
"dev": "tsx watch src/server.ts",
|
||||||
|
"start": "tsx src/server.ts",
|
||||||
"bootstrap": "tsx src/bootstrap.ts",
|
"bootstrap": "tsx src/bootstrap.ts",
|
||||||
"password:reset": "tsx src/reset-password.ts",
|
"password:reset": "tsx src/reset-password.ts",
|
||||||
"build": "tsc --noEmit",
|
"build": "tsc --noEmit",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue