From e5024355242035bdf56e977f2b1393708b1c2d35 Mon Sep 17 00:00:00 2001 From: farid Date: Mon, 28 Mar 2022 08:45:41 +0430 Subject: [PATCH 01/16] feat: update Dockerfile structure and minor change in drone file --- .drone.yml | 2 +- Dockerfile | 35 ++--------------------------------- 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/.drone.yml b/.drone.yml index 03e1b40..4037b2a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,7 +6,7 @@ steps: - name: build to production commands: - sudo cp /home/administrator/apps/willaengine/composer-prod.json . - - docker build -t registry.willaspace.com/willaspace/willaengine:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" . + - docker build -t registry.willaspace.com/willaspace/willaengine:latest --build-arg COMPOSER_FILE_NAME=composer-prod . when: branch: - master diff --git a/Dockerfile b/Dockerfile index 5e5361e..56a8d6a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,35 +1,4 @@ -FROM dfs1368/laravel-php-fpm:7.4 - -ARG ssh_prv_key - -WORKDIR /var/www - -RUN apt install -y sendmail openssh-server libpng-dev - -# Authorize SSH Host -RUN mkdir -p /root/.ssh && \ - chmod 0700 /root/.ssh && \ - echo "$ssh_prv_key" > /root/.ssh/id_rsa && \ - ssh-keyscan git.willaspace.com > /root/.ssh/known_hosts && \ - chmod 600 /root/.ssh/id_rsa - -RUN docker-php-ext-install gd - -RUN printf 'upload_max_filesize=300M;\npost_max_size=300M;\nmax_execution_time=600;\nmax_input_time=600;\n' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini; -RUN echo 'pm.max_children = 100' >> /usr/local/etc/php-fpm.d/zz-docker.conf - -COPY database /var/www/database - -COPY composer-prod.* /var/www/ - -RUN composer clearcache && COMPOSER=composer-prod.json composer install --no-scripts - -COPY . /var/www +FROM fsaravi/standard-laravel:7.4 +WORKDIR /var/www/html RUN php artisan morphmap:cache - -RUN chown -R www-data:www-data \ - /var/www/public \ - /var/www/storage \ - /var/www/bootstrap/cache - From a03cc9bdfdc0f8369802454c9e1013f7d56c1245 Mon Sep 17 00:00:00 2001 From: farid Date: Mon, 28 Mar 2022 08:49:58 +0430 Subject: [PATCH 02/16] fix: conflict in gitignore file --- .gitignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitignore b/.gitignore index 10ffc2d..a5dbc7e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,10 +2,6 @@ /development/ # Created by https://www.toptal.com/developers/gitignore/api/visualstudiocode,laravel,vuejs,phpstorm -<<<<<<< Updated upstream -======= -composer-prod.json ->>>>>>> Stashed changes # Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,laravel,vuejs,phpstorm ### Laravel ### From eb793458e619b94cd4445fb92206df639bee5d90 Mon Sep 17 00:00:00 2001 From: saeid Date: Mon, 4 Apr 2022 13:47:48 +0430 Subject: [PATCH 03/16] fix --- composer-prod.json | 2 +- composer-staging.json | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/composer-prod.json b/composer-prod.json index 3a4232c..a28ab19 100644 --- a/composer-prod.json +++ b/composer-prod.json @@ -155,7 +155,7 @@ "type": "vcs", "url": "git@git.willaspace.com:WillaEngine-Project/lms.git" }, - { + { "type": "vcs", "url": "git@git.willaspace.com:WillaEngine-Project/contact-us.git" } diff --git a/composer-staging.json b/composer-staging.json index 4a6aa71..a9e34c5 100644 --- a/composer-staging.json +++ b/composer-staging.json @@ -20,23 +20,23 @@ "spatie/laravel-medialibrary": "^8.0.0", "io-developer/php-whois": "^4.0", "silber/bouncer": "v1.0.0-rc.10", - "wm/blog": "dev-master", - "wm/common": "dev-master", - "wm/core": "dev-master", - "wm/crm": "dev-master", - "wm/portfolio": "dev-master", - "wm/product": "dev-master", - "wm/service": "dev-master", - "wm/store": "dev-master", - "wm/finance": "dev-master", - "wm/admin": "dev-master", - "wm/web-builder": "dev-master", - "wm/app-management": "dev-master", - "wm/notification": "dev-master", - "wm/roll-call": "dev-master", - "wm/lms": "dev-master", - "wm/service-store": "dev-master", - "wm/contact-us": "dev-master", + "wm/blog": "dev-dev", + "wm/common": "dev-dev", + "wm/core": "dev-dev", + "wm/crm": "dev-dev", + "wm/portfolio": "dev-dev", + "wm/product": "dev-dev", + "wm/service": "dev-dev", + "wm/store": "dev-dev", + "wm/finance": "dev-dev", + "wm/admin": "dev-dev", + "wm/web-builder": "dev-dev", + "wm/app-management": "dev-dev", + "wm/notification": "dev-dev", + "wm/roll-call": "dev-dev", + "wm/lms": "dev-dev", + "wm/service-store": "dev-dev", + "wm/contact-us": "dev-dev", "zircote/swagger-php": "^3.0" }, "provide": { From e663bf91262f7d627b4835b5c6a709bc5cd0b1b1 Mon Sep 17 00:00:00 2001 From: saeid Date: Sat, 9 Apr 2022 18:08:17 +0430 Subject: [PATCH 04/16] feat: add custom page for error 404 --- app/Exceptions/Handler.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 7323ea7..ee4413b 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -60,6 +60,10 @@ class Handler extends ExceptionHandler return response()->view('webBuilder::errors.template_disabled', ['error' => 'business banned']); } elseif ($exception instanceof HasRelationException) { return response()->json(Responser::error([$exception->getMessage()]), 422); + } elseif ($this->isHttpException($exception)) { + if ($exception->getStatusCode() == 404) { + return response()->view('webBuilder::errors.404', [], 404); + } } return parent::render($request, $exception); From 76309a02d8c8e05bb28e3d2e019b4d8e2b6fc300 Mon Sep 17 00:00:00 2001 From: Alireza Date: Mon, 11 Apr 2022 00:20:15 +0430 Subject: [PATCH 05/16] add supervisor worker --- worker.conf | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 worker.conf diff --git a/worker.conf b/worker.conf new file mode 100644 index 0000000..b27ee62 --- /dev/null +++ b/worker.conf @@ -0,0 +1,41 @@ +[supervisord] +nodaemon=true +user = root +[supervisorctl] +[inet_http_server] +port = 127.0.0.1:9001 +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[program:scheduler] +process_name=%(program_name)s_%(process_num)02d +command=/bin/sh -c "while [ true ]; do (php /var/www/html/artisan schedule:run --verbose --no-interaction &); sleep 60; done" +autostart=true +autorestart=true +numprocs=1 +user=www-data +redirect_stderr=true +stdout_logfile=/var/log/supervisor/scheduler.log + +[program:change-store-order-status] +command=php /var/www/html/artisan queue:work redis --queue=change_to_successful_store_order --tries=3 +process_name=%(program_name)s_%(process_num)02d +autostart=true +autorestart=true +user=www-data +numprocs=3 +redirect_stderr=true +stdout_logfile=/var/log/supervisor/sms-status.log + + + +# [program:check-sms-status] +# command=php /var/www/html/artisan queue:work redis --queue=check-sms-status --tries=3 +# process_name=%(program_name)s_%(process_num)02d +# autostart=true +# autorestart=true +# user=www-data +# numprocs=3 +# redirect_stderr=true +# stdout_logfile=/var/log/supervisor/sms-status.log + From 9c19dd844aa5476d3262af6db6a0ce2987fa254c Mon Sep 17 00:00:00 2001 From: azizi Date: Wed, 13 Apr 2022 09:51:06 +0000 Subject: [PATCH 06/16] Update '.drone.yml' --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 4037b2a..d227e1f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,6 +33,7 @@ steps: - name: deploy to staging commands: - cd /apps/willaengine-staging/ ; docker-compose up -d + - docker exec willaengine-staging_php sh /usr/bin/supervisord when: branch: - dev From a422e9971b18c7c48e0f35b080b16490c7777749 Mon Sep 17 00:00:00 2001 From: azizi Date: Wed, 13 Apr 2022 09:53:29 +0000 Subject: [PATCH 07/16] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index d227e1f..4d2f89d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,7 +33,7 @@ steps: - name: deploy to staging commands: - cd /apps/willaengine-staging/ ; docker-compose up -d - - docker exec willaengine-staging_php sh /usr/bin/supervisord + - docker exec willaengine-staging_php service supervisor status when: branch: - dev From 14393865225bdfe1c75ecef6447d1dd10dbcfa8e Mon Sep 17 00:00:00 2001 From: azizi Date: Wed, 13 Apr 2022 09:55:26 +0000 Subject: [PATCH 08/16] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4d2f89d..d3246aa 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,7 +33,7 @@ steps: - name: deploy to staging commands: - cd /apps/willaengine-staging/ ; docker-compose up -d - - docker exec willaengine-staging_php service supervisor status + - docker exec willaengine-staging_php service supervisor start when: branch: - dev From 4eb072b6533ff45bb6be8d62871fcdf63f051592 Mon Sep 17 00:00:00 2001 From: azizi Date: Thu, 14 Apr 2022 12:54:21 +0000 Subject: [PATCH 09/16] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index d3246aa..be2402c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,7 +33,7 @@ steps: - name: deploy to staging commands: - cd /apps/willaengine-staging/ ; docker-compose up -d - - docker exec willaengine-staging_php service supervisor start + #- docker exec willaengine-staging_php service supervisor start when: branch: - dev From 8415d3905aff9e350be7730ca1eb8e6fbce27909 Mon Sep 17 00:00:00 2001 From: azizi Date: Thu, 14 Apr 2022 13:00:48 +0000 Subject: [PATCH 10/16] Update '.drone.yml' --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index be2402c..b371c79 100644 --- a/.drone.yml +++ b/.drone.yml @@ -34,6 +34,7 @@ steps: commands: - cd /apps/willaengine-staging/ ; docker-compose up -d #- docker exec willaengine-staging_php service supervisor start + - docker exec -it willaengine-staging_php php artisan migrate --path=vendor/wm/finance/database/migrations when: branch: - dev From 0d02c71efa206f850ab7388a074b362edb4bd787 Mon Sep 17 00:00:00 2001 From: azizi Date: Thu, 14 Apr 2022 13:01:35 +0000 Subject: [PATCH 11/16] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index b371c79..0172ddf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -34,7 +34,7 @@ steps: commands: - cd /apps/willaengine-staging/ ; docker-compose up -d #- docker exec willaengine-staging_php service supervisor start - - docker exec -it willaengine-staging_php php artisan migrate --path=vendor/wm/finance/database/migrations + - docker exec willaengine-staging_php php artisan migrate --path=vendor/wm/finance/database/migrations when: branch: - dev From 7ce782b28064bd3c33f7c2aed430e1cfc5a195f7 Mon Sep 17 00:00:00 2001 From: azizi Date: Thu, 14 Apr 2022 14:00:21 +0000 Subject: [PATCH 12/16] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 0172ddf..f241dbc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,7 +33,7 @@ steps: - name: deploy to staging commands: - cd /apps/willaengine-staging/ ; docker-compose up -d - #- docker exec willaengine-staging_php service supervisor start + - docker exec willaengine-staging_php service supervisor start - docker exec willaengine-staging_php php artisan migrate --path=vendor/wm/finance/database/migrations when: branch: From 792aa300970ee962dd754ba3d7fd57767091ebf4 Mon Sep 17 00:00:00 2001 From: saeid_01 Date: Tue, 26 Apr 2022 11:10:23 +0000 Subject: [PATCH 13/16] Update 'composer-staging.json' --- composer-staging.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer-staging.json b/composer-staging.json index a9e34c5..286a34b 100644 --- a/composer-staging.json +++ b/composer-staging.json @@ -36,6 +36,7 @@ "wm/roll-call": "dev-dev", "wm/lms": "dev-dev", "wm/service-store": "dev-dev", + "predis/predis": "^1.1", "wm/contact-us": "dev-dev", "zircote/swagger-php": "^3.0" }, From 9b9bc446c782def9c3d7a56a3bce33347bfee05d Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Wed, 27 Apr 2022 14:28:27 +0430 Subject: [PATCH 14/16] fix --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index f241dbc..dee9772 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,8 +33,8 @@ steps: - name: deploy to staging commands: - cd /apps/willaengine-staging/ ; docker-compose up -d - - docker exec willaengine-staging_php service supervisor start - - docker exec willaengine-staging_php php artisan migrate --path=vendor/wm/finance/database/migrations + # - docker exec willaengine-staging_php service supervisor start + # - docker exec willaengine-staging_php php artisan migrate --path=vendor/wm/finance/database/migrations when: branch: - dev From 35fbcc48839f963040bf0086c966bff0b5e00883 Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Wed, 27 Apr 2022 14:39:11 +0430 Subject: [PATCH 15/16] fix --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index dee9772..7e0179e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,6 +33,7 @@ steps: - name: deploy to staging commands: - cd /apps/willaengine-staging/ ; docker-compose up -d + - docker exec willaengine bash -c "COMPOSER=composer-staging.json composer update" # - docker exec willaengine-staging_php service supervisor start # - docker exec willaengine-staging_php php artisan migrate --path=vendor/wm/finance/database/migrations when: From 073419ed8bf4a1caff8ecf8a679cdb1c00f4ba50 Mon Sep 17 00:00:00 2001 From: azizi Date: Thu, 28 Apr 2022 12:46:16 +0000 Subject: [PATCH 16/16] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 7e0179e..f0e4546 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,7 +33,7 @@ steps: - name: deploy to staging commands: - cd /apps/willaengine-staging/ ; docker-compose up -d - - docker exec willaengine bash -c "COMPOSER=composer-staging.json composer update" + - docker exec willaengine-staging_php bash -c "COMPOSER=composer-staging.json composer update" # - docker exec willaengine-staging_php service supervisor start # - docker exec willaengine-staging_php php artisan migrate --path=vendor/wm/finance/database/migrations when: