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)