Build: Review pipeline

pedroamador · pedroamador · commit aab5636f41fa · 2020-04-05T12:07:54.000+02:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -9,7 +9,7 @@ def publishDockerImage(nextReleaseNumber = "") {
     if (nextReleaseNumber == "") {
         nextReleaseNumber = sh (script: "kd get-next-release-number .", returnStdout: true).trim().substring(1)
     }
-    docker.withRegistry("https://registry.hub.docker.com", 'teeckebot-docker-credentials') {
+    docker.withRegistry("", 'teeckebot-docker-credentials') {
         def customImage = docker.build("teecke/${cfg.projectName}:${nextReleaseNumber}", "--pull --no-cache ${cfg.projectName.substring(3)}")
         customImage.push()
         if (nextReleaseNumber != "beta") {
@@ -29,17 +29,13 @@ pipeline {
         }
         stage ('Bash linter') {
             steps {
-                script {
-                    sh 'devcontrol run-bash-linter'
-                }
+                sh 'devcontrol run-bash-linter'
             }
         }
         stage ('Build') {
             agent { label 'docker' }
             steps {
-                script {
-                    publishDockerImage("beta")
-                }
+                publishDockerImage("beta")
             }
         }
         stage ('Make release') {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ def publishDockerImage(nextReleaseNumber = "") {`
`9`	`9`	`if (nextReleaseNumber == "") {`
`10`	`10`	`nextReleaseNumber = sh (script: "kd get-next-release-number .", returnStdout: true).trim().substring(1)`
`11`	`11`	`}`
`12`		`- docker.withRegistry("https://registry.hub.docker.com", 'teeckebot-docker-credentials') {`
	`12`	`+ docker.withRegistry("", 'teeckebot-docker-credentials') {`
`13`	`13`	`def customImage = docker.build("teecke/${cfg.projectName}:${nextReleaseNumber}", "--pull --no-cache ${cfg.projectName.substring(3)}")`
`14`	`14`	`customImage.push()`
`15`	`15`	`if (nextReleaseNumber != "beta") {`
`@@ -29,17 +29,13 @@ pipeline {`
`29`	`29`	`}`
`30`	`30`	`stage ('Bash linter') {`
`31`	`31`	`steps {`
`32`		`- script {`
`33`		`- sh 'devcontrol run-bash-linter'`
`34`		`- }`
	`32`	`+ sh 'devcontrol run-bash-linter'`
`35`	`33`	`}`
`36`	`34`	`}`
`37`	`35`	`stage ('Build') {`
`38`	`36`	`agent { label 'docker' }`
`39`	`37`	`steps {`
`40`		`- script {`
`41`		`- publishDockerImage("beta")`
`42`		`- }`
	`38`	`+ publishDockerImage("beta")`
`43`	`39`	`}`
`44`	`40`	`}`
`45`	`41`	`stage ('Make release') {`