diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 8b883e56..a6942510 100644 --- 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 index 63abc4d3..f47b02e1 100644 --- 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 index c133615f..e1e17a15 100755 --- 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 +