From e1353419e8400a556b0a8126ef68fb0059241835 Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Mon, 19 Jun 2023 16:34:52 +0200
Subject: [PATCH] fup-try-013

---
 Jenkinsfile | 7 -------
 Makefile    | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b84234c..727f9c0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,13 +20,6 @@ symfonyAppPipeline('ubuntu:22.04', [
                     'dockerfile': './misc/images/myapplication-standalone/Dockerfile',
                     'dryRun': false
                 ])
-                kubecontainer.buildAndPublishImage([
-                    'imageName': 'reg.cadoles.com/pcaseiro/myapplication-kube',
-                    // Use current tag or default tag if not defined
-                    'imageTag': defaultTag,
-                    'dockerfile': './misc/images/myapplication-kube/Dockerfile',
-                    'dryRun': false
-                ])
             }
         }
     ]
diff --git a/Makefile b/Makefile
index d22673f..0aace3a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 ################################
 
 COMMIT_ID ?= $(shell git rev-parse --short --verify HEAD)
-CURRENT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD | tr -c '[:alnum:]\n\r' '_'| tr '[:upper:]' '[:lower:]')
+CURRENT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD | tr -c '[:alnum:]\n\r' '_'| tr '[:upper:]' '[:lower:]')
 
 IMAGE_REPO ?= reg.cadoles.com/cadoles
 IMAGE_VERSION ?= 0.0.1-$(CURRENT_BRANCH)