You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by ji...@apache.org on 2022/07/27 01:03:13 UTC

[doris-website] branch master updated: compile fix

This is an automated email from the ASF dual-hosted git repository.

jiafengzheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-website.git


The following commit(s) were added to refs/heads/master by this push:
     new a2fc77996e7 compile fix
a2fc77996e7 is described below

commit a2fc77996e779435b7e379a7e3fa8a1f2e25bbd7
Author: jiafeng.zhang <zh...@gmail.com>
AuthorDate: Wed Jul 27 09:03:01 2022 +0800

    compile fix
---
 docs/install/source-install/compilation.md         | 318 +++++++++++----------
 .../current/install/source-install/compilation.md  | 154 +++++-----
 2 files changed, 240 insertions(+), 232 deletions(-)

diff --git a/docs/install/source-install/compilation.md b/docs/install/source-install/compilation.md
index 392d63b1352..7543097ed31 100644
--- a/docs/install/source-install/compilation.md
+++ b/docs/install/source-install/compilation.md
@@ -1,158 +1,155 @@
----
-{
-    "title": "Compilation",
-    "language": "en"
-}
----
+* <!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
 
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
 
-  http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  -->
 
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
 
+  # Compilation
 
-# Compilation
+  This document focuses on how to code Doris through source code.
 
-This document focuses on how to code Doris through source code.
+  ## Developing mirror compilation using Docker (recommended)
 
-## Developing mirror compilation using Docker (recommended)
+  ### Use off-the-shelf mirrors
 
-### Use off-the-shelf mirrors
+  1. Download Docker Mirror
 
-1. Download Docker Mirror
+     `$ docker pull apache/doris:build-env-ldb-toolchain-latest`
 
-    `$ docker pull apache/incubator-doris:build-env-ldb-toolchain-latest`
+     Check mirror download completed:
 
