test: docker compose wait until healthy

wzyboy · Jul 9, 2023 · 1377058 · 1377058
1 parent 9862899
commit 1377058
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
@@ -22,9 +22,7 @@ jobs:
       - name: Setup Elasticsearch
         run: |
           pushd tests/elasticsearch
-          docker compose up -d
-          # wait until up
-          docker inspect --format '{{ .NetworkSettings.IPAddress }}:9200' es01 | xargs wget --retry-connrefused --tries=5 -q --wait=3 --spider
+          docker compose up -d --wait
           popd
 
       - name: Run pytest

diff --git a/tests/elasticsearch/docker-compose.yaml b/tests/elasticsearch/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: '2.2'
+version: '3'
 services:
   es01:
     image: docker.elastic.co/elasticsearch/elasticsearch:8.1.3
@@ -9,3 +9,9 @@ services:
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
     ports:
       - 9200:9200
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9200"]
+      interval: 10s
+      timeout: 1s
+      retries: 6
+      start_period: 20s