Integrate dockerfile

Signed-off-by: cai.zhang <cai.zhang@zilliz.com>
2025-12-28 22:45:26 +08:00 · 2021-02-25 10:09:03 +08:00 · 2021-02-25 10:09:03 +08:00 · 379e4d5fae
commit 379e4d5fae
parent f87e558725
12 changed files with 78 additions and 430 deletions
--- a/.jenkins/modules/Publish/Publish.groovy
+++ b/.jenkins/modules/Publish/Publish.groovy
@ -13,43 +13,10 @@ dir ('build/docker/deploy') {
        withCredentials([usernamePassword(credentialsId: "${env.DOCKER_CREDENTIALS_ID}", usernameVariable: 'DOCKER_USERNAME', passwordVariable: 'DOCKER_PASSWORD')]) {
            sh 'docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD} ${DOKCER_REGISTRY_URL}'

+            sh 'docker pull registry.zilliz.com/milvus-distributed/milvus-distributed-dev:latest || true'
            sh 'docker pull ${SOURCE_REPO}/master:${SOURCE_TAG} || true'
            sh 'docker-compose build --force-rm master'
            sh 'docker-compose push master'
-
-            sh 'docker pull ${SOURCE_REPO}/proxyservice:${SOURCE_TAG} || true'
-            sh 'docker-compose build --force-rm proxyservice'
-            sh 'docker-compose push proxyservice'
-
-            sh 'docker pull ${SOURCE_REPO}/proxynode:${SOURCE_TAG} || true'
-            sh 'docker-compose build --force-rm proxynode'
-            sh 'docker-compose push proxynode'
-
-            sh 'docker pull ${SOURCE_REPO}/indexservice:${SOURCE_TAG} || true'
-            sh 'docker-compose build --force-rm indexservice'
-            sh 'docker-compose push indexservice'
-
-            sh 'docker pull ${SOURCE_REPO}/indexnode:${SOURCE_TAG} || true'
-            sh 'docker-compose build --force-rm indexnode'
-            sh 'docker-compose push indexnode'
-
-            sh 'docker pull ${SOURCE_REPO}/queryservice:${SOURCE_TAG} || true'
-            sh 'docker-compose build --force-rm queryservice'
-            sh 'docker-compose push queryservice'
-
-            sh 'docker pull ${SOURCE_REPO}/dataservice:${SOURCE_TAG} || true'
-            sh 'docker-compose build --force-rm dataservice'
-            sh 'docker-compose push dataservice'
-
-            sh 'docker pull registry.zilliz.com/milvus-distributed/milvus-distributed-dev:latest || true'
-            sh 'docker pull ${SOURCE_REPO}/querynode:${SOURCE_TAG} || true'
-            sh 'docker-compose build --force-rm querynode1'
-            sh 'docker-compose push querynode1'
-
-            sh 'docker pull registry.zilliz.com/milvus-distributed/milvus-distributed-dev:latest || true'
-            sh 'docker pull ${SOURCE_REPO}/datanode:${SOURCE_TAG} || true'
-            sh 'docker-compose build --force-rm datanode'
-            sh 'docker-compose push datanode'
        }
    } catch (exc) {
        throw exc
--- a/.jenkins/modules/Regression/PythonRegression.groovy
+++ b/.jenkins/modules/Regression/PythonRegression.groovy
@ -13,8 +13,8 @@ try {
        sh 'docker-compose -p ${DOCKER_COMPOSE_PROJECT_NAME} up -d queryservice'
        sh 'docker-compose -p ${DOCKER_COMPOSE_PROJECT_NAME} run -e DATA_NODE_ID=3 -d datanode'
        sh 'docker-compose -p ${DOCKER_COMPOSE_PROJECT_NAME} up -d proxynode'
-        sh 'docker-compose -p ${DOCKER_COMPOSE_PROJECT_NAME} run -e QUERY_NODE_ID=1 -d querynode1'
-        sh 'docker-compose -p ${DOCKER_COMPOSE_PROJECT_NAME} run -e QUERY_NODE_ID=2 -d querynode2'
+        sh 'docker-compose -p ${DOCKER_COMPOSE_PROJECT_NAME} run -e QUERY_NODE_ID=1 -d querynode'
+        sh 'docker-compose -p ${DOCKER_COMPOSE_PROJECT_NAME} run -e QUERY_NODE_ID=2 -d querynode'
    }

    dir ('build/docker/test') {
--- a/build/docker/deploy/datanode/Dockerfile
+++ b/build/docker/deploy/datanode/Dockerfile
@ -1,39 +0,0 @@
-# Copyright (C) 2019-2020 Zilliz. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# 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-distributed-dev:amd64-ubuntu18.04-latest AS openblas
-
-#FROM alpine
-FROM ubuntu:bionic-20200921
-
-RUN apt-get update && apt-get install -y --no-install-recommends libtbb-dev gfortran
-
-#RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
-
-#RUN sed -i "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g" /etc/apk/repositories \
-#      && apk add --no-cache libtbb gfortran
-
-COPY --from=openblas /usr/lib/libopenblas-r0.3.9.so /usr/lib/
-
-RUN ln -s /usr/lib/libopenblas-r0.3.9.so /usr/lib/libopenblas.so.0 && \
-    ln -s /usr/lib/libopenblas.so.0 /usr/lib/libopenblas.so
-
-COPY ./bin/datanode /milvus-distributed/bin/datanode
-
-COPY ./configs/ /milvus-distributed/configs/
-
-COPY ./lib/ /milvus-distributed/lib/
-
-ENV LD_LIBRARY_PATH=/milvus-distributed/lib:$LD_LIBRARY_PATH:/usr/lib
-
-WORKDIR /milvus-distributed/
-
-CMD ["./bin/datanode"]
--- a/build/docker/deploy/dataservice/Dockerfile
+++ b/build/docker/deploy/dataservice/Dockerfile
@ -1,41 +0,0 @@
-# Copyright (C) 2019-2020 Zilliz. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# 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-distributed-dev:amd64-ubuntu18.04-latest AS openblas
-
-#FROM alpine
-FROM ubuntu:bionic-20200921
-
-RUN apt-get update && apt-get install -y --no-install-recommends libtbb-dev gfortran
-
-#RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
-
-#RUN sed -i "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g" /etc/apk/repositories \
-#      && apk add --no-cache libtbb gfortran
-
-COPY --from=openblas /usr/lib/libopenblas-r0.3.9.so /usr/lib/
-
-RUN ln -s /usr/lib/libopenblas-r0.3.9.so /usr/lib/libopenblas.so.0 && \
-    ln -s /usr/lib/libopenblas.so.0 /usr/lib/libopenblas.so
-
-COPY ./bin/dataservice /milvus-distributed/bin/dataservice
-
-COPY ./configs/ /milvus-distributed/configs/
-
-COPY ./lib/ /milvus-distributed/lib/
-
-ENV LD_LIBRARY_PATH=/milvus-distributed/lib:$LD_LIBRARY_PATH:/usr/lib
-
-WORKDIR /milvus-distributed/
-
-CMD ["./bin/dataservice"]
-
-EXPOSE 13333
--- a/build/docker/deploy/distributed/Dockerfile
+++ b/build/docker/deploy/distributed/Dockerfile
@ -14,6 +14,15 @@ FROM milvusdb/milvus-distributed-dev:amd64-ubuntu18.04-latest AS openblas
 #FROM alpine
 FROM ubuntu:bionic-20200921

+# Add Tini
+ENV TINI_VERSION v0.19.0
+
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+
+RUN chmod +x /tini
+
+ENTRYPOINT ["/tini", "--"]
+
 RUN apt-get update && apt-get install -y --no-install-recommends libtbb-dev gfortran

 COPY --from=openblas /usr/lib/libopenblas-r0.3.9.so /usr/lib/
@ -21,11 +30,7 @@ COPY --from=openblas /usr/lib/libopenblas-r0.3.9.so /usr/lib/
 RUN ln -s /usr/lib/libopenblas-r0.3.9.so /usr/lib/libopenblas.so.0 && \
    ln -s /usr/lib/libopenblas.so.0 /usr/lib/libopenblas.so

-COPY ./bin/proxynode /milvus-distributed/bin/proxynode
-
-COPY ./lib/ /milvus-distributed/lib/
-
-ENV LD_LIBRARY_PATH=/milvus-distributed/lib:$LD_LIBRARY_PATH:/usr/lib
+COPY ./bin/ /milvus-distributed/bin/

 COPY ./configs/ /milvus-distributed/configs/

@ -34,7 +39,3 @@ COPY ./lib/ /milvus-distributed/lib/
 ENV LD_LIBRARY_PATH=/milvus-distributed/lib:$LD_LIBRARY_PATH:/usr/lib

 WORKDIR /milvus-distributed/
-
-CMD ["./bin/proxynode"]
-
-EXPOSE 19530
--- a/build/docker/deploy/docker-compose.yml
+++ b/build/docker/deploy/docker-compose.yml
@ -2,41 +2,47 @@ version: '3.5'

 services:
  master:
-    image: ${TARGET_REPO}/master:${TARGET_TAG}
+    image: ${TARGET_REPO}/milvus-distributed:${TARGET_TAG}
    build:
      context: ../../../
-      dockerfile: build/docker/deploy/masterservice/Dockerfile
+      dockerfile: build/docker/deploy/distributed/Dockerfile
      cache_from:
-        - ${SOURCE_REPO}/master:${SOURCE_TAG}
-    environment: 
+        - ${SOURCE_REPO}/milvus-distributed:${SOURCE_TAG}
+    command:
+      - "/milvus-distributed/bin/masterservice"
+    environment:
      PULSAR_ADDRESS: ${PULSAR_ADDRESS}
      ETCD_ADDRESS: ${ETCD_ADDRESS}
      INDEX_SERVICE_ADDRESS: ${INDEX_SERVICE_ADDRESS}
      DATA_SERVICE_ADDRESS: ${DATA_SERVICE_ADDRESS}
      QUERY_SERVICE_ADDRESS: ${QUERY_SERVICE_ADDRESS}
      PROXY_SERVICE_ADDRESS: ${PROXY_SERVICE_ADDRESS}
-    networks: 
+    networks:
      - milvus

  proxyservice:
-    image: ${TARGET_REPO}/proxyservice:${TARGET_TAG}
+    image: ${TARGET_REPO}/milvus-distributed:${TARGET_TAG}
    build:
      context: ../../../
-      dockerfile: build/docker/deploy/proxyservice/Dockerfile
+      dockerfile: build/docker/deploy/distributed/Dockerfile
      cache_from:
-        - ${SOURCE_REPO}/proxyservice:${SOURCE_TAG}
+        - ${SOURCE_REPO}/milvus-distributed:${SOURCE_TAG}
+    command: 
+      - "/milvus-distributed/bin/proxyservice"
    environment: 
      PULSAR_ADDRESS: ${PULSAR_ADDRESS}
    networks:
      - milvus

  proxynode:
-    image: ${TARGET_REPO}/proxynode:${TARGET_TAG}
+    image: ${TARGET_REPO}/milvus-distributed:${TARGET_TAG}
    build:
      context: ../../../
-      dockerfile: build/docker/deploy/proxynode/Dockerfile
+      dockerfile: build/docker/deploy/distributed/Dockerfile
      cache_from:
-        - ${SOURCE_REPO}/proxynode:${SOURCE_TAG}
+        - ${SOURCE_REPO}/milvus-distributed:${SOURCE_TAG}
+    command: 
+      - "/milvus-distributed/bin/proxynode"
    environment: 
      ETCD_ADDRESS: ${ETCD_ADDRESS}
      PULSAR_ADDRESS: ${PULSAR_ADDRESS}
@ -46,30 +52,35 @@ services:
      INDEX_SERVICE_ADDRESS: ${INDEX_SERVICE_ADDRESS}
      DATA_SERVICE_ADDRESS: ${DATA_SERVICE_ADDRESS}
      QUERY_SERVICE_ADDRESS: ${QUERY_SERVICE_ADDRESS}
-
+    depends_on:
+      - "proxyservice"
    networks:
      - milvus

  queryservice:
-    image: ${TARGET_REPO}/queryservice:${TARGET_TAG}
+    image: ${TARGET_REPO}/milvus-distributed:${TARGET_TAG}
    build:
      context: ../../../
-      dockerfile: build/docker/deploy/queryservice/Dockerfile
+      dockerfile: build/docker/deploy/distributed/Dockerfile
      cache_from:
-        - ${SOURCE_REPO}/queryservice:${SOURCE_TAG}
+        - ${SOURCE_REPO}/milvus-distributed:${SOURCE_TAG}
+    command: 
+      - "/milvus-distributed/bin/queryservice"
    environment:
      MASTER_ADDRESS: ${MASTER_ADDRESS}
      DATA_SERVICE_ADDRESS: ${DATA_SERVICE_ADDRESS}
    networks:
      - milvus

-  querynode1:
-    image: ${TARGET_REPO}/querynode:${TARGET_TAG}
+  querynode:
+    image: ${TARGET_REPO}/milvus-distributed:${TARGET_TAG}
    build:
      context: ../../../
-      dockerfile: build/docker/deploy/querynode/Dockerfile
+      dockerfile: build/docker/deploy/distributed/Dockerfile
      cache_from:
-        - ${SOURCE_REPO}/querynode:${SOURCE_TAG}
+        - ${SOURCE_REPO}/milvus-distributed:${SOURCE_TAG}
+    command: 
+      -  "/milvus-distributed/bin/querynode"
    environment: 
      PULSAR_ADDRESS: ${PULSAR_ADDRESS}
      MASTER_ADDRESS: ${MASTER_ADDRESS}
@ -77,54 +88,20 @@ services:
      DATA_SERVICE_ADDRESS: ${DATA_SERVICE_ADDRESS}
      INDEX_SERVICE_ADDRESS: ${INDEX_SERVICE_ADDRESS}
      QUERY_SERVICE_ADDRESS: ${QUERY_SERVICE_ADDRESS}
-#      QUERY_NODE_HOST: ${QUERY_NODE_HOST1}
-    networks:
-      - milvus
-
-  querynode2:
-    image: ${TARGET_REPO}/querynode:${TARGET_TAG}
-    build:
-      context: ../../../
-      dockerfile: build/docker/deploy/querynode/Dockerfile
-      cache_from:
-        - ${SOURCE_REPO}/querynode:${SOURCE_TAG}
-    environment:
-      PULSAR_ADDRESS: ${PULSAR_ADDRESS}
-      MASTER_ADDRESS: ${MASTER_ADDRESS}
-      MINIO_ADDRESS: ${MINIO_ADDRESS}
-      DATA_SERVICE_ADDRESS: ${DATA_SERVICE_ADDRESS}
-      INDEX_SERVICE_ADDRESS: ${INDEX_SERVICE_ADDRESS}
-      QUERY_SERVICE_ADDRESS: ${QUERY_SERVICE_ADDRESS}
-#      QUERY_NODE_HOST: ${QUERY_NODE_HOST2}
-    networks:
-      - milvus
-
-  datanode:
-    image: ${TARGET_REPO}/datanode:${TARGET_TAG}
-    build:
-      context: ../../../
-      dockerfile: build/docker/deploy/datanode/Dockerfile
-      cache_from:
-        - ${SOURCE_REPO}/datanode:${SOURCE_TAG}
-    environment: 
-      PULSAR_ADDRESS: ${PULSAR_ADDRESS}
-      ETCD_ADDRESS: ${ETCD_ADDRESS}
-      MASTER_ADDRESS: ${MASTER_ADDRESS}
-      MINIO_ADDRESS: ${MINIO_ADDRESS}
-      DATA_SERVICE_ADDRESS: ${DATA_SERVICE_ADDRESS}
-#      DATA_NODE_HOST: ${DATA_NODE_HOST}
    depends_on:
-      - "dataservice"
+      - "queryservice"
    networks:
      - milvus

  indexservice:
-    image: ${TARGET_REPO}/indexservice:${TARGET_TAG}
+    image: ${TARGET_REPO}/milvus-distributed:${TARGET_TAG}
    build:
      context: ../../../
-      dockerfile: build/docker/deploy/indexservice/Dockerfile
+      dockerfile: build/docker/deploy/distributed/Dockerfile
      cache_from:
-        - ${SOURCE_REPO}/indexservice:${SOURCE_TAG}
+        - ${SOURCE_REPO}/milvus-distributed:${SOURCE_TAG}
+    command: 
+      - "/milvus-distributed/bin/indexservice"
    environment:
      MASTER_ADDRESS: ${MASTER_ADDRESS}
      ETCD_ADDRESS: ${ETCD_ADDRESS}
@ -133,12 +110,14 @@ services:
      - milvus

  indexnode:
-    image: ${TARGET_REPO}/indexnode:${TARGET_TAG}
+    image: ${TARGET_REPO}/milvus-distributed:${TARGET_TAG}
    build:
      context: ../../../
-      dockerfile: build/docker/deploy/indexnode/Dockerfile
+      dockerfile: build/docker/deploy/distributed/Dockerfile
      cache_from:
-        - ${SOURCE_REPO}/indexnode:${SOURCE_TAG}
+        - ${SOURCE_REPO}/milvus-distributed:${SOURCE_TAG}
+    command: 
+      - "/milvus-distributed/bin/indexnode"
    environment:
      INDEX_SERVICE_ADDRESS: ${INDEX_SERVICE_ADDRESS}
      MINIO_ADDRESS: ${MINIO_ADDRESS}
@ -149,12 +128,14 @@ services:
      - milvus

  dataservice:
-    image: ${TARGET_REPO}/dataservice:${TARGET_TAG}
+    image: ${TARGET_REPO}/milvus-distributed:${TARGET_TAG}
    build:
      context: ../../../
-      dockerfile: build/docker/deploy/dataservice/Dockerfile
+      dockerfile: build/docker/deploy/distributed/Dockerfile
      cache_from:
-        - ${SOURCE_REPO}/dataservice:${SOURCE_TAG}
+        - ${SOURCE_REPO}/milvus-distributed:${SOURCE_TAG}
+    command: 
+      - "/milvus-distributed/bin/dataservice"
    environment:
      PULSAR_ADDRESS: ${PULSAR_ADDRESS}
      ETCD_ADDRESS: ${ETCD_ADDRESS}
@ -163,6 +144,25 @@ services:
    networks:
      - milvus

+  datanode:
+    image: ${TARGET_REPO}/milvus-distributed:${TARGET_TAG}
+    build:
+      context: ../../../
+      dockerfile: build/docker/deploy/distributed/Dockerfile
+      cache_from:
+        - ${SOURCE_REPO}/milvus-distributed:${SOURCE_TAG}
+    command: 
+      - "/milvus-distributed/bin/datanode"
+    environment: 
+      PULSAR_ADDRESS: ${PULSAR_ADDRESS}
+      ETCD_ADDRESS: ${ETCD_ADDRESS}
+      MASTER_ADDRESS: ${MASTER_ADDRESS}
+      MINIO_ADDRESS: ${MINIO_ADDRESS}
+      DATA_SERVICE_ADDRESS: ${DATA_SERVICE_ADDRESS}
+    depends_on:
+      - "dataservice"
+    networks:
+      - milvus

 networks:
  milvus:
--- a/build/docker/deploy/indexnode/Dockerfile
+++ b/build/docker/deploy/indexnode/Dockerfile
@ -1,40 +0,0 @@
-# Copyright (C) 2019-2020 Zilliz. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# 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-distributed-dev:amd64-ubuntu18.04-latest AS openblas
-
-#FROM alpine
-FROM ubuntu:bionic-20200921
-
-RUN apt-get update && apt-get install -y --no-install-recommends libtbb-dev gfortran
-
-#RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
-
-#RUN sed -i "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g" /etc/apk/repositories \
-#      && apk add --no-cache libtbb gfortran
-
-COPY --from=openblas /usr/lib/libopenblas-r0.3.9.so /usr/lib/
-
-RUN ln -s /usr/lib/libopenblas-r0.3.9.so /usr/lib/libopenblas.so.0 && \
-    ln -s /usr/lib/libopenblas.so.0 /usr/lib/libopenblas.so
-
-COPY ./bin/indexnode /milvus-distributed/bin/indexnode
-
-COPY ./configs/ /milvus-distributed/configs/
-
-COPY ./lib/ /milvus-distributed/lib/
-
-ENV LD_LIBRARY_PATH=/milvus-distributed/lib:$LD_LIBRARY_PATH:/usr/lib
-
-WORKDIR /milvus-distributed/
-
-CMD ["./bin/indexnode"]
-
--- a/build/docker/deploy/indexservice/Dockerfile
+++ b/build/docker/deploy/indexservice/Dockerfile
@ -1,41 +0,0 @@
-# Copyright (C) 2019-2020 Zilliz. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# 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-distributed-dev:amd64-ubuntu18.04-latest AS openblas
-
-#FROM alpine
-FROM ubuntu:bionic-20200921
-
-RUN apt-get update && apt-get install -y --no-install-recommends libtbb-dev gfortran
-
-#RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
-
-#RUN sed -i "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g" /etc/apk/repositories \
-#      && apk add --no-cache libtbb gfortran
-
-COPY --from=openblas /usr/lib/libopenblas-r0.3.9.so /usr/lib/
-
-RUN ln -s /usr/lib/libopenblas-r0.3.9.so /usr/lib/libopenblas.so.0 && \
-    ln -s /usr/lib/libopenblas.so.0 /usr/lib/libopenblas.so
-
-COPY ./bin/indexservice /milvus-distributed/bin/indexservice
-
-COPY ./configs/ /milvus-distributed/configs/
-
-COPY ./lib/ /milvus-distributed/lib/
-
-ENV LD_LIBRARY_PATH=/milvus-distributed/lib:$LD_LIBRARY_PATH:/usr/lib
-
-WORKDIR /milvus-distributed/
-
-CMD ["./bin/indexservice"]
-
-EXPOSE 31000
--- a/build/docker/deploy/masterservice/Dockerfile
+++ b/build/docker/deploy/masterservice/Dockerfile
@ -1,41 +0,0 @@
-# Copyright (C) 2019-2020 Zilliz. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# 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-distributed-dev:amd64-ubuntu18.04-latest AS openblas
-
-#FROM alpine
-FROM ubuntu:bionic-20200921
-
-RUN apt-get update && apt-get install -y --no-install-recommends libtbb-dev gfortran
-
-#RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
-
-#RUN sed -i "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g" /etc/apk/repositories \
-#      && apk add --no-cache libtbb gfortran
-
-COPY --from=openblas /usr/lib/libopenblas-r0.3.9.so /usr/lib/
-
-RUN ln -s /usr/lib/libopenblas-r0.3.9.so /usr/lib/libopenblas.so.0 && \
-    ln -s /usr/lib/libopenblas.so.0 /usr/lib/libopenblas.so
-
-COPY ./bin/masterservice /milvus-distributed/bin/masterservice
-
-COPY ./configs/ /milvus-distributed/configs/
-
-COPY ./lib/ /milvus-distributed/lib/
-
-ENV LD_LIBRARY_PATH=/milvus-distributed/lib:$LD_LIBRARY_PATH:/usr/lib
-
-WORKDIR /milvus-distributed/
-
-CMD ["./bin/masterservice"]
-
-EXPOSE 53100
--- a/build/docker/deploy/proxyservice/Dockerfile
+++ b/build/docker/deploy/proxyservice/Dockerfile
@ -1,40 +0,0 @@
-# Copyright (C) 2019-2020 Zilliz. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# 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-distributed-dev:amd64-ubuntu18.04-latest AS openblas
-
-#FROM alpine
-FROM ubuntu:bionic-20200921
-
-RUN apt-get update && apt-get install -y --no-install-recommends libtbb-dev gfortran
-
-COPY --from=openblas /usr/lib/libopenblas-r0.3.9.so /usr/lib/
-
-RUN ln -s /usr/lib/libopenblas-r0.3.9.so /usr/lib/libopenblas.so.0 && \
-    ln -s /usr/lib/libopenblas.so.0 /usr/lib/libopenblas.so
-
-COPY ./bin/proxyservice /milvus-distributed/bin/proxyservice
-
-COPY ./lib/ /milvus-distributed/lib/
-
-ENV LD_LIBRARY_PATH=/milvus-distributed/lib:$LD_LIBRARY_PATH:/usr/lib
-
-COPY ./configs/ /milvus-distributed/configs/
-
-COPY ./lib/ /milvus-distributed/lib/
-
-ENV LD_LIBRARY_PATH=/milvus-distributed/lib:$LD_LIBRARY_PATH:/usr/lib
-
-WORKDIR /milvus-distributed/
-
-CMD ["./bin/proxyservice"]
-
-EXPOSE 19530
--- a/build/docker/deploy/querynode/Dockerfile
+++ b/build/docker/deploy/querynode/Dockerfile
@ -1,39 +0,0 @@
-# Copyright (C) 2019-2020 Zilliz. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# 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-distributed-dev:amd64-ubuntu18.04-latest AS openblas
-
-#FROM alpine
-FROM ubuntu:bionic-20200921
-
-RUN apt-get update && apt-get install -y --no-install-recommends libtbb-dev gfortran
-
-#RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
-
-#RUN sed -i "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g" /etc/apk/repositories \
-#      && apk add --no-cache libtbb gfortran
-
-COPY --from=openblas /usr/lib/libopenblas-r0.3.9.so /usr/lib/
-
-RUN ln -s /usr/lib/libopenblas-r0.3.9.so /usr/lib/libopenblas.so.0 && \
-    ln -s /usr/lib/libopenblas.so.0 /usr/lib/libopenblas.so
-
-COPY ./bin/querynode /milvus-distributed/bin/querynode
-
-COPY ./configs/ /milvus-distributed/configs/
-
-COPY ./lib/ /milvus-distributed/lib/
-
-ENV LD_LIBRARY_PATH=/milvus-distributed/lib:$LD_LIBRARY_PATH:/usr/lib
-
-WORKDIR /milvus-distributed/
-
-CMD ["./bin/querynode"]
--- a/build/docker/deploy/queryservice/Dockerfile
+++ b/build/docker/deploy/queryservice/Dockerfile
@ -1,39 +0,0 @@
-# Copyright (C) 2019-2020 Zilliz. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# 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-distributed-dev:amd64-ubuntu18.04-latest AS openblas
-
-#FROM alpine
-FROM ubuntu:bionic-20200921
-
-RUN apt-get update && apt-get install -y --no-install-recommends libtbb-dev gfortran
-
-#RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
-
-#RUN sed -i "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g" /etc/apk/repositories \
-#      && apk add --no-cache libtbb gfortran
-
-COPY --from=openblas /usr/lib/libopenblas-r0.3.9.so /usr/lib/
-
-RUN ln -s /usr/lib/libopenblas-r0.3.9.so /usr/lib/libopenblas.so.0 && \
-    ln -s /usr/lib/libopenblas.so.0 /usr/lib/libopenblas.so
-
-COPY ./bin/queryservice /milvus-distributed/bin/queryservice
-
-COPY ./configs/ /milvus-distributed/configs/
-
-COPY ./lib/ /milvus-distributed/lib/
-
-ENV LD_LIBRARY_PATH=/milvus-distributed/lib:$LD_LIBRARY_PATH:/usr/lib
-
-WORKDIR /milvus-distributed/
-
-CMD ["./bin/queryservice"]