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

docker-compose.yml

@@ -64,6 +64,19 @@ services:
         ports:
             - "3004:3004"
 
+    route:
+        environment:
+            - NODE_ENV=${NODE_ENV}
+        container_name: "${BRANCH_NAME}-route"
+        image: "route:${TAG}"
+        build:
+            context: ./services
+            dockerfile: /route/Dockerfile
+        expose:
+            - "3005"
+        ports:
+            - "3005:3005"    
+
     nginx:
         container_name: "${BRANCH_NAME}-nginx"
         image: "nginx:${TAG}"

services/auth/Dockerfile

@@ -1,8 +1,10 @@
 FROM node:6.9.1
 
-COPY ./auth /app
+COPY auth /app
 
-COPY ./loopback /loopback
+COPY loopback /loopback
+
+RUN npm install /loopback
 
 WORKDIR /app
  

services/client/Dockerfile

@@ -1,8 +1,10 @@
 FROM node:6.9.1
  
-COPY ./client /app
+COPY client /app
 
-COPY ./loopback /loopback
+COPY loopback /loopback
+
+RUN npm install /loopback
 
 WORKDIR /app  
  

services/production/Dockerfile

@@ -1,8 +1,10 @@
 FROM node:6.9.1
 
-COPY ./production /app
+COPY production /app
 
-COPY ./loopback /loopback
+COPY loopback /loopback
+
+RUN npm install /loopback
 
 WORKDIR /app
  

services/route/Dockerfile

@@ -1,8 +1,10 @@
 FROM node:6.9.1
 
-COPY ./route /app
+COPY route /app
 
-COPY ./loopback /loopback
+COPY loopback /loopback
+
+RUN npm install /loopback
 
 WORKDIR /app
  

services/salix/Dockerfile

@@ -1,8 +1,10 @@
 FROM node:6.9.1
  
-COPY ./salix /app
+COPY salix /app
 
-COPY ./loopback /loopback
+COPY loopback /loopback
+
+RUN npm install /loopback
 
 WORKDIR /app