This is an automated email from the ASF dual-hosted git repository.
zykkk 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 f429276863 [typo(docs)Change docker docs DorisImage version (#20580)
f429276863 is described below
commit f42927686312c489d82fef44c2637f2169d28df9
Author: FreeOnePlus <54164178+freeonep...@users.noreply.github.com>
AuthorDate: Thu Jun 8 13:41:48 2023 +0800
[typo(docs)Change docker docs DorisImage version (#20580)
---
.../install/construct-docker/run-docker-cluster.md | 139 +++++++--------------
.../install/construct-docker/run-docker-cluster.md | 99 ++++++---------
2 files changed, 81 insertions(+), 157 deletions(-)
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 7e258ea44f..c6c0f3dc9a 100644
--- a/docs/en/docs/install/construct-docker/run-docker-cluster.md
+++ b/docs/en/docs/install/construct-docker/run-docker-cluster.md
@@ -74,15 +74,15 @@ For the sake of presentation, this chapter only
demonstrates scripts written in
### Interface Description
-From the version of `Apache Doris 1.2.2 Docker Image`, the interface list of
each process image is as follows:
+From the version of `Apache Doris 1.2.1 Docker Image`, the interface list of
each process image is as follows:
| process name | interface name | interface definition | interface example |
-| -------------- |-------------| ------------------- |
-------------------------------------------------------------- |
-| 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 |
broker:172.20.80.6:8000 |
+|--------------|----------------|---------------|------------------|
+| 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.
@@ -94,126 +94,75 @@ Note that the above interface must fill in the
information, otherwise the proces
>
> 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_NAME:BROKER_HOST_IP:BROKER_IPC_PORT`
+> BROKER_ADDR interface rule is: `BROKER_HOST:BROKER_IPC_PORT`
### Script Template
#### Docker Run command
-Create a subnet bridge
+1FE & 1BE Command Templates
-``` shell
-docker network create --driver bridge --subnet=172.20.80.0/24 doris-network
-```
-
-1FE & 1BE & 1Broker Command Templates
+Note that you need to modify `${intranet IP of the current machine}` to
replace it with the intranet IP of the current machine
```shell
docker run -itd \
--name=fe \
---env FE_SERVERS="fe1:172.20.80.2:9010" \
+--env FE_SERVERS="fe1:${intranet IP of the current machine}:9010" \
--env FE_ID=1 \
--p 8030:8030 \
+-p 8030:8030\
-p 9030:9030 \
-v /data/fe/doris-meta:/opt/apache-doris/fe/doris-meta \
-v /data/fe/log:/opt/apache-doris/fe/log \
---network=doris-network \
---ip=172.20.80.2\
-apache/doris:1.2.2-fe-x86_64
+--net=host \
+apache/doris:2.0.0_alpha-fe-x86_64
docker run -itd \
---name=be \
---env FE_SERVERS="fe1:172.20.80.2:9010" \
---env BE_ADDR="172.20.80.3:9050" \
+--name=be\
+--env FE_SERVERS="fe1:${intranet IP of the current machine}:9010" \
+--env BE_ADDR="${Intranet IP of the current machine}:9050" \
-p 8040:8040 \
-v /data/be/storage:/opt/apache-doris/be/storage \
-v /data/be/log:/opt/apache-doris/be/log \
---network=doris-network \
---ip=172.20.80.3\
-apache/doris:1.2.2-be-x86_64
-
-docker run -itd \
---name=broker1\
---env FE_SERVERS="fe1:172.20.80.2:9010" \
---env BROKER_ADDR="broker1:172.20.80.6:8000" \
--p 8000:8000 \
--v /data/broker/log:/opt/apache-doris/broker/log \
---network=doris-network \
---ip=172.20.80.6\
-apache/doris:1.2.2-broker-x86_64
+--net=host \
+apache/doris:2.0.0_alpha-be-x86_64
```
-> Note: if you CPU does not support AVX2, the backend will fail to start.
-> If this is the case, use the `apache/doris:X.X.X-be-x86_64-noavx2` backend
image.
-> Use `docker logs -f be` to check the backend for error messages.
-
-3FE & 3BE run command template can be downloaded
[here](https://github.com/apache/doris/tree/master/docker/runtime/docker-compose-demo/build-cluster/rum-command/3fe_3be.sh).
+3FE & 3BE Run command template if needed [click
here](https://github.com/apache/doris/tree/master/docker/runtime/docker-compose-demo/build-cluster/rum-command/3fe_3be
.sh) to access downloads.
#### Docker Compose script
-1FE & 1BE & 1Broker template
+1FE & 1BE template
+
+Note that you need to modify `${intranet IP of the current machine}` to
replace it with the intranet IP of the current machine
```yaml
-version: '3'
+version: "3"
services:
- docker-fe:
- image: "apache/doris:1.2.2-fe-x86_64"
- container_name: "doris-fe"
- hostname: "fe"
+ fe:
+ image: apache/doris:2.0.0_alpha-fe-x86_64
+ hostname: fe
environment:
- - FE_SERVERS=fe1:172.20.80.2:9010
- - FE_ID=1
- ports:
- - 8030:8030
- - 9030:9030
+ - FE_SERVERS=fe1:${intranet IP of the current machine}:9010
+ - FE_ID=1
volumes:
- - /data/fe/doris-meta:/opt/apache-doris/fe/doris-meta
- - /data/fe/log:/opt/apache-doris/fe/log
- networks:
- doris_net:
- ipv4_address: 172.20.80.2
- docker-be:
- image: "apache/doris:1.2.2-be-x86_64"
- container_name: "doris-be"
- hostname: "be"
- depends_on:
- - docker-fe
+ - /data/fe/doris-meta/:/opt/apache-doris/fe/doris-meta/
+ - /data/fe/log/:/opt/apache-doris/fe/log/
+ network_mode: host
+ be:
+ image: apache/doris:2.0.0_alpha-be-x86_64
+ hostname: be
environment:
- - FE_SERVERS=fe1:172.20.80.2:9010
- - BE_ADDR=172.20.80.3:9050
- ports:
- - 8040:8040
+ - FE_SERVERS=fe1:${intranet IP of the current machine}:9010
+ - BE_ADDR=${intranet IP of the current machine}:9050
volumes:
- - /data/be/storage:/opt/apache-doris/be/storage
- - /data/be/script:/docker-entrypoint-initdb.d
- - /data/be/log:/opt/apache-doris/be/log
- networks:
- doris_net:
- ipv4_address: 172.20.80.3
- docker-broker:
- image: "apache/doris:1.2.2-broker-x86_64"
- container_name: "doris-broker"
- hostname: "broker"
+ - /data/be/storage/:/opt/apache-doris/be/storage/
+ - /data/be/script/:/docker-entrypoint-initdb.d/
depends_on:
- - docker-fe
- environment:
- - FE_SERVERS=fe1:172.20.80.2:9010
- - BROKER_ADDR=broker1:172.20.80.6:8000
- volumes:
- - /data/broker/log:/opt/apache-doris/broker/log
- ports:
- - 8000:8000
- networks:
- doris_net:
- ipv4_address: 172.20.80.6
-networks:
- doris_net:
- ipam:
- config:
- - subnet: 172.20.80.0/16
+ -fe
+ network_mode: host
```
-3FE & 3BE Docker Compose file can be downloaded
[here](https://github.com/apache/doris/tree/master/docker/runtime/docker-compose-demo/build-cluster/docker-compose/3fe_3be/docker-compose.yaml).
+3FE & 3BE Docker Compose script template if needed [click
here](https://github.com/apache/doris/tree/master/docker/runtime/docker-compose-demo/build-cluster/docker-compose/
3fe_3be/docker-compose.yaml) access to download.
## Deploy Doris Docker
@@ -237,7 +186,3 @@ sysctl -w vm.max_map_count=2000000
```
Then `exit` exits and creates the Doris Docker cluster.
-
-## Unfinished business
-
-1. Compose Demo List
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 9d9f9e6a36..97d724a6bb 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,13 +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 |
-| BE | NODE_ROLE | BE 节点类型 | computation |
-| 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 |
注意，以上接口必须填写信息，否则进程无法启动。
@@ -100,37 +100,31 @@ Doris Docker 适用的网络模式有两种。
#### Docker Run 命令
-创建子网网桥
-
-``` shell
-docker network create --driver bridge --subnet=172.20.80.0/24 doris-network
-```
-
1FE & 1BE 命令模板
-```shell
+注意需要修改 `${当前机器的内网IP}` 替换为当前机器的内网IP
+
+```shell
docker run -itd \
--name=fe \
---env FE_SERVERS="fe1:172.20.80.2:9010" \
+--env FE_SERVERS="fe1:${当前机器的内网IP}:9010" \
--env FE_ID=1 \
-p 8030:8030 \
-p 9030:9030 \
-v /data/fe/doris-meta:/opt/apache-doris/fe/doris-meta \
-v /data/fe/log:/opt/apache-doris/fe/log \
---network=doris-network \
---ip=172.20.80.2 \
-apache/doris:1.2.1-fe-x86_64
+--net=host \
+apache/doris:2.0.0_alpha-fe-x86_64
docker run -itd \
--name=be \
---env FE_SERVERS="fe1:172.20.80.2:9010" \
---env BE_ADDR="172.20.80.3:9050" \
+--env FE_SERVERS="fe1:${当前机器的内网IP}:9010" \
+--env BE_ADDR="${当前机器的内网IP}:9050" \
-p 8040:8040 \
-v /data/be/storage:/opt/apache-doris/be/storage \
-v /data/be/log:/opt/apache-doris/be/log \
---network=doris-network \
---ip=172.20.80.3 \
-apache/doris:1.2.1-be-x86_64
+--net=host \
+apache/doris:2.0.0_alpha-be-x86_64
```
3FE & 3BE Run
命令模板如有需要[点击此处](https://github.com/apache/doris/tree/master/docker/runtime/docker-compose-demo/build-cluster/rum-command/3fe_3be.sh)访问下载。
@@ -139,48 +133,33 @@ apache/doris:1.2.1-be-x86_64
1FE & 1BE 模板
-``` yaml
-version: '3'
+注意需要修改 `${当前机器的内网IP}` 替换为当前机器的内网IP
+
+``` yaml
+version: "3"
services:
- docker-fe:
- image: "apache/doris:1.2.1-fe-x86_64"
- container_name: "doris-fe"
- hostname: "fe"
+ fe:
+ image: apache/doris:2.0.0_alpha-fe-x86_64
+ hostname: fe
environment:
- - FE_SERVERS=fe1:172.20.80.2:9010
- - FE_ID=1
- ports:
- - 8030:8030
- - 9030:9030
+ - FE_SERVERS=fe1:${当前机器的内网IP}:9010
+ - FE_ID=1
volumes:
- - /data/fe/doris-meta:/opt/apache-doris/fe/doris-meta
- - /data/fe/log:/opt/apache-doris/fe/log
- networks:
- doris_net:
- ipv4_address: 172.20.80.2
- docker-be:
- image: "apache/doris:1.2.1-be-x86_64"
- container_name: "doris-be"
- hostname: "be"
- depends_on:
- - docker-fe
+ - /data/fe/doris-meta/:/opt/apache-doris/fe/doris-meta/
+ - /data/fe/log/:/opt/apache-doris/fe/log/
+ network_mode: host
+ be:
+ image: apache/doris:2.0.0_alpha-be-x86_64
+ hostname: be
environment:
- - FE_SERVERS=fe1:172.20.80.2:9010
- - BE_ADDR=172.20.80.3:9050
- ports:
- - 8040:8040
+ - FE_SERVERS=fe1:${当前机器的内网IP}:9010
+ - BE_ADDR=${当前机器的内网IP}:9050
volumes:
- - /data/be/storage:/opt/apache-doris/be/storage
- - /data/be/script:/docker-entrypoint-initdb.d
- - /data/be/log:/opt/apache-doris/be/log
- networks:
- doris_net:
- ipv4_address: 172.20.80.3
-networks:
- doris_net:
- ipam:
- config:
- - subnet: 172.20.80.0/16
+ - /data/be/storage/:/opt/apache-doris/be/storage/
+ - /data/be/script/:/docker-entrypoint-initdb.d/
+ depends_on:
+ - fe
+ network_mode: host
```
3FE & 3BE Docker Compose
脚本模板如有需要[点击此处](https://github.com/apache/doris/tree/master/docker/runtime/docker-compose-demo/build-cluster/docker-compose/3fe_3be/docker-compose.yaml)访问下载。
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
