From 4afb10558f4463e712ea7e0f9a3cd9f6f7597c74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco-Javier=20Ram=C3=B3n=20Salguero?= Date: Tue, 1 Sep 2020 20:09:34 +0200 Subject: [PATCH 01/11] Improvement of Jenkinsfile: - More complete build stage. - Stub for image push to registry. --- Jenkinsfile | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 049f6e9..32d5919 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,19 +1,34 @@ pipeline { - agent none - stages { -/* stage('Test') { - agent { dockerfile true } - steps { - sh 'echo HOLA' - } - } -*/ - stage('Build') { - agent any - steps { - sh 'docker build .' - sh 'echo PUBLISH' - } + environment { + imagename = "opensourcemano/api-fe" + registryCredential = '' // To be updated with actual ID in the future + dockerImage = '' + } + agent any + stages { + stage('Build API-FE image') { + steps{ + script { + dockerImage = docker.build imagename + ":$BUILD_NUMBER" } + } + } + stage('Upload to Docker registry') { + steps{ + sh "echo Here it would upload the image with appropriate tags (build number, latest)" + /*script { + docker.withRegistry( '', registryCredential ) { + dockerImage.push("$BUILD_NUMBER") + dockerImage.push('latest') + } + }*/ + } + } + stage('Remove unused Docker image') { + steps{ + sh "docker rmi $imagename:$BUILD_NUMBER" + sh "docker rmi $imagename:latest" + } } + } } -- GitLab From 6f65b4fa6571597144957cfdad7a6298b4809a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco-Javier=20Ram=C3=B3n=20Salguero?= Date: Wed, 2 Sep 2020 02:31:03 +0200 Subject: [PATCH 02/11] Added echo message to first stage --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 32d5919..614a7eb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,6 +8,7 @@ pipeline { stages { stage('Build API-FE image') { steps{ + sh "echo Building API-FE image" script { dockerImage = docker.build imagename + ":$BUILD_NUMBER" } -- GitLab From e3f52eff56cc10866adfd902b1e71b1b84936e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco-Javier=20Ram=C3=B3n=20Salguero?= Date: Wed, 2 Sep 2020 02:35:40 +0200 Subject: [PATCH 03/11] `dockerImage`as variable, defined prior to pipeline --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 614a7eb..b7cceec 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,8 +1,9 @@ +def dockerImage + pipeline { environment { imagename = "opensourcemano/api-fe" registryCredential = '' // To be updated with actual ID in the future - dockerImage = '' } agent any stages { -- GitLab From 0bd47637519e8990bd45030ad7eaf48c8a6df000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco-Javier=20Ram=C3=B3n=20Salguero?= Date: Wed, 2 Sep 2020 02:41:18 +0200 Subject: [PATCH 04/11] Typo fixed with image name env variable --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b7cceec..20bd4af 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps{ sh "echo Building API-FE image" script { - dockerImage = docker.build imagename + ":$BUILD_NUMBER" + dockerImage = docker.build $imagename + ":$BUILD_NUMBER" } } } -- GitLab From 27031663f2f66980f88030c732de9b289d299220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco-Javier=20Ram=C3=B3n=20Salguero?= Date: Wed, 2 Sep 2020 02:45:10 +0200 Subject: [PATCH 05/11] Debug of docker.build phase --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 20bd4af..36bf4e3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,8 @@ pipeline { steps{ sh "echo Building API-FE image" script { - dockerImage = docker.build $imagename + ":$BUILD_NUMBER" + //dockerImage = docker.build $imagename + ":$BUILD_NUMBER" + dockerImage = docker.build $imagename } } } -- GitLab From dea9e694db8ce2ff9c993328a8d7966b65017faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco-Javier=20Ram=C3=B3n=20Salguero?= Date: Wed, 2 Sep 2020 03:18:52 +0200 Subject: [PATCH 06/11] Test of location of implicitly cloned repo --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 36bf4e3..e587a2e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,6 +10,7 @@ pipeline { stage('Build API-FE image') { steps{ sh "echo Building API-FE image" + sh "ls -R" script { //dockerImage = docker.build $imagename + ":$BUILD_NUMBER" dockerImage = docker.build $imagename -- GitLab From 15761dad05b23a2218e9d392e8f622b9e57c255c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco-Javier=20Ram=C3=B3n=20Salguero?= Date: Wed, 2 Sep 2020 03:24:10 +0200 Subject: [PATCH 07/11] Fix to env var reference --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e587a2e..8e15216 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { sh "ls -R" script { //dockerImage = docker.build $imagename + ":$BUILD_NUMBER" - dockerImage = docker.build $imagename + dockerImage = docker.build(${env.imagename}) } } } -- GitLab From e20cdcd981f1996f22916c2ded8196834e580094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco-Javier=20Ram=C3=B3n=20Salguero?= Date: Wed, 2 Sep 2020 03:26:12 +0200 Subject: [PATCH 08/11] New fix to reference to imagename --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8e15216..de063ac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { sh "ls -R" script { //dockerImage = docker.build $imagename + ":$BUILD_NUMBER" - dockerImage = docker.build(${env.imagename}) + dockerImage = docker.build("${env.imagename}") } } } -- GitLab From 1fa451166592cf46a070444b4fcf336d70ecb8a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco-Javier=20Ram=C3=B3n=20Salguero?= Date: Wed, 2 Sep 2020 03:31:06 +0200 Subject: [PATCH 09/11] Once fixed references, improves 2nd stage --- Jenkinsfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index de063ac..be3be10 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,19 +10,18 @@ pipeline { stage('Build API-FE image') { steps{ sh "echo Building API-FE image" - sh "ls -R" script { //dockerImage = docker.build $imagename + ":$BUILD_NUMBER" - dockerImage = docker.build("${env.imagename}") + dockerImage = docker.build "${env.imagename}:${env.BUILD_NUMBER}" } } } stage('Upload to Docker registry') { steps{ - sh "echo Here it would upload the image with appropriate tags (build number, latest)" + sh "echo Here it would upload the image with appropriate tags: build number, latest" /*script { docker.withRegistry( '', registryCredential ) { - dockerImage.push("$BUILD_NUMBER") + dockerImage.push("${BUILD_NUMBER}") dockerImage.push('latest') } }*/ -- GitLab From 8c93335e4a8f9e43aa2021fddeace98780478e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco-Javier=20Ram=C3=B3n=20Salguero?= Date: Wed, 2 Sep 2020 03:32:46 +0200 Subject: [PATCH 10/11] Cleanup, once debugged version is working --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index be3be10..d2e5bc2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,6 @@ pipeline { steps{ sh "echo Building API-FE image" script { - //dockerImage = docker.build $imagename + ":$BUILD_NUMBER" dockerImage = docker.build "${env.imagename}:${env.BUILD_NUMBER}" } } -- GitLab From acdebeed1db6b088921fc450e72158eb55eb8802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco-Javier=20Ram=C3=B3n=20Salguero?= Date: Wed, 2 Sep 2020 03:39:25 +0200 Subject: [PATCH 11/11] Polished version just pending DockerHub credentials --- Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d2e5bc2..29a4109 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,7 @@ pipeline { sh "echo Here it would upload the image with appropriate tags: build number, latest" /*script { docker.withRegistry( '', registryCredential ) { - dockerImage.push("${BUILD_NUMBER}") + dockerImage.push("${env.BUILD_NUMBER}") dockerImage.push('latest') } }*/ @@ -28,8 +28,9 @@ pipeline { } stage('Remove unused Docker image') { steps{ - sh "docker rmi $imagename:$BUILD_NUMBER" - sh "docker rmi $imagename:latest" + sh "docker rmi ${imagename}:${BUILD_NUMBER}" + // Commented until "upload" stage can be uncommented as well + //sh "docker rmi ${imagename}:latest" } } } -- GitLab