From 823e81c8c95d011a14f87bb93fd222ecfd5f562f Mon Sep 17 00:00:00 2001 From: Anatoliy Date: Tue, 29 Jul 2025 17:45:32 +0300 Subject: [PATCH 1/2] refactor --- Makefile | 47 +++++++++++++++++++++++++----------- docker-compose.yml | 5 ++-- phpdocker/php-fpm/Dockerfile | 1 + 3 files changed, 36 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 664449c..be50b59 100644 --- a/Makefile +++ b/Makefile @@ -60,10 +60,10 @@ fix-permissions: docker compose exec php-fpm chown -R www-data:www-data storage fix-code-style: - docker compose exec php-fpm vendor/bin/pint + docker compose exec -T php-fpm vendor/bin/pint -test-code-style: - docker compose exec php-fpm vendor/bin/pint --test +fix-blade-formatting: + docker compose exec -T php-fpm ./node_modules/.bin/prettier --write resources/**/**/**/**/*.blade.php artisan: docker compose exec php-fpm ./artisan $(ARGS) @@ -71,6 +71,9 @@ artisan: mysql-console: docker compose exec mysql mysql -u${MYSQL_USER} -p${MYSQL_PASSWORD} ${MYSQL_DATABASE} +mysql-restore: + docker compose exec mysql mysql -u${MYSQL_USER} -p${MYSQL_PASSWORD} ${MYSQL_DATABASE} \< /application/eatvio-11-03-2025.sql + start-frontend: docker compose exec php-fpm npm run watch @@ -87,37 +90,53 @@ paratest-bin: docker compose exec -u www-data php-fpm vendor/bin/paratest paratest-artisan: - docker compose exec -u www-data php-fpm ./artisan test --parallel --stop-on-failure --env=testing + docker compose exec -u www-data -T php-fpm ./artisan test --parallel --stop-on-failure --env=testing fix-insights: docker compose exec php-fpm vendor/bin/phpinsights --fix --config-path=./config/insights.php --no-interaction --min-quality=80 --min-complexity=90 --min-architecture=75 --min-style=95 insights: - docker compose exec php-fpm vendor/bin/phpinsights --config-path=./config/insights.php --no-interaction --min-quality=80 --min-complexity=90 --min-architecture=75 --min-style=95 --flush-cache + docker compose exec -T php-fpm vendor/bin/phpinsights --config-path=./config/insights.php --no-interaction --min-quality=80 --min-complexity=90 --min-architecture=75 --min-style=95 --flush-cache rector: - docker compose exec php-fpm vendor/bin/rector process --dry-run + docker compose exec -T php-fpm vendor/bin/rector process --dry-run static-analysis: - docker compose exec php-fpm composer static-analysis + docker compose exec -T php-fpm composer static-analysis detect-magic-numbers: - docker compose exec -u www-data php-fpm vendor/bin/phpmnd app/ tests/ + docker compose exec -u www-data -T php-fpm vendor/bin/phpmnd app/ tests/ fix-web-permissions: docker compose exec -T php-fpm chown -R www-data:www-data bootstrap/cache storage -ci: fix-web-permissions fix-code-style detect-magic-numbers test rector insights static-analysis fix-web-permissions +clear-app-cache: + docker compose exec php-fpm ./artisan optimize:clear + +build-front: + docker compose exec php-fpm npm run production + +composer-do: + docker compose exec php-fpm composer dump-auto + +run-once-oprations: + docker compose exec php-fpm bash -c "./artisan operations:process --test && ./artisan operations:process" + +after-deploy-light: composer-do run-once-oprations clear-app-cache build-front fix-permissions reload-wokers + +after-deploy: composer-do clear-app-cache run-migrations run-once-oprations build-front fix-permissions reload-wokers reindex-search + +# ci: fix-web-permissions fix-code-style detect-magic-numbers test rector insights static-analysis fix-web-permissions +ci: fix-web-permissions detect-magic-numbers test rector insights static-analysis fix-web-permissions local-composer-ci: - docker compose exec -T php-fpm composer ci - -after-deploy-light: composer-do clear-app-cache build-front fix-permissions reload-wokers - -after-deploy: composer-do clear-app-cache run-migrations build-front fix-permissions reload-wokers reindex-search + docker compose exec php-fpm composer ci test: fix-web-permissions paratest-artisan +test-file-by-path: + docker compose exec php-fpm ./artisan test --env=testing $(ARGS) + local-ci: fix-web-permissions local-composer-ci fix-web-permissions init: clone copy-infra-env restart setup-laravel-packages copy-laravel-env setup-laravel-key run-migrations node-frontend-deps build-frontend-prod fix-permissions make-storage-link diff --git a/docker-compose.yml b/docker-compose.yml index eb89f31..135b8f1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ ---- -version: "3.1" services: soketi: image: "quay.io/soketi/soketi:latest-16-alpine" @@ -113,6 +111,7 @@ services: - "./phpdocker/nginx/shalom.eatvio.local+2-key.pem:/etc/nginx/shalom.eatvio.local+2-key.pem" ports: - "10443:5000" + - "1092:80" networks: - web - ns-eatvio @@ -132,7 +131,7 @@ services: typesense: image: typesense/typesense:26.0 - restart: on-failure + restart: always networks: - ns-eatvio volumes: diff --git a/phpdocker/php-fpm/Dockerfile b/phpdocker/php-fpm/Dockerfile index 5696c6f..d9b8df1 100644 --- a/phpdocker/php-fpm/Dockerfile +++ b/phpdocker/php-fpm/Dockerfile @@ -12,6 +12,7 @@ RUN apt-get update && \ php8.3-intl \ php8.3-memcached \ php8.3-pgsql \ + php8.3-xdebug \ python3-pkg-resources supervisor ffmpeg jpegoptim \ nodejs && npm install -g npm@10.1.0 \ apt-get clean; \ From 5bb41ee525dd9846a9dae3147a9915ad8281758b Mon Sep 17 00:00:00 2001 From: Anatoliy Poloz Date: Tue, 29 Jul 2025 20:51:54 +0300 Subject: [PATCH 2/2] ci: rebuild scripts added --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index be50b59..887ed52 100644 --- a/Makefile +++ b/Makefile @@ -141,3 +141,11 @@ local-ci: fix-web-permissions local-composer-ci fix-web-permissions init: clone copy-infra-env restart setup-laravel-packages copy-laravel-env setup-laravel-key run-migrations node-frontend-deps build-frontend-prod fix-permissions make-storage-link +rebuild-services: + docker compose build --no-cache + +pull-services: + docker compose pull + +force-rebuild-services: stop rebuild-services pull-services start +