diff --git a/docker/deploy/cpu/centos7/Dockerfile b/docker/deploy/cpu/centos7/Dockerfile index 4e9b88f7a4ab9fd5a4b2ad8f2a46573e8165a5a4..f7b752240dc0a558605e2113ae840e5b7f0fef94 100644 --- a/docker/deploy/cpu/centos7/Dockerfile +++ b/docker/deploy/cpu/centos7/Dockerfile @@ -16,13 +16,10 @@ RUN yum install -y epel-release && \ 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" 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/centos7/docker-entrypoint.sh b/docker/deploy/cpu/centos7/docker-entrypoint.sh deleted file mode 100755 index 830b394eb703659b7f15d485872b3d4d4e5ffce4..0000000000000000000000000000000000000000 --- a/docker/deploy/cpu/centos7/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/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/ubuntu16.04/docker-entrypoint.sh b/docker/deploy/cpu/ubuntu16.04/docker-entrypoint.sh deleted file mode 100755 index 830b394eb703659b7f15d485872b3d4d4e5ffce4..0000000000000000000000000000000000000000 --- a/docker/deploy/cpu/ubuntu16.04/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/cpu/ubuntu18.04/Dockerfile b/docker/deploy/cpu/ubuntu18.04/Dockerfile index f520dfab70cf4c0b1bea75ece1930fcf4547a9d6..5c6f22eff20f63ac47ec02db1ac60767e1c1f4fe 100644 --- a/docker/deploy/cpu/ubuntu18.04/Dockerfile +++ b/docker/deploy/cpu/ubuntu18.04/Dockerfile @@ -19,14 +19,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/cpu/ubuntu18.04/docker-entrypoint.sh b/docker/deploy/cpu/ubuntu18.04/docker-entrypoint.sh deleted file mode 100755 index 830b394eb703659b7f15d485872b3d4d4e5ffce4..0000000000000000000000000000000000000000 --- a/docker/deploy/cpu/ubuntu18.04/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 198c2439490c958197dbccb325ce35e481e9670d..2bf35f843e460960563eb67b0f658af211ca0bf9 100644 --- a/docker/deploy/gpu/centos7/Dockerfile +++ b/docker/deploy/gpu/centos7/Dockerfile @@ -18,13 +18,10 @@ RUN yum --disablerepo=cuda install -y epel-release && \ 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" 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/centos7/docker-entrypoint.sh b/docker/deploy/gpu/centos7/docker-entrypoint.sh deleted file mode 100755 index 830b394eb703659b7f15d485872b3d4d4e5ffce4..0000000000000000000000000000000000000000 --- a/docker/deploy/gpu/centos7/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/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/ubuntu16.04/docker-entrypoint.sh b/docker/deploy/gpu/ubuntu16.04/docker-entrypoint.sh deleted file mode 100755 index 830b394eb703659b7f15d485872b3d4d4e5ffce4..0000000000000000000000000000000000000000 --- a/docker/deploy/gpu/ubuntu16.04/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/ubuntu18.04/Dockerfile b/docker/deploy/gpu/ubuntu18.04/Dockerfile index fa4eba650704e43f5e46b2a42a321f0a9b82f7f6..62b191abbd6115abed4c86fba7b727cab1e74f28 100644 --- a/docker/deploy/gpu/ubuntu18.04/Dockerfile +++ b/docker/deploy/gpu/ubuntu18.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/docker-entrypoint.sh b/docker/deploy/gpu/ubuntu18.04/docker-entrypoint.sh deleted file mode 100755 index 830b394eb703659b7f15d485872b3d4d4e5ffce4..0000000000000000000000000000000000000000 --- a/docker/deploy/gpu/ubuntu18.04/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 "$@"