This is an automated email from the ASF dual-hosted git repository.
morningman 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 6d237335cd8 [deps](docker) update docker build env to add jdk17
(#31644)
6d237335cd8 is described below
commit 6d237335cd8886d6e19f3253c89fc0c14cde7736
Author: Mingyu Chen <[email protected]>
AuthorDate: Wed Mar 6 21:12:25 2024 +0800
[deps](docker) update docker build env to add jdk17 (#31644)
---
docker/compilation/Dockerfile | 21 +++++++++-----
.../install/source-install/compilation-general.md | 33 ++++++++++------------
.../install/source-install/compilation-general.md | 12 ++++----
3 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/docker/compilation/Dockerfile b/docker/compilation/Dockerfile
index 2dcab8d2ee0..d24c1e72929 100644
--- a/docker/compilation/Dockerfile
+++ b/docker/compilation/Dockerfile
@@ -22,25 +22,32 @@ RUN yum install epel-release -y && yum clean all && yum
makecache
# install dependencies
RUN yum install -y byacc patch automake libtool perf vim make which file
ncurses-devel gettext-devel unzip bzip2 zip util-linux \
- wget git python2 bison java-11-openjdk-devel java-1.8.0-openjdk-devel
+ wget git python2 bison java-1.8.0-openjdk-devel
# clean cache
RUN yum clean all
# install maven 3.6.3
-RUN mkdir -p /usr/share/maven /usr/share/maven/ref && \
- wget -q -O /tmp/apache-maven.tar.gz
https://doris-thirdparty-repo.bj.bcebos.com/thirdparty/apache-maven-3.6.3-bin.tar.gz
&& \
- tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1
&& \
- rm -f /tmp/apache-maven.tar.gz && \
- ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
+RUN mkdir -p /usr/share/maven /usr/share/maven/ref \
+ && wget -q -O /tmp/apache-maven.tar.gz
https://doris-thirdparty-1308700295.cos.ap-beijing.myqcloud.com/tools/apache-maven-3.6.3-bin.tar.gz
\
+ && tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven
--strip-components=1 \
+ && rm -f /tmp/apache-maven.tar.gz \
+ && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn
# install nodejs
-RUN wget
https://doris-thirdparty-repo.bj.bcebos.com/thirdparty/node-v12.13.0-linux-x64.tar.gz
\
+RUN wget
https://doris-thirdparty-1308700295.cos.ap-beijing.myqcloud.com/tools/node-v12.13.0-linux-x64.tar.gz
\
-q -O /tmp/node-v12.13.0-linux-x64.tar.gz \
&& cd /tmp/ && tar -xf node-v12.13.0-linux-x64.tar.gz \
&& cp -r node-v12.13.0-linux-x64/* /usr/local/ \
&& rm /tmp/node-v12.13.0-linux-x64.tar.gz && rm -rf node-v12.13.0-linux-x64
+# install jdk17
+RUN wget
https://doris-thirdparty-1308700295.cos.ap-beijing.myqcloud.com/tools/openjdk-17.0.2_linux-x64_bin.tar.gz
\
+ -q -O /tmp/openjdk-17.0.2_linux-x64_bin.tar.gz \
+ && cd /tmp && tar -xzf openjdk-17.0.2_linux-x64_bin.tar.gz \
+ && cp -r jdk-17.0.2/ /usr/lib/jvm/ \
+ && rm /tmp/openjdk-17.0.2_linux-x64_bin.tar.gz && rm -rf /tmp/jdk-17.0.2/
+
# install ldb-toolchain
# 0.17
RUN wget
https://doris-community-bj-1308700295.cos.ap-beijing.myqcloud.com/tools/ldb_toolchain_gen.sh
\
diff --git a/docs/en/docs/install/source-install/compilation-general.md
b/docs/en/docs/install/source-install/compilation-general.md
index a551357171e..2a020106cc9 100644
--- a/docs/en/docs/install/source-install/compilation-general.md
+++ b/docs/en/docs/install/source-install/compilation-general.md
@@ -74,24 +74,21 @@ This topic is about how to compile Doris from source.
> 3. For Doris 0.14.0, use `apache/incubator-doris:build-env-1.2` to compile;
> for Doris 0.14.x, use `apache/incubator-doris:build-env-1.3.1` to compile.
-> 4. The docker images of build-env-1.3.1 and above include both OpenJDK 8 and
OpenJDK 11, please confirm the default JDK version with `java -version`. You
can also switch versions as follows. (It is recommended to use JDK8.)
->
-> 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
-> ```
->
+> 4. The latest version of the `apache/doris:build-env-ldb-toolchain-latest`
image contains both JDK 8 and JDK 17.
+ >
+ > Switch to JDK 8:
+ >
+ > ```
+ > export JAVA_HOME=/usr/lib/jvm/java-1.8.0
+ > export PATH=$JAVA_HOME/bin/:$PATH
+ > ```
+ >
+ > Switch to JDK 17:
+ >
+ > ```
+ > export JAVA_HOME=/usr/lib/jvm/jdk-17.0.2/
+ > export PATH=$JAVA_HOME/bin/:$PATH
+ > ```
2. Run the image
diff --git a/docs/zh-CN/docs/install/source-install/compilation-general.md
b/docs/zh-CN/docs/install/source-install/compilation-general.md
index 30bdab1761f..01408f2f8b0 100644
--- a/docs/zh-CN/docs/install/source-install/compilation-general.md
+++ b/docs/zh-CN/docs/install/source-install/compilation-general.md
@@ -73,22 +73,20 @@ under the License.
> 3. doris 0.14.0 版本仍然使用apache/incubator-doris:build-env-1.2 编译，0.14.x
> 版本的代码将使用apache/incubator-doris:build-env-1.3.1。
-> 4. 从 build-env-1.3.1 的docker镜像起，同时包含了 OpenJDK 8 和 OpenJDK 11，请通过 `java
-version` 确认默认 JDK 版本。也可以通过以下方式切换版本（建议默认使用 JDK8）
+> 4. 最新版本的 `apache/doris:build-env-ldb-toolchain-latest` 镜像中同时包含 JDK 8 和 JDK
17。
>
> 切换到 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
+ > export PATH=$JAVA_HOME/bin/:$PATH
> ```
>
- > 切换到 JDK 11：
+ > 切换到 JDK 17：
>
> ```
- > alternatives --set java java-11-openjdk.x86_64
- > alternatives --set javac java-11-openjdk.x86_64
- > export JAVA_HOME=/usr/lib/jvm/java-11
+ > export JAVA_HOME=/usr/lib/jvm/jdk-17.0.2/
+ > export PATH=$JAVA_HOME/bin/:$PATH
> ```
2. 运行镜像
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
