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 868bae47f6 [improvement](docker) update compilation Dockerfile (#19563)
868bae47f6 is described below
commit 868bae47f62bf500898cdb1aa31c3484f9e381af
Author: Mingyu Chen <morning...@163.com>
AuthorDate: Fri May 12 09:06:45 2023 +0800
[improvement](docker) update compilation Dockerfile (#19563)
---
docker/compilation/Dockerfile | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/docker/compilation/Dockerfile b/docker/compilation/Dockerfile
index 6630f28cb4..2dcab8d2ee 100644
--- a/docker/compilation/Dockerfile
+++ b/docker/compilation/Dockerfile
@@ -22,7 +22,7 @@ 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 \
- ccache wget git python2 bison java-11-openjdk-devel
java-1.8.0-openjdk-devel
+ wget git python2 bison java-11-openjdk-devel java-1.8.0-openjdk-devel
# clean cache
RUN yum clean all
@@ -42,20 +42,32 @@ RUN wget
https://doris-thirdparty-repo.bj.bcebos.com/thirdparty/node-v12.13.0-li
&& rm /tmp/node-v12.13.0-linux-x64.tar.gz && rm -rf node-v12.13.0-linux-x64
# install ldb-toolchain
-RUN wget
https://doris-thirdparty-repo.bj.bcebos.com/thirdparty/ldb_toolchain_gen-v0.9.1.sh
\
+# 0.17
+RUN wget
https://doris-community-bj-1308700295.cos.ap-beijing.myqcloud.com/tools/ldb_toolchain_gen.sh
\
-q -O /tmp/ldb_toolchain_gen.sh \
&& sh /tmp/ldb_toolchain_gen.sh /var/local/ldb-toolchain/ \
&& rm /tmp/ldb_toolchain_gen.sh
# there is a repo which is included all of thirdparty
-ENV REPOSITORY_URL="https://doris-thirdparty-repo.bj.bcebos.com/thirdparty/"; \
+ENV
REPOSITORY_URL="https://doris-thirdparty-hk-1308700295.cos.ap-hongkong.myqcloud.com/thirdparty";
\
DEFAULT_DIR="/var/local" \
JAVA_HOME="/usr/lib/jvm/java-1.8.0" \
PATH="/var/local/ldb-toolchain/bin/:$PATH"
- # USE_AVX2=0 # set it when building no-avx2 image
+ # USE_AVX2=0
+
+# install ccache
+RUN wget
https://doris-community-bj-1308700295.cos.ap-beijing.myqcloud.com/tools/ccache-4.8.tar.gz
\
+ -q -O /tmp/ccache-4.8.tar.gz \
+ && cd /tmp/ && tar xzf ccache-4.8.tar.gz \
+ && cd ccache-4.8 \
+ && cmake -B _build -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-DCMAKE_BUILD_TYPE=Release . \
+ && cmake --build _build --config Release -j 4 \
+ && cp _build/ccache /var/local/ldb-toolchain/bin/
# disable auto enable ccache
-RUN rm -f /etc/profile.d/ccache.*
+# and resolve curl error setting certificate verfiy location error
+RUN rm -f /etc/profile.d/ccache.* \
+ && cp /etc/pki/tls/certs/ca-bundle.crt /etc/ssl/certs/ca-certificates.crt
# clone lastest source code, download and build third party
COPY doris ${DEFAULT_DIR}/doris
@@ -69,7 +81,6 @@ RUN cd ${DEFAULT_DIR}/doris && /bin/bash
thirdparty/build-thirdparty.sh \
RUN alternatives --set java java-1.8.0-openjdk.x86_64 && alternatives --set
javac java-1.8.0-openjdk.x86_64
-
# squash all layers to reduce the image size
FROM scratch
COPY --from=builder / /
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
