This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 0701ce1d71 [docs](docs)Fix Docker documentation description (#16643)
0701ce1d71 is described below
commit 0701ce1d718608871212cf162fb142e502d6b466
Author: FreeOnePlus <[email protected]>
AuthorDate: Sun Feb 12 16:37:51 2023 +0800
[docs](docs)Fix Docker documentation description (#16643)
* change sh_checker_exclude
* add broker Dockerfile and init_broker.sh
* add docker docs
* Adjust the field naming rules when creating tables
* Fix Docker documentation description
---------
Co-authored-by: Yijia Su <[email protected]>
---
.../install/construct-docker/construct-docker-image.md | 2 +-
.../install/construct-docker/run-docker-cluster.md | 6 ++++--
.../install/construct-docker/construct-docker-image.md | 2 +-
.../install/construct-docker/run-docker-cluster.md | 18 ++++++++++--------
4 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/docs/en/docs/install/construct-docker/construct-docker-image.md
b/docs/en/docs/install/construct-docker/construct-docker-image.md
index d98d190a1b..4d270d3801 100644
--- a/docs/en/docs/install/construct-docker/construct-docker-image.md
+++ b/docs/en/docs/install/construct-docker/construct-docker-image.md
@@ -67,7 +67,7 @@ In the Dockerfile script for compiling the Docker Image,
there are two methods t
1. Execute the download command via wget / curl when compiling, and then start
the docker build process.
2. Download the binary package to the compilation directory in advance, and
then load it into the docker build process through the ADD or COPY command.
-Method 1 can produce a smaller Docker image, but if the docker build process
fails, the download operation might be repeated and result in longer build
time; Method 2 is more suitable for less-than-ideal network environments.
Method 2 will produce a Docker image that is slightly larger than that from
Method 1.
+Method 1 can produce a smaller Docker image, but if the docker build process
fails, the download operation might be repeated and result in longer build
time; Method 2 is more suitable for less-than-ideal network environments.
**The examples below are based on Method 2. If you prefer to go for Method 1,
you may modify the steps accordingly.**
diff --git a/docs/en/docs/install/construct-docker/run-docker-cluster.md
b/docs/en/docs/install/construct-docker/run-docker-cluster.md
index a6ca26aae9..36cdcb1b94 100644
--- a/docs/en/docs/install/construct-docker/run-docker-cluster.md
+++ b/docs/en/docs/install/construct-docker/run-docker-cluster.md
@@ -81,6 +81,7 @@ From the version of `Apache Doris 1.2.1 Docker Image`, the
interface list of eac
| FE\BE\BROKER | FE_SERVERS | FE node main information |
fe1:172.20.80.2:9010,fe2:172.20.80.3:9010,fe3:172.20.80.4:9010 |
| FE | FE_ID | FE node ID | 1 |
| BE | BE_ADDR | BE node main information | 172.20.80.5:9050 |
+| BE | NODE_ROLE | BE node type | computation |
| BROKER | BROKER_ADDR | Main information of BROKER node | 172.20.80.6:8000 |
Note that the above interface must fill in the information, otherwise the
process cannot be started.
@@ -91,6 +92,8 @@ Note that the above interface must fill in the information,
otherwise the proces
>
> BE_ADDR interface rule is: `BE_HOST:BE_HEARTBEAT_SERVICE_PORT`
>
+> The NODE_ROLE interface rule is: `computation` or empty, where empty or
other values indicate that the node type is `mix` type
+>
> BROKER_ADDR interface rule is: `BROKER_HOST:BROKER_IPC_PORT`
### Script Template
@@ -211,5 +214,4 @@ Then `exit` exits and creates the Doris Docker cluster.
## Unfinished business
-1. The Computer Node interface has not yet been adapted, and the next version
will adapt
-2. Compose Demo List
+1. Compose Demo List
diff --git a/docs/zh-CN/docs/install/construct-docker/construct-docker-image.md
b/docs/zh-CN/docs/install/construct-docker/construct-docker-image.md
index 178412375e..d2e87bdd14 100644
--- a/docs/zh-CN/docs/install/construct-docker/construct-docker-image.md
+++ b/docs/zh-CN/docs/install/construct-docker/construct-docker-image.md
@@ -68,7 +68,7 @@ Dockerfile 脚本编写需要注意以下几点：
1. 通过 wget / curl 在编译时执行下载命令，随后完成 docker build 制作过程
2. 提前下载二进制包至编译目录，然后通过 ADD 或者 COPY 命令加载至 docker build 过程中
-使用前者会让 Docker Image Size
更小，但是如果构建失败的话可能下载操作会重复进行，导致构建时间过长，而后者更适用于网络环境不是很好的构建环境。后者构建的镜像要略大于前者，但是不会大很多。
+使用前者会让 Docker Image Size
更小，但是如果构建失败的话可能下载操作会重复进行，导致构建时间过长，而后者更适用于网络环境不是很好的构建环境。
**综上，本文档的示例以第二种方式为准，若有第一种诉求，可根据自己需求定制修改即可。**
diff --git a/docs/zh-CN/docs/install/construct-docker/run-docker-cluster.md
b/docs/zh-CN/docs/install/construct-docker/run-docker-cluster.md
index 963f91a94f..20484acdd8 100644
--- a/docs/zh-CN/docs/install/construct-docker/run-docker-cluster.md
+++ b/docs/zh-CN/docs/install/construct-docker/run-docker-cluster.md
@@ -76,12 +76,13 @@ Doris Docker 适用的网络模式有两种。
从 `Apache Doris 1.2.1 Docker Image` 版本起，各个进程镜像接口列表如下：
-| 进程名 | 接口名 | 接口定义 | 接口示例
|
-| -------------- | ----------- | ------------------- |
------------------------------------------------------------ |
-| FE\|BE\|BROKER | FE_SERVERS | FE 节点主要信息 |
fe1:172.20.80.2:9010,fe2:172.20.80.3:9010,fe3:172.20.80.4:9010 |
-| FE | FE_ID | FE 节点 ID | 1
|
-| BE | BE_ADDR | BE 节点主要信息 | 172.20.80.5:9050
|
-| BROKER | BROKER_ADDR | BROKER 节点主要信息 | 172.20.80.6:8000
|
+| 进程名 | 接口名 | 接口定义 | 接口示例 |
+| -------------- |-------------|---------------|------------------|
+| FE\| BE\ | BROKER | FE_SERVERS | FE 节点主要信息 |
fe1:172.20.80.2:9010,fe2:172.20.80.3:9010,fe3:172.20.80.4:9010 |
+| FE | FE_ID | FE 节点 ID | 1 |
+| BE | BE_ADDR | BE 节点主要信息 | 172.20.80.5:9050 |
+| BE | NODE_ROLE | BE 节点类型 | computation |
+| BROKER | BROKER_ADDR | BROKER 节点主要信息 | 172.20.80.6:8000 |
注意，以上接口必须填写信息，否则进程无法启动。
@@ -91,6 +92,8 @@ Doris Docker 适用的网络模式有两种。
>
> BE_ADDR 接口规则为：`BE_HOST:BE_HEARTBEAT_SERVICE_PORT`
>
+> NODE_ROLE 接口规则为：`computation` 或为空，其中为空或为其他值时表示节点类型为 `mix` 类型
+>
> BROKER_ADDR 接口规则为：`BROKER_HOST:BROKER_IPC_PORT`
### 脚本模板
@@ -211,5 +214,4 @@ sysctl -w vm.max_map_count=2000000
## 未尽事项
-1. Computer Node 接口尚未适配，下个版本适配
-2. Compose Demo List
+1. Compose Demo List
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
