From 74a2a08232bfdc74d6de11a3578ce3e170ce9048 Mon Sep 17 00:00:00 2001
From: Yassine Guedidi <yassine@guedidi.com>
Date: Tue, 19 Nov 2024 22:09:56 +0100
Subject: [PATCH] Use new compose command

---
 .github/CONTRIBUTING.md        | 10 +++++-----
 GNUmakefile                    |  2 +-
 app/config/parameters.yml.dist |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 3bd5a06de..61d1b5e76 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -7,11 +7,11 @@
 - Clone the repository
 - Ensure your Docker daemon is running
 - Copy `docker/php/env.example` to `docker/php/env` and customize
-- Launch `docker-compose run --rm php composer install` to bootstrap php dependencies
-- Launch `docker-compose run --rm php bin/console wallabag:install` to bootstrap your installation
-- Launch `docker-compose run --rm php yarn install` to bootstrap dependencies for the frontend
-- Launch `docker-compose run --rm php yarn build:dev` to build assets for the frontend
-- Launch `docker-compose up -d` to start the stack
+- Launch `docker compose run --rm php composer install` to bootstrap php dependencies
+- Launch `docker compose run --rm php bin/console wallabag:install` to bootstrap your installation
+- Launch `docker compose run --rm php yarn install` to bootstrap dependencies for the frontend
+- Launch `docker compose run --rm php yarn build:dev` to build assets for the frontend
+- Launch `docker compose up -d` to start the stack
 
 You'll then have:
 - a PHP daemon with standalone web server
diff --git a/GNUmakefile b/GNUmakefile
index 2037be837..2e7f1b43b 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -11,7 +11,7 @@ else
 	override ENV = prod
 endif
 
-DOCKER_COMPOSE_RUNNING := $(shell docker-compose ps -q | grep -q . && echo 1 || echo 0)
+DOCKER_COMPOSE_RUNNING := $(shell docker compose ps -q | grep -q . && echo 1 || echo 0)
 
 ifeq ($(DOCKER_COMPOSE_RUNNING), 1)
   PHP := docker compose run --rm php php
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index a84567ba1..fd46dd933 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -1,7 +1,7 @@
 # This file is a "template" of what your parameters.yml file should look like
 parameters:
     # Uncomment these settings or manually update your parameters.yml
-    # to use docker-compose
+    # to use Docker Compose
     #
     # database_driver: %env.database_driver%
     # database_host: %env.database_host%