Merge pull request #285 from rubygems/segiddins/use-docker-compose-in…

…stead-of-docker-compose

Use docker compose instead of docker-compose

.github/workflows/test.yml

@@ -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

README.md

@@ -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