From 0274e72eadd3c072221e4a927a524cdca8ccb811 Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Tue, 28 Nov 2017 10:35:12 +0100 Subject: [PATCH 1/8] Jenkins --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4cc6d74f4..15c4ff79f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,13 +43,13 @@ node stage ("Stopping/Removing Docker") { - env.TAG = "${env.BUILD_NUMBER}" - 1; + env.TAG = env.BUILD_NUMBER - 1; sh "docker-compose down --rmi 'all'" } stage ("Generar dockers") { - env.TAG = "${env.BUILD_NUMBER}" + 1; + env.TAG = env.BUILD_NUMBER + 1; sh "docker-compose up -d --build" } } From 6c772c52d89ae45cd56e764ee687aff821a7a115 Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Mon, 8 Jan 2018 11:05:19 +0100 Subject: [PATCH 2/8] Jenkins --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4066730c1..1e4202752 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,7 +43,7 @@ node stage ("Stopping/Removing Docker") { - steps{ + step{ env.TAG = env.BUILD_NUMBER - 1; sh "docker-compose down --rmi 'all'" } @@ -51,7 +51,7 @@ node stage ("Generar dockers") { - steps{ + step{ env.TAG = env.BUILD_NUMBER + 1; sh "docker-compose up -d --build" } From 6109338726daee2f3335dcb5ea5cee5fae994735 Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Mon, 8 Jan 2018 11:07:52 +0100 Subject: [PATCH 3/8] _Jenkins --- Jenkinsfile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1e4202752..d20201a81 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,18 +43,14 @@ node stage ("Stopping/Removing Docker") { - step{ - env.TAG = env.BUILD_NUMBER - 1; - sh "docker-compose down --rmi 'all'" - } + //env.TAG = env.BUILD_NUMBER - 1; + sh "docker-compose down --rmi 'all'" } stage ("Generar dockers") { - step{ - env.TAG = env.BUILD_NUMBER + 1; - sh "docker-compose up -d --build" - } + //env.TAG = env.BUILD_NUMBER + 1; + sh "docker-compose up -d --build" } } -} \ No newline at end of file +} From 3a922e534508f29ac2707ac690aa97099e5df21a Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Mon, 8 Jan 2018 12:04:49 +0100 Subject: [PATCH 4/8] Jenkins --- Jenkinsfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d20201a81..6db2d3de0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,13 +43,17 @@ node stage ("Stopping/Removing Docker") { - //env.TAG = env.BUILD_NUMBER - 1; + environment { + env.TAG = env.BUILD_NUMBER - 1; + } sh "docker-compose down --rmi 'all'" } stage ("Generar dockers") { - //env.TAG = env.BUILD_NUMBER + 1; + environment { + env.TAG = env.BUILD_NUMBER + 1; + } sh "docker-compose up -d --build" } } From 1acfdf5950d33f4bf972dc2830e05d2f2b1ba99a Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Mon, 8 Jan 2018 12:13:09 +0100 Subject: [PATCH 5/8] jENKINS --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6db2d3de0..ab70d68cf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,7 +44,7 @@ node stage ("Stopping/Removing Docker") { environment { - env.TAG = env.BUILD_NUMBER - 1; + env.BUILD_TAG = env.BUILD_NUMBER - 1; } sh "docker-compose down --rmi 'all'" } @@ -52,7 +52,7 @@ node stage ("Generar dockers") { environment { - env.TAG = env.BUILD_NUMBER + 1; + env.BUILD_TAG = env.BUILD_NUMBER; } sh "docker-compose up -d --build" } From 5deb6e11ca6268e2ea7618d854c7e3a767e0a13d Mon Sep 17 00:00:00 2001 From: Carlos Jimenez <=> Date: Wed, 17 Jan 2018 13:07:52 +0100 Subject: [PATCH 6/8] 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 +} From 309f31fb930621d97e1717948fa270b24757a5f7 Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Wed, 17 Jan 2018 14:56:03 +0100 Subject: [PATCH 7/8] JenkinsFile --- Jenkinsfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ab70d68cf..17aeb4ec3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,17 +43,11 @@ node stage ("Stopping/Removing Docker") { - environment { - env.BUILD_TAG = env.BUILD_NUMBER - 1; - } sh "docker-compose down --rmi 'all'" } stage ("Generar dockers") { - environment { - env.BUILD_TAG = env.BUILD_NUMBER; - } sh "docker-compose up -d --build" } } From 8f7344c8980a0afffc8f89ae99ef8474f5a8b8e8 Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Wed, 17 Jan 2018 15:00:32 +0100 Subject: [PATCH 8/8] 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" } }