github/deer-flow
1
0
Fork 0
mirror of https://github.com/bytedance/deer-flow.git synced 2026-06-09 17:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(makefile): extract setup-sandbox inline bash to script for Windows compatibility (#3326)

Browse Source
This commit is contained in:
FallingSnowFlake 2026-06-01 07:28:13 +08:00 committed by GitHub
parent 46ddc346ad
commit d6a604d5a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Makefile
View File

@ -89,36 +89,7 @@ install:
# Pre-pull sandbox Docker image (optional but recommended)
setup-sandbox:
@echo "=========================================="
@echo " Pre-pulling Sandbox Container Image"
@echo "=========================================="
@echo ""
@IMAGE=$$(grep -A 20 "# sandbox:" config.yaml 2>/dev/null | grep "image:" | awk '{print $$2}' | head -1); \
if [ -z "$$IMAGE" ]; then \
IMAGE="enterprise-public-cn-beijing.cr.volces.com/vefaas-public/all-in-one-sandbox:latest"; \
echo "Using default image: $$IMAGE"; \
else \
echo "Using configured image: $$IMAGE"; \
fi; \
echo ""; \
if command -v container >/dev/null 2>&1 && [ "$$(uname)" = "Darwin" ]; then \
echo "Detected Apple Container on macOS, pulling image..."; \
container image pull "$$IMAGE" || echo "⚠ Apple Container pull failed, will try Docker"; \
fi; \
if command -v docker >/dev/null 2>&1; then \
echo "Pulling image using Docker..."; \
if docker pull "$$IMAGE"; then \
echo ""; \
echo "✓ Sandbox image pulled successfully"; \
else \
echo ""; \
echo "⚠ Failed to pull sandbox image (this is OK for local sandbox mode)"; \
fi; \
else \
echo "✗ Neither Docker nor Apple Container is available"; \
echo " Please install Docker: https://docs.docker.com/get-docker/"; \
exit 1; \
fi
@$(RUN_WITH_GIT_BASH) ./scripts/setup-sandbox.sh
# Start all services in development mode (with hot-reloading)
dev:

45
scripts/setup-sandbox.sh Normal file
View File

@ -0,0 +1,45 @@
#!/usr/bin/env bash
# Pre-pull sandbox container image for DeerFlow
set -uo pipefail
echo "=========================================="
echo " Pre-pulling Sandbox Container Image"
echo "=========================================="
echo ""
# Try to extract image from config.yaml (handles both commented and uncommented sandbox sections)
IMAGE=""
if [ -f "config.yaml" ]; then
# Look for uncommented image: field under the sandbox section
IMAGE=$(grep -A 20 "^sandbox:" config.yaml 2>/dev/null | grep "^ image:" | awk '{print $2}' | head -1 || true)
fi
if [ -z "$IMAGE" ]; then
IMAGE="enterprise-public-cn-beijing.cr.volces.com/vefaas-public/all-in-one-sandbox:latest"
echo "Using default image: $IMAGE"
else
echo "Using configured image: $IMAGE"
fi
echo ""
if command -v container >/dev/null 2>&1 && [ "$(uname)" = "Darwin" ]; then
echo "Detected Apple Container on macOS, pulling image..."
container image pull "$IMAGE" || echo "⚠ Apple Container pull failed, will try Docker"
fi
if command -v docker >/dev/null 2>&1; then
echo "Pulling image using Docker..."
if docker pull "$IMAGE"; then
echo ""
echo "✓ Sandbox image pulled successfully"
else
echo ""
echo "⚠ Failed to pull sandbox image (this is OK for local sandbox mode)"
fi
else
echo "✗ Neither Docker nor Apple Container is available"
echo " Please install Docker: https://docs.docker.com/get-docker/"
exit 1
fi