SSB-47: refactored jenkinsfile to have a successful build

CAL/Docker/Jenkinsfile

@@ -4,31 +4,30 @@ pipeline {
     }
     environment {
        LOFAR_REGISTRY_URL = "http://nexus.cep4.control.lofar:18080"
-       LOFAR_TAG = "${env.BUILD_NAME}-${env.BUILD_NUMBER}"
+       LOFAR_REGISTRY = "nexus.cep4.control.lofar:18080"
+       LOFAR_TAG = "${env.BRANCH_NAME}-${env.BUILD_NUMBER}"
     }
     stages {
         stage('Build base docker file') {
             steps {
                 script{
-                    with dir('CAL/Docker/HolographyBase'){
-                        def image = docker.build('holography-base')
-                        image.tag(env.LOFAR_TAG)
+                    dir('CAL/Docker/HolographyBase'){
+                        name = docker.build("holography-base").tag(env.LOFAR_TAG)
                         withDockerRegistry(credentialsId: 'nexus', url: env.LOFAR_REGISTRY_URL) {
-                            image.push()
+                            tag_and_push(name, env.LOFAR_REGISTRY)
                         }
                     }
+
                 }
             }
         }
         stage('Build build docker file') {
             steps {
                 script{
-                    with dir('CAL/Docker/HolographyBuild'){
-                        def image = docker.build('holography-build')
-                        image.tag(env.LOFAR_TAG)
+                    name = docker.build("holography-build", '-f CAL/Docker/HolographyBuild/Dockerfile .')
+                        .tag(env.LOFAR_TAG)
                         withDockerRegistry(credentialsId: 'nexus', url: env.LOFAR_REGISTRY_URL) {
-                            image.push()
-                        }
+                            tag_and_push(name, env.LOFAR_REGISTRY)
                     }
                 }
             }
@@ -36,3 +35,9 @@ pipeline {
 
     }
 }
+
+
+def tag_and_push(image_name, registry){
+    sh "docker tag $image_name $registry/$image_name"
+    sh "docker push $registry/$image_name"
+}
\ No newline at end of file