Prefer docker compose over docker-compose to fix failing CI

quadratichq · Aug 5, 2024 · 2756967 · 2756967
1 parent 5c7d808
commit 2756967
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -74,7 +74,7 @@ for more more information.
 
 Docker Compose is a utility that's built into Docker Desktop and is a compact
 infrastructure-as-code framework.  Services (e.g. running Docker containers) are
-defined, along with configuration information, in the `docker-compose.yml` file.
+defined, along with configuration information, in the `docker compose.yml` file.
 Services can talk to each other and can communicate with services in the user's host
 network.
 
@@ -92,9 +92,9 @@ migrate the database.  Docker is run in the background in this script.
 To build images for individual services (from project root):
 
 ```shell
-docker-compose build quadratic-api
-docker-compose build quadratic-files
-docker-compose build quadratic-multiplayer
+docker compose build quadratic-api
+docker compose build quadratic-files
+docker compose build quadratic-multiplayer
 ```
 
 ### Developing without Docker

diff --git a/quadratic-api/package.json b/quadratic-api/package.json
@@ -20,8 +20,8 @@
     "prisma:migrate": "npx prisma migrate dev",
     "prisma:migrate:create": "npx prisma migrate dev --create-only",
     "prisma:dev:reset": "npx prisma migrate reset",
-    "docker:up": "docker-compose up -d && sleep 3",
-    "docker:down": "docker-compose down",
+    "docker:up": "docker compose up -d && sleep 3",
+    "docker:down": "docker compose down",
     "docker:dev": "npm run docker:up && dotenv -e .env.test -- prisma migrate deploy && dotenv -e .env.test -- ts-node-dev --watch src --project ./tsconfig.json -- ./src/server.ts && npm run docker:down",
     "docker:test:dev": "npm run docker:up && dotenv -e .env.test -- prisma migrate deploy && dotenv -e .env.test -- jest --watch --detectOpenHandles && npm run docker:down",
     "docker:test:ci": "npm run docker:up && dotenv -e .env.test -- prisma migrate reset --force && dotenv -e .env.test -- jest --runInBand && npm run docker:down",

diff --git a/quadratic-connection/package.json b/quadratic-connection/package.json
@@ -17,6 +17,6 @@
     "coverage:html": "grcov . --binary-path ./target/debug/deps/ -s . -t html --branch --ignore-not-existing --ignore '../*' --ignore '/*' -o coverage/html",
     "coverage:view": "open coverage/html/index.html",
     "docker:up": "docker compose --profile quadratic-connection-test up -d && sleep 3",
-    "docker:down": "docker-compose down --profile quadratic-connection-test"
+    "docker:down": "docker compose down --profile quadratic-connection-test"
   }
 }
diff --git a/quadratic-multiplayer/package.json b/quadratic-multiplayer/package.json
@@ -15,7 +15,7 @@
     "coverage:gen": "CARGO_INCREMENTAL=0 RUSTFLAGS='-Cinstrument-coverage' LLVM_PROFILE_FILE='coverage/cargo-test-%p-%m.profraw' cargo test",
     "coverage:html": "grcov . --binary-path ./target/debug/deps/ -s . -t html --branch --ignore-not-existing --ignore '../*' --ignore '/*' -o coverage/html",
     "coverage:view": "open coverage/html/index.html",
-    "docker:up": "docker compose -f ../docker-compose.base.yml up -d --wait",
+    "docker:up": "docker compose -f ../docker compose.base.yml up -d --wait",
     "docker:down": "docker compose down -v",
     "docker:test": "docker compose kill && npm run docker:up && npm run test && npm run docker:down"
   }