From 2876c35ffa331e1327616990316ae1366ff4cb3b Mon Sep 17 00:00:00 2001
From: Dominik Chilla <dominik@zwackl.de>
Date: Fri, 14 Jun 2019 21:19:44 +0200
Subject: [PATCH] Jenkins multibranch pipeline

---
 Jenkinsfile.declarative | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile.declarative b/Jenkinsfile.declarative
index 3ff7479..483e612 100644
--- a/Jenkinsfile.declarative
+++ b/Jenkinsfile.declarative
@@ -1,18 +1,15 @@
+def dockerImage = ''
+
 pipeline {
   agent any
 
-  environment {
-    dockerImage = ''
-    imageName = 'sos-milter'
-  }
-
   stages {
     stage('Build image') {
       steps {
         sh '/usr/bin/env'
         script {
           /* Multi-Branch Pipeline works with env.BRANCH_NAME*/
-          dockerImage = docker.build("${env.imageName}:${env.BRANCH_NAME}","--pull --label BUILD_URL=${env.BUILD_URL} .")
+          dockerImage = docker.build("sos-milter:${env.BRANCH_NAME}","--pull --label BUILD_URL=${env.BUILD_URL} .")
         }
       }
     }
@@ -29,9 +26,7 @@ pipeline {
     stage('Push image') {
       steps {
         script {
-          docker.withRegistry('https://dockreg-fra.zwackl.de') {
-            dockerImage.push()
-          }
+          dockerImage.push()
         }
       }
     }
@@ -42,3 +37,4 @@ pipeline {
     }
   }
 }
+