ci: fix run command and other things

Author: mickamy

.github/workflows/benchmark.yml

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

Makefile

@@ -10,5 +10,5 @@ up: build
 down: 
 	docker compose down
 
-bench: up
+bench:
 	docker exec -i ishocon2-bench-1 sh -c "./benchmark --ip app:443"

docker-compose.yml

@@ -6,7 +6,7 @@ services:
       dockerfile: ./docker/app/python/Dockerfile
     environment:
       ISHOCON_APP_LANG: "${ISHOCON_APP_LANG-python}"
-    command: /home/ishocon/run.sh
+    command: [/home/ishocon/run.sh]
     tty: true
     volumes:
       - storage_app:/var/lib/mysql

docker/app/entrypoint.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/bin/bash -eux
+
 sudo service nginx start
 sudo service mysql start
 sudo chown -R mysql:mysql /var/lib/mysql /var/run/mysqld

docker/benchmarker/entrypoint.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/bin/bash -ux
+
 service mysql start  # なぜか失敗する(調査中)
 chown -R mysql:mysql /var/lib/mysql /var/run/mysqld
 service mysql start  # 正しく起動

run.sh

@@ -50,9 +50,6 @@ function run_crystal() {
 }
 
 echo "run $app_lang app..."
-ls -alt /home/ishocon
-ls -alt "/home/ishocon/webapp"
-ls -alt "/home/ishocon/webapp/$app_lang"
 cd "/home/ishocon/webapp/$app_lang"
 
 "run_$app_lang"