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

Reviewed-on: WillaEngine-Project/WillaEngine#54

Dockerfile

@@ -6,10 +6,8 @@ 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 modules /var/www/modules
 COPY database /var/www/database
-COPY composer.json /var/www/
-COPY composer.lock /var/www/
+COPY composer.* /var/www/
 
 RUN composer install --no-scripts
 

composer.json

@@ -24,7 +24,7 @@
         "wm/portfolio": "dev-master",
         "wm/product": "dev-master",
         "wm/service": "dev-master",
-        "wm/store": "dev-dev",
+        "wm/store": "dev-master",
         "zircote/swagger-php": "^3.0"
     },
     "provide": {
@@ -78,36 +78,36 @@
     },
     "repositories": [
         {
-            "type": "path",
-            "url": "./modules/wm-crm"
+            "type": "vcs",
+            "url": "https://git.willaspace.com/WillaEngine-Project/crm.git"
         },
         {
-            "type": "path",
-            "url": "./modules/wm-common"
+            "type": "vcs",
+            "url": "https://git.willaspace.com/WillaEngine-Project/common.git"
         },
         {
-            "type": "path",
-            "url": "./modules/wm-core"
+            "type": "vcs",
+            "url": "https://git.willaspace.com/WillaEngine-Project/core.git"
         },
         {
-            "type": "path",
-            "url": "./modules/wm-blog"
+            "type": "vcs",
+            "url": "https://git.willaspace.com/WillaEngine-Project/blog.git"
         },
         {
-            "type": "path",
-            "url": "./modules/wm-portfolio"
+            "type": "vcs",
+            "url": "https://git.willaspace.com/WillaEngine-Project/portfolio.git"
         },
         {
-            "type": "path",
-            "url": "./modules/wm-product"
+            "type": "vcs",
+            "url": "https://git.willaspace.com/WillaEngine-Project/product.git"
         },
         {
-            "type": "path",
-            "url": "./modules/wm-service"
+            "type": "vcs",
+            "url": "https://git.willaspace.com/WillaEngine-Project/service.git"
         },
         {
-            "type": "path",
-            "url": "./modules/wm-store"
+            "type": "vcs",
+            "url": "https://git.willaspace.com/WillaEngine-Project/store.git"
         }
     ]
 }