docker: start bench after app started

mickamy · Jan 1, 2024 · 8b6356a · 8b6356a
1 parent eefceaf
commit 8b6356a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -33,6 +33,6 @@ jobs:
          make build
         env:
             ISHOCON_APP_LANG: ${{ matrix.language }}
-      - run: make up && sleep 30
+      - run: make up
       - run: make bench
         timeout-minutes: 5
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,6 +6,11 @@ services:
       dockerfile: ./docker/app/python/Dockerfile
     environment:
       ISHOCON_APP_LANG: "${ISHOCON_APP_LANG-python}"
+    healthcheck:
+      test: bash -c '[ -S /tmp/ishocon-app ]
+      interval: 60s
+      timeout: 5s
+      retries: 1
     command: [/home/ishocon/run.sh]
     tty: true
     volumes:
@@ -23,6 +28,9 @@ services:
       - app
     environment: 
       - TARGET=app
+    depends_on:
+      app:
+        condition: service_healthy
 
 volumes:
   storage_bench:

diff --git a/run.sh b/run.sh
@@ -52,3 +52,5 @@ echo "start running $app_lang app..."
 "run_${app_lang}"
 echo "completed to start running $app_lang app..."
 
+touch /tmp/ishocon-app
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,3 +52,5 @@ echo "start running $app_lang app..."
		"run_${app_lang}"
		echo "completed to start running $app_lang app..."

		touch /tmp/ishocon-app