Skip to content

Commit

Permalink
Merge branch 'mickamy' into feat/add-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
mickamy authored Jan 1, 2024
2 parents 04c3031 + 1e5105b commit 292b72a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
fail-fast: false
matrix:
language:
- "crystal"
- "go"
- "nodejs"
- "php"
- "python"
# - "crystal"
# - "go"
# - "nodejs"
# - "php"
# - "python"
- "ruby"
env:
ISHOCON_APP_LANG: ${{ matrix.language }}
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ services:
app:
build:
context: .
dockerfile: ./docker/app/python/Dockerfile
image: ishocon2-app-python:latest
dockerfile: ./docker/app/ruby/Dockerfile
image: ishocon2-app-ruby:latest
platform: linux/amd64
environment:
ISHOCON_APP_LANG: "${ISHOCON_APP_LANG-python}"
ISHOCON_APP_LANG: "${ISHOCON_APP_LANG-ruby}"
healthcheck:
test: ["CMD", "test", "-f", "/tmp/ishocon-app"]
interval: 10s
timeout: 3s
retries: 5
start_period: 10s
command: sh -c "/home/ishocon/run.sh"
command: [/home/ishocon/run.sh]
tty: true
volumes:
- storage_app:/var/lib/mysql
Expand Down

0 comments on commit 292b72a

Please sign in to comment.