From 3e140c3b39c02eda5d420fc1937e9b8439481953 Mon Sep 17 00:00:00 2001 From: Abby <78209557+abby-cyber@users.noreply.github.com> Date: Mon, 1 Nov 2021 14:17:14 +0800 Subject: [PATCH 1/4] Update 3.deploy-nebula-graph-with-docker-compose.md --- ...deploy-nebula-graph-with-docker-compose.md | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) 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 ff610bd695b..a8738fe484e 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 @@ -27,7 +27,7 @@ `master`分支包含最新的未测试代码。请**不要**在生产环境使用此版本。 ```bash - $ git clone -b v{{dockercompose.release}} https://github.com/vesoft-inc/nebula-docker-compose.git + $ git clone -b {{dockercompose.branch}} https://github.com/vesoft-inc/nebula-docker-compose.git ``` 2. 切换至目录`nebula-docker-compose`。 @@ -175,24 +175,24 @@ $ docker-compose down 如果返回如下信息，表示已经成功停止服务。 ```bash -Stopping nebula-docker-compose_storaged0_1 ... done +Stopping nebula-docker-compose_graphd2_1 ... done Stopping nebula-docker-compose_graphd1_1 ... done Stopping nebula-docker-compose_graphd_1 ... done Stopping nebula-docker-compose_storaged1_1 ... done -Stopping nebula-docker-compose_graphd2_1 ... done Stopping nebula-docker-compose_storaged2_1 ... done +Stopping nebula-docker-compose_storaged0_1 ... done Stopping nebula-docker-compose_metad0_1 ... done -Stopping nebula-docker-compose_metad2_1 ... done Stopping nebula-docker-compose_metad1_1 ... done -Removing nebula-docker-compose_storaged0_1 ... done +Stopping nebula-docker-compose_metad2_1 ... done +Removing nebula-docker-compose_graphd2_1 ... done Removing nebula-docker-compose_graphd1_1 ... done Removing nebula-docker-compose_graphd_1 ... done Removing nebula-docker-compose_storaged1_1 ... done -Removing nebula-docker-compose_graphd2_1 ... done Removing nebula-docker-compose_storaged2_1 ... done +Removing nebula-docker-compose_storaged0_1 ... done Removing nebula-docker-compose_metad0_1 ... done -Removing nebula-docker-compose_metad2_1 ... done Removing nebula-docker-compose_metad1_1 ... done +Removing nebula-docker-compose_metad2_1 ... done Removing network nebula-docker-compose_nebula-net ``` @@ -224,9 +224,20 @@ graphd: `9669:9669`表示内部的9669映射到外部的端口也是9669，下方的`19669`表示内部的19669映射到外部的端口是随机的。 -### 如何更新Nebula Graph服务的Docker镜像？ +### 如何升级/更新Nebula Graph服务的Docker镜像？ + +1. 在文件`nebula-docker-compose/docker-compose.yaml`中，找到所有服务的`image`并修改其值为相应的镜像版本。 + +2. 在目录`nebula-docker-compose`内执行命令`docker-compose pull`，更新Graph服务、Storage服务和Meta服务的镜像。 + + !!! note + 执行`docker-compose pull`命令更新服务镜像前，确保已停止Nebula Graph。 + +3. 通过Nebula Console连接Nebula Graph后，分别执行命令`show hosts graph`、`show hosts storage`、`show hosts meta`查看各服务版本。 -在目录`nebula-docker-compose`内执行命令`docker-compose pull`，可以更新Graph服务、Storage服务和Meta服务的镜像。 +### 如何停止Nebula Graph服务？ + +在目录`nebula-docker-compose`内，执行命令`docker-compose down`停止Nebula Graph服务。 ### 执行命令`docker-compose pull`报错`ERROR: toomanyrequests` @@ -244,17 +255,6 @@ graphd: docker pull vesoft/nebula-console:{{console.branch}} ``` -### 如何升级Nebula Graph？ - -更新Nebula Graph的Docker镜像并重启服务： - -1. 在目录`nebula-docker-compose`内，执行命令`docker-compose pull`更新Nebula Graph的Docker镜像。 - -2. 执行命令`docker-compose down`停止Nebula Graph服务。 - -3. 执行命令`docker-compose up -d`启动Nebula Graph服务。 - - ### 为什么更新nebula-docker-compose仓库（Nebula Graph 2.0.0-RC）后，无法通过端口`3699`连接Nebula Graph？ 在 Nebula Graph 2.0.0-RC 版本，默认端口从`3699`改为`9669`。请使用`9669`端口连接，或修改配置文件`docker-compose.yaml`内的端口。 From 06b0e208ead05cea6e94d430132b99a429339754 Mon Sep 17 00:00:00 2001 From: Abby <78209557+abby-cyber@users.noreply.github.com> Date: Mon, 1 Nov 2021 14:33:46 +0800 Subject: [PATCH 2/4] Update 3.deploy-nebula-graph-with-docker-compose.md --- .../3.deploy-nebula-graph-with-docker-compose.md | 4 ---- 1 file changed, 4 deletions(-) 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 a8738fe484e..bacbd4c34b8 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 @@ -235,10 +235,6 @@ graphd: 3. 通过Nebula Console连接Nebula Graph后，分别执行命令`show hosts graph`、`show hosts storage`、`show hosts meta`查看各服务版本。 -### 如何停止Nebula Graph服务？ - -在目录`nebula-docker-compose`内，执行命令`docker-compose down`停止Nebula Graph服务。 - ### 执行命令`docker-compose pull`报错`ERROR: toomanyrequests` 可能遇到如下错误： From 750b9c3b86a1f1cbe5ac128478ca52bfec59f1da Mon Sep 17 00:00:00 2001 From: Abby <78209557+abby-cyber@users.noreply.github.com> Date: Mon, 1 Nov 2021 14:48:56 +0800 Subject: [PATCH 3/4] Update 3.deploy-nebula-graph-with-docker-compose.md --- .../3.deploy-nebula-graph-with-docker-compose.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 bacbd4c34b8..49a253895d9 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 @@ -40,7 +40,7 @@ !!! Note - 如果长期未更新镜像，请先更新[Nebula Graph镜像](#nebula_graphdocker)和[Nebula Console镜像](#nebula_console)。 + 如果长期未更新镜像，请先更新[Nebula Graph镜像](#如何升级更新nebula-graph服务的docker镜像)和[Nebula Console镜像](#nebula_console)。 ```bash [nebula-docker-compose]$ docker-compose up -d @@ -233,8 +233,10 @@ graphd: !!! note 执行`docker-compose pull`命令更新服务镜像前，确保已停止Nebula Graph。 -3. 通过Nebula Console连接Nebula Graph后，分别执行命令`show hosts graph`、`show hosts storage`、`show hosts meta`查看各服务版本。 +3. 执行命令`docker-compose up -d`启动Nebula Graph服务。 +4. 通过Nebula Console连接Nebula Graph后，分别执行命令`show hosts graph`、`show hosts storage`、`show hosts meta`查看各服务版本。 + ### 执行命令`docker-compose pull`报错`ERROR: toomanyrequests` 可能遇到如下错误： From 1c079cfd2b9f34703662b2ac60d547a268ba8f41 Mon Sep 17 00:00:00 2001 From: Abby <78209557+abby-cyber@users.noreply.github.com> Date: Mon, 1 Nov 2021 16:48:31 +0800 Subject: [PATCH 4/4] Update 3.deploy-nebula-graph-with-docker-compose.md --- .../3.deploy-nebula-graph-with-docker-compose.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 49a253895d9..cef0a88b97e 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 @@ -40,7 +40,7 @@ !!! Note - 如果长期未更新镜像，请先更新[Nebula Graph镜像](#如何升级更新nebula-graph服务的docker镜像)和[Nebula Console镜像](#nebula_console)。 + 如果长期未更新镜像，请先更新[Nebula Graph镜像](#nebula_graphdocker)和[Nebula Console镜像](#nebula_console)。 ```bash [nebula-docker-compose]$ docker-compose up -d