From b7c027015c0fbac417b74f6c74ba52ce1f5d3383 Mon Sep 17 00:00:00 2001 From: saeid_01 Date: Tue, 28 Sep 2021 10:30:45 +0000 Subject: [PATCH 01/11] Update 'Dockerfile' --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 769edbf..7b79dd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ COPY database /var/www/database COPY composer-prod.* /var/www/ -RUN composer clearcache && COMPOSER=composer-prod.json composer update --no-scripts +RUN composer clearcache && COMPOSER=composer-prod.json composer install --no-scripts COPY . /var/www From 4c699ffdb093d4ebdf126711c56596942b3a9ff9 Mon Sep 17 00:00:00 2001 From: azizi Date: Thu, 30 Sep 2021 16:42:54 +0000 Subject: [PATCH 02/11] Update '.gitattributes' --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 967315d..dbb821a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,3 +3,4 @@ *.scss linguist-vendored *.js linguist-vendored CHANGELOG.md export-ignore + From 28f7d12a8eb80c27ef32a430cf4729b966aba9ab Mon Sep 17 00:00:00 2001 From: "f.saravi" Date: Wed, 6 Oct 2021 18:05:21 +0000 Subject: [PATCH 03/11] Update 'Dockerfile' --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7b79dd9..b2046a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM dfs1368/laravel-php-fpm:7.4 +FROM dfs1368/laravel-php-fpm:7.4.1 WORKDIR /var/www From 153b049f32a6e853cc44998c42e52ab0417ad67b Mon Sep 17 00:00:00 2001 From: "f.saravi" Date: Wed, 6 Oct 2021 18:25:59 +0000 Subject: [PATCH 04/11] Update 'Dockerfile' --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b2046a8..7b79dd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM dfs1368/laravel-php-fpm:7.4.1 +FROM dfs1368/laravel-php-fpm:7.4 WORKDIR /var/www From 3e4618b8f6378d89ecea62d98075fdaba30affdc Mon Sep 17 00:00:00 2001 From: azizi Date: Tue, 12 Oct 2021 15:04:55 +0000 Subject: [PATCH 05/11] Update '.gitignore' --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fd1ded0..978a758 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ /development/ # Created by https://www.toptal.com/developers/gitignore/api/visualstudiocode,laravel,vuejs,phpstorm -# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,laravel,vuejs,phpstorm +# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,laravel,vuejs, phpstorm composer-prod.json ### Laravel ### From 67d77176533f7c2129c7c92ad629333ff471c58d Mon Sep 17 00:00:00 2001 From: azizi Date: Mon, 15 Nov 2021 14:28:45 +0000 Subject: [PATCH 06/11] Update 'Jenkinsfile' --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4dbea50..781bc84 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,6 @@ pipeline { node { label 'willa' } - } stages { stage('build') { From 5c6c919ba8b1d019b9d1b3053ab04c9519964c1e Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Thu, 24 Feb 2022 17:19:22 +0330 Subject: [PATCH 07/11] fix --- .drone.yml | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2193f47..0e372da 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,23 +2,28 @@ kind: pipeline type: exec name: default +settings: + sh_key: + from_secret: id-rsa + steps: -- name: build - commands: - - docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" - - cd /home/administrator/apps/${IMAGE_NAME}/;sudo ./BuildDocker + - name: build_production + commands: + - docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" + - cd /home/administrator/apps/${IMAGE_NAME}/;sudo ./BuildDocker + settiong -- name: deploy - commands: - - cd /home/administrator/apps/${IMAGE_NAME}/ ; docker-compose up -d - - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" - - docker exec willaengine service cron start - - docker exec willaengine php artisan config:cache - - docker exec willaengine php artisan route:cache + - name: deploy_production + commands: + - cd /home/administrator/apps/${IMAGE_NAME}/ ; docker-compose up -d + - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" + - docker exec willaengine service cron start + - docker exec willaengine php artisan config:cache + - docker exec willaengine php artisan route:cache trigger: branch: - - master + - master environment: - IMAGE_NAME=willaengine From 645852a6d6d64632ca22b1002b5613f60a4fcd20 Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Thu, 24 Feb 2022 17:20:24 +0330 Subject: [PATCH 08/11] drone --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 0e372da..56d0908 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,6 @@ steps: commands: - docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" - cd /home/administrator/apps/${IMAGE_NAME}/;sudo ./BuildDocker - settiong - name: deploy_production commands: From cbe5c3dd0ccdbdcdb2dc0a528b9833d04f765eb3 Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Thu, 24 Feb 2022 17:28:10 +0330 Subject: [PATCH 09/11] drone --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 56d0908..5510cd4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,7 +4,7 @@ name: default settings: sh_key: - from_secret: id-rsa + from_secret: /home/administrator/.ssh/id_rsa steps: - name: build_production From 5254a98f0b4247c4810796556b76b8c9c586f2f6 Mon Sep 17 00:00:00 2001 From: farid Date: Mon, 28 Mar 2022 09:03:27 +0430 Subject: [PATCH 10/11] fix: remove cron command from drone file --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4037b2a..d65bb61 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,7 +15,6 @@ steps: commands: - cd /home/administrator/apps/willaengine/ ; docker-compose up -d - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" - - docker exec willaengine service cron start - docker exec willaengine php artisan config:cache - docker exec willaengine php artisan route:cache when: From 307e2eaf6ffb59eff47d0913c27dcc574b8fef8b Mon Sep 17 00:00:00 2001 From: farid Date: Mon, 28 Mar 2022 20:13:21 +0430 Subject: [PATCH 11/11] feat: add worker file --- worker.conf | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 worker.conf diff --git a/worker.conf b/worker.conf new file mode 100644 index 0000000..fbd319c --- /dev/null +++ b/worker.conf @@ -0,0 +1,28 @@ +[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: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