From 9cad0e502b6a4d099248a54be641808825f976b2 Mon Sep 17 00:00:00 2001 From: "abby.huang" <78209557+abby-cyber@users.noreply.github.com> Date: Tue, 29 Mar 2022 11:34:21 +0800 Subject: [PATCH] add new branch 3.0.2 (#1608) --- .github/workflows/deploy.yaml | 14 +++++++------- docs-2.0/20.appendix/releasenote.md | 8 ++------ .../1.resource-preparations.md | 4 ++++ .../3.deploy-nebula-graph-with-docker-compose.md | 5 ++--- mkdocs.yml | 8 ++++---- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index dc48bdb6b89..1334566f206 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -2,7 +2,7 @@ name: Publish docs via GitHub Pages on: push: branches: - - v3.0.1 + - v3.0.2 jobs: deploy: @@ -35,11 +35,11 @@ jobs: - name: mike list delete run: | mike list - - name: Mike Deploy 3.0.1 + - name: Mike Deploy 3.0.2 run: | - #mike delete v3.0.1 -p - mike deploy 3.0.1 -p --rebase - mike set-default 3.0.1 -p --rebase + #mike delete v3.0.2 -p + mike deploy 3.0.2 -p --rebase + mike set-default 3.0.2 -p --rebase mike list - name: show git branch run: | @@ -47,7 +47,7 @@ jobs: git checkout gh-pages - name: Compress run: | - tar -vczf nebula-docs.tar.gz 3.0.1 versions.json *.html + tar -vczf nebula-docs.tar.gz 3.0.2 versions.json *.html - name: Transfer # uses: garygrossgarten/github-action-scp@release @@ -71,7 +71,7 @@ jobs: mkdir -p /usr/web/nebula-docs/ tar -xzf /usr/web/nebula-docs.tar.gz -C /usr/web/nebula-docs/ mkdir -p /usr/web/nebula-docs/site/pdf/ - cp -f /usr/web/nebula-docs/3.0.1/pdf/NebulaGraph-CN.pdf /usr/web/nebula-docs/site/pdf/NebulaGraph-book.pdf + cp -f /usr/web/nebula-docs/3.0.2/pdf/NebulaGraph-CN.pdf /usr/web/nebula-docs/site/pdf/NebulaGraph-book.pdf # pip3 install --upgrade pip # pip3 install -r /usr/web/nebula-docs/requirement.txt diff --git a/docs-2.0/20.appendix/releasenote.md b/docs-2.0/20.appendix/releasenote.md index e5f6ee492fc..9e9287aa6ac 100644 --- a/docs-2.0/20.appendix/releasenote.md +++ b/docs-2.0/20.appendix/releasenote.md @@ -2,13 +2,9 @@ ## Bug fix -- 修复`ADD HOSTS`后 Storage 服务可能需要等待较长时间才能在线（`ONLINE`）的缺陷。 [#3950](https://github.com/vesoft-inc/nebula/pull/3950) +- 支持在 ARM 架构上使用 Docker 镜像运行 Nebula Graph。[#3939](https://github.com/vesoft-inc/nebula/pull/3939/) -- 修复了早于 v2.6 版本的客户端连接 Nebula Graph 时，Graph 服务会崩溃的缺陷。 [#3942](https://github.com/vesoft-inc/nebula/pull/3942) - -- 修复了如果图空间中没有 Tag 会导致升级时升级工具崩溃的缺陷。 [#3920](https://github.com/vesoft-inc/nebula/pull/3920) - -- 修复了`MATCH , , `时，Graph 服务会崩溃的缺陷。 [#3915](https://github.com/vesoft-inc/nebula/pull/3915) +- 优化了版本配套的服务端连接客户端的处理，避免客户端连接可能会失效问题。[#4075](https://github.com/vesoft-inc/nebula/pull/3942) ## 历史版本 diff --git a/docs-2.0/4.deployment-and-installation/1.resource-preparations.md b/docs-2.0/4.deployment-and-installation/1.resource-preparations.md index 8326bd5a8c2..9dd34fdc962 100644 --- a/docs-2.0/4.deployment-and-installation/1.resource-preparations.md +++ b/docs-2.0/4.deployment-and-installation/1.resource-preparations.md @@ -238,3 +238,7 @@ Nebula Graph 是针对 NVMe SSD 进行设计和实现的，所有默认参数都 !!! enterpriseonly Nebula Graph {{ nebula.release }} 仅企业版支持在 ARM 架构（包括 Apple Mac M1 或者华为鲲鹏）上运行。访问官网获取[商业支持](https://nebula-graph.com.cn/pricing/)。 + +!!! note + + 从 Nebula Graph 3.0.2 开始，社区用户可以在 ARM macOS 的 Docker Desktop 上或者 ARM Linux Server 上运行容器化的 Nebula Graph。 \ No newline at end of file diff --git a/docs-2.0/4.deployment-and-installation/2.compile-and-install-nebula-graph/3.deploy-nebula-graph-with-docker-compose.md b/docs-2.0/4.deployment-and-installation/2.compile-and-install-nebula-graph/3.deploy-nebula-graph-with-docker-compose.md index 86249e53c41..3534f258325 100644 --- a/docs-2.0/4.deployment-and-installation/2.compile-and-install-nebula-graph/3.deploy-nebula-graph-with-docker-compose.md +++ b/docs-2.0/4.deployment-and-installation/2.compile-and-install-nebula-graph/3.deploy-nebula-graph-with-docker-compose.md @@ -38,9 +38,8 @@ 3. 执行如下命令启动 Nebula Graph 服务。 - + 从 3.0.2 开始，Nebula Graph 在 Docker Hub 上的 Docker 支持 ARM64 架构。用户可以在 ARM macOS 的 Docker Desktop 上或者 ARM Linux Server 上运行容器化的 Nebula Graph。 + !!! Note diff --git a/mkdocs.yml b/mkdocs.yml index becdb12cd51..5ad9d1a4e14 100755 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -2,7 +2,7 @@ site_name: Nebula Graph Database 手册 site_description: Documentation for Nebula Graph Database site_author: Nebula Graph site_url: https://docs.nebula-graph.com.cn/ -edit_uri: 'edit/v3.0.1/docs-2.0/' +edit_uri: 'edit/v3.0.2/docs-2.0/' docs_dir: docs-2.0 # repository @@ -43,12 +43,12 @@ extra: provider: google property: UA-60523578-15 nebula: - release: 3.0.1 + release: 3.0.2 nightly: nightly master: master base20: 2.0 base200: 2.0.0 - branch: v3.0.1 + branch: v3.0.2 version: method: mike social: @@ -566,7 +566,7 @@ plugins: - with-pdf: copyright: 2022 vesoft Inc. - cover_subtitle: v3.0.1 + cover_subtitle: v3.0.2 author: 吴敏，周瑶，梁振亚，杨怡璇，黄凤仙 cover: true back_cover: true