admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-07 09:38:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add zstd lib in docker images (#18823)

Browse Source 
See also: #18304, #18335

Signed-off-by: yangxuan <xuan.yang@zilliz.com>

Signed-off-by: yangxuan <xuan.yang@zilliz.com>
This commit is contained in:
XuanYang-cn 2022-08-25 14:24:53 +08:00 committed by GitHub
parent d443b5420a
commit 769606cce2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/docker/builder/cpu/centos7/Dockerfile
View File

@ -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 && \ 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 && \ 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 \ libcurl-devel python3-devel \
devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-gcc-gfortran \ devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-gcc-gfortran \
llvm-toolset-7.0-clang llvm-toolset-7.0-clang-tools-extra \ llvm-toolset-7.0-clang llvm-toolset-7.0-clang-tools-extra \

5
build/docker/builder/cpu/ubuntu18.04/Dockerfile
View File

@ -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 && \ 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 && \ 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 \ 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 && \ apt-get remove --purge -y && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install -y --no-install-recommends libzstd-dev
# Install Go # Install Go
ENV GOPATH /go ENV GOPATH /go
ENV GOROOT /usr/local/go ENV GOROOT /usr/local/go

2
build/docker/milvus/centos7/Dockerfile
View File

@ -16,7 +16,7 @@ FROM centos:centos7
RUN yum install -y wget && \ RUN yum install -y wget && \
wget -P /etc/yum.repos.d/ http://mirrors.aliyun.com/repo/epel-7.repo && \ wget -P /etc/yum.repos.d/ http://mirrors.aliyun.com/repo/epel-7.repo && \
yum clean all && yum makecache && \ 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/* rm -rf /var/cache/yum/*
COPY --from=openblas /usr/lib/libopenblas-r0.3.9.so /usr/lib/ COPY --from=openblas /usr/lib/libopenblas-r0.3.9.so /usr/lib/

2
build/docker/milvus/ubuntu18.04/Dockerfile
View File

@ -15,7 +15,7 @@ FROM milvusdb/openblas:ubuntu18.04-20210428 AS openblas
FROM ubuntu:bionic-20200921 FROM ubuntu:bionic-20200921
RUN apt-get update && \ 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 && \ apt-get remove --purge -y && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

6
scripts/install_deps.sh
View File

@ -21,11 +21,11 @@ function install_linux_deps() {
# for Ubuntu 18.04 # for Ubuntu 18.04
sudo apt install -y g++ gcc make lcov libtool m4 autoconf automake ccache libssl-dev zlib1g-dev libboost-regex-dev \ 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-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 elif [[ -x "$(command -v yum)" ]]; then
# for CentOS 7 # for CentOS 7
sudo yum install -y epel-release centos-release-scl-rh && \ 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 \ libcurl-devel python3-devel \
devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-gcc-gfortran \ devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-gcc-gfortran \
llvm-toolset-7.0-clang llvm-toolset-7.0-clang-tools-extra llvm-toolset-7.0-clang llvm-toolset-7.0-clang-tools-extra
@ -56,7 +56,7 @@ function install_linux_deps() {
function install_mac_deps() { function install_mac_deps() {
sudo xcode-select --install > /dev/null 2>&1 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 uninstall grep
brew install grep brew install grep
export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH" export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH"

6
scripts/install_deps_embd.sh
View File

@ -21,7 +21,7 @@ function install_linux_deps() {
# for Ubuntu 18.04 # for Ubuntu 18.04
sudo apt install -y g++ gcc make ccache libssl-dev zlib1g-dev libboost-regex-dev \ 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-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. # install OpenBLAS, this could take a while.
wget https://github.com/xianyi/OpenBLAS/archive/v0.3.9.tar.gz && \ wget https://github.com/xianyi/OpenBLAS/archive/v0.3.9.tar.gz && \
tar zxvf v0.3.9.tar.gz && cd OpenBLAS-0.3.9 && \ tar zxvf v0.3.9.tar.gz && cd OpenBLAS-0.3.9 && \
@ -31,7 +31,7 @@ function install_linux_deps() {
elif [[ -x "$(command -v yum)" ]]; then elif [[ -x "$(command -v yum)" ]]; then
# for CentOS 7 # for CentOS 7
sudo yum install -y epel-release centos-release-scl-rh && \ 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 \ libcurl-devel python3-devel \
devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-gcc-gfortran \ devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-gcc-gfortran \
llvm-toolset-7.0-clang llvm-toolset-7.0-clang-tools-extra llvm-toolset-7.0-clang llvm-toolset-7.0-clang-tools-extra
@ -70,7 +70,7 @@ function install_linux_deps() {
function install_mac_deps() { function install_mac_deps() {
sudo xcode-select --install > /dev/null 2>&1 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 uninstall grep
brew install grep brew install grep
export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH" export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH"

3
scripts/install_deps_msys.sh
View File

@ -23,7 +23,8 @@ pacmanInstall()
mingw-w64-x86_64-python2 \ mingw-w64-x86_64-python2 \
mingw-w64-x86_64-diffutils \ mingw-w64-x86_64-diffutils \
mingw-w64-x86_64-arrow \ mingw-w64-x86_64-arrow \
mingw-w64-x86_64-go mingw-w64-x86_64-go \
mingw-w64-x86_64-zstd
pacman -U --noconfirm \ pacman -U --noconfirm \
https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-rocksdb-6.26.1-1-any.pkg.tar.zst https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-rocksdb-6.26.1-1-any.pkg.tar.zst
} }