From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
docker/postgres/tencent/docker-compose.tencent-pg.yml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/docker/postgres/tencent/docker-compose.tencent-pg.yml b/docker/postgres/tencent/docker-compose.tencent-pg.yml
new file mode 100644
index 0000000..027b4ba
--- /dev/null
+++ b/docker/postgres/tencent/docker-compose.tencent-pg.yml
@@ -0,0 +1,52 @@
+# 鑵捐浜� CVM 涓撶敤锛氬彧璧� jnpf PG锛堣祫婧愰檺姝伙紝瀵勪綇鍏变韩鐢熶骇鏈� YOUR_DB_HOST锛夈��
+# 鑳屾櫙/鍓叉帴瑙� docs/superpowers/plans/2026-07-20-tencent-cloud-pg-shared-db.md銆�
+# 闀滃儚 cx/postgres:18.4 鐢� build docker/postgres 浜у嚭锛坅md64锛屽惈 pg_bigm/pgvector锛夈��
+# 鍑嵁缁忎粨搴撴牴 .env 娉ㄥ叆锛涚鍙� 15432锛�5432/5433 宸茶 fastgpt-pg/homework-pg 鍗狅級銆�
+# 馃敶 椤圭洰鍚� jnpf-pg 涓� service key 缁濅笉鑳芥敼锛氬嵎鍚� jnpf-pg_jnpf_pgdata 鐢遍」鐩悕娲剧敓
+# 锛堜笅鏂� jnpf_pgdata 鏈樉寮� name:锛夛紝鏀逛簡鏂板鍣ㄦ寕绌哄嵎銆佸鎴稟鏁版嵁"娑堝け"銆�
+name: jnpf-pg
+services:
+ cx-postgres:
+ # 2026-08-08 CVM 瀹瑰櫒鍚嶈鑼冨寲锛氬甫瀹㈡埛鎷奸煶锛堝師 cx-postgres锛屼笌鏈満娌欑洅/浜や粯鍩虹嚎鍚屽悕鏄撴贩娣嗭級銆�
+ # 浠呭鍣ㄥ悕鏀癸紝service key / 椤圭洰鍚� / 鍗蜂笉鍔ㄣ��
+ container_name: cx-pg-customer1
+ image: cx/postgres:18.4
+ build:
+ context: .. # tencent/ 涓婁竴绾� = docker/postgres锛堝惈 Dockerfile锛�
+ platform: linux/amd64
+ restart: unless-stopped
+ shm_size: 512m
+ mem_limit: 3g
+ memswap_limit: 3g # 鏃� swap锛岀姝㈡孩鍑哄埌 swap
+ environment:
+ TZ: Asia/Shanghai
+ POSTGRES_USER: postgres
+ POSTGRES_PASSWORD: ${JNPF_PG_PASSWORD:?缂� JNPF_PG_PASSWORD锛屽厛鍦ㄤ粨搴撴牴 .env 璁緘
+ POSTGRES_INITDB_ARGS: "--locale=C.UTF-8 --encoding=UTF8"
+ volumes:
+ - jnpf_pgdata:/var/lib/postgresql
+ ports:
+ - "15432:5432" # 瀵瑰叕缃戯紙瀹夊叏缁勫彧鏀� 15432锛岄潬寮哄瘑鐮�+闈炶秴鎴烽槻鎶わ級
+ command:
+ - postgres
+ - -c
+ - shared_buffers=512MB
+ - -c
+ - shared_preload_libraries=pg_stat_statements,auto_explain
+ - -c
+ - pg_stat_statements.track=all
+ - -c
+ # 鍏变韩搴擄細寮�鍙�(鏈湴~10鏈嶅姟)+娴嬭瘯(192.168.21.151~10鏈嶅姟)涓ょ幆澧� Druid 姹犲彔鍔狅紝
+ # 绋虫�佹浘杈� 197/200 閫兼弧(L029 鍏卞簱鏀惧ぇ)銆傚崟鐜 9 鏈嶅姟鍏堜緥=200 鈫� 鍙岀幆澧冩彁鍒� 400銆�
+ # 400 杩炴帴鍐呭瓨 ~700-900MB锛屼粛鍦� mem_limit 3g / CVM 鍙敤鍐呭瓨鍐呫��
+ - max_connections=400
+ - -c
+ - timezone=Asia/Shanghai
+ healthcheck:
+ test: ["CMD-SHELL", "pg_isready -U postgres -d postgres"]
+ interval: 15s
+ timeout: 10s
+ retries: 10
+ start_period: 60s
+volumes:
+ jnpf_pgdata:
--
Gitblit v1.8.0