diff --git a/Jenkinsfile b/Jenkinsfile index d6a5f76df..d7bd6224a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,6 +8,7 @@ node('Node-Dev-100163') { sh 'make clean_up' } stage('Build') { + sh "sed -i 's/TAG := \\$\\(shell rev-parse --abbrev-ref HEAD\\)/TAG := ${env.BRANCH_NAME}/g' Makefile" sh 'make install' sh 'make stop_server_docker' sh 'make gen_config' diff --git a/Makefile b/Makefile index 2f640b358..cb12d6ca9 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ SETUP_PATH=${PWD}/setup HASH := $(shell git rev-parse HEAD) CONFIG=odoo.conf ODOO_IMAGE=hub.nextzenos.com/nexterp/odoo -TAG := main +TAG := $(shell rev-parse --abbrev-ref HEAD) CONTAINER_ID=odoo-${TAG} install: sudo apt -y update && \