Fix docker-compose -> docker compose

fairnesscoop · Sep 27, 2024 · 49bdd6e · 49bdd6e
1 parent 12d8cba
commit 49bdd6e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
 
       - name: Tests
-        run: make ci
+        run: make ci BIN_DOCKER_COMPOSE="docker compose"
 
       - uses: codecov/codecov-action@v1
         with:

diff --git a/Makefile b/Makefile
@@ -3,7 +3,9 @@
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
-compose = docker-compose -p permacoop
+BIN_DOCKER_COMPOSE=docker-compose
+
+compose = ${BIN_DOCKER_COMPOSE} -p permacoop
 
 run_server = ./tools/colorize_prefix.sh [server] 31
 run_watch = ./tools/colorize_prefix.sh [watch] 36

diff --git a/src/Infrastructure/HumanResource/Leave/Controller/ListLeaveRequestsController.ts b/src/Infrastructure/HumanResource/Leave/Controller/ListLeaveRequestsController.ts
@@ -61,7 +61,7 @@ export class ListLeaveRequestsController {
       overviewTable,
       pagination,
       currentPage: dto.page,
-      calendarToken,
+      calendarToken
     };
   }
 }