another big bag of changes

vars/buildAndDeploy.groovy

@@ -22,7 +22,15 @@ def call(String appName, String helmChartPath, String helmRepoName,String helmCh
     stage('Docker build & push') {
         container(containerName) {
             script {
-                dockerBuildAndPush(env.NEXUS_DOCKER_URL, appName, "./Dockerfile", "target", "admin", env.NEXUS_DOCKER_PASS, useInsecureRegistry)
+                dockerBuilder.dockerBuildAndPush(
+                    env.NEXUS_DOCKER_URL,
+                    appName,
+                    "./Dockerfile",
+                    "target",
+                    "admin",
+                    env.NEXUS_DOCKER_PASS,
+                    useInsecureRegistry
+                )
             }
         }
     }