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/Dockerfile |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile
new file mode 100644
index 0000000..2d7480e
--- /dev/null
+++ b/docker/postgres/Dockerfile
@@ -0,0 +1,41 @@
+# JNPF PG 杩佺Щ鏍囧噯闀滃儚锛堟柟妗堣 docs/pg-migration-plan.md 搂1/搂4锛�
+# 鍩哄簳锛歋WR 鎼繍鐨勫畼鏂� postgres:18.4锛�= Docker Hub 18.4-trixie锛孌ebian 13 + PG 18.4-1.pgdg13+1锛�
+# 瀹炴祴 os-release/PG_VERSION 涓�鑷达紝2026-07-17 鍒囨崲锛夈�係WR 鏃� -trixie 鍚庣紑 tag銆佸崟鏋舵瀯 amd64鈥斺��
+# 鏈暅鍍忕粡 compose `platform: linux/amd64` 鎭掑畾 amd64 鏋勫缓锛屾棤闇�涓氬姟鍩哄骇閭ｆ牱鐨� ARG 鍙岃建銆�
+# 2026-07-14 鍐崇瓥淇锛氫笟鍔℃棤 GIS 闇�姹傦紝寮冪敤 postgis/postgis 鍩哄簳锛堢渷 ~200MB銆�
+# 渚涘簲閾炬洿骞插噣锛夛紱灏嗘潵闇�瑕佸湴鍥捐兘鍔涙椂鎹㈠洖 postgis 鍩哄簳閲嶆墦鍗冲彲銆�
+#
+# 鏋勫缓鏈烘畫浣欏閮ㄤ緷璧栵紙鐜板満闆朵緷璧栵紝浜х墿闅忕绾垮寘璧帮級锛欴ebian/PGDG apt + GitHub pg_bigm 婧愮爜銆�
+# pg_bigm锛歅GDG apt 鏃犳鍖咃紝浠庡畼鏂逛笂娓告簮鐮佺紪璇戯紙v1.2-20250903 璧锋敮鎸� PG18锛夈��
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/postgres:18.4 AS pg_bigm_builder
+
+# Debian apt 鎹㈠崕涓轰簯闀滃儚锛�209MB 宸ュ叿閾剧殑澶уご鎻愰�燂紱debian.sources=Debian 13 deb822 鏍煎紡锛夈��
+# PGDG 淇濈暀瀹樻柟 apt.postgresql.org锛氬叾 trixie-pgdg 鐢ㄧ増鏈寲缁勪欢锛坢ain + '18'锛夛紝鍥藉唴闀滃儚绔�
+# 鏅亶鍙悓姝� main 缂� '18'锛堝崕涓轰簯瀹炴祴缂猴紝TUNA 鍏ㄤ絾娴嬭瘯鏈嶅姟鍣� https 涓嶉�氾級锛涘畼鏂规簮鍖呴噺灏�
+# 锛坰erver-dev-18+pgvector 绾� 2MB锛変笖娴嬭瘯鏈嶅姟鍣ㄥ疄娴嬪彲杈俱�侴itHub 娴呭厠闅� ~100KB 涓嶅鐞嗐��
+RUN sed -i 's|deb.debian.org|mirrors.huaweicloud.com|g' /etc/apt/sources.list.d/debian.sources
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        build-essential \
+        postgresql-server-dev-18 \
+        libicu-dev \
+        git \
+        ca-certificates \
+    && git clone --depth 1 --branch v1.2-20250903 \
+        https://github.com/pgbigm/pg_bigm.git /tmp/pg_bigm \
+    && make -C /tmp/pg_bigm USE_PGXS=1 PG_CONFIG=/usr/lib/postgresql/18/bin/pg_config \
+    && make -C /tmp/pg_bigm USE_PGXS=1 PG_CONFIG=/usr/lib/postgresql/18/bin/pg_config install
+
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/postgres:18.4
+
+# Debian 鎹㈠崕涓轰簯闀滃儚锛屽悓 builder 闃舵锛圥GDG 淇濈暀瀹樻柟锛岀悊鐢辫涓婏級
+RUN sed -i 's|deb.debian.org|mirrors.huaweicloud.com|g' /etc/apt/sources.list.d/debian.sources
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        postgresql-18-pgvector \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY --from=pg_bigm_builder /usr/lib/postgresql/18/lib/pg_bigm.so /usr/lib/postgresql/18/lib/
+COPY --from=pg_bigm_builder /usr/share/postgresql/18/extension/pg_bigm* /usr/share/postgresql/18/extension/

--
Gitblit v1.8.0