diff --git a/docker/deploy/cpu/centos7/Dockerfile b/docker/deploy/cpu/centos7/Dockerfile index 61a77805602bc337c38750b15821bb3071b30782..57ccf196f4af81d656f733708775ed2ca2684204 100644 --- a/docker/deploy/cpu/centos7/Dockerfile +++ b/docker/deploy/cpu/centos7/Dockerfile @@ -20,15 +20,12 @@ RUN yum install -y wget && \ rm -rf /var/cache/yum/* COPY ./milvus /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" ] - -CMD [ "start" ] +CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/server_config.yaml" ] EXPOSE 19530 diff --git a/docker/deploy/cpu/ubuntu16.04/Dockerfile b/docker/deploy/cpu/ubuntu16.04/Dockerfile index e1ba90e8182727da6f634093e5193b3b9afcecc5..453a5671b7f4d36ca7734c3e15fa5289833bb714 100644 --- a/docker/deploy/cpu/ubuntu16.04/Dockerfile +++ b/docker/deploy/cpu/ubuntu16.04/Dockerfile @@ -19,13 +19,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ 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 ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/var/lib/milvus/lib" WORKDIR /var/lib/milvus -ENTRYPOINT [ "/var/lib/milvus/docker-entrypoint.sh" ] - -CMD [ "start" ] +CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/server_config.yaml" ] EXPOSE 19530 diff --git a/docker/deploy/cpu/ubuntu18.04/Dockerfile b/docker/deploy/cpu/ubuntu18.04/Dockerfile index 44fd6f41b89428b0ff542c82f62d4641b9c049e4..37f750ecb888642216b40d5896c118292dfe71b5 100644 --- a/docker/deploy/cpu/ubuntu18.04/Dockerfile +++ b/docker/deploy/cpu/ubuntu18.04/Dockerfile @@ -21,16 +21,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ 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/ 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" ] - -CMD [ "start" ] +CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/server_config.yaml" ] EXPOSE 19530 diff --git a/docker/deploy/docker-entrypoint.sh b/docker/deploy/docker-entrypoint.sh deleted file mode 100755 index 830b394eb703659b7f15d485872b3d4d4e5ffce4..0000000000000000000000000000000000000000 --- a/docker/deploy/docker-entrypoint.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -e - -if [ "$1" == 'start' ]; then - cd /var/lib/milvus/scripts && ./start_server.sh -fi - -exec "$@" diff --git a/docker/deploy/gpu/centos7/Dockerfile b/docker/deploy/gpu/centos7/Dockerfile index 58662e2995c5a3f96c2dc682c9966e3b3cbef754..daed9a60de371b0af62306bea0c06c16701cb009 100644 --- a/docker/deploy/gpu/centos7/Dockerfile +++ b/docker/deploy/gpu/centos7/Dockerfile @@ -22,15 +22,12 @@ RUN yum --disablerepo=cuda install -y wget && \ rm -rf /var/cache/yum/* COPY ./milvus /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" ] - -CMD [ "start" ] +CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/server_config.yaml" ] EXPOSE 19530 diff --git a/docker/deploy/gpu/ubuntu16.04/Dockerfile b/docker/deploy/gpu/ubuntu16.04/Dockerfile index dfbad8a97f0c769dff487aeffaab0d21c5d2fb5c..1249fd9769b7869586530538cc833ad06eac8ed5 100644 --- a/docker/deploy/gpu/ubuntu16.04/Dockerfile +++ b/docker/deploy/gpu/ubuntu16.04/Dockerfile @@ -23,14 +23,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ 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 ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/var/lib/milvus/lib" WORKDIR /var/lib/milvus -ENTRYPOINT [ "/var/lib/milvus/docker-entrypoint.sh" ] - -CMD [ "start" ] +CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/server_config.yaml" ] EXPOSE 19530 diff --git a/docker/deploy/gpu/ubuntu18.04/Dockerfile b/docker/deploy/gpu/ubuntu18.04/Dockerfile index 298ca9d7e1cdac03e8b47e341ec2d1cc0111cdc1..0aa2c4ac36e0b6bc1e150dddcca9014fdcb212eb 100644 --- a/docker/deploy/gpu/ubuntu18.04/Dockerfile +++ b/docker/deploy/gpu/ubuntu18.04/Dockerfile @@ -25,16 +25,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ 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/ 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" ] - -CMD [ "start" ] +CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/server_config.yaml" ] EXPOSE 19530