Skip to content

Commit

Permalink
change eco-tools (#1106)
Browse files Browse the repository at this point in the history
console, importer, Docker Compose, Go, Python, Java
  • Loading branch information
cooper-lzy authored Oct 27, 2021
1 parent c2471b6 commit 84dc9b1
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 29 deletions.
14 changes: 7 additions & 7 deletions docs-2.0/20.appendix/6.eco-tool-version.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Nebula Importer(简称Importer)是一款Nebula Graph的CSV文件导入工具

|Nebula Graph版本|[Importer](https://github.com/vesoft-inc/nebula-importer/tree/{{importer.branch}})版本(commit id)|
|:---|:---|
| {{ nebula.release }} | {{importer.release}}(5c7417d|
| {{ nebula.release }} | {{importer.release}}(43234f3|

## Nebula Spark Connector

Expand Down Expand Up @@ -108,15 +108,15 @@ Nebula Console是Nebula Graph的原生CLI客户端。如何使用请参见[连

|Nebula Graph版本|Console版本(commit id)|
|:---|:---|
| {{ nebula.release }} | {{console.release}}(3ce5151|
| {{ nebula.release }} | {{console.release}}(0834198 |

## Nebula Docker Compose

Docker Compose可以快速部署Nebula Graph集群。如何使用请参见[Docker Compose部署Nebula Graph](../4.deployment-and-installation/2.compile-and-install-nebula-graph/3.deploy-nebula-graph-with-docker-compose.md)

|Nebula Graph版本|Docker Compose版本(commit id)|
|:---|:---|
| {{ nebula.release }} | {{dockercompose.release}}(d42231f|
| {{ nebula.release }} | {{dockercompose.release}}(a6e9d78|

<!--
## Backup & Restore
Expand Down Expand Up @@ -144,10 +144,10 @@ Docker Compose可以快速部署Nebula Graph集群。如何使用请参见[Docke

|Nebula Graph版本| 语言(commit id) |
|:---| :--- |
| {{ nebula.release }}| [C++](https://github.com/vesoft-inc/nebula-cpp)(00e2625) |
| {{ nebula.release }}| [Go](https://github.com/vesoft-inc/nebula-go/tree/{{go.branch}})8a1495a|
| {{ nebula.release }}| [Python](https://github.com/vesoft-inc/nebula-python)(98e08e4|
| {{ nebula.release }}| [Java Client](https://github.com/vesoft-inc/nebula-java/tree/{{java.branch}})0fbc3c6|
| {{ nebula.release }}| [C++](https://github.com/vesoft-inc/nebula-cpp/tree/{{cpp.branch}})(00e2625) |
| {{ nebula.release }}| [Go](https://github.com/vesoft-inc/nebula-go/tree/{{go.branch}})02eb246|
| {{ nebula.release }}| [Python](https://github.com/vesoft-inc/nebula-python/tree/{{python.branch}})(6e467a9|
| {{ nebula.release }}| [Java](https://github.com/vesoft-inc/nebula-java/tree/{{java.branch}})8e171e4|

## 未发布

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
1. 使用Nebula Console镜像启动一个容器,并连接到Nebula Graph服务所在的网络(nebula-docker-compose_nebula-net)中。

```bash
$ docker run --rm -ti --network nebula-docker-compose_nebula-net --entrypoint=/bin/sh vesoft/nebula-console:v2.5.0
$ docker run --rm -ti --network nebula-docker-compose_nebula-net --entrypoint=/bin/sh vesoft/nebula-console:{{console.branch}}
```

!!! Note
Expand Down Expand Up @@ -217,7 +217,7 @@ Docker Compose部署的Nebula Graph,配置文件位置为`nebula-docker-compos

```bash
graphd:
image: vesoft/nebula-graphd:v2.5.0
image: vesoft/nebula-graphd:{{nebula.branch}}
...
ports:
- 9669:9669
Expand All @@ -244,7 +244,7 @@ graphd:
执行如下命令可以更新Nebula Console客户端镜像。

```bash
docker pull vesoft/nebula-console:v2.5.0
docker pull vesoft/nebula-console:{{console.branch}}
```

### 如何升级Nebula Graph?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Nebula Graph v2.0.x升级至v{{nebula.release}},只需要使用v{{nebula.relea

## Docker Compose部署升级步骤

1. 修改目录`nebula-docker-compose`内的文件`docker-compose.yaml`,将`image`后的所有版本都修改为`{{nebula.release}}`
1. 修改目录`nebula-docker-compose`内的文件`docker-compose.yaml`,将`image`后的所有版本都修改为`{{nebula.branch}}`

2. 在目录`nebula-docker-compose`内执行命令`docker-compose pull`,更新所有服务的镜像版本。

Expand Down
8 changes: 4 additions & 4 deletions docs-2.0/nebula-operator/4.connect-to-nebula-graph-service.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
2. 使用上述`<cluster-name>-graphd-svc` Service的IP连接Nebula Graph数据库:

```bash
kubectl run -ti --image vesoft/nebula-console:v2.5.0 --restart=Never -- <nebula-console> -addr <10.98.213.34> -port 9669 -u <root> -p <vesoft>
kubectl run -ti --image vesoft/nebula-console:{{console.branch}} --restart=Never -- <nebula-console> -addr <10.98.213.34> -port 9669 -u <root> -p <vesoft>
```

- `--image`:为连接Nebula Graph的工具Nebula Console的镜像。
Expand All @@ -46,7 +46,7 @@
用户还可以使用**完全限定域名(FQDN)**连接数据库,域名格式为`<cluster-name>-graphd.<cluster-namespace>.svc.<CLUSTER_DOMAIN>`:
```bash
kubectl run -ti --image vesoft/nebula-console:v2.5.0 --restart=Never -- <nebula-console> -addr <cluster_name>-graphd-svc.default.svc.cluster.local -port 9669 -u root -p vesoft
kubectl run -ti --image vesoft/nebula-console:{{console.branch}} --restart=Never -- <nebula-console> -addr <cluster_name>-graphd-svc.default.svc.cluster.local -port 9669 -u root -p vesoft
```
`CLUSTER_DOMAIN`的默认值为`cluster.local`。
Expand Down Expand Up @@ -120,13 +120,13 @@ kubectl run -ti --image vesoft/nebula-console:v2.5.0 --restart=Never -- <nebula-
4. 使用节点IP和上述映射的节点端口连接Nebula Graph。
```bash
kubectl run -ti --image vesoft/nebula-console:v2.5.0 --restart=Never -- <nebula-console> -addr <node_ip> -port <node_port> -u root -p vesoft
kubectl run -ti --image vesoft/nebula-console:{{console.branch}} --restart=Never -- <nebula-console> -addr <node_ip> -port <node_port> -u root -p vesoft
```
示例如下:
```bash
[root@k8s4 ~]# kubectl run -ti --image vesoft/nebula-console:v2.5.0 --restart=Never -- nebula-console2 -addr 192.168.8.24 -port 32236 -u root -p vesoft
[root@k8s4 ~]# kubectl run -ti --image vesoft/nebula-console:{{console.branch}} --restart=Never -- nebula-console2 -addr 192.168.8.24 -port 32236 -u root -p vesoft
If you don't see a command prompt, try pressing enter.

(root@nebula) [(none)]>
Expand Down
Binary file added docs-2.0/reuse/assets-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs-2.0/reuse/assets.png
Binary file not shown.
Binary file added docs-2.0/reuse/console-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs-2.0/reuse/console.png
Binary file not shown.
6 changes: 3 additions & 3 deletions docs-2.0/reuse/source_connect-to-nebula-graph.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ Nebula Graph支持多种类型客户端,包括CLI客户端、GUI客户端和

建议选择**最新**版本。

![Select a Nebula Graph version and click **Assets**](../reuse/console.png "Click Assets to show the available Nebula Graph binary files")
![Select a Nebula Graph version and click **Assets**](../reuse/console-1.png "Click Assets to show the available Nebula Graph binary files")

2.**Assets**区域找到机器运行所需的二进制文件,下载文件到机器上。

![Click to download the package according to your hardware architecture](../reuse/assets.png "Click the package name to download it")
![Click to download the package according to your hardware architecture](../reuse/assets-1.png "Click the package name to download it")

3. (可选)为方便使用,重命名文件为`nebula-console`

Expand Down Expand Up @@ -77,7 +77,7 @@ Nebula Graph支持多种类型客户端,包括CLI客户端、GUI客户端和
| `-e/-eval` | 设置字符串类型的nGQL语句。连接成功后会执行一次该语句并返回结果,然后自动断开连接。 |
| `-f/-file` | 设置存储nGQL语句的文件的路径。连接成功后会执行该文件内的nGQL语句并返回结果,执行完毕后自动断开连接。 |

用户可以使用`./nebula-console --help`命令获取所有参数的说明,也可以在[项目仓库](https://github.com/vesoft-inc/nebula-console/tree/v2.0.0-ga)找到更多说明。
用户可以使用`./nebula-console --help`命令获取所有参数的说明,也可以在[项目仓库](https://github.com/vesoft-inc/nebula-console/tree/{{console.branch}})找到更多说明。

## Nebula Console命令

Expand Down
23 changes: 12 additions & 11 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ extra:
release: 2.5.1
branch: v2.5
importer:
release: 2.5.0
branch: release-v2.0.0-ga
release: 2.6.0
branch: v2.6.0
algorithm:
release: 2.5.1
branch: v2.5
Expand All @@ -78,30 +78,31 @@ extra:
release: 2.5.0
branch: v2.5
dockercompose:
release: 2.5.0
branch: v2.5.0
release: 2.6.0
branch: v2.6.0
common:
release: 2.5.0
dashboard:
release: 1.0.1
base100: 1.0.0
branch: v1.0.1
console:
release: 2.5.0
release: 2.6.0
branch: v2.6.0
br:
release: 0.5.0
cpp:
release: 2.5.0
branch: v2.5.0
java:
release: 2.5.0
branch: v2.5.0
release: 2.6.0
branch: v2.6.0
python:
release: 2.5.0
branch: v2.5.0
release: 2.6.0
branch: v2.6.0
go:
release: 2.5.0
branch: release-v2.5.0
release: 2.6.0
branch: v2.6.0
bench:
release: 1.0.0
branch: master
Expand Down

0 comments on commit 84dc9b1

Please sign in to comment.