diff --git a/.drone.yml b/.drone.yml index 3ba31af..29fc50f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -52,8 +52,8 @@ steps: - docker network create ai_ai-strategy-network 2>/dev/null || true - docker compose -f docker-compose.test.yml down --remove-orphans || true - docker compose -f docker-compose.test.yml build --no-cache - - docker compose -f docker-compose.test.yml up -d - - sleep 15 + - docker compose -f docker-compose.test.yml up -d --wait --wait-timeout 300 || docker compose -f docker-compose.test.yml up -d + - sleep 30 - docker compose -f docker-compose.test.yml ps - echo "========== 测试环境部署完成 ==========" - echo "前端地址 - https://pricing.test.zhicheng.ireborn.com.cn" @@ -113,8 +113,8 @@ steps: - docker network create ai_ai-strategy-network 2>/dev/null || true - docker compose -f docker-compose.prod.yml down --remove-orphans || true - docker compose -f docker-compose.prod.yml build --no-cache - - docker compose -f docker-compose.prod.yml up -d - - sleep 15 + - docker compose -f docker-compose.prod.yml up -d --wait --wait-timeout 300 || docker compose -f docker-compose.prod.yml up -d + - sleep 30 - docker compose -f docker-compose.prod.yml ps - echo "========== 生产环境部署完成 ==========" - echo "前端地址 - https://pricing.zhicheng.ireborn.com.cn" diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 2f68ec7..ba4420a 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -115,10 +115,10 @@ services: - pricing_network_prod healthcheck: test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p${MYSQL_ROOT_PASSWORD}"] - interval: 30s + interval: 10s timeout: 10s - retries: 3 - start_period: 60s + retries: 10 + start_period: 120s logging: driver: "json-file" options: diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 02679cf..3751f38 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -115,10 +115,10 @@ services: - pricing_network_test healthcheck: test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p${MYSQL_ROOT_PASSWORD:-root_test_123}"] - interval: 30s + interval: 10s timeout: 10s - retries: 3 - start_period: 60s + retries: 10 + start_period: 120s logging: driver: "json-file" options: