From c029c4007d89bb26205e0d3c841af3d746309acb Mon Sep 17 00:00:00 2001 From: zhenwu Date: Fri, 8 Nov 2019 14:09:03 +0800 Subject: [PATCH] add cpu deploy docker image --- docker/deploy/cpu_version/Dockerfile | 18 ++++++++++++++++++ .../docker-entrypoint.sh | 0 .../{ => gpu_version}/ubuntu16.04/Dockerfile | 0 .../ubuntu16.04}/docker-entrypoint.sh | 0 .../{ => gpu_version}/ubuntu18.04/Dockerfile | 0 .../ubuntu18.04/docker-entrypoint.sh | 10 ++++++++++ 6 files changed, 28 insertions(+) create mode 100644 docker/deploy/cpu_version/Dockerfile rename docker/deploy/{ubuntu16.04 => cpu_version}/docker-entrypoint.sh (100%) rename docker/deploy/{ => gpu_version}/ubuntu16.04/Dockerfile (100%) rename docker/deploy/{ubuntu18.04 => gpu_version/ubuntu16.04}/docker-entrypoint.sh (100%) rename docker/deploy/{ => gpu_version}/ubuntu18.04/Dockerfile (100%) create mode 100755 docker/deploy/gpu_version/ubuntu18.04/docker-entrypoint.sh diff --git a/docker/deploy/cpu_version/Dockerfile b/docker/deploy/cpu_version/Dockerfile new file mode 100644 index 0000000000..317001385e --- /dev/null +++ b/docker/deploy/cpu_version/Dockerfile @@ -0,0 +1,18 @@ +FROM ubuntu:18.04 + +RUN apt-get update && apt-get install -y --no-install-recommends \ + gfortran libsqlite3-dev libmysqlclient-dev && \ + 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 ./docker-entrypoint.sh /opt +COPY ./milvus /opt/milvus +ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/milvus/lib" + +ENTRYPOINT [ "/opt/docker-entrypoint.sh" ] + +CMD [ "start" ] + +EXPOSE 19530 diff --git a/docker/deploy/ubuntu16.04/docker-entrypoint.sh b/docker/deploy/cpu_version/docker-entrypoint.sh similarity index 100% rename from docker/deploy/ubuntu16.04/docker-entrypoint.sh rename to docker/deploy/cpu_version/docker-entrypoint.sh diff --git a/docker/deploy/ubuntu16.04/Dockerfile b/docker/deploy/gpu_version/ubuntu16.04/Dockerfile similarity index 100% rename from docker/deploy/ubuntu16.04/Dockerfile rename to docker/deploy/gpu_version/ubuntu16.04/Dockerfile diff --git a/docker/deploy/ubuntu18.04/docker-entrypoint.sh b/docker/deploy/gpu_version/ubuntu16.04/docker-entrypoint.sh similarity index 100% rename from docker/deploy/ubuntu18.04/docker-entrypoint.sh rename to docker/deploy/gpu_version/ubuntu16.04/docker-entrypoint.sh diff --git a/docker/deploy/ubuntu18.04/Dockerfile b/docker/deploy/gpu_version/ubuntu18.04/Dockerfile similarity index 100% rename from docker/deploy/ubuntu18.04/Dockerfile rename to docker/deploy/gpu_version/ubuntu18.04/Dockerfile diff --git a/docker/deploy/gpu_version/ubuntu18.04/docker-entrypoint.sh b/docker/deploy/gpu_version/ubuntu18.04/docker-entrypoint.sh new file mode 100755 index 0000000000..446c174d74 --- /dev/null +++ b/docker/deploy/gpu_version/ubuntu18.04/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +set -e + +if [ "$1" == 'start' ]; then + cd /opt/milvus/scripts && ./start_server.sh +fi + +exec "$@" +