OSB-45: small refactoring

LCU/Maintenance/Docker/Jenkinsfile

@@ -15,24 +15,24 @@ pipeline {
                 
                 script {
                     dir ('LCU/Maintenance/Docker/BaseMaintenance/'){
-                        docker.build "lofar-maintenance-base:${DOCKER_TAG}"
+                        docker.build("lofar-maintenance-base").tag("${DOCKER_TAG}")
                     }
 
-                    docker.build("lofar-maintenance-dbinterface:${DOCKER_TAG}",
-                                 "-f LCU/Maintenance/Docker/DBInterface/Dockerfile --build-arg TAG=${DOCKER_TAG} .")
+                    docker.build("lofar-maintenance-dbinterface",
+                                 "-f LCU/Maintenance/Docker/DBInterface/Dockerfile --build-arg TAG=${DOCKER_TAG} .").tag("${DOCKER_TAG}")
 
                     dir ('LCU/Maintenance/Docker/RESTService/'){
-                        docker.build("lofar-maintenance-restservice:${DOCKER_TAG}",
-                                     "--build-arg TAG=${DOCKER_TAG} .")
+                        docker.build("lofar-maintenance-restservice",
+                                     "--build-arg TAG=${DOCKER_TAG} .").tag("${DOCKER_TAG}")
                     }
 
                     dir ('LCU/Maintenance/Docker/RESTService/'){
-                        docker.build("lofar-maintenance-nginxproxy:${DOCKER_TAG}",
-                                     "--build-arg TAG=${DOCKER_TAG} .")
+                        docker.build("lofar-maintenance-nginxproxy",
+                                     "--build-arg TAG=${DOCKER_TAG} .").tag("${DOCKER_TAG}")
                     }
                     dir ('LCU/Maintenance/Docker/BackgroundWorkers'){
-                        docker.build("lofar-maintenance-backgroundworkers:${DOCKER_TAG}",
-                                     "--build-arg TAG=${DOCKER_TAG} .")
+                        docker.build("lofar-maintenance-backgroundworkers",
+                                     "--build-arg TAG=${DOCKER_TAG} .").tag("${DOCKER_TAG}")
                     }
                 }
 
@@ -45,10 +45,10 @@ pipeline {
             }
             steps {
                 script {
-                    withDockerRegistry(credentialsId: 'nexus', url: 'http://nexus.cep4.control.lofar:18080') {
-                        docker.image("lofar-maintenance-restservice:${DOCKER_TAG}").push('${DOCKER_REGISTRY}/lofar-maintenance-restservice:${DOCKER_TAG}')
-                        docker.image("lofar-maintenance-nginxproxy:${DOCKER_TAG}").push('${DOCKER_REGISTRY}/lofar-maintenance-nginxproxy:${DOCKER_TAG}')
-                        docker.image("lofar-maintenance-backgroundworkers:${DOCKER_TAG}").push('${DOCKER_REGISTRY}/lofar-maintenance-backgroundworkers:${DOCKER_TAG}')
+                    docker.withDockerRegistry(credentialsId: 'nexus', url: 'http://nexus.cep4.control.lofar:18080') {
+                        docker.image("lofar-maintenance-restservice:${DOCKER_TAG}").push()
+                        docker.image("lofar-maintenance-nginxproxy:${DOCKER_TAG}").push()
+                        docker.image("lofar-maintenance-backgroundworkers:${DOCKER_TAG}").push()
                     }
                 }
             }