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/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 91043bb [BuildEnv] Update Dockerfile add libasan (#5616)
91043bb is described below
commit 91043bb1162377ce29fd7c67f26c8a39bfb7526d
Author: Zhengguo Yang <yangz...@gmail.com>
AuthorDate: Sun Apr 11 22:02:49 2021 +0800
[BuildEnv] Update Dockerfile add libasan (#5616)
---
docker/Dockerfile | 2 +-
docker/Dockerfile.gcc7 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c9bbf99..4a9dab3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -34,7 +34,7 @@ RUN yum makecache && yum -y update && yum -y groupinstall
'Development Tools' &&
# install gcc10
RUN wget http://public-yum.oracle.com/RPM-GPG-KEY-oracle-ol7 -O
/etc/pki/rpm-gpg/RPM-GPG-KEY-oracle && \
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-* && \
- yum install -y devtoolset-10-gcc*
+ yum install -y devtoolset-10-gcc* devtoolset-10-libubsan-devel
devtoolset-10-liblsan-devel devtoolset-10-libasan-devel
ENV JAVA_HOME="/usr/lib/jvm/java-11"
diff --git a/docker/Dockerfile.gcc7 b/docker/Dockerfile.gcc7
index 9abefc8..9b4e6d9 100644
--- a/docker/Dockerfile.gcc7
+++ b/docker/Dockerfile.gcc7
@@ -25,7 +25,7 @@ ARG GCC_VERSION=7.3.0
ARG GCC_URL=https://mirrors.ustc.edu.cn/gnu/gcc/gcc-${GCC_VERSION}
# install dependencies and build gcc
-RUN yum install -y bzip2 wget git gcc-c++ libstdc++-static byacc flex automake
libtool binutils-devel bison ncurses-devel make mlocate unzip patch which
vim-common redhat-lsb-core zip libcurl-devel \
+RUN yum install -y bzip2 wget git gcc-c++ libstdc++-static byacc flex automake
libtool binutils-devel bison ncurses-devel make mlocate unzip patch which
vim-common redhat-lsb-core zip libcurl-devel libasan-static libtsan-static \
&& updatedb \
&& yum -y clean all \
&& rm -rf /var/cache/yum \
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
