diff --git a/Makefile b/Makefile index d9d5f66..0df20fc 100644 --- a/Makefile +++ b/Makefile @@ -20,10 +20,16 @@ copy-laravel-env: copy-infra-env: cp .env.infra-example .env - + run-migrations: docker-compose exec php-fpm ./artisan migrate +run-plan-seed: + docker-compose exec php-fpm ./artisan db:seed --class=PlanTablesSeeder + +seed-db: + docker-compose exec php-fpm ./artisan db:seed + fix-permissions: docker-compose exec php-fpm chown -R www-data:www-data storage @@ -32,11 +38,20 @@ lint-code-style: artisan: docker-compose exec php-fpm ./artisan $(ARGS) + mysql-console: docker-compose exec mysql mysql -u${MYSQL_USER} -p${MYSQL_PASSWORD} ${MYSQL_DATABASE} -init: clone copy-infra-env compose-down compose-up setup-laravel-packages copy-laravel-env setup-laravel-key run-migrations fix-permissions +start-frontend: + docker-compose exec php-fpm npm run watch +start-frontend-prod: + docker-compose exec php-fpm npm run production +make-storage-link: + docker-compose exec php-fpm ./artisan storage:link +node-frontend-deps: + docker-compose exec php-fpm npm i --legacy-peer-deps +init: clone copy-infra-env compose-down compose-up setup-laravel-packages copy-laravel-env setup-laravel-key run-migrations node-frontend-deps start-frontend-prod fix-permissions make-storage-link diff --git a/docker-compose.yml b/docker-compose.yml index f5370e1..1486c25 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -75,7 +75,7 @@ services: mailhog: image: 'mailhog/mailhog' ports: - - '8082:8025' + - '8082:8025' networks: ns-eatvio: ipv4_address: 172.118.0.4 diff --git a/phpdocker/php-fpm/Dockerfile b/phpdocker/php-fpm/Dockerfile index 34b02b6..7051d88 100644 --- a/phpdocker/php-fpm/Dockerfile +++ b/phpdocker/php-fpm/Dockerfile @@ -3,9 +3,14 @@ WORKDIR "/application" RUN apt-get update; \ apt-get -y --no-install-recommends install \ - git \ - php8.2-gd \ - php8.2-mysql \ + git \ + php8.2-gd \ + php8.2-mysql \ php8.2-pgsql; \ apt-get clean; \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* + +RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - +RUN apt-get update && apt-get install -y nodejs && npm install -g npm@10.1.0 + +ENV PATH=node_modules/.bin:$PATH