Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/developer-guide/core/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ git checkout ${branch_name}

## 构建 Fat Jar

构建之前需要修改 `gradle.properties` 中的 `version` 属性(推荐遵循 [SemVer 规范](https://semver.org/)),例如:`version=2.22.0`
构建之前需要修改 `gradle.properties` 中的 `version` 属性(推荐遵循 [SemVer 规范](https://semver.org/)),例如:`version=2.23.0`

```bash
cd path/to/halo
Expand Down
6 changes: 3 additions & 3 deletions docs/getting-started/install/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Halo 支持通过多种方式进行配置,目前 [Docker Compose 部署文档]
```yaml {5-10}
services:
halo:
image: registry.fit2cloud.com/halo/halo-pro:2.22
image: registry.fit2cloud.com/halo/halo-pro:2.23
...
command:
- --spring.r2dbc.url=r2dbc:pool:postgresql://halodb/halo
Expand Down Expand Up @@ -216,7 +216,7 @@ version: "3"

services:
halo:
image: registry.fit2cloud.com/halo/halo-pro:2.22
image: registry.fit2cloud.com/halo/halo-pro:2.23
restart: on-failure:3
depends_on:
halodb:
Expand Down Expand Up @@ -255,7 +255,7 @@ version: "3"

services:
halo:
image: registry.fit2cloud.com/halo/halo-pro:2.22
image: registry.fit2cloud.com/halo/halo-pro:2.23
restart: on-failure:3
depends_on:
halodb:
Expand Down
12 changes: 6 additions & 6 deletions docs/getting-started/install/docker-compose.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import DockerRegistryList from "./slots/_docker-registry-list.md"

services:
halo:
image: registry.fit2cloud.com/halo/halo-pro:2.22
image: registry.fit2cloud.com/halo/halo-pro:2.23
restart: on-failure:3
depends_on:
halodb:
Expand Down Expand Up @@ -107,7 +107,7 @@ import DockerRegistryList from "./slots/_docker-registry-list.md"

services:
halo:
image: registry.fit2cloud.com/halo/halo-pro:2.22
image: registry.fit2cloud.com/halo/halo-pro:2.23
restart: on-failure:3
depends_on:
halodb:
Expand Down Expand Up @@ -177,7 +177,7 @@ import DockerRegistryList from "./slots/_docker-registry-list.md"

services:
halo:
image: registry.fit2cloud.com/halo/halo-pro:2.22
image: registry.fit2cloud.com/halo/halo-pro:2.23
restart: on-failure:3
volumes:
- ./halo2:/root/.halo2
Expand All @@ -203,7 +203,7 @@ import DockerRegistryList from "./slots/_docker-registry-list.md"

services:
halo:
image: registry.fit2cloud.com/halo/halo-pro:2.22
image: registry.fit2cloud.com/halo/halo-pro:2.23
restart: on-failure:3
network_mode: "host"
volumes:
Expand Down Expand Up @@ -271,7 +271,7 @@ import DockerRegistryList from "./slots/_docker-registry-list.md"
```yaml {3}
services:
halo:
image: registry.fit2cloud.com/halo/halo-pro:2.22
image: registry.fit2cloud.com/halo/halo-pro:2.23
```

```bash
Expand Down Expand Up @@ -335,7 +335,7 @@ networks:

services:
halo:
image: registry.fit2cloud.com/halo/halo-pro:2.22
image: registry.fit2cloud.com/halo/halo-pro:2.23
restart: on-failure:3
volumes:
- ./halo2:/root/.halo2
Expand Down
6 changes: 3 additions & 3 deletions docs/getting-started/install/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import DockerRegistryList from "./slots/_docker-registry-list.md"
1. 创建容器

```bash
docker run -it -d --name halo -p 8090:8090 -v ~/.halo2:/root/.halo2 -e JVM_OPTS="-Xmx256m -Xms256m" registry.fit2cloud.com/halo/halo-pro:2.22
docker run -it -d --name halo -p 8090:8090 -v ~/.halo2:/root/.halo2 -e JVM_OPTS="-Xmx256m -Xms256m" registry.fit2cloud.com/halo/halo-pro:2.23
```

:::info
Expand Down Expand Up @@ -66,7 +66,7 @@ import DockerRegistryList from "./slots/_docker-registry-list.md"
2. 拉取新版本镜像

```bash
docker pull registry.fit2cloud.com/halo/halo-pro:2.22
docker pull registry.fit2cloud.com/halo/halo-pro:2.23
```

3. 停止运行中的容器
Expand All @@ -81,5 +81,5 @@ import DockerRegistryList from "./slots/_docker-registry-list.md"
修改版本号后,按照最初安装的方式,重新创建容器即可。

```bash
docker run -it -d --name halo -p 8090:8090 -v ~/.halo2:/root/.halo2 registry.fit2cloud.com/halo/halo-pro:2.22
docker run -it -d --name halo -p 8090:8090 -v ~/.halo2:/root/.halo2 registry.fit2cloud.com/halo/halo-pro:2.23
```
4 changes: 2 additions & 2 deletions docs/getting-started/install/jar-file.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ title: 使用 JAR 文件部署
:::

```bash
wget https://dl.halo.run/release/halo-pro-2.22.3.jar -O halo.jar
wget https://dl.halo.run/release/halo-pro-2.23.0.jar -O halo.jar
```

4. 创建 [工作目录](../prepare#工作目录)
Expand Down Expand Up @@ -310,7 +310,7 @@ journalctl -n 20 -u halo
3. 下载新版本的 Halo 运行包,覆盖原有的运行包

```bash
wget https://dl.halo.run/release/halo-pro-2.22.3.jar -O /home/halo/app/halo.jar
wget https://dl.halo.run/release/halo-pro-2.23.0.jar -O /home/halo/app/halo.jar
```

:::info
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started/install/other/nginxproxymanager.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ docker compose up -d

services:
halo:
image: registry.fit2cloud.com/halo/halo-pro:2.22
image: registry.fit2cloud.com/halo/halo-pro:2.23
container_name: halo
restart: on-failure:3
volumes:
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started/install/other/traefik.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ networks:

services:
halo:
image: registry.fit2cloud.com/halo/halo-pro:2.22
image: registry.fit2cloud.com/halo/halo-pro:2.23
container_name: halo
restart: on-failure:3
volumes:
Expand Down
12 changes: 6 additions & 6 deletions docs/getting-started/install/podman.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Podman 采用无守护进程的包容性架构,因此可以更安全、更简

```bash
mkdir -p ~/.halo2
podman run -it -d --name halo -p 8090:8090 -v ~/.halo2:/root/.halo2 registry.fit2cloud.com/halo/halo-pro:2.22
podman run -it -d --name halo -p 8090:8090 -v ~/.halo2:/root/.halo2 registry.fit2cloud.com/halo/halo-pro:2.23
```

:::info
Expand Down Expand Up @@ -96,7 +96,7 @@ Podman 采用无守护进程的包容性架构,因此可以更安全、更简
2. 拉取新版本镜像

```bash
podman pull registry.fit2cloud.com/halo/halo-pro:2.22
podman pull registry.fit2cloud.com/halo/halo-pro:2.23
```

3. 停止运行中的容器
Expand All @@ -111,7 +111,7 @@ Podman 采用无守护进程的包容性架构,因此可以更安全、更简
修改版本号后,按照最初安装的方式,重新创建容器即可。

```bash
podman run -it -d --name halo -p 8090:8090 -v ~/.halo2:/root/.halo2 registry.fit2cloud.com/halo/halo-pro:2.22
podman run -it -d --name halo -p 8090:8090 -v ~/.halo2:/root/.halo2 registry.fit2cloud.com/halo/halo-pro:2.23
```

## 使用 [Podman Quadlet](https://docs.podman.io/en/latest/markdown/podman-systemd.unit.5.html)
Expand Down Expand Up @@ -147,7 +147,7 @@ Environment=SPRING_CONFIG_LOCATION="optional:classpath:/;optional:file:/.halo/"
Environment=TZ=Asia/Shanghai
Volume=/opt/podman-data/halo:/.halo
PublishPort=127.0.0.1:8090:8090
Image=ghcr.io/halo-dev/halo:2.22
Image=ghcr.io/halo-dev/halo:2.23
Exec=--halo.external-url=https://localhost:8090 --spring.sql.init.platform=postgresql --spring.r2dbc.url=r2dbc:pool:postgresql://127.0.0.1:5432/my-db --spring.r2dbc.username=my-user --spring.r2dbc.password=my-password

[Service]
Expand Down Expand Up @@ -176,7 +176,7 @@ Podman Quadlet 解析:

`[Container]` 部分:

- `AutoUpdate=registry`指定了自动拉取容器。假设后续 Halo 镜像支持了`latest`标签,你需要`systemctl enable --now podman-auto-update.timer`以启用容器自动更新。本文示例`ghcr.io/halo-dev/halo:2.22`,将会自动更新适用与`2.22`版本的 patch,例如您创建容器时是`2.22.1`,在官方发布`2.22.2`版本时,容器会自动更新到`2.22.2`。
- `AutoUpdate=registry`指定了自动拉取容器。假设后续 Halo 镜像支持了`latest`标签,你需要`systemctl enable --now podman-auto-update.timer`以启用容器自动更新。本文示例`ghcr.io/halo-dev/halo:2.23`,将会自动更新适用与`2.23`版本的 patch,例如您创建容器时是`2.23.1`,在官方发布`2.23.2`版本时,容器会自动更新到`2.23.2`。
- `ContainerName=`指定了 systemd 将生成的服务名称。
- `User=60000 Group=60000 UserNS=keep-id:uid=60000,gid=60000` 限制容器以 id 60000 的用户运行,提高安全性。注意这个 id 60000 请根据你实际想要运行的用户名来修改,可通过`id user`获得你的用户的 id.
- `Environment=`字段指定了容器的环境变量,其中你需要注意的是`Environment=HALO_WORK_DIR="/.halo"` `Environment=SPRING_CONFIG_LOCATION="optional:classpath:/;optional:file:/.halo/"`这两个变量中的`/.halo`路径。
Expand Down Expand Up @@ -219,7 +219,7 @@ AutoUpdate=registry
ContainerName=halo
Volume=/opt/podman-data/halo:/root/.halo
PublishPort=127.0.0.1:8090:8090
Image=ghcr.io/halo-dev/halo:2.22
Image=ghcr.io/halo-dev/halo:2.23
Exec=--halo.external-url=https://localhost:8090 --spring.sql.init.platform=postgresql --spring.r2dbc.url=r2dbc:pool:postgresql://127.0.0.1:5432/my-db --spring.r2dbc.username=my-user --spring.r2dbc.password=my-password

[Service]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ halohub/halo-pro:<version>
halohub/halo:<version>
```

`<version>` 表示 Halo 的具体版本号,比如 `2.22.0`,版本命名方式遵循 [SemVer](https://semver.org/lang/zh-CN/),即 `<major>.<minor>.<patch>`
`<version>` 表示 Halo 的具体版本号,比如 `2.23.0`,版本命名方式遵循 [SemVer](https://semver.org/lang/zh-CN/),即 `<major>.<minor>.<patch>`

除了具体版本号的标签之外,Halo 还提供了 `:<major>` 和 `:<major>.<minor>` 的标签,比如:

Expand Down
2 changes: 1 addition & 1 deletion docs/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ slug: /
如果你的设备有 Docker 环境,可以使用以下命令快速启动一个 Halo 的体验环境:

```bash
docker run -d --name halo -p 8090:8090 -v ~/.halo2:/root/.halo2 halohub/halo:2.22
docker run -d --name halo -p 8090:8090 -v ~/.halo2:/root/.halo2 halohub/halo:2.23
```

或者点击下方按钮使用 [Gitpod](https://gitpod.io/) 启动一个体验环境:
Expand Down
4 changes: 2 additions & 2 deletions docs/user-guide/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,15 @@ server {
--name halo-1 \
-p 8090:8090 \
-v ~/.halo2:/root/.halo2 \
registry.fit2cloud.com/halo/halo-pro:2.22 \
registry.fit2cloud.com/halo/halo-pro:2.23 \

# 第二个 Halo 容器
docker run \
-it -d \
--name halo-2 \
-p 8091:8090 \
-v ~/.halo2_2:/root/.halo2 \
registry.fit2cloud.com/halo/halo-pro:2.22 \
registry.fit2cloud.com/halo/halo-pro:2.23 \
```

更多 Docker 相关的教程请参考:[使用 Docker 部署 Halo](../getting-started/install/docker.md)
Expand Down
4 changes: 2 additions & 2 deletions docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const config = {
routeBasePath: "/",
showLastUpdateTime: true,
showLastUpdateAuthor: true,
lastVersion: "2.22",
lastVersion: "2.23",
versions: {
current: {
label: "next",
Expand Down Expand Up @@ -74,7 +74,7 @@ const config = {
sitemap: {
changefreq: "weekly",
priority: 0.5,
ignorePatterns: ["/2.18/**", "/2.19/**", "/2.20/**", "/2.21/**"],
ignorePatterns: ["/2.18/**", "/2.19/**", "/2.20/**", "/2.21/**", "/2.22/**"],
},
googleAnalytics: {
trackingID: "UA-110780416-7",
Expand Down
48 changes: 24 additions & 24 deletions i18n/zh-Hans/code.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
"message": "页面已崩溃。",
"description": "The title of the fallback page when the page crashed"
},
"theme.BackToTopButton.buttonAriaLabel": {
"message": "回到顶部",
"description": "The ARIA label for the back to top button"
},
"theme.blog.archive.title": {
"message": "历史博文",
"description": "The page & hero title of the blog archive page"
Expand All @@ -21,6 +17,10 @@
"message": "历史博文",
"description": "The page & hero description of the blog archive page"
},
"theme.BackToTopButton.buttonAriaLabel": {
"message": "回到顶部",
"description": "The ARIA label for the back to top button"
},
"theme.blog.paginator.navAriaLabel": {
"message": "博文列表分页导航",
"description": "The ARIA label for the blog pagination"
Expand Down Expand Up @@ -96,6 +96,10 @@
"theme.docs.versionBadge.label": {
"message": "版本:{versionLabel}"
},
"theme.common.editThisPage": {
"message": "编辑此页",
"description": "The link label to edit the current page"
},
"theme.docs.versions.unreleasedVersionLabel": {
"message": "此为 {siteTitle} {versionLabel} 版尚未发行的文档。",
"description": "The label used to tell the user that he's browsing an unreleased doc version"
Expand All @@ -112,10 +116,6 @@
"message": "最新版本",
"description": "The label used for the latest version suggestion link label"
},
"theme.common.editThisPage": {
"message": "编辑此页",
"description": "The link label to edit the current page"
},
"theme.common.headingLinkTitle": {
"message": "{heading}的直接链接",
"description": "Title for link to heading"
Expand Down Expand Up @@ -204,10 +204,6 @@
"message": "本页总览",
"description": "The label used by the button on the collapsible TOC component"
},
"theme.navbar.mobileLanguageDropdown.label": {
"message": "选择语言",
"description": "The label for the mobile language switcher dropdown"
},
"theme.blog.post.readMore": {
"message": "阅读更多",
"description": "The label used in blog post item excerpts to link to full blog posts"
Expand All @@ -216,6 +212,10 @@
"message": "阅读 {title} 的全文",
"description": "The ARIA label for the link to full blog posts from excerpts"
},
"theme.navbar.mobileLanguageDropdown.label": {
"message": "选择语言",
"description": "The label for the mobile language switcher dropdown"
},
"theme.blog.post.readingTime.plurals": {
"message": "阅读需 {readingTime} 分钟",
"description": "Pluralized label for \"{readingTime} min read\". Use as much plural forms (separated by \"|\") as your language support (see https://www.unicode.org/cldr/cldr-aux/charts/34/supplemental/language_plural_rules.html)"
Expand All @@ -224,10 +224,6 @@
"message": "切换自动换行",
"description": "The title attribute for toggle word wrapping button of code block lines"
},
"theme.docs.breadcrumbs.home": {
"message": "主页面",
"description": "The ARIA label for the home page in the breadcrumbs"
},
"theme.docs.sidebar.navAriaLabel": {
"message": "文档侧边栏",
"description": "The ARIA label for the sidebar navigation"
Expand All @@ -240,6 +236,10 @@
"message": "收起侧边栏",
"description": "The title attribute for collapse button of doc sidebar"
},
"theme.docs.breadcrumbs.home": {
"message": "主页面",
"description": "The ARIA label for the home page in the breadcrumbs"
},
"theme.CodeBlock.copy": {
"message": "复制",
"description": "The copy button label on code blocks"
Expand All @@ -252,6 +252,14 @@
"message": "复制代码到剪贴板",
"description": "The ARIA label for copy code blocks button"
},
"theme.navbar.mobileDropdown.collapseButton.expandAriaLabel": {
"message": "Expand the dropdown",
"description": "The ARIA label of the button to expand the mobile dropdown navbar item"
},
"theme.navbar.mobileDropdown.collapseButton.collapseAriaLabel": {
"message": "Collapse the dropdown",
"description": "The ARIA label of the button to collapse the mobile dropdown navbar item"
},
"theme.docs.sidebar.closeSidebarButtonAriaLabel": {
"message": "关闭导航栏",
"description": "The ARIA label for close button of mobile sidebar"
Expand All @@ -264,14 +272,6 @@
"message": "切换导航栏",
"description": "The ARIA label for hamburger menu button of mobile navigation"
},
"theme.navbar.mobileDropdown.collapseButton.expandAriaLabel": {
"message": "Expand the dropdown",
"description": "The ARIA label of the button to expand the mobile dropdown navbar item"
},
"theme.navbar.mobileDropdown.collapseButton.collapseAriaLabel": {
"message": "Collapse the dropdown",
"description": "The ARIA label of the button to collapse the mobile dropdown navbar item"
},
"theme.docs.sidebar.expandButtonTitle": {
"message": "展开侧边栏",
"description": "The ARIA label and title attribute for expand button of doc sidebar"
Expand Down
Loading
Loading