zuowei/erpnew
1
0
Fork 0
forked from erp-dev/erp
Code Pull Requests Activity

fix: sync the yml

Browse Source
This commit is contained in:
colaftc
2025-12-25 10:45:43 +08:00
parent 5a1e618cab
commit f62572eef6
4 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
celerybeat-schedule-shm
View File

Binary file not shown.

BIN
celerybeat-schedule-wal
View File

Binary file not shown.

30
docker-compose.dev.yml
View File

@@ -14,6 +14,18 @@ services:
- db_data:/var/lib/postgresql/data - db_data:/var/lib/postgresql/data
restart: unless-stopped restart: unless-stopped
pgbouncer:
image: edoburu/pgbouncer:latest
container_name: pgbouncer
ports:
- "6432:6432"
volumes:
- ./deploy/pgbouncer/pgbouncer.ini:/etc/pgbouncer/pgbouncer.ini
- ./deploy/pgbouncer/userlist.txt:/etc/pgbouncer/userlist.txt
depends_on:
- postgres
restart: unless-stopped
pgadmin: pgadmin:
image: dpage/pgadmin4:latest image: dpage/pgadmin4:latest
container_name: pgadmin container_name: pgadmin
@@ -66,13 +78,13 @@ services:
PYTHONPATH: /app PYTHONPATH: /app
DEBUG: "1" DEBUG: "1"
ALLOWED_HOSTS: "localhost,127.0.0.1,0.0.0.0,8.148.215.233,yuwenerp.yuwen.cloud" ALLOWED_HOSTS: "localhost,127.0.0.1,0.0.0.0,8.148.215.233,yuwenerp.yuwen.cloud"
DB_HOST: postgres DB_HOST: pgbouncer
DB_PORT: "5432" DB_PORT: "6432"
DB_NAME: flower DB_NAME: flower
DB_USER: postgres DB_USER: postgres
DB_PASSWORD: postgres DB_PASSWORD: postgres
depends_on: depends_on:
- postgres - pgbouncer
- redis - redis
- rabbitmq - rabbitmq
restart: unless-stopped restart: unless-stopped
@@ -94,15 +106,15 @@ services:
volumes: volumes:
- .:/app - .:/app
depends_on: depends_on:
- postgres - pgbouncer
- redis - redis
- rabbitmq - rabbitmq
environment: environment:
CELERY_BROKER_URL: amqp://guest:guest@rabbitmq:5672// CELERY_BROKER_URL: amqp://guest:guest@rabbitmq:5672//
CELERY_RESULT_BACKEND: redis://redis:6379/0 CELERY_RESULT_BACKEND: redis://redis:6379/0
PYTHONPATH: /app PYTHONPATH: /app
DB_HOST: postgres DB_HOST: pgbouncer
DB_PORT: "5432" DB_PORT: "6432"
DB_NAME: flower DB_NAME: flower
DB_USER: postgres DB_USER: postgres
DB_PASSWORD: postgres DB_PASSWORD: postgres
@@ -126,14 +138,14 @@ services:
- .:/app - .:/app
- celery_beat_data:/var/lib/celery - celery_beat_data:/var/lib/celery
depends_on: depends_on:
- postgres - pgbouncer
- redis - redis
- rabbitmq - rabbitmq
environment: environment:
DJANGO_SETTINGS_MODULE: flower.settings DJANGO_SETTINGS_MODULE: flower.settings
PYTHONPATH: /app PYTHONPATH: /app
DB_HOST: postgres DB_HOST: pgbouncer
DB_PORT: "5432" DB_PORT: "6432"
DB_NAME: flower DB_NAME: flower
DB_USER: postgres DB_USER: postgres
DB_PASSWORD: postgres DB_PASSWORD: postgres

30
docker-compose.prod.yml
View File

