From 07047487c3d1d7bd33b5c5ac27180dfd5564a020 Mon Sep 17 00:00:00 2001 From: Frederick2313072 <2031894837@qq.com> Date: Sat, 20 Sep 2025 05:41:25 +0800 Subject: [PATCH] fix --- docker/README-local-test.md | 25 +++++++++----- docker/start-local-test.bat | 69 +++++++++++++++++++++++-------------- 2 files changed, 60 insertions(+), 34 deletions(-) diff --git a/docker/README-local-test.md b/docker/README-local-test.md index 25e94bb065..ece98b3c4d 100644 --- a/docker/README-local-test.md +++ b/docker/README-local-test.md @@ -6,11 +6,10 @@ ``` docker/ -├── .env # 本地环境配置 -├── env.local # 本地环境配置(备选方案) -├── docker-compose.override.yaml # 本地覆盖配置 -├── start-local-test.sh # 启动脚本 -└── README-local-test.md # 本文档 +├── .env # 本地环境配置 +├── docker-compose.override.yaml # 本地覆盖配置 +├── start-local-test.bat # Windows启动脚本 +└── README-local-test.md # 本文档 ``` ## 🚀 快速开始 @@ -20,9 +19,11 @@ docker/ **使用 `.env`** ```bash cd docker -cp .env.example .env +copy .env.example .env ``` +**注意**: 请确保 Docker Desktop 正在运行,然后执行启动脚本。 + ### 2. 修改配置(可选) 编辑你选择的环境文件,调整适合本地测试的配置: @@ -46,12 +47,18 @@ VECTOR_STORE=weaviate ### 3. 启动测试环境 -```bash +**Windows用户**: +```cmd cd docker -chmod +x start-local-test.sh -./start-local-test.sh +start-local-test.bat ``` +**脚本会自动**: +- 检查 Docker Desktop 是否运行 +- 验证 `.env` 配置文件存在 +- 构建 worker 镜像(使用本地 Dockerfile) +- 启动所有服务 + 或者手动启动: ```bash diff --git a/docker/start-local-test.bat b/docker/start-local-test.bat index 73390f47d0..58fba6a85f 100644 --- a/docker/start-local-test.bat +++ b/docker/start-local-test.bat @@ -1,44 +1,63 @@ @echo off -REM 本地测试环境启动脚本 (Windows) -REM 用于快速启动本地开发和测试环境 +chcp 65001 >nul +REM Dify Local Test Environment Startup Script (Windows) +REM Used to quickly start local development and testing environment -echo 🚀 启动Dify本地测试环境... +echo [INFO] Starting Dify local test environment... -REM 确保在docker目录中 +REM Ensure in docker directory cd /d "%~dp0" -REM 检查.env文件是否存在 -if not exist ".env" ( - echo ❌ 未找到 .env 配置文件 - echo 请先创建: copy .env.example .env +REM Check if Docker is running +docker info >nul 2>&1 +if errorlevel 1 ( + echo [ERROR] Docker is not running. Please start Docker Desktop first. pause exit /b 1 ) -echo 📄 使用配置文件: .env +REM Check if .env file exists +if not exist ".env" ( + echo [ERROR] .env configuration file not found + echo Please create first: copy .env.example .env + pause + exit /b 1 +) -REM 构建worker镜像 -echo 🔨 构建worker镜像... +echo [INFO] Using config file: .env + +REM Build worker image +echo [INFO] Building worker image... docker compose --env-file .env build worker +if errorlevel 1 ( + echo [ERROR] Failed to build worker image + pause + exit /b 1 +) -REM 启动所有服务 -echo 🚀 启动所有服务... +REM Start all services +echo [INFO] Starting all services... docker compose --env-file .env up -d +if errorlevel 1 ( + echo [ERROR] Failed to start services + pause + exit /b 1 +) -echo ✅ 本地测试环境启动完成! +echo [SUCCESS] Local test environment started successfully! echo. -echo 🌐 服务地址: -echo - Web界面: http://localhost -echo - API文档: http://localhost/swagger-ui.html -echo - API服务: http://localhost:5001 +echo [SERVICES] Service URLs: +echo - Web UI: http://localhost +echo - API Docs: http://localhost/swagger-ui.html +echo - API Service: http://localhost:5001 echo. -echo 📊 查看日志: docker compose logs -f -echo 🛑 停止服务: docker compose down -echo 🧹 清理数据: docker compose -f docker-compose.middleware.yaml down -v -echo 🔄 重启服务: docker compose restart - +echo [COMMANDS] Available commands: +echo - View logs: docker compose logs -f +echo - Stop services: docker compose down +echo - Clean data: docker compose -f docker-compose.middleware.yaml down -v +echo - Restart services: docker compose restart echo. -echo 💡 提示: 如果是首次运行,可能需要等待几分钟让服务完全启动 -echo 可以使用 'docker compose ps' 查看服务状态 +echo [TIP] If first run, wait a few minutes for services to fully start +echo Use 'docker compose ps' to check service status pause