From a952777a848c901e7b9e4ea0380084fe4df82680 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Sat, 16 May 2020 00:01:23 +0800 Subject: [PATCH] Install openblas library to deployment environment (#2335) * Install openblas library to deployment environment Signed-off-by: quicksilver * Install openblas library to deployment environment Signed-off-by: quicksilver --- docker/deploy/cpu/centos7/Dockerfile | 8 ++++++-- docker/deploy/cpu/ubuntu18.04/Dockerfile | 8 ++++++-- docker/deploy/gpu/centos7/Dockerfile | 8 ++++++-- docker/deploy/gpu/ubuntu18.04/Dockerfile | 8 ++++++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/docker/deploy/cpu/centos7/Dockerfile b/docker/deploy/cpu/centos7/Dockerfile index 4e9b88f7..ef189ff8 100644 --- a/docker/deploy/cpu/centos7/Dockerfile +++ b/docker/deploy/cpu/centos7/Dockerfile @@ -9,16 +9,20 @@ # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express # or implied. See the License for the specific language governing permissions and limitations under the License. +FROM milvusdb/milvus-dev:amd64-centos-7-core AS openblas + FROM centos:centos7 RUN yum install -y epel-release && \ - yum install -y libgomp libgfortran4 mysql-devel openblas-devel lapack-devel && \ + yum install -y libgomp libgfortran4 mysql-devel && \ rm -rf /var/cache/yum/* COPY ./milvus /var/lib/milvus -COPY ./docker-entrypoint.sh /var/lib/milvus +COPY ./docker-entrypoint.sh /var/lib/milvus/ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/var/lib/milvus/lib" +COPY --from=openblas /usr/lib/libopenblas*.so* /var/lib/milvus/lib/ + WORKDIR /var/lib/milvus ENTRYPOINT [ "/var/lib/milvus/docker-entrypoint.sh" ] diff --git a/docker/deploy/cpu/ubuntu18.04/Dockerfile b/docker/deploy/cpu/ubuntu18.04/Dockerfile index f520dfab..44fd6f41 100644 --- a/docker/deploy/cpu/ubuntu18.04/Dockerfile +++ b/docker/deploy/cpu/ubuntu18.04/Dockerfile @@ -9,19 +9,23 @@ # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express # or implied. See the License for the specific language governing permissions and limitations under the License. +FROM milvusdb/milvus-dev:amd64-ubuntu-18.04-core AS openblas + FROM ubuntu:18.04 RUN apt-get update && apt-get install -y --no-install-recommends \ - gfortran libsqlite3-dev libmysqlclient-dev libcurl4-openssl-dev python3 libopenblas-dev liblapack3 && \ + gfortran libsqlite3-dev libmysqlclient-dev libcurl4-openssl-dev python3 && \ apt-get remove --purge -y && \ rm -rf /var/lib/apt/lists/* RUN ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so COPY ./milvus /var/lib/milvus -COPY ./docker-entrypoint.sh /var/lib/milvus +COPY ./docker-entrypoint.sh /var/lib/milvus/ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/var/lib/milvus/lib" +COPY --from=openblas /usr/lib/libopenblas*.so* /var/lib/milvus/lib/ + WORKDIR /var/lib/milvus ENTRYPOINT [ "/var/lib/milvus/docker-entrypoint.sh" ] diff --git a/docker/deploy/gpu/centos7/Dockerfile b/docker/deploy/gpu/centos7/Dockerfile index 198c2439..bd506606 100644 --- a/docker/deploy/gpu/centos7/Dockerfile +++ b/docker/deploy/gpu/centos7/Dockerfile @@ -9,18 +9,22 @@ # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express # or implied. See the License for the specific language governing permissions and limitations under the License. +FROM milvusdb/milvus-dev:amd64-centos-7-core AS openblas + FROM nvidia/cuda:10.1-devel-centos7 ENV NVIDIA_DRIVER_CAPABILITIES compute,utility RUN yum --disablerepo=cuda install -y epel-release && \ - yum --disablerepo=cuda install -y libgomp libgfortran4 mysql-devel openblas-devel lapack-devel && \ + yum --disablerepo=cuda install -y libgomp libgfortran4 mysql-devel && \ rm -rf /var/cache/yum/* COPY ./milvus /var/lib/milvus -COPY ./docker-entrypoint.sh /var/lib/milvus +COPY ./docker-entrypoint.sh /var/lib/milvus/ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/var/lib/milvus/lib" +COPY --from=openblas /usr/lib/libopenblas*.so* /var/lib/milvus/lib/ + WORKDIR /var/lib/milvus ENTRYPOINT [ "/var/lib/milvus/docker-entrypoint.sh" ] diff --git a/docker/deploy/gpu/ubuntu18.04/Dockerfile b/docker/deploy/gpu/ubuntu18.04/Dockerfile index fa4eba65..298ca9d7 100644 --- a/docker/deploy/gpu/ubuntu18.04/Dockerfile +++ b/docker/deploy/gpu/ubuntu18.04/Dockerfile @@ -9,6 +9,8 @@ # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express # or implied. See the License for the specific language governing permissions and limitations under the License. +FROM milvusdb/milvus-dev:amd64-ubuntu-18.04-core AS openblas + FROM nvidia/cuda:10.1-devel-ubuntu18.04 ENV NVIDIA_DRIVER_CAPABILITIES compute,utility @@ -16,16 +18,18 @@ ENV NVIDIA_DRIVER_CAPABILITIES compute,utility RUN rm -rf /etc/apt/sources.list.d/nvidia-ml.list && rm -rf /etc/apt/sources.list.d/cuda.list RUN apt-get update && apt-get install -y --no-install-recommends \ - gfortran libsqlite3-dev libmysqlclient-dev libcurl4-openssl-dev python3 libopenblas-dev liblapack3 && \ + gfortran libsqlite3-dev libmysqlclient-dev libcurl4-openssl-dev python3 && \ apt-get remove --purge -y && \ rm -rf /var/lib/apt/lists/* RUN ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so COPY ./milvus /var/lib/milvus -COPY ./docker-entrypoint.sh /var/lib/milvus +COPY ./docker-entrypoint.sh /var/lib/milvus/ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/var/lib/milvus/lib" +COPY --from=openblas /usr/lib/libopenblas*.so* /var/lib/milvus/lib/ + WORKDIR /var/lib/milvus ENTRYPOINT [ "/var/lib/milvus/docker-entrypoint.sh" ] -- GitLab