Jenkinsfile

@@ -123,7 +123,7 @@ pipeline {
             parallel {
                 stage('Back') {
                     steps {
-                        dockerBuildPush 'back', '.'
+                        dockerBuildPush 'back', '.', 'back/Dockerfile'
                     }
                 }
                 stage('Front') {
@@ -250,21 +250,16 @@ pipeline {
     }
 }
 
-def dockerBuildPush(service, context) {
-    def image = "${env.REGISTRY}/salix-${service}"
-    def versionImage = "${image}:${env.VERSION}"
-    def branchImage = "${image}:${env.BRANCH_NAME}"
+def dockerBuildPush(service, context, dockerfile = null) {
+    if (dockerfile == null)
+        dockerfile = "${context}/Dockerfile"
 
-    sh "docker build -t ${versionImage} ${context}"
-    sh 'docker login --username $CREDENTIALS_USR --password $CREDENTIALS_PSW $REGISTRY'
-    sh "docker push ${versionImage}"
+    def imageName = "${env.REGISTRY}/salix-${service}"
+    def image = docker.build("${image}:${env.VERSION}", "-f ${dockerfile} ${context}")
 
-    sh "docker tag ${versionImage} ${branchImage}"
-    sh "docker push ${branchImage}"
-
-    if (IS_LATEST) {
-        def latestImage = "${image}:latest"
-        sh "docker tag ${versionImage} ${latestImage}"
-        sh "docker push ${latestImage}"
+    withRegistry(env.REGISTRY, 'docker-registry') {
+        image.push()
+        image.push(env.BRANCH_NAME)
+        if (IS_LATEST) image.push('latest')
     }
 }