From 8f7344c8980a0afffc8f89ae99ef8474f5a8b8e8 Mon Sep 17 00:00:00 2001
From: Vicente Falco <vfalco@verdnatura.es>
Date: Wed, 17 Jan 2018 15:00:32 +0100
Subject: [PATCH] Jenkinsfile

---
 Jenkinsfile | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2c3df72e5..2dd18f147 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -43,35 +43,11 @@ node
         
         stage ("Stopping/Removing Docker")
         {
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-            step{
-                env.TAG = env.BUILD_NUMBER - 1;
-                sh "docker-compose down --rmi 'all'" 
-=======
-            environment { 
-                env.BUILD_TAG = env.BUILD_NUMBER - 1;
->>>>>>> 1acfdf5950d33f4bf972dc2830e05d2f2b1ba99a
-            }
->>>>>>> e47138eda088c8d307f58d42cc34cbde7295946f
-            sh "docker-compose down --rmi 'all'" 
+             sh "docker-compose down --rmi 'all'" 
         }
 
         stage ("Generar dockers")
         {
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-            step{
-                env.TAG = env.BUILD_NUMBER + 1;
-                sh "docker-compose up -d --build"
-=======
-            environment {
-                env.BUILD_TAG = env.BUILD_NUMBER;
->>>>>>> 1acfdf5950d33f4bf972dc2830e05d2f2b1ba99a
-            }
->>>>>>> e47138eda088c8d307f58d42cc34cbde7295946f
             sh "docker-compose up -d --build"
         }  
     }