-    Check mirror download completed:
-
-    ```
-    $ docker images
-    REPOSITORY               TAG                              IMAGE ID            CREATED             SIZE
-    apache/incubator-doris   build-env-ldb-toolchain-latest   49f68cecbc1a        4 days ago          3.76GB
-    ```
-
-> Note1: For different versions of Doris, you need to download the corresponding mirror version. From Apache Doris 0.15 version, the docker image will keep same version number with Doris. For example, you can use  `apache/incubator-doris:build-env-for-0.15.0` to compile Apache Doris 0.15.0.
->
-> Node2: `apache/incubator-doris:build-env-ldb-toolchain-latest` is for compiling trunk code, and will be updated along with trunk code. View the update time in `docker/README.md`
-
-| image version | commit id | release version |
-|---|---|---|
-| apache/incubator-doris:build-env | before [ff0dd0d](https://github.com/apache/incubator-doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81) | 0.8.x, 0.9.x |
-| apache/incubator-doris:build-env-1.1 | [ff0dd0d](https://github.com/apache/incubator-doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81) or later | 0.10.x or later |
-| apache/incubator-doris:build-env-1.2 | [4ef5a8c](https://github.com/apache/incubator-doris/commit/4ef5a8c8560351d7fff7ff8fd51c4c7a75e006a8) or later | 0.12.x - 0.14.0 |
-| apache/incubator-doris:build-env-1.3.1 | [ad67dd3](https://github.com/apache/incubator-doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) or later | 0.14.x |
-| apache/incubator-doris:build-env-for-0.15.0 | [a81f4da](https://github.com/apache/incubator-doris/commit/a81f4da4e461a54782a96433b746d07be89e6b54) or later | 0.15.0          |
-| apache/incubator-doris:build-env-latest | before [0efef1b](https://github.com/apache/incubator-doris/commit/0efef1b332300887ee0473f9df9bdd9d7297d824) | |
-| apache/incubator-doris:build-env-for-1.0.0| | 1.0.0 |
-| apache/incubator-doris:build-env-ldb-toolchain-latest | trunk | trunk |
-
-**note**:
-
-> 1. Dev docker image [ChangeLog](https://github.com/apache/incubator-doris/blob/master/thirdparty/CHANGELOG.md)
-
-> 2. Doris version 0.14.0 still uses apache/incubator-doris:build-env-1.2 to compile, and the 0.14.x code will use apache/incubator-doris:build-env-1.3.1.
-
-> 3. From docker image of build-env-1.3.1, both OpenJDK 8 and OpenJDK 11 are included, and OpenJDK 11 is used for compilation by default. Please make sure that the JDK version used for compiling is the same as the JDK version used at runtime, otherwise it may cause unexpected operation errors. You can use the following command to switch the default JDK version in container:
->
->   Switch to JDK 8:
->
->   ```
->   $ alternatives --set java java-1.8.0-openjdk.x86_64
->   $ alternatives --set javac java-1.8.0-openjdk.x86_64
->   $ export JAVA_HOME=/usr/lib/jvm/java-1.8.0
->   ```
->
->   Switch to JDK 11:
->
->   ```
->   $ alternatives --set java java-11-openjdk.x86_64
->   $ alternatives --set javac java-11-openjdk.x86_64
->   $ export JAVA_HOME=/usr/lib/jvm/java-11
->   ```
-
-2. Running Mirror
+     ```
+     $ docker images
+     REPOSITORY               TAG                              IMAGE ID            CREATED             SIZE
+     apache/doris   build-env-ldb-toolchain-latest   49f68cecbc1a        4 days ago          3.76GB
+     ```
 
-    `$ docker run -it apache/incubator-doris:build-env-ldb-toolchain-latest`
+  > Note1: For different versions of Doris, you need to download the corresponding mirror version. From Apache Doris 0.15 version, the docker image will keep same version number with Doris. For example, you can use  `apache/doris:build-env-for-0.15.0` to compile Apache Doris 0.15.0.
+  >
+  > Node2: `apache/doris:build-env-ldb-toolchain-latest` is for compiling trunk code, and will be updated along with trunk code. View the update time in `docker/README.md`
+
+  | image version                               | commit id                                                    | release version |
+  | ------------------------------------------- | ------------------------------------------------------------ | --------------- |
+  | apache/incubator-doris:build-env            | before [ff0dd0d](https://github.com/apache/doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81) | 0.8.x, 0.9.x    |
+  | apache/incubator-doris:build-env-1.1        | [ff0dd0d](https://github.com/apache/doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81) or later | 0.10.x or later |
+  | apache/incubator-doris:build-env-1.2        | [4ef5a8c](https://github.com/apache/doris/commit/4ef5a8c8560351d7fff7ff8fd51c4c7a75e006a8) or later | 0.12.x - 0.14.0 |
+  | apache/incubator-doris:build-env-1.3.1      | [ad67dd3](https://github.com/apache/doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) or later | 0.14.x          |
+  | apache/doris:build-env-for-0.15.0           | [a81f4da](https://github.com/apache/doris/commit/a81f4da4e461a54782a96433b746d07be89e6b54) or later | 0.15.0          |
+  | apache/incubator-doris:build-env-latest     | before [0efef1b](https://github.com/apache/doris/commit/0efef1b332300887ee0473f9df9bdd9d7297d824) |                 |
+  | apache/doris:build-env-for-1.0.0            |                                                              | 1.0.0           |
+  | apache/doris:build-env-for-1.1.0            |                                                              | 1.1.0           |
+  | apache/doris:build-env-ldb-toolchain-latest | trunk                                                        | trunk           |
+
+  **note**:
+
+  > 1. Dev docker image [ChangeLog](https://github.com/apache/doris/blob/master/thirdparty/CHANGELOG.md)
+
+  > 2. Doris version 0.14.0 still uses apache/incubator-doris:build-env-1.2 to compile, and the 0.14.x code will use apache/incubator-doris:build-env-1.3.1.
+
+  > 3. From docker image of build-env-1.3.1, both OpenJDK 8 and OpenJDK 11 are included, and OpenJDK 11 is used for compilation by default. Please make sure that the JDK version used for compiling is the same as the JDK version used at runtime, otherwise it may cause unexpected operation errors. You can use the following command to switch the default JDK version in container:
+  >
+  >   Switch to JDK 8:
+  >
+  >   ```
+  > $ alternatives --set java java-1.8.0-openjdk.x86_64
+  > $ alternatives --set javac java-1.8.0-openjdk.x86_64
+  > $ export JAVA_HOME=/usr/lib/jvm/java-1.8.0
+  >   ```
+  >
+  >   Switch to JDK 11:
+  >
+  >   ```
+  > $ alternatives --set java java-11-openjdk.x86_64
+  > $ alternatives --set javac java-11-openjdk.x86_64
+  > $ export JAVA_HOME=/usr/lib/jvm/java-11
+  >   ```
+
+  2. Running Mirror
+
+     `$ docker run -it apache/doris:build-env-ldb-toolchain-latest`
+
+     It is recommended to run the container by mounting the local Doris source directory, so that the compiled binary file will be stored in the host machine and will not disappear because the container exits.
+
+      At the same time, it is recommended to mount the maven `.m2` directory in the mirror to the host directory at the same time to prevent repeated downloading of maven's dependent libraries each time the compilation is started.
 
-    It is recommended to run the container by mounting the local Doris source directory, so that the compiled binary file will be stored in the host machine and will not disappear because the container exits.
+     ```
+     $ docker run -it -v /your/local/.m2:/root/.m2 -v /your/local/doris-DORIS-x.x.x-release/:/root/doris-DORIS-x.x.x-release/ apache/doris:build-env-ldb-toolchain-latest
+     ```
 
-     At the same time, it is recommended to mount the maven `.m2` directory in the mirror to the host directory at the same time to prevent repeated downloading of maven's dependent libraries each time the compilation is started.
+  3. Download source code
 
-    ```
-    $ docker run -it -v /your/local/.m2:/root/.m2 -v /your/local/incubator-doris-DORIS-x.x.x-release/:/root/incubator-doris-DORIS-x.x.x-release/ apache/incubator-doris:build-env-ldb-toolchain-latest
-    ```
+     After starting the mirror, you should be in the container. The Doris source code can be downloaded from the following command (local source directory mounted is not required):
 
-3. Download source code
+     ```
+     $ wget https://dist.apache.org/repos/dist/dev/doris/xxx.tar.gz
+     or
+     $ git clone https://github.com/apache/doris.git
+     ```
 
-    After starting the mirror, you should be in the container. The Doris source code can be downloaded from the following command (local source directory mounted is not required):
+  4. Compile Doris
 
-    ```
-    $ wget https://dist.apache.org/repos/dist/dev/incubator/doris/xxx.tar.gz
-    or
-    $ git clone https://github.com/apache/incubator-doris.git
-    ```
+     First run the following command to check whether the compilation machine supports the avx2 instruction set
 
-4. Compile Doris
+       ```
+      $ cat /proc/cpuinfo | grep avx2
+       ```
 
-   First run the following command to check whether the compilation machine supports the avx2 instruction set
+     If it is not supported, use the following command to compile
 
-     ```
-    $ cat /proc/cpuinfo | grep avx2
-     ```
+      ```
+     $ USE_AVX2=0 sh build.sh
+      ```
 
-   If it is not supported, use the following command to compile
+     If supported, compile directly without adding USE_AVX2=0
 
-    ```
-    $ USE_AVX2=0 sh build.sh
-    ```
+      ```
+     $ sh build.sh
+      ```
 
-   If supported, compile directly without adding USE_AVX2=0
+     After compilation, the output files are in the `output/` directory.
 
-    ```
-    $ sh build.sh
-    ```
+      > **Note:**
+      >
+      > If you are using `build-env-for-0.15.0` or  `build-env-for-1.0.0` for the first time, use the following command when compiling:
+      >
+      > `sh build.sh --clean --be --fe --ui`
+      >
+      > `build-env-ldb-toolchain-latest` and later, use the following command:
+      >
+      > ```
+      > sh build --clean --be --fe
+      > ```
+      >
+      > This is because from build-env-for-0.15.0, we upgraded thrift (0.9 -> 0.13), you need to use the --clean command to force the use of the new version of thrift to generate code files, otherwise incompatible code will appear.
 
-   After compilation, the output files are in the `output/` directory.
+      After compilation, the output file is in the `output/` directory.
 
-    > **Note:**
-    >
-    > If you are using `build-env-for-0.15.0` or `build-env-for-1.0.0` for the first time, use the following command when compiling:
-    >
-    > `sh build.sh --clean --be --fe --ui `
-    >
-    > `build-env-ldb-toolchain-latest` and later, use the following command:
-    >
-    > `sh build --clean --be --fe`
-    >
-    > This is because from build-env-for-0.15.0, we upgraded thrift (0.9 -> 0.13), you need to use the --clean command to force the use of the new version of thrift to generate code files, otherwise incompatible code will appear.
-   
-    After compilation, the output file is in the `output/` directory.
+  ### Self-compiling Development Environment Mirror
 
-### Self-compiling Development Environment Mirror
+  You can also create a Doris development environment mirror yourself, referring specifically to the `docker/README.md` file.
 
-You can also create a Doris development environment mirror yourself, referring specifically to the `docker/README.md` file.
 
+  ## Direct Compilation (CentOS/Ubuntu)
 
-## Direct Compilation (CentOS/Ubuntu)
+  You can try to compile Doris directly in your own Linux environment.
 
-You can try to compile Doris directly in your own Linux environment.
+  1. System Dependence
 
-1. System Dependence
-    * Before commit [ad67dd3](https://github.com/apache/incubator-doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) will use the dependencies as follows:
+     * Before commit [ad67dd3](https://github.com/apache/doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) will use the dependencies as follows:
 
        `GCC 7.3+, Oracle JDK 1.8+, Python 2.7+, Apache Maven 3.5+, CMake 3.11+ Bison 3.0+`
 
@@ -168,7 +165,7 @@ You can try to compile Doris directly in your own Linux environment.
 
        `sudo yum groupinstall 'Development Tools' && sudo yum install maven cmake byacc flex automake libtool bison binutils-devel zip unzip ncurses-devel curl git wget python2 glibc-static libstdc++-static java-1.8.0-openjdk`
 
-    * After commit [ad67dd3](https://github.com/apache/incubator-doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) will use the dependencies as follows:
+     * After commit [ad67dd3](https://github.com/apache/doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) will use the dependencies as follows:
 
        `GCC 10+, Oracle JDK 1.8+, Python 2.7+, Apache Maven 3.5+, CMake 3.19.2+ Bison 3.0+`
 
@@ -183,6 +180,7 @@ You can try to compile Doris directly in your own Linux environment.
        ln -s /usr/bin/gcc-11 /usr/bin/gcc
        sudo apt-get install autoconf automake libtool autopoint
        ```
+
         If you are using CentOS you can use the following command to install the dependencies
 
        ```
@@ -191,7 +189,9 @@ You can try to compile Doris directly in your own Linux environment.
        sudo yum install devtoolset-10
        scl enable devtoolset-10 bash
        ```
+
        If devtoolset-10 is not found in current repo. Oracle has already rebuilt the devtoolset-10 packages. You can use this repo file:
+
        ```
        [ol7_software_collections]
        name=Software Collection packages for Oracle Linux 7 ($basearch)
@@ -200,71 +200,73 @@ You can try to compile Doris directly in your own Linux environment.
        gpgcheck=1
        enabled=1
        ```
+
        After installation, set environment variables `PATH`, `JAVA_HOME`, etc.
+
        > nit: you can find the jdk install directory by using command `alternatives --list`
 
        Doris 0.14.0 will use gcc7 env to compile.
 
-2. Compile Doris
+  2. Compile Doris
 
-   Compiling with the Docker development image, check whether the avx2 instruction is supported before compiling
+     Compiling with the Docker development image, check whether the avx2 instruction is supported before compiling
 
-   ```
-   $ cat /proc/cpuinfo | grep avx2
-   ```
+     ```
+     $ cat /proc/cpuinfo | grep avx2
+     ```
 
-   If supported, use the following command to compile
+     If supported, use the following command to compile
 
-    ```
-    $ sh build.sh
-    ```
+      ```
+     $ sh build.sh
+      ```
 
-   If it is not supported, you need to add USE_AVX2=0
+     If it is not supported, you need to add USE_AVX2=0
 
-    ```
-    $ USE_AVX2=0 sh build.sh
-    ```
+      ```
+     $ USE_AVX2=0 sh build.sh
+      ```
 
-   After compilation, the output files are in the `output/` directory.
+     After compilation, the output files are in the `output/` directory.
 
-## FAQ
+  ## FAQ
 
-1. `Could not transfer artifact net.sourceforge.czt.dev:cup-maven-plugin:pom:1.6-cdh from/to xxx`
+  1. `Could not transfer artifact net.sourceforge.czt.dev:cup-maven-plugin:pom:1.6-cdh from/to xxx`
 
-    If you encounter the above error, please refer to [PR #4769](https://github.com/apache/incubator-doris/pull/4769/files) to modify the cloudera-related repo configuration in `fe/pom.xml`.
+     If you encounter the above error, please refer to [PR #4769](https://github.com/apache/doris/pull/4769/files) to modify the cloudera-related repo configuration in `fe/pom.xml`.
 
-2. The third party relies on download connection errors, failures, etc.
+  2. The third party relies on download connection errors, failures, etc.
 
      The download links of the third-party libraries that Doris relies on are all in the `thirdparty/vars.sh` file. Over time, some download connections may fail. If you encounter this situation. It can be solved in the following two ways:
 
      1. Manually modify the `thirdparty/vars.sh` file
 
-         Manually modify the problematic download connection and the corresponding MD5 value.
+        Manually modify the problematic download connection and the corresponding MD5 value.
 
      2. Use a third-party download warehouse:
 
-         ```
-         export REPOSITORY_URL=https://doris-thirdparty-repo.bj.bcebos.com/thirdparty
-         sh build-thirdparty.sh
-         ```
+        ```
+        export REPOSITORY_URL=https://doris-thirdparty-repo.bj.bcebos.com/thirdparty
+        sh build-thirdparty.sh
+        ```
 
-         REPOSITORY_URL contains all third-party library source code packages and their historical versions.
+        REPOSITORY_URL contains all third-party library source code packages and their historical versions.
 
-## Special statement
+  ## Special statement
 
-Starting from version 0.13, the dependency on the two third-party libraries [1] and [2] will be removed in the default compiled output. These two third-party libraries are under [GNU General Public License V3](https://www.gnu.org/licenses/gpl-3.0.en.html). This license is incompatible with [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0), so it should not appear in the Apache release by default.
+  Starting from version 0.13, the dependency on the two third-party libraries [1] and [2] will be removed in the default compiled output. These two third-party libraries are under [GNU General Public License V3](https://www.gnu.org/licenses/gpl-3.0.en.html). This license is incompatible with [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0), so it should not appear in the Apache release by default.
 
-Remove library [1] will result in the inability to access MySQL external tables. The feature of accessing MySQL external tables will be implemented through `UnixODBC` in future release version.
+  Remove library [1] will result in the inability to access MySQL external tables. The feature of accessing MySQL external tables will be implemented through `UnixODBC` in future release version.
 
-Remove library [2] will cause some data written in earlier versions (before version 0.8) to be unable to read. Because the data in the earlier version was compressed using the LZO algorithm, in later versions, it has been changed to the LZ4 compression algorithm. We will provide tools to detect and convert this part of the data in the future.
+  Remove library [2] will cause some data written in earlier versions (before version 0.8) to be unable to read. Because the data in the earlier version was compressed using the LZO algorithm, in later versions, it has been changed to the LZ4 compression algorithm. We will provide tools to detect and convert this part of the data in the future.
 
-If required, users can continue to use these two dependent libraries. If you want to use it, you need to add the following options when compiling:
+  If required, users can continue to use these two dependent libraries. If you want to use it, you need to add the following options when compiling:
 
-```
-WITH_MYSQL=1 WITH_LZO=1 sh build.sh
-```
+  ```
+  WITH_MYSQL=1 WITH_LZO=1 sh build.sh
+  ```
 
-Note that when users rely on these two third-party libraries, Doris is not used under the Apache License 2.0 by default. Please pay attention to the GPL related agreements.
+  Note that when users rely on these two third-party libraries, Doris is not used under the Apache License 2.0 by default. Please pay attention to the GPL related agreements.
 
-* [1] mysql-5.7.18
-* [2] lzo-2.10
+  * [1] mysql-5.7.18
+  * [2] lzo-2.10
diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/current/install/source-install/compilation.md b/i18n/zh-CN/docusaurus-plugin-content-docs/current/install/source-install/compilation.md
index 7535699cdac..7e7d48df4f8 100644
--- a/i18n/zh-CN/docusaurus-plugin-content-docs/current/install/source-install/compilation.md
+++ b/i18n/zh-CN/docusaurus-plugin-content-docs/current/install/source-install/compilation.md
@@ -1,6 +1,6 @@
 ---
 {
-    "title": "Doris编译",
+    "title": "Doris 编译",
     "language": "zh-CN"
 }
 ---
@@ -34,65 +34,66 @@ under the License.
 
 1. 下载 Docker 镜像
 
-   `$ docker pull apache/incubator-doris:build-env-ldb-toolchain-latest`
+   `$ docker pull apache/doris:build-env-ldb-toolchain-latest`
 
    检查镜像下载完成:
 
     ```
-    $ docker images
-    REPOSITORY              TAG                               IMAGE ID            CREATED             SIZE
-    apache/incubator-doris  build-env-ldb-toolchain-latest    49f68cecbc1a        4 days ago          3.76GB
+   $ docker images
+   REPOSITORY              TAG                               IMAGE ID            CREATED             SIZE
+   apache/doris  build-env-ldb-toolchain-latest    49f68cecbc1a        4 days ago          3.76GB
     ```
 
-> 注1:针对不同的 Doris 版本,需要下载对应的镜像版本。从 Apache Doris 0.15 版本起,后续镜像版本号将与 Doris 版本号统一。比如可以使用 `apache/incubator-doris:build-env-for-0.15.0 `  来编译 0.15.0 版本。
+> 注1:针对不同的 Doris 版本,需要下载对应的镜像版本。从 Apache Doris 0.15 版本起,后续镜像版本号将与 Doris 版本号统一。比如可以使用 `apache/doris:build-env-for-0.15.0 `  来编译 0.15.0 版本。
 >
-> 注2:`apache/incubator-doris:build-env-ldb-toolchain-latest` 用于编译最新主干版本代码,会随主干版本不断更新。可以查看 `docker/README.md` 中的更新时间。
-
-| 镜像版本 | commit id | doris 版本 |
-|---|---|---|
-| apache/incubator-doris:build-env | before [ff0dd0d](https://github.com/apache/incubator-doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81) | 0.8.x, 0.9.x |
-| apache/incubator-doris:build-env-1.1 | [ff0dd0d](https://github.com/apache/incubator-doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81) | 0.10.x, 0.11.x |
-| apache/incubator-doris:build-env-1.2 | [4ef5a8c](https://github.com/apache/incubator-doris/commit/4ef5a8c8560351d7fff7ff8fd51c4c7a75e006a8) | 0.12.x - 0.14.0 |
-| apache/incubator-doris:build-env-1.3.1 | [ad67dd3](https://github.com/apache/incubator-doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) | 0.14.x |
-| apache/incubator-doris:build-env-for-0.15.0 | [a81f4da](https://github.com/apache/incubator-doris/commit/a81f4da4e461a54782a96433b746d07be89e6b54) or later | 0.15.0 |
-| apache/incubator-doris:build-env-latest | before [0efef1b](https://github.com/apache/incubator-doris/commit/0efef1b332300887ee0473f9df9bdd9d7297d824) | |
-| apache/incubator-doris:build-env-for-1.0.0| | 1.0.0 |
-| apache/incubator-doris:build-env-ldb-toolchain-latest | trunk | |
+> 注2:`apache/doris:build-env-ldb-toolchain-latest` 用于编译最新主干版本代码,会随主干版本不断更新。可以查看 `docker/README.md` 中的更新时间。
+
+| 镜像版本                                    | commit id                                                    | doris 版本      |
+| ------------------------------------------- | ------------------------------------------------------------ | --------------- |
+| apache/incubator-doris:build-env            | before [ff0dd0d](https://github.com/apache/doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81) | 0.8.x, 0.9.x    |
+| apache/incubator-doris:build-env-1.1        | [ff0dd0d](https://github.com/apache/doris/commit/ff0dd0d2daa588f18b6db56f947e813a56d8ec81) | 0.10.x, 0.11.x  |
+| apache/incubator-doris:build-env-1.2        | [4ef5a8c](https://github.com/apache/doris/commit/4ef5a8c8560351d7fff7ff8fd51c4c7a75e006a8) | 0.12.x - 0.14.0 |
+| apache/incubator-doris:build-env-1.3.1      | [ad67dd3](https://github.com/apache/doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) | 0.14.x          |
+| apache/doris:build-env-for-0.15.0           | [a81f4da](https://github.com/apache/doris/commit/a81f4da4e461a54782a96433b746d07be89e6b54) or later | 0.15.0          |
+| apache/incubator-doris:build-env-latest     | before [0efef1b](https://github.com/apache/doris/commit/0efef1b332300887ee0473f9df9bdd9d7297d824) |                 |
+| apache/doris:build-env-for-1.0.0            |                                                              | 1.0.0           |
+| apache/doris:build-env-for-1.1.0            |                                                              | 1.1.0           |
+| apache/doris:build-env-ldb-toolchain-latest | trunk                                                        |                 |
 
 **注意**:
 
-> 1. 编译镜像 [ChangeLog](https://github.com/apache/incubator-doris/blob/master/thirdparty/CHANGELOG.md)。
+> 1. 编译镜像 [ChangeLog](https://github.com/apache/doris/blob/master/thirdparty/CHANGELOG.md)。
 
 > 2. doris 0.14.0 版本仍然使用apache/incubator-doris:build-env-1.2 编译,0.14.x 版本的代码将使用apache/incubator-doris:build-env-1.3.1。
 
 > 3. 从 build-env-1.3.1 的docker镜像起,同时包含了 OpenJDK 8 和 OpenJDK 11,并且默认使用 OpenJDK 11 编译。请确保编译使用的 JDK 版本和运行时使用的 JDK 版本一致,否则会导致非预期的运行错误。你可以在进入编译镜像的容器后,使用以下命令切换默认 JDK 版本:
-     >
-     >   切换到 JDK 8:
-     >
-     >   ```
->   $ alternatives --set java java-1.8.0-openjdk.x86_64
->   $ alternatives --set javac java-1.8.0-openjdk.x86_64
->   $ export JAVA_HOME=/usr/lib/jvm/java-1.8.0
+>
+>   切换到 JDK 8:
+>
 >   ```
-     >
-     >   切换到 JDK 11:
-     >
-     >   ```
->   $ alternatives --set java java-11-openjdk.x86_64
->   $ alternatives --set javac java-11-openjdk.x86_64
->   $ export JAVA_HOME=/usr/lib/jvm/java-11
+> $ alternatives --set java java-1.8.0-openjdk.x86_64
+> $ alternatives --set javac java-1.8.0-openjdk.x86_64
+> $ export JAVA_HOME=/usr/lib/jvm/java-1.8.0
+>   ```
+>
+>   切换到 JDK 11:
+>
+>   ```
+> $ alternatives --set java java-11-openjdk.x86_64
+> $ alternatives --set javac java-11-openjdk.x86_64
+> $ export JAVA_HOME=/usr/lib/jvm/java-11
 >   ```
 
 2. 运行镜像
 
-   `$ docker run -it apache/incubator-doris:build-env-ldb-toolchain-latest`
+   `$ docker run -it apache/doris:build-env-ldb-toolchain-latest`
 
    建议以挂载本地 Doris 源码目录的方式运行镜像,这样编译的产出二进制文件会存储在宿主机中,不会因为镜像退出而消失。
 
    同时,建议同时将镜像中 maven 的 `.m2` 目录挂载到宿主机目录,以防止每次启动镜像编译时,重复下载 maven 的依赖库。
 
     ```
-    $ docker run -it -v /your/local/.m2:/root/.m2 -v /your/local/incubator-doris-DORIS-x.x.x-release/:/root/incubator-doris-DORIS-x.x.x-release/ apache/incubator-doris:build-env-ldb-toolchain-latest
+   $ docker run -it -v /your/local/.m2:/root/.m2 -v /your/local/doris-DORIS-x.x.x-release/:/root/doris-DORIS-x.x.x-release/ apache/doris:build-env-ldb-toolchain-latest
     ```
 
 3. 下载源码
@@ -100,36 +101,36 @@ under the License.
    启动镜像后,你应该已经处于容器内。可以通过以下命令下载 Doris 源码(已挂载本地源码目录则不用):
 
     ```
-    $ wget https://dist.apache.org/repos/dist/dev/incubator/doris/xxx.tar.gz
-    or
-    $ git clone https://github.com/apache/incubator-doris.git
+   $ wget https://dist.apache.org/repos/dist/dev/doris/xxx.tar.gz
+   or
+   $ git clone https://github.com/apache/doris.git
     ```
 
 4. 编译 Doris
 
    先通过以下命令查看编译机器是否支持avx2指令集
-   
+
     ```
    $ cat /proc/cpuinfo | grep avx2
     ```
-   
+
    不支持则使用以下命令进行编译
-   
+
    ```
    $ USE_AVX2=0  sh build.sh
    ```
 
    如果支持,可不加 USE_AVX2=0 ,直接进行编译
-   
+
    ```
    $ sh build.sh
    ```
-   
+
    编译完成后,产出文件在 `output/` 目录中。
-   
+
    >**注意:**
    >
-   >如果你是第一次使用 `build-env-for-0.15.0` 或 `incubator-doris:build-env-for-1.0.0` 的版本,第一次编译的时候要使用如下命令:
+   >如果你是第一次使用 `build-env-for-0.15.0` 或 `build-env-for-1.0.0` 的版本,第一次编译的时候要使用如下命令:
    >
    >`sh build.sh --clean --be --fe --ui`
    >
@@ -138,7 +139,7 @@ under the License.
    >`sh build --clean --be --fe`
    >
    >这是因为 build-env-for-0.15.0 版本镜像升级了 thrift(0.9 -> 0.13),需要通过 --clean 命令强制使用新版本的 thrift 生成代码文件,否则会出现不兼容的代码。
-   
+
    编译完成后,产出文件在 `output/` 目录中。
 
 ### 自行编译开发环境镜像
@@ -152,7 +153,8 @@ under the License.
 
 1. 系统依赖
    不同的版本依赖也不相同
-    * 在 [ad67dd3](https://github.com/apache/incubator-doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) 之前版本依赖如下:
+
+    * 在 [ad67dd3](https://github.com/apache/doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) 之前版本依赖如下:
 
       `GCC 7.3+, Oracle JDK 1.8+, Python 2.7+, Apache Maven 3.5+, CMake 3.11+     Bison 3.0+`
 
@@ -164,34 +166,38 @@ under the License.
 
       `sudo yum groupinstall 'Development Tools' && sudo yum install maven cmake byacc flex automake libtool bison binutils-devel zip unzip ncurses-devel curl git wget python2 glibc-static libstdc++-static java-1.8.0-openjdk`
 
-    * 在 [ad67dd3](https://github.com/apache/incubator-doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) 之后版本依赖如下:
+    * 在 [ad67dd3](https://github.com/apache/doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) 之后版本依赖如下:
 
       `GCC 10+, Oracle JDK 1.8+, Python 2.7+, Apache Maven 3.5+, CMake 3.19.2+ Bison 3.0+`
 
       如果使用Ubuntu 16.04 及以上系统 可以执行以下命令来安装依赖
+
        ```
-       sudo apt install build-essential openjdk-8-jdk maven cmake byacc flex automake libtool-bin bison binutils-dev libiberty-dev zip unzip libncurses5-dev curl git ninja-build python
-       sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
-       sudo apt update
-       sudo apt install gcc-10 g++-10 
-       sudo apt-get install autoconf automake libtool autopoint
+      sudo apt install build-essential openjdk-8-jdk maven cmake byacc flex automake libtool-bin bison binutils-dev libiberty-dev zip unzip libncurses5-dev curl git ninja-build python
+      sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
+      sudo apt update
+      sudo apt install gcc-10 g++-10 
+      sudo apt-get install autoconf automake libtool autopoint
        ```
 
       如果是CentOS 可以执行以下命令
+
        ```
-       sudo yum groupinstall 'Development Tools' && sudo yum install maven cmake byacc flex automake libtool bison binutils-devel zip unzip ncurses-devel curl git wget python2 glibc-static libstdc++-static java-1.8.0-openjdk
-       sudo yum install centos-release-scl
-       sudo yum install devtoolset-10
-       scl enable devtoolset-10 bash
+      sudo yum groupinstall 'Development Tools' && sudo yum install maven cmake byacc flex automake libtool bison binutils-devel zip unzip ncurses-devel curl git wget python2 glibc-static libstdc++-static java-1.8.0-openjdk
+      sudo yum install centos-release-scl
+      sudo yum install devtoolset-10
+      scl enable devtoolset-10 bash
        ```
+
       如果当前仓库没有提供devtoolset-10 可以添加如下repo 使用oracle 提供 package
+
        ```
-       [ol7_software_collections]
-       name=Software Collection packages for Oracle Linux 7 ($basearch)
-       baseurl=http://yum.oracle.com/repo/OracleLinux/OL7/SoftwareCollections/$basearch/
-       gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
-       gpgcheck=1
-       enabled=1
+      [ol7_software_collections]
+      name=Software Collection packages for Oracle Linux 7 ($basearch)
+      baseurl=http://yum.oracle.com/repo/OracleLinux/OL7/SoftwareCollections/$basearch/
+      gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
+      gpgcheck=1
+      enabled=1
        ```
 
    安装完成后,自行设置环境变量 `PATH`, `JAVA_HOME` 等。(可以通过`alternatives --list`命令找到jdk的安装目录)
@@ -199,31 +205,31 @@ under the License.
 
 2. 编译 Doris
 
-    与使用 Docker 开发镜像编译一样,编译之前先检查是否支持avx2指令
+   与使用 Docker 开发镜像编译一样,编译之前先检查是否支持avx2指令
 
-    ```
+   ```
    $ cat /proc/cpuinfo | grep avx2
    ```
-   
+
     支持则使用下面命令进行编译
 
    ```
    $ sh build.sh
    ```
-   
+
    如不支持需要加 USE_AVX2=0 
-   
+
    ```
    $ USE_AVX2=0 sh build.sh
    ```
-   
+
    编译完成后,产出文件在 `output/` 目录中。
 
 ## 常见问题
 
 1. `Could not transfer artifact net.sourceforge.czt.dev:cup-maven-plugin:pom:1.6-cdh from/to xxx`
 
-   如遇到上述错误,请参照 [PR #4769](https://github.com/apache/incubator-doris/pull/4769/files) 修改 `fe/pom.xml` 中 cloudera 相关的仓库配置。
+   如遇到上述错误,请参照 [PR #4769](https://github.com/apache/doris/pull/4769/files) 修改 `fe/pom.xml` 中 cloudera 相关的仓库配置。
 
 2. 第三方依赖下载连接错误、失效等问题
 
@@ -235,10 +241,10 @@ under the License.
 
     2. 使用第三方下载仓库:
 
-        ```
-        export REPOSITORY_URL=https://doris-thirdparty-repo.bj.bcebos.com/thirdparty
-        sh build-thirdparty.sh
-        ```
+       ```
+       export REPOSITORY_URL=https://doris-thirdparty-repo.bj.bcebos.com/thirdparty
+       sh build-thirdparty.sh
+       ```
 
        REPOSITORY_URL 中包含所有第三方库源码包和他们的历史版本。
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org