Merge pull request 'dev' (#96) from dev into master

Reviewed-on: WillaEngine-Project/WillaEngine#96

Dockerfile

@@ -4,7 +4,6 @@ WORKDIR /var/www
 
 RUN apt install -y sendmail libpng-dev
 RUN docker-php-ext-install gd
-RUN echo 'memory_limit = -1' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini;
 
 COPY database /var/www/database
 COPY composer-prod.* /var/www/
@@ -19,3 +18,5 @@ RUN chown -R www-data:www-data \
         /var/www/public \
         /var/www/storage \
         /var/www/bootstrap/cache
+
+COPY .env.prod .env

Jenkinsfile

@@ -16,7 +16,7 @@ pipeline {
     stage('deploy') {
       steps {
         sh 'cd /home/administrator/apps/$IMAGE_NAME/ ; docker-compose up -d'
-	sh 'docker exec willaengine service cron start'
+	    sh 'docker exec willaengine service cron start'
       }
     }
 

app/Providers/EventServiceProvider.php

@@ -6,8 +6,8 @@ use Illuminate\Support\Facades\Event;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use WM\Common\Services\Sms\Events\SmsSent;
-use WM\Common\Services\Sms\Listeners\StoreSmsInDatabase;
+use WM\Notification\Services\Sms\Events\SmsSent;
+use WM\Notification\Services\Sms\Listeners\StoreSmsInDatabase;
 
 class EventServiceProvider extends ServiceProvider
 {

composer.json

@@ -84,44 +84,44 @@
 
     "repositories": [
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/crm.git"
+            "type": "path",
+            "url": "./modules/wm-crm"
         },
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/common.git"
+            "type": "path",
+            "url": "./modules/wm-common"
         },
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/core.git"
+            "type": "path",
+            "url": "./modules/wm-core"
         },
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/blog.git"
+            "type": "path",
+            "url": "./modules/wm-blog"
         },
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/portfolio.git"
+            "type": "path",
+            "url": "./modules/wm-portfolio"
         },
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/product.git"
+            "type": "path",
+            "url": "./modules/wm-product"
         },
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/service.git"
+            "type": "path",
+            "url": "./modules/wm-service"
         },
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/store.git"
+            "type": "path",
+            "url": "./modules/wm-store"
         },
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/notification.git"
+            "type": "path",
+            "url": "./modules/wm-notification"
         },
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/admin.git"
+            "type": "path",
+            "url": "./modules/wm-admin"
         }
     ]
 }