From 16be2a841badc05eae6f2d2c811686f2f86dbd3f Mon Sep 17 00:00:00 2001 From: florimondmanca Date: Fri, 27 Sep 2024 15:37:30 +0200 Subject: [PATCH] Fix docker-compose -> docker compose --- .github/workflows/ci.yml | 2 +- Makefile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b181320b..e7f19ad8 100644 --- 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 index 5387166d..205f33cc 100644 --- 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