Skip to content

Commit

Permalink
fix(ci/cd): Switch from "docker-compose" to "docker compose"
Browse files Browse the repository at this point in the history
  • Loading branch information
annelhote committed May 29, 2024
1 parent 3213728 commit dae12e4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
.dockerignore
Dockerfile
docker-compose.yml
docker-compose-test.yml

# Misc
.DS_Store
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion src/setup/mongo.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});

0 comments on commit dae12e4

Please sign in to comment.