From 37202359770856b24e0fb696adb8176c478a6aa1 Mon Sep 17 00:00:00 2001
From: Sasha Syrotenko <alex.syrotenko.official@gmail.com>
Date: Tue, 26 Nov 2024 13:24:52 +0200
Subject: [PATCH] Please work-4

---
 .github/workflows/compose-fastnear-test.yml | 8 ++++----
 Makefile                                    | 2 +-
 docker-compose-fastnear.yml                 | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/compose-fastnear-test.yml b/.github/workflows/compose-fastnear-test.yml
index b4c2a5ff..25d5b05b 100644
--- a/.github/workflows/compose-fastnear-test.yml
+++ b/.github/workflows/compose-fastnear-test.yml
@@ -68,10 +68,10 @@ jobs:
           cache-to: type=gha,mode=max,scope=operator
 
       - name: Build and start Docker Compose services
-        run: docker-compose -f ./docker-compose-fastnear.yml up --build -d
+        run: docker-compose -f ./docker-compose-fastnear.yml up --build -d --wait --wait-timeout 180
 
-      - name: Wait for a 3 minutes
-        run: sleep 180
+      - name: Wait for a minute
+        run: sleep 60
 
       - name: List running containers
         run: |
@@ -87,7 +87,7 @@ jobs:
             "nffl-operator0"
             "rollup1-relayer"
             "rollup0-relayer"
-            "nffl-fast-indexer"
+            "nffl-indexer"
             "nffl-aggregator"
             "nffl_aggregator-health_1"
             "mainnet-anvil"
diff --git a/Makefile b/Makefile
index 3fa56e2a..d905377a 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ docker-build-plugin:
 	docker build -t nffl-operator-plugin -f ./plugin/cmd/Dockerfile .
 docker-build-images: docker-build-indexer docker-build-relayer docker-build-aggregator docker-build-operator docker-build-plugin ## builds and publishes indexer, operator and aggregator docker images
 docker-start-everything: docker-build-images ## starts aggregator and operator docker containers
-	docker compose --profile default-indexer up
+	docker compose up
 
 __CLI__: ##
 
diff --git a/docker-compose-fastnear.yml b/docker-compose-fastnear.yml
index 89c2cb32..d1a7d1a9 100644
--- a/docker-compose-fastnear.yml
+++ b/docker-compose-fastnear.yml
@@ -190,7 +190,7 @@ services:
     container_name: nffl-near-da-deploy
     depends_on:
       indexer:
-        condition: service_healthy
+        condition: service_started
     volumes:
       - ./:/nffl/
       - near_cli_data:/near-cli