Skip to content

Commit

Permalink
Fix docker compose deprecations
Browse files Browse the repository at this point in the history
  • Loading branch information
jskowronski39 committed Nov 16, 2024
1 parent cc6d5dc commit 02ea0c7
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 22 deletions.
32 changes: 16 additions & 16 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,35 @@ ifeq ($(ci),true)
endif

cs:
docker-compose exec -T php php vendor/bin/php-cs-fixer fix ${dryrun}
docker-compose exec -T php php vendor/bin/phpstan analyse --memory-limit 512M
docker compose exec -T php php vendor/bin/php-cs-fixer fix ${dryrun}
docker compose exec -T php php vendor/bin/phpstan analyse --memory-limit 512M

docker-compose exec -T php php tests/tests_namespace_checker.php
docker-compose exec -T php php bin/console lint:twig templates/
docker-compose exec -T php php bin/console lint:yaml --parse-tags config/
docker-compose exec -T php php bin/console doctrine:schema:validate --env=${env}
docker-compose exec -T php php bin/console doctrine:mapping:info --env=${env}
docker compose exec -T php php tests/tests_namespace_checker.php
docker compose exec -T php php bin/console lint:twig templates/
docker compose exec -T php php bin/console lint:yaml --parse-tags config/
docker compose exec -T php php bin/console doctrine:schema:validate --env=${env}
docker compose exec -T php php bin/console doctrine:mapping:info --env=${env}

admin:
docker-compose exec php php bin/console app:permissions:make-admin --full-permissions
docker compose exec php php bin/console app:permissions:make-admin --full-permissions

db:
docker-compose exec -T php php bin/console doctrine:database:drop --if-exists --force --env=${env}
docker-compose exec -T php php bin/console doctrine:database:create --if-not-exists --env=${env}
docker-compose exec -T php php bin/console doctrine:migration:migrate --no-interaction --env=${env}
docker compose exec -T php php bin/console doctrine:database:drop --if-exists --force --env=${env}
docker compose exec -T php php bin/console doctrine:database:create --if-not-exists --env=${env}
docker compose exec -T php php bin/console doctrine:migration:migrate --no-interaction --env=${env}

docker-compose exec -T php php bin/console doctrine:fixtures:load --no-interaction --env=${env}
docker compose exec -T php php bin/console doctrine:fixtures:load --no-interaction --env=${env}

console:
@docker-compose exec php sh
@docker compose exec php sh

setup:
@make db

test-setup:
@make db env=test
docker-compose exec -T php php vendor/bin/codecept clean
docker-compose exec -T php php vendor/bin/codecept build
docker compose exec -T php php vendor/bin/codecept clean
docker compose exec -T php php vendor/bin/codecept build

test:
docker-compose exec -T php php vendor/bin/codecept run unit,integration,functional --fail-fast
docker compose exec -T php php vendor/bin/codecept run unit,integration,functional --fail-fast
2 changes: 0 additions & 2 deletions docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.4'

services:

php:
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.4'

services:

php:
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.4'

services:

php:
Expand Down

0 comments on commit 02ea0c7

Please sign in to comment.