Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add zstd lib in docker images #18823

Merged
merged 1 commit into from
Aug 25, 2022
Merged

Add zstd lib in docker images #18823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add zstd lib in docker images 
See also: #18304, #18335

Signed-off-by: yangxuan <xuan.yang@zilliz.com>
  • Loading branch information
@XuanYang-cn
XuanYang-cn committed Aug 25, 2022
commit 0b2423dca9662ad345f4ee02cebda084c383ce63
2 changes: 1 addition & 1 deletion build/docker/builder/cpu/centos7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FROM milvusdb/openblas:centos7-20210706

RUN yum install -y epel-release centos-release-scl-rh && yum install -y wget curl which && \
wget -qO- "https://cmake.org/files/v3.18/cmake-3.18.6-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local && \
yum install -y git make automake openssl-devel zlib-devel \
yum install -y git make automake openssl-devel zlib-devel libzstd-devel\
libcurl-devel python3-devel \
devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-gcc-gfortran \
llvm-toolset-7.0-clang llvm-toolset-7.0-clang-tools-extra \
Expand Down
5 changes: 4 additions & 1 deletion build/docker/builder/cpu/ubuntu18.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ FROM milvusdb/openblas:ubuntu18.04-20210428
RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-certificates gnupg2 && \
wget -qO- "https://cmake.org/files/v3.18/cmake-3.18.6-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local && \
apt-get update && apt-get install -y --no-install-recommends \
g++ gcc gfortran git make ccache libssl-dev zlib1g-dev libboost-regex-dev libboost-program-options-dev libboost-system-dev libboost-filesystem-dev libboost-serialization-dev python3-dev libboost-python-dev libcurl4-openssl-dev libtbb-dev clang-format-10 clang-tidy-10 lcov libtool m4 autoconf automake && \
g++ gcc gfortran git make ccache libssl-dev zlib1g-dev libboost-regex-dev libboost-program-options-dev libboost-system-dev \
libboost-filesystem-dev libboost-serialization-dev python3-dev libboost-python-dev libcurl4-openssl-dev libtbb-dev clang-format-10 clang-tidy-10 lcov libtool m4 autoconf automake && \
apt-get remove --purge -y && \
rm -rf /var/lib/apt/lists/*

RUN apt-get update && apt-get install -y --no-install-recommends libzstd-dev

# Install Go
ENV GOPATH /go
ENV GOROOT /usr/local/go
Expand Down
2 changes: 1 addition & 1 deletion build/docker/milvus/centos7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ FROM centos:centos7
RUN yum install -y wget && \
wget -P /etc/yum.repos.d/ http://mirrors.aliyun.com/repo/epel-7.repo && \
yum clean all && yum makecache && \
yum install -y libgomp libgfortran4 tbb-devel && \
yum install -y libgomp libgfortran4 tbb-devel libzstd-devel && \
rm -rf /var/cache/yum/*

COPY --from=openblas /usr/lib/libopenblas-r0.3.9.so /usr/lib/
Expand Down
2 changes: 1 addition & 1 deletion build/docker/milvus/ubuntu18.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ FROM milvusdb/openblas:ubuntu18.04-20210428 AS openblas
FROM ubuntu:bionic-20200921

RUN apt-get update && \
apt-get install -y --no-install-recommends libtbb-dev gfortran netcat iputils-ping ca-certificates && \
apt-get install -y --no-install-recommends libtbb-dev libzstd-dev gfortran netcat iputils-ping ca-certificates && \
apt-get remove --purge -y && \
rm -rf /var/lib/apt/lists/*

Expand Down
6 changes: 3 additions & 3 deletions scripts/install_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ function install_linux_deps() {
# for Ubuntu 18.04
sudo apt install -y g++ gcc make lcov libtool m4 autoconf automake ccache libssl-dev zlib1g-dev libboost-regex-dev \
libboost-program-options-dev libboost-system-dev libboost-filesystem-dev \
libboost-serialization-dev python3-dev libboost-python-dev libcurl4-openssl-dev gfortran libtbb-dev
libboost-serialization-dev python3-dev libboost-python-dev libcurl4-openssl-dev gfortran libtbb-dev libzstd-dev
elif [[ -x "$(command -v yum)" ]]; then
# for CentOS 7
sudo yum install -y epel-release centos-release-scl-rh && \
sudo yum install -y git make lcov libtool m4 autoconf automake ccache openssl-devel zlib-devel \
sudo yum install -y git make lcov libtool m4 autoconf automake ccache openssl-devel zlib-devel libzstd-devel \
libcurl-devel python3-devel \
devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-gcc-gfortran \
llvm-toolset-7.0-clang llvm-toolset-7.0-clang-tools-extra
Expand Down Expand Up @@ -56,7 +56,7 @@ function install_linux_deps() {

function install_mac_deps() {
sudo xcode-select --install > /dev/null 2>&1
brew install boost libomp ninja tbb cmake llvm ccache
brew install boost libomp ninja tbb cmake llvm ccache zstd
brew uninstall grep
brew install grep
export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH"
Expand Down
6 changes: 3 additions & 3 deletions scripts/install_deps_embd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function install_linux_deps() {
# for Ubuntu 18.04
sudo apt install -y g++ gcc make ccache libssl-dev zlib1g-dev libboost-regex-dev \
libboost-program-options-dev libboost-system-dev libboost-filesystem-dev \
libboost-serialization-dev python3-dev libboost-python-dev libcurl4-openssl-dev gfortran libtbb-dev
libboost-serialization-dev python3-dev libboost-python-dev libcurl4-openssl-dev gfortran libtbb-dev libzstd-dev
# install OpenBLAS, this could take a while.
wget https://github.com/xianyi/OpenBLAS/archive/v0.3.9.tar.gz && \
tar zxvf v0.3.9.tar.gz && cd OpenBLAS-0.3.9 && \
Expand All @@ -31,7 +31,7 @@ function install_linux_deps() {
elif [[ -x "$(command -v yum)" ]]; then
# for CentOS 7
sudo yum install -y epel-release centos-release-scl-rh && \
sudo yum install -y git make automake ccache openssl-devel zlib-devel \
sudo yum install -y git make automake ccache openssl-devel zlib-devel libzstd-devel \
libcurl-devel python3-devel \
devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-gcc-gfortran \
llvm-toolset-7.0-clang llvm-toolset-7.0-clang-tools-extra
Expand Down Expand Up @@ -70,7 +70,7 @@ function install_linux_deps() {

function install_mac_deps() {
sudo xcode-select --install > /dev/null 2>&1
brew install boost libomp ninja tbb cmake llvm ccache
brew install boost libomp ninja tbb cmake llvm ccache zstd
brew uninstall grep
brew install grep
export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH"
Expand Down
3 changes: 2 additions & 1 deletion scripts/install_deps_msys.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ pacmanInstall()
mingw-w64-x86_64-python2 \
mingw-w64-x86_64-diffutils \
mingw-w64-x86_64-arrow \
mingw-w64-x86_64-go
mingw-w64-x86_64-go \
mingw-w64-x86_64-zstd
pacman -U --noconfirm \
https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-rocksdb-6.26.1-1-any.pkg.tar.zst
}
Expand Down