From f62572eef6f13cbcc94d9648bdc2d6032854c46b Mon Sep 17 00:00:00 2001 From: colaftc Date: Thu, 25 Dec 2025 10:45:43 +0800 Subject: [PATCH] fix: sync the yml --- celerybeat-schedule-shm | Bin 32768 -> 32768 bytes celerybeat-schedule-wal | Bin 4120032 -> 4120032 bytes docker-compose.dev.yml | 30 +++++++++++++++++++++--------- docker-compose.prod.yml | 30 +++++++++++++++++++++--------- 4 files changed, 42 insertions(+), 18 deletions(-) diff --git a/celerybeat-schedule-shm b/celerybeat-schedule-shm index 9fda1d94a4232e81e589482dcb4dc09e16333686..e8f0e9134959d9bc1b39f0f574332d0f361f51ea 100644 GIT binary patch delta 170 zcmZo@U}|V!s+V}A%K!pj85tOWNPr2*W(H!$r{6A}Wm$G@^3iB*4~_RPAqPSZgd7Mt5ON^oK*)iR z10e@O4*dUe;O#$ps2~sofi2m(PM2n2y35Cnoi5C{T6AP5A3 zAP@wCKoAH5K_CbOfglhBfi2m(PM2n2y35Cnoi5cp>V_@?7Z z1Vlm$hL~5i(dSpaqWJPwohg`^md?AMq1@!Eg8jf8jMqGXf(q3ZpVQV=^}5GCmVB zF_SVmQ!+KvGCeagGqW-~-(xQ3VLldMAr@gVmS8ECVL4V{C01cI)?h8xVLdkB`)tgn zY|fT!&9-dMj_k}2*o_~uCwsFm`*R=%b0~*%Bu8^B$8#blb1J8ECTDXl=W`(!b16UK za<1fRuH|}ewUS9zT`d7F3n86WTwpYU@& z=SzOculX&%=a2k}zwkHy!N2&Llodgd6h%=LT`?6~aTQ+)l~_rYTq%`WX_a0Xm04Mp zUGFKE@+hAQsE~@Nm`bRW%BY+wsFJFvnrf()>ZqO?=zTR-Q#DshwN_iTS4VZ$2kNE| z)lNKf>+p6jK))Ytk}-|I*Hq+j%# z{?K0%-a$k}#=D4y7>I>9h=&A7gd|9Y6i9_MNQVr_ge=I09LR~>$cy|ah{7m};wXvI zD2wu_h{~vn>Zpm@sEhh&h(>6FW@v#{XoGg>fKKRwuIP>)=!HJ$hXELbAsB`c7=z~G2J5f^o3I7jumd}>8+)-I2XPojaSSJL3TJQ* z7jOwza1A$b3wLl2_wf*q@f6SS0$<=Oe1q@s176{0{EFZ4C;ooZ>`8ow5gD29G8$tr z7UM7;6EG2zFd0)Y71J;sGcXggFdK6)Cv!6|^RplevnY$RBuld_%d;XYvns2zCTp`U z>$4#nu?d^81zWKV+pz;Xu?xGhJA1Gf`>-Dea1e)Z7)Njv$8a1ca1y6*8fS18=Wreu za1obq89(L{rf9Ie4n~?O5A}X@pRW!v=EX7egB~T(IQ8J}aDy306 zWl$z%Q8wjJPUTi!#)bFpbbCjnOzw&?HUKG|kW~&Cxt9&>}6-GJUKSTBS8wrw!Vq zE!w6X+Ns^ztNl8t!#b*CI-yfKqjS2TOS+V% z?i5bxR8H+QPV00|?+ni9OwQ~q&gyK=?i_y4Ii1V7oyU2d&-q=z1zpI6UBpFQ%*9>8 zC0)v;UB+cy&gEUf6dclU?x;hyg0-tObR?&tm<;DH|G!5-qF9_Ha5;gKHY z(H`Tm9_R6%;EA5($)4h=p62PE;hCQ0*`DLMp6B^q;Duh~#a`m2UgnSdv6p*=S9+CK zdyUt6o!5JVH+qvddyBVvo40$1Kk-iQ@^0_(UhngMAMimR@?jtGQGe=VKJF7f=~F)K zGd}BcKJN>@=u5urE57P$zU~{o>07?-JHG3C{>=CNzz_Y%kNw0?{kfm{x&PB??VtH} z2zLnrK_CbOfglhBfi2m(PM2n2y35Cnoi5C{T6AP5A3AP@wC kKoAH5K_CbOfglhBfi_-6$E1+b4L{Qv*} diff --git a/celerybeat-schedule-wal b/celerybeat-schedule-wal index c324539b0b4b5c76553eafa1d06d10a012d46ace..bfc2fec24f48b2a72254ad1bbf2c96723c64d54d 100644 GIT binary patch delta 414 zcmXxdyGufG7{>AQ)1zI~)GnskMZ4HhGqqArH;0CbprMAAhEAJJ{s~DzEp6w3&>A>K zO=pN`3M^;|s-?k#psBV9YUpd=3!mkAA9!jPKcWUTw`<>%60d$q@<^P}uQ%h%%ICXS zs8&t_Rh`UIe>C#*#qe{n=)5x3wd|8qte9uf{Dbf-R5C`vcVMg=tH0JlP&txg$#kl` z{cT$+8;<;jn~LSMQMr-JQLi|5{cqiWy@|()d}o$+A|GyXt8cx8_qEWW780<)3K=%o z(S&BSpcM`{;X)hS@W6|9bf6Pm@Sz)i1ki&ZdeMh|44}Rr#vq0;j1fdI3I$Qb5XTr2 f7)KH*q%na>Od*3Ta!@gi8O&l1^QIQcmoEPRvJHgd delta 382 zcmYk#y)OfC0LJm(-BsW2S9f((y`R@sxl(WSQsQNi7}z8%7k_|3Ocp}IVC-;%Cd1;y7^I`WijW3G}TLbUR22hpKc59*6z71ZkQiN zSicTvrn-Ni7xFuc=@ZvJb8Q7GH26>lKLQ9MgfMhSL{JX{CZcG7g+??XhGxXkf>yMl z9UbUI7i$0A=s_>~(2oHmki;NT7{V|dq%nd~WH5$tOkfgI$YL5Zn8h4&m@m2Z!qMX& Dg0^)u diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index c7ba48e..d8c7d61 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -14,6 +14,18 @@ services: - db_data:/var/lib/postgresql/data 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: image: dpage/pgadmin4:latest container_name: pgadmin @@ -66,13 +78,13 @@ services: PYTHONPATH: /app DEBUG: "1" ALLOWED_HOSTS: "localhost,127.0.0.1,0.0.0.0,8.148.215.233,yuwenerp.yuwen.cloud" - DB_HOST: postgres - DB_PORT: "5432" + DB_HOST: pgbouncer + DB_PORT: "6432" DB_NAME: flower DB_USER: postgres DB_PASSWORD: postgres depends_on: - - postgres + - pgbouncer - redis - rabbitmq restart: unless-stopped @@ -94,15 +106,15 @@ services: volumes: - .:/app depends_on: - - postgres + - pgbouncer - redis - rabbitmq environment: CELERY_BROKER_URL: amqp://guest:guest@rabbitmq:5672// CELERY_RESULT_BACKEND: redis://redis:6379/0 PYTHONPATH: /app - DB_HOST: postgres - DB_PORT: "5432" + DB_HOST: pgbouncer + DB_PORT: "6432" DB_NAME: flower DB_USER: postgres DB_PASSWORD: postgres @@ -126,14 +138,14 @@ services: - .:/app - celery_beat_data:/var/lib/celery depends_on: - - postgres + - pgbouncer - redis - rabbitmq environment: DJANGO_SETTINGS_MODULE: flower.settings PYTHONPATH: /app - DB_HOST: postgres - DB_PORT: "5432" + DB_HOST: pgbouncer + DB_PORT: "6432" DB_NAME: flower DB_USER: postgres DB_PASSWORD: postgres diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index e5ec511..22d38e5 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -15,6 +15,18 @@ services: - db_data:/var/lib/postgresql/data 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: image: redis:7-alpine container_name: redis @@ -45,21 +57,21 @@ services: - --workers - "${UVICORN_WORKERS:-1}" ports: - - "${WEB_PORT:-8000}:8000" + - "${WEB_PORT:-8100}:8000" environment: DJANGO_SETTINGS_MODULE: flower.settings PYTHONPATH: /app DEBUG: "${DEBUG:-0}" ALLOWED_HOSTS: "${ALLOWED_HOSTS:-yuwenerp.yuwen.cloud}" - DB_HOST: ${DB_HOST:-postgres} - DB_PORT: "${DB_PORT:-5432}" + DB_HOST: ${DB_HOST:-pgbouncer} + DB_PORT: "${DB_PORT:-6432}" DB_NAME: "${DB_NAME:-flower}" DB_USER: "${DB_USER:-postgres}" DB_PASSWORD: "${DB_PASSWORD:-postgres}" CELERY_BROKER_URL: "${CELERY_BROKER_URL:-amqp://guest:guest@rabbitmq:5672//}" CELERY_RESULT_BACKEND: "${CELERY_RESULT_BACKEND:-redis://redis:6379/0}" depends_on: - - postgres + - pgbouncer - redis - rabbitmq restart: unless-stopped @@ -78,8 +90,8 @@ services: - --pool=solo environment: PYTHONPATH: /app - DB_HOST: ${DB_HOST:-postgres} - DB_PORT: "${DB_PORT:-5432}" + DB_HOST: ${DB_HOST:-pgbouncer} + DB_PORT: "${DB_PORT:-6432}" DB_NAME: "${DB_NAME:-flower}" DB_USER: "${DB_USER:-postgres}" DB_PASSWORD: "${DB_PASSWORD:-postgres}" @@ -91,7 +103,7 @@ services: # 也可通过 BACKUP_DIR 指定绝对路径，如 /srv/flower/data-bak - ${BACKUP_DIR:-./data-bak}:/app/data-bak depends_on: - - postgres + - pgbouncer - redis - rabbitmq restart: unless-stopped @@ -111,8 +123,8 @@ services: environment: DJANGO_SETTINGS_MODULE: flower.settings PYTHONPATH: /app - DB_HOST: ${DB_HOST:-postgres} - DB_PORT: "${DB_PORT:-5432}" + DB_HOST: ${DB_HOST:-pgbouncer} + DB_PORT: "${DB_PORT:-6432}" DB_NAME: "${DB_NAME:-flower}" DB_USER: "${DB_USER:-postgres}" DB_PASSWORD: "${DB_PASSWORD:-postgres}"