Skip to content

Commit

Permalink
Use docker compose instead of docker-compose
Browse files Browse the repository at this point in the history
Latter has been deprecated a long time
  • Loading branch information
segiddins committed Aug 5, 2024
1 parent c6a1cb3 commit 37823f3
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@ jobs:
test:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2

- name: Install and start services
run: |
docker-compose up -d
- name: Install and start services
run: |
docker compose up -d --wait
- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0.3'
bundler-cache: true
- uses: ruby/setup-ruby@v1
with:
ruby-version: "3.0.3"
bundler-cache: true

- name: Wait for MySQL to boot
run: |
timeout 30 bash -c 'until mysqladmin ping -h 127.0.0.1 -u root -pshipit; do echo waiting for MySQL; sleep 1; done'
- name: Wait for MySQL to boot
run: |
timeout 30 bash -c 'until mysqladmin ping -h 127.0.0.1 -u root -pshipit; do echo waiting for MySQL; sleep 1; done'
- name: Run tests
run: |
cp config/database.ci.yml config/database.yml
bin/rails db:setup test
- name: Run tests
run: |
cp config/database.ci.yml config/database.yml
bin/rails db:setup test
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ This is the [shipit-engine](https://github.com/Shopify/shipit-engine) instance f

Shipit needs MySQL database to be running. You can copy `config/database.yml.sample` to `config/database.yml` and tweak.

You can also use pre-configured setup (originally prepared for CI) using `docker-compose`.
You can also use pre-configured setup (originally prepared for CI) using `docker compose`.

```bash
cp config/database.ci.yml config/database.ylm
docker-compose up -d
docker compose up -d
```

## Running tests
Expand Down

0 comments on commit 37823f3

Please sign in to comment.