Merge pull request 'main' (#6) from alex_chevski/eatvio-infra:main into main

Reviewed-on: eatvio/eatvio-infra#6

.env.infra-example

@@ -11,3 +11,4 @@ MYSQL_ROOT_PASSWORD="nhbnhb22"
 MYSQL_DATABASE="eatvio"
 MYSQL_USER="eatvio_user"
 MYSQL_PASSWORD="eatvio_pass_nhbnhb22"
+MY_APP_GIT_URL="ssh://git@10.55.5.123:222/eatvio/eatvio.git"

Makefile

@@ -1,7 +1,7 @@
-include .env
+include .env.infra-example
 
 clone:
-	git clone ssh://git@10.55.5.123:222/eatvio/eatvio.git app
+	git clone ${MY_APP_GIT_URL} app
 
 compose-up:
 	docker-compose up -d
@@ -9,6 +9,12 @@ compose-up:
 compose-down:
 	docker-compose down --remove-orphans -v
 
+status:
+	docker-compose ps
+
+tinker:
+	docker-compose exec php-fpm ./artisan tinker
+
 setup-laravel-key:
 	docker-compose exec php-fpm php /application/artisan key:generate
 
@@ -25,7 +31,10 @@ run-migrations:
 	docker-compose exec php-fpm ./artisan migrate
 
 run-plan-seed:
-	docker-compose exec php-fpm ./artisan db:seed --class=PlanTablesSeeder
+	docker-compose exec php-fpm ./artisan db:seed --class=PlanSeeder
+
+run-user-seed:
+	docker-compose exec php-fpm ./artisan db:seed --class=UserSeeder
 
 seed-db:
 	docker-compose exec php-fpm ./artisan db:seed
@@ -54,4 +63,4 @@ make-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
+init: clone 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

phpdocker/php-fpm/Dockerfile

@@ -1,16 +1,16 @@
 FROM phpdockerio/php:8.2-fpm
 WORKDIR "/application"
 
+RUN curl -sL https://deb.nodesource.com/setup_20.x | bash -
 RUN apt-get update; \
     apt-get -y --no-install-recommends install \
         git \
         php8.2-gd \
         php8.2-mysql \
-        php8.2-pgsql; \
+        php8.2-sqlite3 \
+        nodejs \
+        php8.2-pgsql && npm install -g npm@10.1.0 \
     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