database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[Document] update docker env version to 1.3.1 (#6517)

Browse Source 
* update docker env version
This commit is contained in:
Pxl
2021-08-30 11:01:39 +08:00
committed by GitHub
parent a2a13dadba
commit 5eed1f897a
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/en/community/release-process.md
View File

@ -305,7 +305,7 @@ After the entire branch is stable, the release can be prepared.
1. Download the compiled image
```
docker pull apache/incubator-doris:build-env-1.2
docker pull apache/incubator-doris:build-env-1.3.1
```
2. Use official documents to compile the new branch, see [Docker Development Mirror Compilation](http://doris.apache.org/master/zh-CN/installing/compilation.html)
@ -513,12 +513,12 @@ To verify and build, you can refer to following instruction:
Firstly, you must be install and start docker service, and then you could build Doris as following steps:
Step1: Pull the docker image with Doris building environment
$ docker pull apache/incubator-doris:build-env-1.3
$ docker pull apache/incubator-doris:build-env-1.3.1
You can check it by listing images, its size is about 3.28GB.
Step2: Run the Docker image
You can run image directly:
$ docker run -it apache/incubator-doris:build-env-1.3
$ docker run -it apache/incubator-doris:build-env-1.3.1
Step3: Download Doris source
Now you should in docker environment, and you can download Doris source package.

14
docs/en/installing/compilation.md
View File

@ -35,14 +35,14 @@ This document focuses on how to code Doris through source code.
1. Download Docker Mirror
`$ docker pull apache/incubator-doris:build-env-1.3`
`$ docker pull apache/incubator-doris:build-env-1.3.1`
Check mirror download completed:
```
$ docker images
REPOSITORY TAG IMAGE ID CREATED SIZE
apache/incubator-doris build-env-1.3 49f68cecbc1a 4 days ago 3.76GB
apache/incubator-doris build-env-1.3.1 49f68cecbc1a 4 days ago 3.76GB
```
Note: For different versions of Doris, you need to download the corresponding mirror version.
@ -52,13 +52,13 @@ Note: For different versions of Doris, you need to download the corresponding mi
| 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 | [ad67dd3](https://github.com/apache/incubator-doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) or later | later |
| apache/incubator-doris:build-env-1.3.1 | [ad67dd3](https://github.com/apache/incubator-doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) or later | later |
**note**:
> 1. Doris version 0.14.0 still uses apache/incubator-doris:build-env-1.2 to compile, and the subsequent code will use apache/incubator-doris:build-env-1.3.
> 1. Doris version 0.14.0 still uses apache/incubator-doris:build-env-1.2 to compile, and the subsequent code will use apache/incubator-doris:build-env-1.3.1.
> 2. In the docker image of build-env-1.3, 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:
> 2. In the 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:
>
@ -78,14 +78,14 @@ Note: For different versions of Doris, you need to download the corresponding mi
2. Running Mirror
`$ docker run -it apache/incubator-doris:build-env-1.3`
`$ docker run -it apache/incubator-doris:build-env-1.3.1`
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.
```
$ 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-1.3
$ 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-1.3.1
```
3. Download source code

6
docs/zh-CN/community/release-process.md
View File

@ -294,7 +294,7 @@ $ git checkout -b branch-0.9
1. 下载编译镜像
```
docker pull apache/incubator-doris:build-env-1.2
docker pull apache/incubator-doris:build-env-1.3.1
```
2. 使用官方文档编译新分支，编译方式见[Docker 开发镜像编译](http://doris.apache.org/master/zh-CN/installing/compilation.html)
@ -497,12 +497,12 @@ To verify and build, you can refer to following instruction:
Firstly, you must be install and start docker service, and then you could build Doris as following steps:
Step1: Pull the docker image with Doris building environment
$ docker pull apache/incubator-doris:build-env-1.3
$ docker pull apache/incubator-doris:build-env-1.3.1
You can check it by listing images, its size is about 3.28GB.
Step2: Run the Docker image
You can run image directly:
$ docker run -it apache/incubator-doris:build-env-1.3
$ docker run -it apache/incubator-doris:build-env-1.3.1
Step3: Download Doris source
Now you should in docker environment, and you can download Doris source package.

14
docs/zh-CN/installing/compilation.md
View File

@ -34,14 +34,14 @@ under the License.
1. 下载 Docker 镜像
`$ docker pull apache/incubator-doris:build-env-1.3`
`$ docker pull apache/incubator-doris:build-env-1.3.1`
检查镜像下载完成：
```
$ docker images
REPOSITORY TAG IMAGE ID CREATED SIZE
apache/incubator-doris build-env-1.3 49f68cecbc1a 4 days ago 3.76GB
apache/incubator-doris build-env-1.3.1 49f68cecbc1a 4 days ago 3.76GB
```
注: 针对不同的 Doris 版本，需要下载对应的镜像版本
@ -51,13 +51,13 @@ under the License.
| 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 | [ad67dd3](https://github.com/apache/incubator-doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) | 后续的发布版本 |
| apache/incubator-doris:build-env-1.3.1 | [ad67dd3](https://github.com/apache/incubator-doris/commit/ad67dd34a04c1ca960cff38e5b335b30fc7d559f) | 后续的发布版本 |
**注意**：
> 1. doris 0.14.0 版本仍然使用apache/incubator-doris:build-env-1.2 编译，之后的代码将使用apache/incubator-doris:build-env-1.3。
> 1. doris 0.14.0 版本仍然使用apache/incubator-doris:build-env-1.2 编译，之后的代码将使用apache/incubator-doris:build-env-1.3.1。
> 2. 在 build-env-1.3 的docker镜像中，同时包含了 OpenJDK 8 和 OpenJDK 11，并且默认使用 OpenJDK 11 编译。请确保编译使用的 JDK 版本和运行时使用的 JDK 版本一致，否则会导致非预期的运行错误。你可以使用在进入编译镜像的容器后，使用以下命令切换默认 JDK 版本：
> 2. 在 build-env-1.3.1 的docker镜像中，同时包含了 OpenJDK 8 和 OpenJDK 11，并且默认使用 OpenJDK 11 编译。请确保编译使用的 JDK 版本和运行时使用的 JDK 版本一致，否则会导致非预期的运行错误。你可以使用在进入编译镜像的容器后，使用以下命令切换默认 JDK 版本：
>
> 切换到 JDK 8：
>
@ -77,14 +77,14 @@ under the License.
2. 运行镜像
`$ docker run -it apache/incubator-doris:build-env-1.3`
`$ docker run -it apache/incubator-doris:build-env-1.3.1`
建议以挂载本地 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-1.3
$ 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-1.3.1
```
3. 下载源码