merge

2018-01-17 13:07:52 +01:00 · 2018-01-17 13:07:52 +01:00 · 5deb6e11ca
parent 47d8cf0610
commit 5deb6e11ca
1 changed files with 13 additions and 1 deletions
--- a/14
+++ b/14
@ -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"
        }  
    }
-}
+}