diff --git a/deploy.sh b/deploy.sh index 1011607..37696b7 100755 --- a/deploy.sh +++ b/deploy.sh @@ -98,8 +98,18 @@ check_prerequisites() { # Check if docker-compose is available if ! command -v docker-compose >/dev/null 2>&1; then - log_error "docker-compose is not installed." - exit 1 + # Try docker compose (without dash) - newer versions + if ! docker compose version >/dev/null 2>&1; then + log_error "Neither docker-compose nor docker compose is available." + log_error "Please install Docker Compose first." + exit 1 + else + log_info "Using 'docker compose' (newer syntax)" + DOCKER_COMPOSE_CMD="docker compose" + fi + else + log_info "Using 'docker-compose' (legacy syntax)" + DOCKER_COMPOSE_CMD="docker-compose" fi # Check if .env file exists @@ -129,7 +139,11 @@ show_status() { # Show containers log_info "Running Containers:" - docker ps --format "table {{.Names}}\t{{.Status}}\t{{.Image}}" | grep -E "(flat-scraper|CONTAINER)" || echo "No flat-scraper containers running" + if command -v docker-compose >/dev/null 2>&1; then + docker-compose ps --format "table {{.Names}}\t{{.Status}}\t{{.Image}}" | grep -E "(flat-scraper|CONTAINER)" || echo "No flat-scraper containers running" + else + docker compose ps --format "table {{.Names}}\t{{.Status}}\t{{.Image}}" | grep -E "(flat-scraper|CONTAINER)" || echo "No flat-scraper containers running" + fi echo "" # Show storage usage @@ -216,28 +230,28 @@ deploy_services() { # Stop existing services if [ "$VERBOSE" = true ]; then log_info "Stopping existing services..." - docker-compose down + $DOCKER_COMPOSE_CMD down fi # Start services if [ "$VERBOSE" = true ]; then - docker-compose up -d --build + $DOCKER_COMPOSE_CMD up -d --build else - docker-compose up -d + $DOCKER_COMPOSE_CMD up -d fi # Check if services started successfully sleep 5 # Give services time to start - running_containers=$(docker-compose ps | grep "Up" | wc -l) - total_containers=$(docker-compose ps | grep -c "flat-scraper") + running_containers=$($DOCKER_COMPOSE_CMD ps | grep "Up" | wc -l) + total_containers=$($DOCKER_COMPOSE_CMD ps | grep -c "flat-scraper") if [ "$running_containers" -eq "$total_containers" ] && [ "$total_containers" -gt 0 ]; then log_success "All services deployed successfully" log_info "Running containers: $running_containers/$total_containers" else log_error "Some services failed to start" - docker-compose ps + $DOCKER_COMPOSE_CMD ps exit 1 fi } @@ -249,12 +263,12 @@ show_final_status() { # Show running containers log_info "Running services:" - docker-compose ps + $DOCKER_COMPOSE_CMD ps echo "" # Show recent logs log_info "Recent logs (last 10 lines):" - docker-compose logs --tail=10 + $DOCKER_COMPOSE_CMD logs --tail=10 echo "" # Show storage usage @@ -288,10 +302,10 @@ main() { log_success "🎉 Flat Scraper deployment completed!" echo "" log_info "Useful commands:" - echo " docker-compose logs -f # Follow logs" - echo " docker-compose ps # Check status" - echo " docker-compose restart # Restart services" - echo " docker-compose down # Stop services" + echo " $DOCKER_COMPOSE_CMD logs -f # Follow logs" + echo " $DOCKER_COMPOSE_CMD ps # Check status" + echo " $DOCKER_COMPOSE_CMD restart # Restart services" + echo " $DOCKER_COMPOSE_CMD down # Stop services" echo " ./deploy.sh --no-build --no-cleanup # Quick restart" echo "" }