diff --git a/Makefile b/Makefile index 873e8de..4aca9df 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ init: @$(shell cp -n $(shell pwd)/web/app/composer.json.dist $(shell pwd)/web/app/composer.json 2> /dev/null) apidoc: - @docker-compose exec php ./app/vendor/bin/apigen generate app/src --destination app/doc + @docker-compose exec -T php ./app/vendor/bin/apigen generate app/src --destination app/doc @make resetOwner clean: @@ -40,7 +40,7 @@ clean: code-sniff: @echo "Checking the standard code..." - @docker-compose exec php app/vendor/bin/phpcs --standard=PSR2 app/src + @docker-compose exec -T php ./app/vendor/bin/phpcs --standard=PSR2 app/src composer-up: @docker run --rm -v $(shell pwd)/web/app:/app composer update @@ -60,14 +60,14 @@ logs: mysql-dump: @mkdir -p $(MYSQL_DUMPS_DIR) - @docker exec $(shell docker-compose ps -q mysqldb) mysqldump --all-databases -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" > $(MYSQL_DUMPS_DIR)/db.sql + @docker exec $(shell docker-compose ps -q mysqldb) mysqldump --all-databases -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" > $(MYSQL_DUMPS_DIR)/db.sql 2>/dev/null @make resetOwner mysql-restore: - @docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < $(MYSQL_DUMPS_DIR)/db.sql + @docker exec -i $(shell docker-compose ps -q mysqldb) mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < $(MYSQL_DUMPS_DIR)/db.sql 2>/dev/null test: code-sniff - @docker exec $(shell docker-compose ps -q php) app/vendor/bin/phpunit --colors=always --configuration app/ + @docker-compose exec -T php ./app/vendor/bin/phpunit --colors=always --configuration ./app/ @make resetOwner resetOwner: