From 5680d7d0ab13508f9225b7b3e19812941e1d88d2 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Thu, 7 Dec 2023 13:53:45 +0300 Subject: [PATCH 01/12] added sqlite service docker --- .env.infra-example | 1 + Makefile | 11 +++++++---- phpdocker/php-fpm/Dockerfile | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.env.infra-example b/.env.infra-example index cf36eb3..d33c253 100644 --- a/.env.infra-example +++ b/.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/alex_chevski/eatvio.git" diff --git a/Makefile b/Makefile index 0df20fc..4bb9898 100644 --- a/Makefile +++ b/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 @@ -25,7 +25,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 +57,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 diff --git a/phpdocker/php-fpm/Dockerfile b/phpdocker/php-fpm/Dockerfile index 7051d88..edaf199 100644 --- a/phpdocker/php-fpm/Dockerfile +++ b/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 From 74889aa8211fe879de76c103bca4b3b20827743f Mon Sep 17 00:00:00 2001 From: Anatoliy Poloz Date: Thu, 7 Dec 2023 14:08:30 +0300 Subject: [PATCH 02/12] status and tinker commands added --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 4bb9898..19d8b58 100644 --- a/Makefile +++ b/Makefile @@ -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 From 6e2d876ddcf067ae76f9313b1956af7e1e31a5d7 Mon Sep 17 00:00:00 2001 From: Anatoliy Poloz Date: Thu, 7 Dec 2023 14:12:29 +0300 Subject: [PATCH 03/12] added new url --- .env.infra-example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.infra-example b/.env.infra-example index d33c253..55c0279 100644 --- a/.env.infra-example +++ b/.env.infra-example @@ -11,4 +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/alex_chevski/eatvio.git" +MY_APP_GIT_URL="ssh://git@10.55.5.123:222/eatvio/eatvio.git" From 1899f3f9662a9c0383a8531da55cc29d615cc7e8 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Thu, 7 Dec 2023 15:02:05 +0300 Subject: [PATCH 04/12] added to Makefile init command copy env-infra --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 19d8b58..08b98ec 100644 --- a/Makefile +++ b/Makefile @@ -63,4 +63,4 @@ make-storage-link: node-frontend-deps: docker-compose exec php-fpm npm i --legacy-peer-deps -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 +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 From 0a92f70005f1ee6abf80ba0fe0e1df08bc02f1b1 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Wed, 13 Dec 2023 12:03:31 +0300 Subject: [PATCH 05/12] fixing makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 08b98ec..931f7dd 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ mysql-console: start-frontend: docker-compose exec php-fpm npm run watch -start-frontend-prod: +build-frontend-prod: docker-compose exec php-fpm npm run production make-storage-link: From 0b95208e0b7573d7f361ada524e0797b7bdbb0c6 Mon Sep 17 00:00:00 2001 From: alex-chevski Date: Wed, 13 Dec 2023 12:04:58 +0300 Subject: [PATCH 06/12] 'fixing makefile' --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 931f7dd..3a77020 100644 --- a/Makefile +++ b/Makefile @@ -63,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 copy-infra-env compose-down compose-up setup-laravel-packages copy-laravel-env setup-laravel-key run-migrations node-frontend-deps build-frontend-prod fix-permissions make-storage-link From 391308803b40e53608fdb1ef4984a493cea91332 Mon Sep 17 00:00:00 2001 From: Anatoliy Poloz Date: Wed, 13 Dec 2023 12:12:37 +0300 Subject: [PATCH 07/12] makefile fix --- .env.infra-example | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.infra-example b/.env.infra-example index 55c0279..7482e38 100644 --- a/.env.infra-example +++ b/.env.infra-example @@ -12,3 +12,4 @@ 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" + From 3eae0867200b0d8241e55de6402b729c9c4789cc Mon Sep 17 00:00:00 2001 From: Anatoliy Poloz Date: Thu, 7 Dec 2023 14:12:29 +0300 Subject: [PATCH 08/12] added new url --- .env.infra-example | 1 - 1 file changed, 1 deletion(-) diff --git a/.env.infra-example b/.env.infra-example index 7482e38..55c0279 100644 --- a/.env.infra-example +++ b/.env.infra-example @@ -12,4 +12,3 @@ 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" - From e81d2f3c89674f029a50d421e3489bf59146e400 Mon Sep 17 00:00:00 2001 From: Anatoliy Poloz Date: Wed, 13 Dec 2023 12:21:25 +0300 Subject: [PATCH 09/12] init fix in makefile --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 05cff59..0124d78 100644 --- a/Makefile +++ b/Makefile @@ -63,8 +63,5 @@ make-storage-link: node-frontend-deps: docker-compose exec php-fpm npm i --legacy-peer-deps -<<<<<<< HEAD init: clone copy-infra-env compose-down compose-up setup-laravel-packages copy-laravel-env setup-laravel-key run-migrations node-frontend-deps build-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 ->>>>>>> alex_chevski-main + From 6b861a5e59e5850b0bbf6b997004ee84e0d50d41 Mon Sep 17 00:00:00 2001 From: apoloz Date: Wed, 13 Dec 2023 09:39:17 +0000 Subject: [PATCH 10/12] Update Makefile up and down commands changed --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0124d78..a1c68ae 100644 --- a/Makefile +++ b/Makefile @@ -3,12 +3,15 @@ include .env.infra-example clone: git clone ${MY_APP_GIT_URL} app -compose-up: +start: docker-compose up -d -compose-down: +stop: docker-compose down --remove-orphans -v +restart: + stop start + status: docker-compose ps From 7abb01490b03d6ea1a96521ae51de9a95d056d1c Mon Sep 17 00:00:00 2001 From: apoloz Date: Wed, 13 Dec 2023 09:41:58 +0000 Subject: [PATCH 11/12] restart command added --- Makefile | 2 +- README.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a1c68ae..072212a 100644 --- a/Makefile +++ b/Makefile @@ -66,5 +66,5 @@ 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 build-frontend-prod fix-permissions make-storage-link +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/README.md b/README.md index 60034d1..d1c0102 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Run in Linux, MacOS or Windows WSL terminal the docker development server and bu ``` After all stop the project ``` -# make compose-down +# make stop ``` ## Address @@ -27,11 +27,11 @@ Clone Eatvio: ``` Project up: ``` -# make compose-up +# make start ``` Project down: ``` -# make compose-down +# make stop ``` Generate key Laravel: ``` @@ -44,4 +44,4 @@ Permissions: Run migration: ``` # make run-migrations -``` \ No newline at end of file +``` From 2fc2e6ce9a0cc13563c21ae87ba1b0eb31a1dc9b Mon Sep 17 00:00:00 2001 From: apoloz Date: Wed, 13 Dec 2023 09:44:31 +0000 Subject: [PATCH 12/12] restart command added & type fixed --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 072212a..0217b5b 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,7 @@ start: stop: docker-compose down --remove-orphans -v -restart: - stop start +restart: stop start status: docker-compose ps