docker: start bench after app started

Author: mickamy

.github/workflows/benchmark.yml

@@ -27,12 +27,13 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: echo 'Run benchmark for ISHOCON2'
+      - run: touch /tmp/ishocon-app
       - run: |
          sed -i 's/python/'"$ISHOCON_APP_LANG"'/g' ./docker-compose.yml
          cat ./docker-compose.yml
          make build
         env:
             ISHOCON_APP_LANG: ${{ matrix.language }}
-      - run: make up && sleep 30
+      - run: make up
       - run: make bench
         timeout-minutes: 5

docker-compose.yml

@@ -6,6 +6,12 @@ services:
       dockerfile: ./docker/app/python/Dockerfile
     environment:
       ISHOCON_APP_LANG: "${ISHOCON_APP_LANG-python}"
+    healthcheck:
+      test: ["CMD", "test", "-f", "/tmp/ishocon-app"]
+      interval: 30s
+      timeout: 3s
+      retries: 5
+      start_period: 10s
     command: [/home/ishocon/run.sh]
     tty: true
     volumes:
@@ -23,6 +29,9 @@ services:
       - app
     environment: 
       - TARGET=app
+    depends_on:
+      app:
+        condition: service_healthy
 
 volumes:
   storage_bench:

run.sh

@@ -10,45 +10,47 @@ fi
 
 echo "app_lang: $app_lang"
 
+function make_tmp_file() {
+  if [ ! -e /tmp/ishocon-app ]; then
+    touch /tmp/ishocon-app
+  fi
+}
+
 function run_ruby() {
   cd "/home/ishocon/webapp/$app_lang"
   bundle install
+  make_tmp_file
   unicorn -c unicorn_config.rb
-  echo $check_message
 }
 
 function run_python() {
   cd "/home/ishocon/webapp/$app_lang"
+  make_tmp_file
   /home/ishocon/.pyenv/shims/uwsgi --ini app.ini
 }
 
-function run_python_sanic() {
-  cd "/home/ishocon/webapp/${app_lang}_sanic"
-  /home/ishocon/.pyenv/shims/uwsgi --ini "app.ini"
-}
-
-
 function run_go() {
   cd "/home/ishocon/webapp/$app_lang"
   go get -t -d -v ./...
   go build -o webapp *.go
+  make_tmp_file
   ./webapp
 }
 
 function run_php() {
   cd "/home/ishocon/webapp/$app_lang"
   sudo mv -f /etc/nginx/nginx.conf /etc/nginx/nginx.conf.orig
   sudo cp webapp/php/php-nginx.conf /etc/nginx/nginx.conf
+  make_tmp_file
   sudo service nginx reload
 }
 
 function run_crystal() {
   cd "/home/ishocon/webapp/$app_lang"
   shards install
+  make_tmp_file
   crystal app.cr
 }
 
-echo "start running $app_lang app..."
+echo "starting running $app_lang app..."
 "run_${app_lang}"
-echo "completed to start running $app_lang app..."
-