Update milvus project name (#5032)

* Update milvus project name
2021-04-26 13:59:28 +08:00 · 2021-04-26 13:59:28 +08:00 · 3b529f3b5d
parent d4e7b4d1a4
commit 3b529f3b5d
20 changed files with 77 additions and 299 deletions
--- a/.env
+++ b/.env
@ -1,4 +1,4 @@
-REPO=milvusdb/milvus-distributed-dev
+REPO=milvusdb/milvus-dev
 ARCH=amd64
 UBUNTU=18.04
 DATE_VERSION=20210318-090357
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@ -32,7 +32,7 @@ jobs:
  ubuntu:
    name: AMD64 Ubuntu ${{ matrix.ubuntu }}
    runs-on: ubuntu-latest
-    timeout-minutes: 60
+    timeout-minutes: 90
    strategy:
      fail-fast: false
      matrix:
--- a/.github/workflows/publish-builder.yaml
+++ b/.github/workflows/publish-builder.yaml
@ -47,7 +47,7 @@ jobs:
          DATE_VERSION=${{ steps.extracter.outputs.version }} docker-compose build ubuntu
          DATE_VERSION=latest docker-compose build ubuntu
      - name: Docker Push
-        if: success() && github.event_name == 'push' && github.repository == 'zilliztech/milvus-distributed'
+        if: success() && github.event_name == 'push' && github.repository == 'milvus-io/milvus'
        continue-on-error: true
        shell: bash
        run: |
--- a/.github/workflows/publish-test-images.yaml
+++ b/.github/workflows/publish-test-images.yaml
@ -42,7 +42,7 @@ jobs:
          docker build -t milvusdb/pytest:${{ steps.extracter.outputs.version }}-${{ steps.extracter.outputs.sha_short }} .
          docker tag milvusdb/pytest:${{ steps.extracter.outputs.version }}-${{ steps.extracter.outputs.sha_short }} milvusdb/pytest:latest
      - name: Docker Push
-        if: success() && github.event_name == 'push' && github.repository == 'zilliztech/milvus-distributed'
+        if: success() && github.event_name == 'push' && github.repository == 'milvus-io/milvus'
        continue-on-error: true
        shell: bash
        run: |
--- a/.jenkins/modules/Build/Build.groovy
+++ b/.jenkins/modules/Build/Build.groovy
@ -3,7 +3,7 @@ timeout(time: 20, unit: 'MINUTES') {
    sh '. ./scripts/before-install.sh && ./scripts/check_cache.sh -l $CCACHE_ARTFACTORY_URL --cache_dir=\$CCACHE_DIR -f ccache-\$OS_NAME-\$BUILD_ENV_IMAGE_ID.tar.gz || echo \"Ccache artfactory files not found!\"'
    sh '. ./scripts/before-install.sh && ./scripts/check_cache.sh -l $GO_CACHE_ARTFACTORY_URL --cache_dir=\$(go env GOCACHE) -f go-cache-\$OS_NAME-\$BUILD_ENV_IMAGE_ID.tar.gz || echo \"Go cache artfactory files not found!\"'
    sh '. ./scripts/before-install.sh && ./scripts/check_cache.sh -l $THIRDPARTY_ARTFACTORY_URL --cache_dir=$CUSTOM_THIRDPARTY_PATH -f thirdparty-download.tar.gz || echo \"Thirdparty artfactory files not found!\"'
-    sh '. ./scripts/before-install.sh && go clean --modcache && ./scripts/check_cache.sh -l $GO_MOD_ARTFACTORY_URL --cache_dir=\$GOPATH/pkg/mod -f milvus-distributed-go-mod-\$(md5sum go.mod).tar.gz || echo \"Go mod artfactory files not found!\"'
+    sh '. ./scripts/before-install.sh && go clean --modcache && ./scripts/check_cache.sh -l $GO_MOD_ARTFACTORY_URL --cache_dir=\$GOPATH/pkg/mod -f milvus-go-mod-\$(md5sum go.mod).tar.gz || echo \"Go mod artfactory files not found!\"'

    // Zero the cache statistics (but not the configuration options)
    sh 'ccache -z'
@ -15,6 +15,6 @@ timeout(time: 20, unit: 'MINUTES') {
        sh '. ./scripts/before-install.sh && ./scripts/update_cache.sh -l $CCACHE_ARTFACTORY_URL --cache_dir=\$CCACHE_DIR -f ccache-\$OS_NAME-\$BUILD_ENV_IMAGE_ID.tar.gz -u ${USERNAME} -p ${PASSWORD}'
        sh '. ./scripts/before-install.sh && ./scripts/update_cache.sh -l $GO_CACHE_ARTFACTORY_URL --cache_dir=\$(go env GOCACHE) -f go-cache-\$OS_NAME-\$BUILD_ENV_IMAGE_ID.tar.gz -u ${USERNAME} -p ${PASSWORD}'
        sh '. ./scripts/before-install.sh && ./scripts/update_cache.sh -l $THIRDPARTY_ARTFACTORY_URL --cache_dir=$CUSTOM_THIRDPARTY_PATH -f thirdparty-download.tar.gz -u ${USERNAME} -p ${PASSWORD}'
-        sh '. ./scripts/before-install.sh && ./scripts/update_cache.sh -l $GO_MOD_ARTFACTORY_URL --cache_dir=\$GOPATH/pkg/mod -f milvus-distributed-go-mod-\$(md5sum go.mod).tar.gz -u ${USERNAME} -p ${PASSWORD}'
+        sh '. ./scripts/before-install.sh && ./scripts/update_cache.sh -l $GO_MOD_ARTFACTORY_URL --cache_dir=\$GOPATH/pkg/mod -f milvus-go-mod-\$(md5sum go.mod).tar.gz -u ${USERNAME} -p ${PASSWORD}'
    }
 }
--- a/.jenkins/modules/Publish/Publish.groovy
+++ b/.jenkins/modules/Publish/Publish.groovy
@ -8,21 +8,18 @@ withCredentials([usernamePassword(credentialsId: "${env.JFROG_CREDENTIALS_ID}",

 sh 'tar zxvf ${PACKAGE_NAME}'

-dir ('build/docker/deploy') {
-	try {
-        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}'
+try {
+    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}/milvus-distributed:${SOURCE_TAG} || true'
-            sh 'docker-compose build --force-rm master'
-            sh 'docker-compose push master'
-        }
-    } catch (exc) {
-        throw exc
-    } finally {
-        sh 'docker logout ${DOKCER_REGISTRY_URL}'
-        sh "docker rmi -f \$(docker images | grep '<none>' | awk '{print \$3}') || true"
-        sh 'docker-compose down --rmi all'
+        sh 'docker pull registry.zilliz.com/milvus/openblas:latest || true'
+        sh "docker build -f build/docker/milvus/Dockerfile -t ${TARGET_REPO}/milvus:${TARGET_TAG} ."
+        sh "docker push ${TARGET_REPO}/milvus:${TARGET_TAG}"
    }
+} catch (exc) {
+    throw exc
+} finally {
+    sh 'docker logout ${DOKCER_REGISTRY_URL}'
+    sh "docker rmi -f \$(docker images | grep '<none>' | awk '{print \$3}') || true"
+    sh "docker rmi ${TARGET_REPO}/milvus:${TARGET_TAG}"
 }
--- a/.jenkins/modules/Regression/PythonRegression.groovy
+++ b/.jenkins/modules/Regression/PythonRegression.groovy
@ -19,20 +19,20 @@ timeout(time: "${regressionTimeout}", unit: 'MINUTES') {
                if ("${REGRESSION_SERVICE_TYPE}" == "distributed") {
                    helmCMD = "helm install --wait --timeout 300s \
                                   --set standalone.enabled=false \
-                                   --set image.all.repository=${env.TARGET_REPO}/milvus-distributed \
+                                   --set image.all.repository=${env.TARGET_REPO}/milvus \
                                   --set image.all.tag=${env.TARGET_TAG} \
                                   --set image.all.pullPolicy=Always \
                                   --set logsPersistence.enabled=true \
-                                   --set logsPersistence.mountPath=/milvus-distributed/logs \
+                                   --set logsPersistence.mountPath=/milvus/logs \
                                   --namespace ${env.HELM_RELEASE_NAMESPACE} ${env.HELM_RELEASE_NAME} ."
                } else {
                    helmCMD = "helm install --wait --timeout 300s \
                                   --set standalone.enabled=true \
-                                   --set image.all.repository=${env.TARGET_REPO}/milvus-distributed \
+                                   --set image.all.repository=${env.TARGET_REPO}/milvus \
                                   --set image.all.tag=${env.TARGET_TAG} \
                                   --set image.all.pullPolicy=Always \
                                   --set logsPersistence.enabled=true \
-                                   --set logsPersistence.mountPath=/milvus-distributed/logs \
+                                   --set logsPersistence.mountPath=/milvus/logs \
                                   --namespace ${env.HELM_RELEASE_NAMESPACE} ${env.HELM_RELEASE_NAME} ."
                }

--- a/build/ci/jenkins/Jenkinsfile
+++ b/build/ci/jenkins/Jenkinsfile
@ -26,8 +26,8 @@ pipeline {
        PACKAGE_ARTFACTORY_URL = "${JFROG_ARTFACTORY_URL}/${PROJECT_NAME}/package/${PACKAGE_NAME}"
        DOCKER_CREDENTIALS_ID = "ba070c98-c8cc-4f7c-b657-897715f359fc"
        DOKCER_REGISTRY_URL = "registry.zilliz.com"
-        SOURCE_REPO = "${DOKCER_REGISTRY_URL}/milvus-distributed"
-        TARGET_REPO = "${DOKCER_REGISTRY_URL}/milvus-distributed"
+        SOURCE_REPO = "${DOKCER_REGISTRY_URL}/milvus"
+        TARGET_REPO = "${DOKCER_REGISTRY_URL}/milvus"
        SOURCE_TAG = "${CHANGE_TARGET ? CHANGE_TARGET : SEMVER}-${LOWER_BUILD_TYPE}"
        TARGET_TAG = "${SEMVER}-${LOWER_BUILD_TYPE}"
        DOCKER_BUILDKIT = 1
@ -45,11 +45,11 @@ pipeline {
            environment {
                PULSAR_ADDRESS = "pulsar://127.0.0.1:6650"
                ETCD_ADDRESS = "127.0.0.1:2379"
-                CCACHE_ARTFACTORY_URL = "${JFROG_ARTFACTORY_URL}/milvus-distributed/ccache"
-                THIRDPARTY_ARTFACTORY_URL = "${JFROG_ARTFACTORY_URL}/milvus-distributed/thirdparty"
+                CCACHE_ARTFACTORY_URL = "${JFROG_ARTFACTORY_URL}/milvus/ccache"
+                THIRDPARTY_ARTFACTORY_URL = "${JFROG_ARTFACTORY_URL}/milvus/thirdparty"
                CUSTOM_THIRDPARTY_PATH = "${WORKSPACE}/3rdparty_download"
-                GO_CACHE_ARTFACTORY_URL = "${JFROG_ARTFACTORY_URL}/milvus-distributed/go-cache"
-                GO_MOD_ARTFACTORY_URL = "${JFROG_ARTFACTORY_URL}/milvus-distributed/go-mod"
+                GO_CACHE_ARTFACTORY_URL = "${JFROG_ARTFACTORY_URL}/milvus/go-cache"
+                GO_MOD_ARTFACTORY_URL = "${JFROG_ARTFACTORY_URL}/milvus/go-mod"
            }
            steps {
                container('build-env') {
@ -84,7 +84,7 @@ pipeline {
                    }
                }
                environment {
-                    HELM_BRANCH = "2.0"
+                    HELM_BRANCH = "main"
                    HELM_RELEASE_NAMESPACE = "dev"
                    HELM_RELEASE_NAME = "${PROJECT_NAME}-${SEMVER}-${env.BUILD_NUMBER}-${REGRESSION_SERVICE_TYPE}".replaceAll("\\.", "-").replaceAll("_", "-").toLowerCase()
                    DEV_TEST_ARTIFACTS_PATH = "artifacts"
--- a/build/ci/jenkins/pod/build-env.yaml
+++ b/build/ci/jenkins/pod/build-env.yaml
@ -3,7 +3,7 @@ kind: Pod
 metadata:
  name: build-env
  labels:
-    app: milvus-distributed
+    app: milvus
    componet: build-env
 spec:
  containers:
--- a/build/ci/jenkins/pod/docker-pod.yaml
+++ b/build/ci/jenkins/pod/docker-pod.yaml
@ -21,29 +21,9 @@ spec:
    volumeMounts:
    - name: docker-graph-storage
      mountPath: /var/lib/docker
-    - name: docker-daemon
-      mountPath: /etc/docker
-  initContainers:
-  - name: docker-daemon-config
-    image: registry.zilliz.com/library/dind-compose:v0.1
-    command: ["sh", "-c"]
-    args:
-      - |
-        cat > "/etc/docker/daemon.json" <<EOF
-        {
-          "registry-mirrors": [
-            "https://hub-mirror.c.163.com",
-            "https://mirror.baidubce.com" ]
-        }
-        EOF
-    volumeMounts:
-    - name: docker-daemon
-      mountPath: /etc/docker
  volumes:
    - name: docker-graph-storage
      emptyDir: {}
-    - name: docker-daemon
-      emptyDir: {}
  tolerations:
  - key: dedicated
    operator: Equal
--- a/build/docker/deploy/.env
+++ b/build/docker/deploy/.env
@ -1,17 +0,0 @@
-SOURCE_REPO=milvusdb
-TARGET_REPO=milvusdb
-SOURCE_TAG=latest
-TARGET_TAG=latest
-PULSAR_ADDRESS=pulsar://pulsar:6650
-ETCD_ADDRESS=etcd:2379
-MASTER_ADDRESS=master:53100
-MINIO_ADDRESS=minio:9000
-PROXY_NODE_HOST=proxynode
-INDEX_NODE_HOST=indexnode
-QUERY_NODE_HOST1=querynode1
-QUERY_NODE_HOST2=querynode2
-DATA_NODE_HOST=datanode
-PROXY_SERVICE_ADDRESS=proxyservice:21122
-INDEX_SERVICE_ADDRESS=indexservice:31000
-DATA_SERVICE_ADDRESS=dataservice:13333
-QUERY_SERVICE_ADDRESS=queryservice:19531
--- a/build/docker/deploy/docker-compose.yml
+++ b/build/docker/deploy/docker-compose.yml
@ -1,183 +0,0 @@
-version: '3.5'
-
-services:
-  master:
-    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/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:
-      - milvus
-
-  proxyservice:
-    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/proxyservice"
-    environment: 
-      PULSAR_ADDRESS: ${PULSAR_ADDRESS}
-    networks:
-      - milvus
-
-  proxynode:
-    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/proxynode"
-    environment: 
-      ETCD_ADDRESS: ${ETCD_ADDRESS}
-      PULSAR_ADDRESS: ${PULSAR_ADDRESS}
-      MASTER_ADDRESS: ${MASTER_ADDRESS}
-      PROXY_NODE_HOST: ${PROXY_NODE_HOST}
-      PROXY_SERVICE_ADDRESS: ${PROXY_SERVICE_ADDRESS}
-      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}/milvus-distributed:${TARGET_TAG}
-    build:
-      context: ../../../
-      dockerfile: build/docker/deploy/distributed/Dockerfile
-      cache_from:
-        - ${SOURCE_REPO}/milvus-distributed:${SOURCE_TAG}
-    command: 
-      - "/milvus-distributed/bin/queryservice"
-    environment:
-      MASTER_ADDRESS: ${MASTER_ADDRESS}
-      DATA_SERVICE_ADDRESS: ${DATA_SERVICE_ADDRESS}
-    networks:
-      - milvus
-
-  querynode:
-    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/querynode"
-    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}
-    depends_on:
-      - "queryservice"
-    networks:
-      - milvus
-
-  indexservice:
-    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/indexservice"
-    environment:
-      MASTER_ADDRESS: ${MASTER_ADDRESS}
-      ETCD_ADDRESS: ${ETCD_ADDRESS}
-      MINIO_ADDRESS: ${MINIO_ADDRESS}
-    networks:
-      - milvus
-
-  indexnode:
-    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/indexnode"
-    environment:
-      INDEX_SERVICE_ADDRESS: ${INDEX_SERVICE_ADDRESS}
-      MINIO_ADDRESS: ${MINIO_ADDRESS}
-      INDEX_NODE_HOST: ${INDEX_NODE_HOST}
-    depends_on:
-      - "indexservice"
-    networks:
-      - milvus
-
-  dataservice:
-    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/dataservice"
-    environment:
-      PULSAR_ADDRESS: ${PULSAR_ADDRESS}
-      ETCD_ADDRESS: ${ETCD_ADDRESS}
-      MASTER_ADDRESS: ${MASTER_ADDRESS}
-      MINIO_ADDRESS: ${MINIO_ADDRESS}
-    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
-
-  standalone:
-    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/singlenode"
-    environment:
-      ETCD_ADDRESS: ${ETCD_ADDRESS}
-      MINIO_ADDRESS: ${MINIO_ADDRESS}
-    networks:
-      - milvus
-
-networks:
-  milvus:
--- a/build/docker/deploy/distributed/Dockerfile
+++ b/build/docker/deploy/distributed/Dockerfile
@ -9,7 +9,7 @@
 # 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 milvusdb/openblas:ubuntu18.04-20210417 AS openblas

 #FROM alpine
 FROM ubuntu:bionic-20200921
@ -23,17 +23,18 @@ 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/ /milvus-distributed/bin/
+COPY ./bin/ /milvus/bin/

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

-COPY ./lib/ /milvus-distributed/lib/
+COPY ./lib/ /milvus/lib/

-ENV LD_LIBRARY_PATH=/milvus-distributed/lib:$LD_LIBRARY_PATH:/usr/lib
+ENV LD_LIBRARY_PATH=/milvus/lib:$LD_LIBRARY_PATH:/usr/lib

 # Add Tini
 ADD https://github.com/krallin/tini/releases/download/v0.19.0/tini /tini
 RUN chmod +x /tini
 ENTRYPOINT ["/tini", "--"]

-WORKDIR /milvus-distributed/
+WORKDIR /milvus/
+
--- a/cmd/singlenode/main.go
+++ b/cmd/singlenode/main.go
@ -43,7 +43,7 @@ func initLogCfg() log.Config {

 	// FIXME(wxyu): Load from config files
 	//logCfg.File.Filename = ""
-	ciFileDir := "/milvus-distributed/logs/"
+	ciFileDir := "/milvus/logs/"
 	if _, err := os.Stat(ciFileDir); err == nil {
 		logCfg.File.Filename = ciFileDir + "singlenode.log"
 	} else {
--- a/deployments/docker/distributed/docker-compose.yml
+++ b/deployments/docker/distributed/docker-compose.yml
@ -37,8 +37,8 @@ services:
      - milvus

  master:
-    image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release
-    command: ["/milvus-distributed/bin/milvus", "run", "master"]
+    image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release
+    command: ["/milvus/bin/milvus", "run", "master"]
    environment:
      ETCD_ADDRESS: etcd:2379
      PULSAR_ADDRESS: pulsar://pulsar:6650
@ -54,8 +54,8 @@ services:
      - milvus

  proxyservice:
-    image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release
-    command: ["/milvus-distributed/bin/milvus", "run", "proxyservice"]
+    image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release
+    command: ["/milvus/bin/milvus", "run", "proxyservice"]
    environment:
      PULSAR_ADDRESS: pulsar://pulsar:6650
    depends_on:
@ -66,8 +66,8 @@ services:
      - milvus

  proxynode:
-    image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release
-    command: ["/milvus-distributed/bin/milvus", "run", "proxynode"]
+    image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release
+    command: ["/milvus/bin/milvus", "run", "proxynode"]
    environment:
      ETCD_ADDRESS: etcd:2379
      PULSAR_ADDRESS: pulsar://pulsar:6650
@ -84,8 +84,8 @@ services:
      - milvus

  queryservice:
-    image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release
-    command: ["/milvus-distributed/bin/milvus", "run", "queryservice"]
+    image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release
+    command: ["/milvus/bin/milvus", "run", "queryservice"]
    environment:
      MASTER_ADDRESS: master:53100
      DATA_SERVICE_ADDRESS: dataservice:13333
@ -97,8 +97,8 @@ services:
      - milvus

  querynode:
-    image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release
-    command: ["/milvus-distributed/bin/milvus", "run", "querynode"]
+    image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release
+    command: ["/milvus/bin/milvus", "run", "querynode"]
    environment:
      MINIO_ADDRESS: minio:9000
      PULSAR_ADDRESS: pulsar://pulsar:6650
@ -113,8 +113,8 @@ services:
      - milvus

  indexservice:
-    image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release
-    command: ["/milvus-distributed/bin/milvus", "run", "indexservice"]
+    image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release
+    command: ["/milvus/bin/milvus", "run", "indexservice"]
    environment:
      ETCD_ADDRESS: etcd:2379
      MINIO_ADDRESS: minio:9000
@ -127,8 +127,8 @@ services:
      - milvus

  indexnode:
-    image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release
-    command: ["/milvus-distributed/bin/milvus", "run", "indexnode"]
+    image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release
+    command: ["/milvus/bin/milvus", "run", "indexnode"]
    environment:
      MINIO_ADDRESS: minio:9000
      INDEX_SERVICE_ADDRESS: indexservice:31000
@ -138,8 +138,8 @@ services:
      - milvus

  dataservice:
-    image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release
-    command: ["/milvus-distributed/bin/milvus", "run", "dataservice"]
+    image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release
+    command: ["/milvus/bin/milvus", "run", "dataservice"]
    environment:
      ETCD_ADDRESS: etcd:2379
      MINIO_ADDRESS: minio:9000
@ -153,8 +153,8 @@ services:
      - milvus

  datanode:
-    image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release
-    command: ["/milvus-distributed/bin/milvus", "run", "datanode"]
+    image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release
+    command: ["/milvus/bin/milvus", "run", "datanode"]
    environment:
      ETCD_ADDRESS: etcd:2379
      MINIO_ADDRESS: minio:9000
--- a/deployments/docker/singlenode/docker-compose.yml
+++ b/deployments/docker/singlenode/docker-compose.yml
@ -28,8 +28,8 @@ services:
      - milvus

  standalone:
-    image: registry.zilliz.com/milvus-distributed/milvus-distributed:PR-5020-release
-    command: ["/milvus-distributed/bin/singlenode"]
+    image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release
+    command: ["/milvus/bin/singlenode"]
    environment:
      ETCD_ADDRESS: etcd:2379
      MINIO_ADDRESS: minio:9000
--- a/docs/developer_guides/entrypoint.md
+++ b/docs/developer_guides/entrypoint.md
@ -2,16 +2,16 @@

 ### Syntax

-Use the following syntax to run `milvus-distributed` commands from your terminal window:
+Use the following syntax to run `milvus` commands from your terminal window:

 ```shell
-milvus-distributed [command] [server type] [flags]
+milvus [command] [server type] [flags]
 ```

 Example:

 ```bash
-$ MILVUS_CONF_PATH=/path/to/milvus-distributed/configs milvus-distributed run master
+$ MILVUS_CONF_PATH=/path/to/milvus/configs milvus run master
 ```


@ -40,16 +40,16 @@ where `command`, `server type`, and `flags` are:
 > Getting help
 > You can get help for CLI tool using the `--help` flag, or `-h` for short.
 > ```shell
-> $ milvus-distributed run master --help
+> $ milvus run master --help
 > ```


 ### Environment


-The table below lists the environment variables that you can use to configure the `milvus-distributed` tool.
+The table below lists the environment variables that you can use to configure the `milvus` tool.


 |  Variable  | Description | Default |
 | :-----:| :----: | :----: |
-| MILVUS_CONF_PATH | Milvus configuration path | `/milvus-distributed/configs` |
+| MILVUS_CONF_PATH | Milvus configuration path | `/milvus/configs` |
--- a/docs/jaeger_guides/Opentracing
+++ b/docs/jaeger_guides/Opentracing
@ -20,7 +20,7 @@ See also:

 We mainly use jaeger as a implementation of opentracing.

-Two request: **Insert Request** and **Search Request** in milvus-distributed system is traced at this stage.
+Two request: **Insert Request** and **Search Request** in milvus system is traced at this stage.



--- a/scripts/run_docker.sh
+++ b/scripts/run_docker.sh
@ -1,31 +1,31 @@
 cd ../build/docker/deploy/

 echo "starting master docker"
-nohup docker-compose -p milvus-distributed up master > ~/master_docker.log 2>&1 &
+nohup docker-compose -p milvus up master > ~/master_docker.log 2>&1 &

 echo "starting proxyservice docker"
-nohup docker-compose -p milvus-distributed up  proxyservice > ~/proxyservice_docker.log 2>&1 &
+nohup docker-compose -p milvus up  proxyservice > ~/proxyservice_docker.log 2>&1 &

 echo "starting proxynode docker"
-nohup docker-compose -p milvus-distributed up  proxynode > ~/proxynode_docker.log 2>&1 &
+nohup docker-compose -p milvus up  proxynode > ~/proxynode_docker.log 2>&1 &

 echo "starting indexservice docker"
-nohup docker-compose -p milvus-distributed up  indexservice > ~/indexservice_docker.log 2>&1 &
+nohup docker-compose -p milvus up  indexservice > ~/indexservice_docker.log 2>&1 &

 echo "starting indexnode docker"
-nohup docker-compose -p milvus-distributed up  indexnode > ~/indexnode_docker.log 2>&1 &
+nohup docker-compose -p milvus up  indexnode > ~/indexnode_docker.log 2>&1 &

 echo "starting queryservice docker"
-nohup docker-compose -p milvus-distributed up queryservice > ~/queryservice_docker.log 2>&1 &
+nohup docker-compose -p milvus up queryservice > ~/queryservice_docker.log 2>&1 &

 echo "starting dataservice docker"
-nohup docker-compose -p milvus-distributed up dataservice > ~/dataservice_docker.log 2>&1 &
+nohup docker-compose -p milvus up dataservice > ~/dataservice_docker.log 2>&1 &

 echo "starting querynode1 docker"
-nohup docker-compose -p milvus-distributed run -e QUERY_NODE_ID=1 querynode > ~/querynode1_docker.log 2>&1 &
+nohup docker-compose -p milvus run -e QUERY_NODE_ID=1 querynode > ~/querynode1_docker.log 2>&1 &

 echo "starting querynode2 docker"
-nohup docker-compose -p milvus-distributed run -e QUERY_NODE_ID=2 querynode > ~/querynode2_docker.log 2>&1 &
+nohup docker-compose -p milvus run -e QUERY_NODE_ID=2 querynode > ~/querynode2_docker.log 2>&1 &

 echo "starting datanode docker"
-nohup docker-compose -p milvus-distributed run -e DATA_NODE_ID=3 datanode > ~/datanode_docker.log 2>&1 &
+nohup docker-compose -p milvus run -e DATA_NODE_ID=3 datanode > ~/datanode_docker.log 2>&1 &
--- a/tests/python_test/docker-compose.yml
+++ b/tests/python_test/docker-compose.yml
@ -4,8 +4,8 @@ services:
  regression:
    image: milvusdb/pytest:latest
    volumes:
-      - ../..:/milvus-distributed:delegated
-    working_dir: "/milvus-distributed/tests/python_test"
+      - ../..:/milvus:delegated
+    working_dir: "/milvus/tests/python_test"
    networks:
      - milvus