Skip to content

Commit

Permalink
Bump toxiproxy to v2.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
miry committed May 20, 2022
1 parent ff24790 commit 74cf2e3
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
- SYS_PTRACE
security_opt:
- seccomp:unconfined
depends_on:
depends_on:
- redis
- mysql
- toxiproxy
Expand All @@ -31,9 +31,9 @@ services:
sleep infinity
toxiproxy:
image: ghcr.io/shopify/toxiproxy:2.3.0
image: ghcr.io/shopify/toxiproxy:2.4.0
container_name: toxiproxy-dev
depends_on:
depends_on:
- redis
- mysql

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby:
ruby:
# - "3.1" # grpc is causing issues with Ruby 3.1
- "3.0"
- "2.7"
Expand All @@ -30,11 +30,11 @@ jobs:
--health-timeout 5s
--health-retries 5
toxiproxy:
image: ghcr.io/shopify/toxiproxy:2.3.0
image: ghcr.io/shopify/toxiproxy:2.4.0

steps:
- uses: actions/checkout@v1
- name: Build image
run: docker build --build-arg RUBY_VERSION=${{ matrix.ruby }} -f dockerfiles/semian-ci -t semian-ci:${GITHUB_SHA::8}-${{ hashFiles(matrix.gemfile) }} .
- name: Run tests
run: docker run --rm --network=${{ job.container.network }} --network-alias=semian semian-ci:${GITHUB_SHA::8}-${{ hashFiles(matrix.gemfile) }} ./scripts/run_tests.sh
- uses: actions/checkout@v1
- name: Build image
run: docker build --build-arg RUBY_VERSION=${{ matrix.ruby }} -f dockerfiles/semian-ci -t semian-ci:${GITHUB_SHA::8}-${{ hashFiles(matrix.gemfile) }} .
- name: Run tests
run: docker run --rm --network=${{ job.container.network }} --network-alias=semian semian-ci:${GITHUB_SHA::8}-${{ hashFiles(matrix.gemfile) }} ./scripts/run_tests.sh
18 changes: 9 additions & 9 deletions docker-compose.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ version: "3.7"
services:
semian:
image: shopify/semian-ci:latest
depends_on:
- redis
- mysql
- toxiproxy
depends_on:
- redis
- mysql
- toxiproxy
command: ./scripts/run_tests.sh

toxiproxy:
image: shopify/toxiproxy:latest
image: ghcr.io/shopify/toxiproxy:2.4.0
logging:
driver: none
container_name: toxiproxy
depends_on:
- redis
- mysql
depends_on:
- redis
- mysql

redis:
image: redis:latest
Expand Down

0 comments on commit 74cf2e3

Please sign in to comment.