From 0751c7ba4cee985b02bb0704d2301d306a3c6929 Mon Sep 17 00:00:00 2001
From: Dominik Chilla <dominik@zwackl.de>
Date: Fri, 14 Jun 2019 18:28:45 +0200
Subject: [PATCH] Jenkins Multi-Branch build

---
 Jenkinsfile.declarative | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile.declarative b/Jenkinsfile.declarative
index 366fb3f..9d859d2 100644
--- a/Jenkinsfile.declarative
+++ b/Jenkinsfile.declarative
@@ -3,6 +3,11 @@ pipeline {
     dockerImage = ''
   }
 
+  parameters {
+    string name: 'imageName', trim: false
+    string name: 'dockerRegistry', trim: false
+  }
+
   agent any
 
   stages {
@@ -10,7 +15,8 @@ pipeline {
       steps {
         sh '/usr/bin/env'
         script {
-          dockerImage = docker.build("${env.imageName}:${env.GIT_LOCAL_BRANCH}","--pull --label \\\"GIT_COMMIT=${env.GIT_COMMIT}\\\" --label \\\"BUILD_URL=${env.BUILD_URL}\\\" .")
+          /* Multi-Branch Pipeline works with env.BRANCH_NAME*/
+          dockerImage = docker.build("${env.imageName}:${env.BRANCH_NAME}","--pull --label BUILD_URL=${env.BUILD_URL} .")
         }
       }
     }
@@ -18,7 +24,7 @@ pipeline {
     stage('Test image') {
       steps {
         script {
-          dockerImage.inside { c ->
+          dockerImage.inside {
             sh '/usr/bin/env'
             sh '/bin/ps auxwwf'
           }