merge

Jenkinsfile

@@ -43,18 +43,12 @@ node
         
         stage ("Stopping/Removing Docker")
         {
-            step{
+             sh "docker-compose down --rmi 'all'" 
-                env.TAG = env.BUILD_NUMBER - 1;
-                sh "docker-compose down --rmi 'all'" 
-            }
         }
 
         stage ("Generar dockers")
         {
-            step{
+            sh "docker-compose up -d --build"
-                env.TAG = env.BUILD_NUMBER + 1;
-                sh "docker-compose up -d --build"
-            }
         }  
     }
-}
+}

docker-compose.yml

@@ -1,91 +0,0 @@
-version: '2'
-services:
-    auth:
-        environment:
-            - NODE_ENV=${NODE_ENV}
-        container_name: "${BRANCH_NAME}-auth"
-        image: "auth:${TAG}"
-        build:
-            context: ./services
-            dockerfile: /auth/Dockerfile
-        expose:
-            - "3000"
-        ports:
-            - "3000:3000"
-    salix:
-        environment:
-            - NODE_ENV=${NODE_ENV}
-        container_name: "${BRANCH_NAME}-salix"
-        image: "salix:${TAG}"
-        build:
-            context: ./services
-            dockerfile: /salix/Dockerfile
-        expose:
-            - "3001"
-        ports:
-            - "3001:3001"
-    client:
-        environment:
-            - NODE_ENV=${NODE_ENV}
-        container_name: "${BRANCH_NAME}-client"
-        image: "client:${TAG}"
-        build:
-            context: ./services
-            dockerfile: /client/Dockerfile
-        expose:
-            - "3002"
-        ports:
-            - "3002:3002"
-    mailer:
-        environment:
-            - NODE_ENV=${NODE_ENV}
-        container_name: "${BRANCH_NAME}-mailer"
-        image: "mailer:${TAG}"
-        build:
-            context: ./services/mailer
-        expose:
-            - "3003"
-        ports:
-            - "3003:3003"
-    production:
-        environment:
-            - NODE_ENV=${NODE_ENV}
-        container_name: "${BRANCH_NAME}-production"
-        image: "production:${TAG}"
-        build:
-            context: ./services
-            dockerfile: /production/Dockerfile
-        expose:
-            - "3004"
-        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}"
-        privileged: true
-        build:
-            context: ./services/nginx
-        expose:
-            - "80"
-        ports:
-            - "80:80"
-        mem_limit: 200m
-        links:
-            - "auth:${BRANCH_NAME}-auth"
-            - "salix:${BRANCH_NAME}-salix"
-            - "client:${BRANCH_NAME}-client"
-            - "mailer:${BRANCH_NAME}-mailer"
-            - "production:${BRANCH_NAME}-production"
-            - "route:${BRANCH_NAME}-route"