diff --git a/.jenkins/modules/Regression/PythonRegression.groovy b/.jenkins/modules/Regression/PythonRegression.groovy index d9bf7bf13f9bf3865b34fc0744f5f0c2b169ae31..3c702a3bf2caa9de2597e35574e3d0c5ee59c5b6 100644 --- a/.jenkins/modules/Regression/PythonRegression.groovy +++ b/.jenkins/modules/Regression/PythonRegression.groovy @@ -2,6 +2,7 @@ try { sh 'docker-compose -p ${DOCKER_COMPOSE_PROJECT_NAME} up -d etcd' sh 'docker-compose -p ${DOCKER_COMPOSE_PROJECT_NAME} up -d pulsar' + sh 'docker-compose -p ${DOCKER_COMPOSE_PROJECT_NAME} up -d minio' dir ('build/docker/deploy') { sh 'docker-compose -p ${DOCKER_COMPOSE_PROJECT_NAME} pull' sh 'docker-compose -p ${DOCKER_COMPOSE_PROJECT_NAME} up -d master' @@ -30,6 +31,7 @@ try { } finally { sh 'docker-compose -p ${DOCKER_COMPOSE_PROJECT_NAME} rm -f -s -v pulsar' sh 'docker-compose -p ${DOCKER_COMPOSE_PROJECT_NAME} rm -f -s -v etcd' + sh 'docker-compose -p ${DOCKER_COMPOSE_PROJECT_NAME} rm -f -s -v minio' dir ('build/docker/deploy') { sh 'docker-compose -p ${DOCKER_COMPOSE_PROJECT_NAME} down --rmi all -v || true' } diff --git a/build/docker/deploy/.env b/build/docker/deploy/.env index dd4ba94a073e996572ed10176c74ccc456644d2f..01c909d01fb55da7d2935e205d53f744f4ecbe3d 100644 --- a/build/docker/deploy/.env +++ b/build/docker/deploy/.env @@ -5,3 +5,4 @@ TARGET_TAG=latest PULSAR_ADDRESS=pulsar://pulsar:6650 ETCD_ADDRESS=etcd:2379 MASTER_ADDRESS=master:53100 +MINIO_ADDRESS=minio:9000 \ No newline at end of file diff --git a/build/docker/deploy/docker-compose.yml b/build/docker/deploy/docker-compose.yml index 01d050c0a433413c16c8c663ef6599faa0e6db40..ee564c66b102ac2e349e9addf86d935550c8f2d0 100644 --- a/build/docker/deploy/docker-compose.yml +++ b/build/docker/deploy/docker-compose.yml @@ -38,6 +38,7 @@ services: PULSAR_ADDRESS: ${PULSAR_ADDRESS} ETCD_ADDRESS: ${ETCD_ADDRESS} MASTER_ADDRESS: ${MASTER_ADDRESS} + MINIO_ADDRESS: ${MINIO_ADDRESS} networks: - milvus diff --git a/docker-compose.yml b/docker-compose.yml index 308055ed597703e65a9922d7456a042b0e05fe22..e2b44897f2c036387547acd0f9213fbce7dc6bc3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -73,8 +73,6 @@ services: minio: image: minio/minio:RELEASE.2020-12-03T00-03-10Z - ports: - - "9000:9000" environment: MINIO_ACCESS_KEY: minioadmin MINIO_SECRET_KEY: minioadmin