feat: add predis

.drone.yml

@@ -5,20 +5,21 @@ name: default
 steps:
   - name: build to production
     commands:
-      - docker build -t registry.willaspace.com/willaspace/willaengine-test:latest --build-arg COMPOSER_FILE_NAME=composer-prod .
+      - docker build -t registry.willaspace.com/willaspace/willaengine:latest --build-arg COMPOSER_FILE_NAME=composer-prod .
     when:
       branch:
         - master
 
   - name: deploy to production
     commands:
-      - cd /apps/willaengine/ ; docker-compose up -d
-      - docker exec willaengine-test bash -c "COMPOSER=composer-prod.json composer update"
-      - docker exec willaengine-test php artisan config:cache
-      - docker exec willaengine-test php artisan route:cache
-#      - docker exec willaengine_worker bash -c "COMPOSER=composer-prod.json composer update"
-#      - docker exec willaengine_worker service supervisor start
-#      - docker network connect nginx_default willaengine
+      - cd /apps/willaengine-production/ ; docker-compose up -d
+      - docker exec willaengine-production_php bash -c "COMPOSER=composer-prod.json composer update"
+      - docker exec willaengine-production_php php artisan config:cache
+      - docker exec willaengine-production_php php artisan route:cache
+      - docker exec willaengine-production_worker bash -c "COMPOSER=composer-prod.json composer update"
+      - docker exec willaengine-production_worker service supervisor start
+      - docker exec willaengine-production_worker php artisan config:cache
+      - docker exec willaengine-production_worker php artisan route:cache
     when:
       branch:
         - master

.gitignore

@@ -18,10 +18,17 @@ app/storage/
 
 .DS_Store
 
-storage/
 storage/framework/views/*
 storage/framework/sessions/*
 storage/framework/cache/*
+storage/logs/*
+storage/app/*
+storage/media-library/*
+storage/medialibrary/*
+storage/modules/*
+storage/oauth-private.key
+storage/oauth-public.key
+
 # Laravel 5 & Lumen specific
 public/storage
 public/hot

Dockerfile

@@ -1,6 +1,6 @@
 FROM willaengine/standard-laravel:7.4
 
-ARG COMPOSER_FILE_NAME=composer
+ARG COMPOSER_FILE_NAME
 
 WORKDIR /var/www/html
 
@@ -14,6 +14,8 @@ COPY $COMPOSER_FILE_NAME.* /var/www/html/
 
 RUN COMPOSER=$COMPOSER_FILE_NAME.json composer install --no-scripts
 
+RUN pecl upgrade timezonedb
+
 COPY . /var/www/html
 
 RUN chown -R www-data:www-data \

app/Console/Kernel.php

@@ -30,6 +30,8 @@ class Kernel extends ConsoleKernel
         $schedule->command('domain:update_ssl_expiry_date')->daily(); # update SSL expired_at
         $schedule->command('domain:update_domain_expiry_date')->daily(); # update domain expired_at
         $schedule->command('make:sitemap')->daily(); # make sitemap
+        $schedule->command('sum:statistics')->daily(); # statistics to statistic-charts
+        $schedule->command('remove:statistics')->lastDayOfMonth(); # remove data from statistics and ad to file
     }
 
     /**

composer-prod.json

@@ -39,6 +39,7 @@
         "wm/service-store": "dev-master",
         "wm/store": "dev-master",
         "wm/web-builder": "dev-master",
+        "predis/predis": "^1.1",
         "zircote/swagger-php": "^3.0"
     },
     "provide": {
@@ -121,7 +122,7 @@
             "url": "git@git.willaspace.com:WillaEngine-Project/product.git"
         },
         {
-            c            "type": "vcs",
+            "type": "vcs",
             "url": "git@git.willaspace.com:WillaEngine-Project/service.git"
         },
         {

config/filesystems.php

@@ -55,6 +55,11 @@ return [
             'visibility' => 'public',
         ],
 
+        'storage_data' => [
+            'driver' => 'local',
+            'root' => storage_path('businesses'),
+        ],
+
         's3' => [
             'driver' => 's3',
             'key' => env('AWS_ACCESS_KEY_ID'),

storage/letsencrypt/Bash/auth-hook.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+php /var/www/html/artisan settxtdns:arvan "$CERTBOT_DOMAIN" _acme-challenge "$CERTBOT_VALIDATION"
+
+sleep 30