Browse Source

address comments

pull/7160/head
chrislu 1 month ago
parent
commit
af1589f7c9
  1. 2
      test/s3/iam/Makefile
  2. 17
      test/s3/iam/Makefile.docker

2
test/s3/iam/Makefile

@ -87,7 +87,7 @@ start-services: ## Start SeaweedFS services for testing
@$(WEED_BINARY) -v=3 s3 -port=$(S3_PORT) \
-filer=localhost:$(FILER_PORT) \
-config=test_config.json \
-iam.config=$(CURDIR)/iam_config.json > weed-s3.log 2>&1 & \
-iam.config=$(CURDIR)/iam_config.json > weed-s3.log 2>&1 & \
echo $$! > $(S3_PID_FILE)
@echo "✅ All services started"

17
test/s3/iam/Makefile.docker

@ -148,9 +148,20 @@ docker-urls: ## Display all service URLs
docker-wait-healthy: ## Wait for all services to be healthy
@echo "⏳ Waiting for all services to be healthy..."
@timeout 300 bash -c ' \
while [ $$(docker-compose -p $(PROJECT_NAME) -f $(COMPOSE_FILE) ps | grep -c "healthy") -lt 4 ]; do \
echo "Waiting for services to be healthy..."; \
required_services="keycloak weed-master weed-volume weed-filer weed-s3"; \
while true; do \
all_healthy=true; \
for service in $$required_services; do \
if ! docker-compose -p $(PROJECT_NAME) -f $(COMPOSE_FILE) ps $$service | grep -q "healthy"; then \
echo "Waiting for $$service to be healthy..."; \
all_healthy=false; \
break; \
fi; \
done; \
if [ "$$all_healthy" = "true" ]; then \
break; \
fi; \
sleep 5; \
done \
'
@echo "✅ All services are healthy"
@echo "✅ All required services are healthy"
Loading…
Cancel
Save