From 040d560aff65ad8fa0324ae4fea90915058d53be Mon Sep 17 00:00:00 2001
From: "jif2.zhang" <jif2.zhang>
Date: Mon, 26 Oct 2026 00:19:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(0.2.1):=20!env=20=E4=B8=BA=20YAML=20?=
 =?UTF-8?q?=E6=95=B4=E5=80=BC=E6=A0=87=E7=AD=BE=20=E2=80=94=E2=80=94=20URI?=
 =?UTF-8?q?=20=E7=94=B1=20compose=20=E7=BB=84=E8=A3=85=E5=90=8E=E6=95=B4?=
 =?UTF-8?q?=E5=80=BC=E6=B3=A8=E5=85=A5=20(PS=5FSOURCE=5FURI/PS=5FSTORAGE?=
 =?UTF-8?q?=5FURI)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/0.2.1/docker-compose.yml     | 6 +++---
 deploy/0.2.1/powersync/service.yaml | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/deploy/0.2.1/docker-compose.yml b/deploy/0.2.1/docker-compose.yml
index 13ad223..0f598bf 100644
--- a/deploy/0.2.1/docker-compose.yml
+++ b/deploy/0.2.1/docker-compose.yml
@@ -62,9 +62,9 @@ services:
       - ./powersync/sync-config.yaml:/config/sync-config.yaml:ro
     environment:
       POWERSYNC_CONFIG_PATH: /config/service.yaml
-      # service.yaml 内 !env PS_* 引用
-      PS_PG_PASSWORD: ${PG_PASSWORD}
-      PS_STORAGE_PASSWORD: ${PS_STORAGE_PASSWORD}
+      # service.yaml 内 !env PS_* 引用 (整值替换; URI 在此组装)
+      PS_SOURCE_URI: postgresql://iboard021:${PG_PASSWORD}@pg:5432/iboard021?sslmode=disable
+      PS_STORAGE_URI: postgresql://powersync_storage:${PS_STORAGE_PASSWORD}@pg:5432/iboard021?sslmode=disable
       PS_JWT_KEY_B64: ${POWERSYNC_JWT_KEY_B64:?POWERSYNC_JWT_KEY_B64 missing}
     ports:
       - "13002:8080"
diff --git a/deploy/0.2.1/powersync/service.yaml b/deploy/0.2.1/powersync/service.yaml
index 77a21b6..757674d 100644
--- a/deploy/0.2.1/powersync/service.yaml
+++ b/deploy/0.2.1/powersync/service.yaml
@@ -1,18 +1,19 @@
 # PowerSync Service 主配置 (0.2.1 验证部署)
 # 参考: https://docs.powersync.com/configuration/powersync-service/self-hosted-instances
-# !env 仅支持 PS_ 前缀变量, 由 docker-compose environment 注入
+# 注意: !env 是 YAML 整值标签, 只能整个值替换变量, 不能内嵌在 URI 字符串中;
+#       完整连接串由 docker-compose 以 PS_* 环境变量注入。
 
 replication:
   connections:
     - type: postgresql
       # 源库: 本栈 pg 容器 (0.2.1 独立实例), 复制走 iboard021 账号
-      uri: postgresql://iboard021:!env PS_PG_PASSWORD@pg:5432/iboard021
+      uri: !env PS_SOURCE_URI
       sslmode: disable
 
 # bucket storage: 同实例 PG (16 >= 14 允许同库不同 schema, service 自建 powersync schema)
 storage:
   type: postgresql
-  uri: postgresql://powersync_storage:!env PS_STORAGE_PASSWORD@pg:5432/iboard021
+  uri: !env PS_STORAGE_URI
   sslmode: disable
 
 port: 8080