Build: Use jpl v4.0.0 version, add cleanup stage and review docker publish function

Author: pedroamador

Jenkinsfile

@@ -1,10 +1,9 @@
 #!groovy
 
-@Library('github.com/teecke/jenkins-pipeline-library@v3.4.1') _
+@Library('github.com/tpbtools/jenkins-pipeline-library@v4.0.0') _
 
 // Initialize global config
-cfg = jplConfig('gp-haproxy', 'docker', '', [email: env.CITEECKE_NOTIFY_EMAIL_TARGETS])
-
+cfg = jplConfig('gp-haproxy', 'bash', '', [email: env.CI_NOTIFY_EMAIL_TARGETS])
 
 /**
  * Build and publish docker images
@@ -15,8 +14,8 @@ def buildAndPublishDockerImage(nextReleaseNumber = "") {
     if (nextReleaseNumber == "") {
         nextReleaseNumber = sh (script: "kd get-next-release-number .", returnStdout: true).trim().substring(1)
     }
-    docker.withRegistry("", 'teeckebot-docker-credentials') {
-        def customImage = docker.build("teecke/${cfg.projectName}:${nextReleaseNumber}", "--pull --no-cache ${cfg.projectName.substring(3)}")
+    docker.withRegistry("", 'docker-token') {
+        def customImage = docker.build("${env.DOCKER_ORGANIZATION}/${cfg.projectName}:${nextReleaseNumber}", "--pull --no-cache .")
         customImage.push()
         if (nextReleaseNumber != "beta") {
             customImage.push('latest')
@@ -56,6 +55,9 @@ pipeline {
         always {
             jplPostBuild(cfg)
         }
+        cleanup {
+            deleteDir()
+        }
     }
 
     options {
@@ -65,4 +67,4 @@ pipeline {
         disableConcurrentBuilds()
         timeout(time: 10, unit: 'MINUTES')
     }
-}
+}