Use Docker Compose v2 (#100)

instedd · Jan 19, 2024 · 3835888 · 3835888
1 parent 4cb8311
commit 3835888
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,15 +15,15 @@ jobs:
 
       - name: Set environment up
         run: |
-          docker-compose pull
-          docker-compose build
-          docker-compose run --rm web bundle install
-          docker-compose run --rm web rake db:setup
-          docker-compose run --rm web rake db:test:prepare
+          docker compose pull
+          docker compose build
+          docker compose run --rm web bundle install
+          docker compose run --rm web rake db:setup
+          docker compose run --rm web rake db:test:prepare
 
       - name: Run specs
         run: |
-          docker-compose run --rm web rake test
+          docker compose run --rm web rake test
 
   build:
     needs: test

diff --git a/README.markdown b/README.markdown
@@ -45,7 +45,7 @@ Docker development
 
 To have a stable development environment, run the `./dev-setup.sh` script.
 
-When that's finished, start your containers by running `docker-compose up`.
+When that's finished, start your containers by running `docker compose up`.
 
 Intercom
 --------

diff --git a/dev-setup.sh b/dev-setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
-docker-compose pull
-docker-compose build
-docker-compose up -d db
-docker-compose run --rm --no-deps web bundle install
-docker-compose run --rm web bash -c 'rake db:setup db:seed'
+docker compose pull
+docker compose build
+docker compose up -d db
+docker compose run --rm --no-deps web bundle install
+docker compose run --rm web bash -c 'rake db:setup db:seed'