Merge branch 'dev' of https://git.verdnatura.es/salix into dev

* 'dev' of https://git.verdnatura.es/salix:
  docker

docker-compose.yml

@@ -1,22 +1,69 @@
 version: '2'
+environment: 
+    - branchName=${env.BRANCH_NAME}
+    - NODE_ENV=
+    - dockerHost=
 services:
-    salix:
-        build: 
-            context: ./services/salix
-        ports: 
-            - "3001:3001"
-    account:
+    auth:
+        container_name: ${branchName}-auth
+        docker_host: ${dockerHost}
         build:
-            context: ./services/account
+            context: ./services/auth
+        expose:
+            - "3000"
         ports:
             - "3000:3000"
-    nginx:
+
+    salix:
+        container_name: ${branchName}-salix
+        docker_host: ${dockerHost}
         build: 
-            context: ./@salix
+            context: ./services/salix
+        expose:
+            - "3001"
         ports: 
-            - "8080:8080"
+            - "3001:3001"
+    
     client:
+        container_name: ${branchName}-client
+        docker_host: ${dockerHost}
         build:
             context: ./services/client
+        expose:
+            - "3002"
         ports: 
-            - "3002:3002"
+            - "3002:3002"
+
+    mailer:
+        container_name: ${branchName}-mailer
+        docker_host: ${dockerHost}
+        build:
+            context: ./services/mailer
+        expose:
+            - "3003"
+        ports: 
+            - "3003:3003"
+
+    production:
+        container_name: ${branchName}-production
+        docker_host: ${dockerHost}
+        build:
+            context: ./services/production
+        expose:
+            - "3004"
+        ports: 
+            - "3004:3004"
+
+    nginx:
+        container_name: ${branchName}-nginx
+        docker_host: ${dockerHost}
+        build: 
+            context: ./services/nginx
+        ports: 
+            - "80:8080"
+        links:
+            - "auth:${branchName}-auth"
+            - "salix:${branchName}-salix"
+            - "client:${branchName}-client"
+            - "mailer:${branchName}-mailer"
+            - "production:${branchName}-production"

forever.json

@@ -1,24 +0,0 @@
-[
-    {
-        "uid": "salix",
-        "append": true,
-        "watch": true,
-        "script": "server.js",
-        "sourceDir": "./services/salix/server",
-        "workingDir": "."
-    }, {
-        "uid": "auth",
-        "append": true,
-        "watch": true,
-        "script": "server.js",
-        "sourceDir": "./services/auth/server",
-        "workingDir": "."
-    }, {
-        "uid": "client",
-        "append": true,
-        "watch": true,
-        "script": "server.js",
-        "sourceDir": "./services/client/server",
-        "workingDir": "."
-    }
-]