From 23c593326fb2917d58736c26b439c04d8d1b348f Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Thu, 7 Nov 2024 16:51:07 +0100 Subject: [PATCH] Switch to newer Docker Compose --- Makefile | 18 +++++++++--------- docker-compose.override.yml.dist | 2 -- docker-compose.yml | 2 -- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index c9c70f4d..5e07226d 100644 --- a/Makefile +++ b/Makefile @@ -2,30 +2,30 @@ setup: build composer-update shell: build - docker-compose run --rm php zsh + docker compose run --rm php zsh build: - docker-compose build php + docker compose build php start: - docker-compose up -d php + docker compose up -d php composer-update: start - docker-compose exec php composer update + docker compose exec php composer update pre-commit-check: rector cs-fix psalm phpstan tests rector: start - docker-compose exec php vendor/bin/rector --ansi + docker compose exec php vendor/bin/rector --ansi cs-fix: start - docker-compose exec php vendor/bin/php-cs-fixer fix --verbose --ansi + docker compose exec php vendor/bin/php-cs-fixer fix --verbose --ansi psalm: start - docker-compose exec php vendor/bin/psalm + docker compose exec php vendor/bin/psalm phpstan: start - docker-compose exec php vendor/bin/phpstan analyse --ansi --memory-limit=-1 + docker compose exec php vendor/bin/phpstan analyse --ansi --memory-limit=-1 tests: start - docker-compose exec php vendor/bin/phpunit --colors=always + docker compose exec php vendor/bin/phpunit --colors=always diff --git a/docker-compose.override.yml.dist b/docker-compose.override.yml.dist index 21d86eef..87541431 100644 --- a/docker-compose.override.yml.dist +++ b/docker-compose.override.yml.dist @@ -1,5 +1,3 @@ -version: '3.2' - services: php: volumes: diff --git a/docker-compose.yml b/docker-compose.yml index f8e67880..7151cb8e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.2' - services: php: container_name: paraunit_container