From 5deb6e11ca6268e2ea7618d854c7e3a767e0a13d Mon Sep 17 00:00:00 2001
From: Carlos Jimenez <=>
Date: Wed, 17 Jan 2018 13:07:52 +0100
Subject: [PATCH] merge

---
 Jenkinsfile | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1e4202752..e3d4c27c0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -43,18 +43,30 @@ node
         
         stage ("Stopping/Removing Docker")
         {
+<<<<<<< HEAD
             step{
                 env.TAG = env.BUILD_NUMBER - 1;
                 sh "docker-compose down --rmi 'all'" 
+=======
+            environment { 
+                env.BUILD_TAG = env.BUILD_NUMBER - 1;
+>>>>>>> 1acfdf5950d33f4bf972dc2830e05d2f2b1ba99a
             }
+            sh "docker-compose down --rmi 'all'" 
         }
 
         stage ("Generar dockers")
         {
+<<<<<<< HEAD
             step{
                 env.TAG = env.BUILD_NUMBER + 1;
                 sh "docker-compose up -d --build"
+=======
+            environment {
+                env.BUILD_TAG = env.BUILD_NUMBER;
+>>>>>>> 1acfdf5950d33f4bf972dc2830e05d2f2b1ba99a
             }
+            sh "docker-compose up -d --build"
         }  
     }
-}
\ No newline at end of file
+}