From a07ed0dc9158841ebdd3cf1826aac1725bd6d027 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Tue, 7 Jul 2020 16:39:28 +0800 Subject: [PATCH] Remove docker-entrypoint.sh in Dockerfile (#2758) Signed-off-by: quicksilver --- docker/deploy/cpu/centos7/Dockerfile | 5 +---- docker/deploy/cpu/centos7/docker-entrypoint.sh | 9 --------- docker/deploy/cpu/ubuntu16.04/Dockerfile | 5 +---- docker/deploy/cpu/ubuntu16.04/docker-entrypoint.sh | 9 --------- docker/deploy/cpu/ubuntu18.04/Dockerfile | 5 +---- docker/deploy/cpu/ubuntu18.04/docker-entrypoint.sh | 9 --------- docker/deploy/gpu/centos7/Dockerfile | 5 +---- docker/deploy/gpu/centos7/docker-entrypoint.sh | 9 --------- docker/deploy/gpu/ubuntu16.04/Dockerfile | 5 +---- docker/deploy/gpu/ubuntu16.04/docker-entrypoint.sh | 9 --------- docker/deploy/gpu/ubuntu18.04/Dockerfile | 5 +---- docker/deploy/gpu/ubuntu18.04/docker-entrypoint.sh | 9 --------- 12 files changed, 6 insertions(+), 78 deletions(-) delete mode 100755 docker/deploy/cpu/centos7/docker-entrypoint.sh delete mode 100755 docker/deploy/cpu/ubuntu16.04/docker-entrypoint.sh delete mode 100755 docker/deploy/cpu/ubuntu18.04/docker-entrypoint.sh delete mode 100755 docker/deploy/gpu/centos7/docker-entrypoint.sh delete mode 100755 docker/deploy/gpu/ubuntu16.04/docker-entrypoint.sh delete mode 100755 docker/deploy/gpu/ubuntu18.04/docker-entrypoint.sh diff --git a/docker/deploy/cpu/centos7/Dockerfile b/docker/deploy/cpu/centos7/Dockerfile index 4e9b88f7a4..f7b752240d 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 830b394eb7..0000000000 --- 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 e1ba90e818..453a5671b7 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 830b394eb7..0000000000 --- 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 f520dfab70..5c6f22eff2 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 830b394eb7..0000000000 --- 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 198c243949..2bf35f843e 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 830b394eb7..0000000000 --- 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 dfbad8a97f..1249fd9769 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 830b394eb7..0000000000 --- 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 fa4eba6507..62b191abbd 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 830b394eb7..0000000000 --- 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 "$@"