Skip to content

World's first open-source enterprise world model.

The compose pin follows the release: rc7 now, and the guide says a release moves it (#944)

WaylandYanga1ccadf8768b
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6334a1e6..2c92e8e2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -26,6 +26,7 @@ Merging `dev → main` is done by maintainers on their own schedule; contributor
- **Back-merge `main` into `dev` right after a release.** The `dev → main` merge commit lives only on `main`, so without this `main` reads as ahead even though the trees are identical, and the gap grows by one every release.
- **Urgent fixes go through `dev` too.** A PR opened straight against `main` is the one thing that makes the two branches genuinely diverge, and then someone has to reconcile them by hand.
+- **A release moves the compose pin.** `docker-compose.yml` defaults `UTOPIA_IMAGE` to a fixed tag, and that tag is what the README's one-command start actually runs. Cutting a release is: merge `dev → main`, tag and publish, then a PR on `dev` that points the pin at the new tag. rc6 and rc7 shipped with the pin still on rc5, so everyone who followed the README ran a three-week-old build. Tags from rc8 on are multi-arch; until the pin reaches one of them, arm64 hosts cannot pull the default image.
Both branches are protected: pull request required, CI (`backend` and `web`) must pass, no force pushes, no deletions, and admins are held to the same rules.
diff --git a/CONTRIBUTING.zh-CN.md b/CONTRIBUTING.zh-CN.md
index fda2dcfe..95037569 100644
--- a/CONTRIBUTING.zh-CN.md
+++ b/CONTRIBUTING.zh-CN.md
@@ -26,6 +26,7 @@ git push -u origin fix/some-thing
- **发版之后紧接着把 `main` 回合进 `dev`。** `dev → main` 那个 merge 节点只存在于 `main`,不回合的话 `main` 会显示成领先,尽管两边文件一模一样,而且每发一版就多领先一个。
- **紧急修复也走 `dev`。** 直接对 `main` 开 PR 是唯一会让两条分支真正分叉的口子,分叉之后就得有人手工对账。
+- **发版要把 compose 的固定标签跟上。** `docker-compose.yml` 里 `UTOPIA_IMAGE` 默认指向一个固定标签,README 那条「一条命令启动」跑的就是它。发一版的完整动作是:`dev → main` 合并、打标签发布,然后在 `dev` 上开一个 PR 把这个固定值改到新标签。rc6、rc7 发版时都漏了这一步,照 README 起来的人跑的是三周前的 rc5。rc8 起的标签是多架构的,固定值没指到多架构标签之前,arm64 主机拉不到默认镜像。
两个分支都开了保护:必须走 PR,CI(`backend` 与 `web`)必须通过,禁止强推与删除,管理员同样受约束。
diff --git a/docker-compose.yml b/docker-compose.yml
index 3d1a3c2e..4f36c299 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,7 +43,7 @@ services:
# 写一个不存在的标签,clone 下来第一步就是 manifest unknown。
# 所以撤掉一个版本时必须连它一起改——0.1.0 撤了,现在指向 rc。
# 转正之后改回 0.1.0(或改成 latest 让它自动跟随)。
- image: ${UTOPIA_IMAGE:-ghcr.io/deeplethe/utopia:0.1.0-rc5}
+ image: ${UTOPIA_IMAGE:-ghcr.io/deeplethe/utopia:0.1.0-rc7}
profiles: ["app"]
environment:
# 默认以 owner 身份运行。要启用受限角色(业务表随便读写、台账只增不改),