From dae12e4b250e674c7b38006249b778893c6df05c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anne=20L=27H=C3=B4te?= <anne.lhote@gmail.com>
Date: Wed, 29 May 2024 15:07:46 +0200
Subject: [PATCH] fix(ci/cd): Switch from "docker-compose" to "docker compose"

---
 .dockerignore              | 1 +
 .github/workflows/test.yml | 2 +-
 package.json               | 4 ++--
 src/setup/mongo.js         | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index c3701d64..23fee4c7 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -17,6 +17,7 @@
 .dockerignore
 Dockerfile
 docker-compose.yml
+docker-compose-test.yml
 
 # Misc
 .DS_Store
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 52e238b8..64abb4a0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Run tests
-        run: docker-compose -f docker-compose-test.yml up --build --exit-code-from paysage-api
+        run: docker compose -f docker-compose-test.yml up --build --exit-code-from paysage-api
 
   notify:
     needs: tests
diff --git a/package.json b/package.json
index 262a375c..8ce386eb 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,8 @@
     "api:start": "NODE_ENV=${npm_config_env} PORT=${npm_config_port} node --experimental-specifier-resolution=node index.js",
     "api:test": "NODE_ENV=testing node --expose-gc --experimental-specifier-resolution=node --experimental-vm-modules node_modules/.bin/jest --runInBand --logHeapUsage",
     "deploy": "git switch main && git pull origin main --rebase --tags && git merge origin staging && npm version $npm_config_level && git push origin main --tags && git switch staging",
-    "docker:test": "docker-compose -f docker-compose-test.yml up --build --exit-code-from paysage-api",
-    "docker:start": "docker-compose up --build",
+    "docker:test": "docker compose -f docker-compose-test.yml up --build --exit-code-from paysage-api",
+    "docker:start": "docker compose up --build",
     "docs:build": "swagger-cli bundle src/openapi/api.yml --outfile docs/reference/api.yml --type yaml",
     "setup:elastic": "NODE_ENV=${npm_config_env} node --experimental-specifier-resolution=node src/setup/elastic.js",
     "setup:mongo": "NODE_ENV=${npm_config_env} node --experimental-specifier-resolution=node src/setup/mongo.js",
diff --git a/src/setup/mongo.js b/src/setup/mongo.js
index d70277e1..36551618 100644
--- a/src/setup/mongo.js
+++ b/src/setup/mongo.js
@@ -96,6 +96,7 @@ async function setupMongo() {
 }
 
 setupMongo().catch((e) => {
-  logger.error({ ...e, message: 'Mongodb setup failed' });
+  logger.error('Mongodb setup failed');
+  logger.error(e);
   process.exit(1);
 });