diff --git a/.drone.yml b/.drone.yml index a0ffbcd..87132fd 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 @@ -33,6 +33,7 @@ steps: - name: deploy to staging commands: - cd /apps/willaengine-staging/ ; docker-compose up -d + - docker exec willaengine-staging_php bash -c "COMPOSER=composer-staging.json composer update" - docker exec willaengine-staging_php php artisan migration when: branch: 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 ### 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 - 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); 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..286a34b 100644 --- a/composer-staging.json +++ b/composer-staging.json @@ -20,23 +20,24 @@ "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", + "predis/predis": "^1.1", + "wm/contact-us": "dev-dev", "zircote/swagger-php": "^3.0" }, "provide": { 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 +