@@ -15,6 +15,18 @@ services:
- db_data:/var/lib/postgresql/data - db_data:/var/lib/postgresql/data
restart: unless-stopped restart: unless-stopped
pgbouncer:
image: edoburu/pgbouncer:latest
container_name: pgbouncer
ports:
- "127.0.0.1:6432:6432"
volumes:
- ./deploy/pgbouncer/pgbouncer.ini:/etc/pgbouncer/pgbouncer.ini
- ./deploy/pgbouncer/userlist.txt:/etc/pgbouncer/userlist.txt
depends_on:
- postgres
restart: unless-stopped
redis: redis:
image: redis:7-alpine image: redis:7-alpine
container_name: redis container_name: redis
@@ -45,21 +57,21 @@ services:
- --workers - --workers
- "${UVICORN_WORKERS:-1}" - "${UVICORN_WORKERS:-1}"
ports: ports:
- "${WEB_PORT:-8000}:8000" - "${WEB_PORT:-8100}:8000"
environment: environment:
DJANGO_SETTINGS_MODULE: flower.settings DJANGO_SETTINGS_MODULE: flower.settings
PYTHONPATH: /app PYTHONPATH: /app
DEBUG: "${DEBUG:-0}" DEBUG: "${DEBUG:-0}"
ALLOWED_HOSTS: "${ALLOWED_HOSTS:-yuwenerp.yuwen.cloud}" ALLOWED_HOSTS: "${ALLOWED_HOSTS:-yuwenerp.yuwen.cloud}"
DB_HOST: ${DB_HOST:-postgres} DB_HOST: ${DB_HOST:-pgbouncer}
DB_PORT: "${DB_PORT:-5432}" DB_PORT: "${DB_PORT:-6432}"
DB_NAME: "${DB_NAME:-flower}" DB_NAME: "${DB_NAME:-flower}"
DB_USER: "${DB_USER:-postgres}" DB_USER: "${DB_USER:-postgres}"
DB_PASSWORD: "${DB_PASSWORD:-postgres}" DB_PASSWORD: "${DB_PASSWORD:-postgres}"
CELERY_BROKER_URL: "${CELERY_BROKER_URL:-amqp://guest:guest@rabbitmq:5672//}" CELERY_BROKER_URL: "${CELERY_BROKER_URL:-amqp://guest:guest@rabbitmq:5672//}"
CELERY_RESULT_BACKEND: "${CELERY_RESULT_BACKEND:-redis://redis:6379/0}" CELERY_RESULT_BACKEND: "${CELERY_RESULT_BACKEND:-redis://redis:6379/0}"
depends_on: depends_on:
- postgres - pgbouncer
- redis - redis
- rabbitmq - rabbitmq
restart: unless-stopped restart: unless-stopped
@@ -78,8 +90,8 @@ services:
- --pool=solo - --pool=solo
environment: environment:
PYTHONPATH: /app PYTHONPATH: /app
DB_HOST: ${DB_HOST:-postgres} DB_HOST: ${DB_HOST:-pgbouncer}
DB_PORT: "${DB_PORT:-5432}" DB_PORT: "${DB_PORT:-6432}"
DB_NAME: "${DB_NAME:-flower}" DB_NAME: "${DB_NAME:-flower}"
DB_USER: "${DB_USER:-postgres}" DB_USER: "${DB_USER:-postgres}"
DB_PASSWORD: "${DB_PASSWORD:-postgres}" DB_PASSWORD: "${DB_PASSWORD:-postgres}"
@@ -91,7 +103,7 @@ services:
# 也可通过 BACKUP_DIR 指定绝对路径，如 /srv/flower/data-bak # 也可通过 BACKUP_DIR 指定绝对路径，如 /srv/flower/data-bak
- ${BACKUP_DIR:-./data-bak}:/app/data-bak - ${BACKUP_DIR:-./data-bak}:/app/data-bak
depends_on: depends_on:
- postgres - pgbouncer
- redis - redis
- rabbitmq - rabbitmq
restart: unless-stopped restart: unless-stopped
@@ -111,8 +123,8 @@ services:
environment: environment:
DJANGO_SETTINGS_MODULE: flower.settings DJANGO_SETTINGS_MODULE: flower.settings
PYTHONPATH: /app PYTHONPATH: /app
DB_HOST: ${DB_HOST:-postgres} DB_HOST: ${DB_HOST:-pgbouncer}
DB_PORT: "${DB_PORT:-5432}" DB_PORT: "${DB_PORT:-6432}"
DB_NAME: "${DB_NAME:-flower}" DB_NAME: "${DB_NAME:-flower}"
DB_USER: "${DB_USER:-postgres}" DB_USER: "${DB_USER:-postgres}"
DB_PASSWORD: "${DB_PASSWORD:-postgres}" DB_PASSWORD: "${DB_PASSWORD:-postgres}"