Merge remote-tracking branch 'origin/main' into fi-2266-inferno-new

inferno-framework · Nov 30, 2023 · 45fb175 · 45fb175
2 parents bdeb594 + 47856ec
commit 45fb175
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/docs/deployment/database.md b/docs/deployment/database.md
@@ -24,7 +24,7 @@ deployment. Multi-user deployments should use PostgreSQL instead.
 
 ### PostgreSQL with Docker
 Rather than setting up a separate PostgreSQL service, you can run it via
-`docker-compose` along with the rest of Inferno's services. To do so:
+`docker compose` along with the rest of Inferno's services. To do so:
 * Add `gem 'pg'` to `Gemfile`
 * Add the following entry to `docker-compose.yml`:
 ```yaml

diff --git a/docs/deployment/index.md b/docs/deployment/index.md
@@ -17,7 +17,7 @@ At a minimum, deploying inferno involves the following:
   some other way)
 - run `setup.sh` to pull & build the needed docker images and run database
   migrations
-- run `docker-compose up -d` to start all of the services in the background
+- run `docker compose up -d` to start all of the services in the background
 
 ## Services
 By default, a deployment of Inferno includes the following services:

diff --git a/lib/inferno/apps/cli/services.rb b/lib/inferno/apps/cli/services.rb
@@ -3,7 +3,7 @@ module CLI
     class Services < Thor
       no_commands do
         def base_command
-          'docker-compose -f docker-compose.background.yml'
+          'docker compose -f docker-compose.background.yml'
         end
       end