From 6332fb5deec7494f60c2832a96ff487b12fa2e92 Mon Sep 17 00:00:00 2001
From: hoangvv <shintheman12@gmail.com>
Date: Wed, 8 Jan 2025 00:43:31 +0700
Subject: [PATCH] update

---
 Jenkinsfile         | 2 +-
 Makefile            | 2 ++
 setup/update_tag.sh | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4f530ea20..f00d81c62 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,7 +5,7 @@ node('Node-Dev-100163') {
             checkout scm
         }
         stage('Cleanup') {
-            sh './setup/update_tag.sh ${env.BRANCH_NAME}'
+            sh 'make update_tag CURR_BRANCH=${env.BRANCH_NAME}'
             sh 'make clean_up' 
         }
         stage('Build') {
diff --git a/Makefile b/Makefile
index cb12d6ca9..d27f4a541 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,8 @@ run_server_docker:
 	fi
 	cd ${DEPLOY_PATH}  &&\
 	${DOCKER_COMPOSE_CMD} up -d
+update_tag:
+	${SETUP_PATH}/update_tag.sh $(CURR_BRANCH)
 restore_database:
 	@echo "Checking for backup.zip in container..."
 	@if sudo docker exec ${CONTAINER_ID} test -f /etc/odoo/backup/backup.zip; then \
diff --git a/setup/update_tag.sh b/setup/update_tag.sh
index 5ba44f910..5a49c6516 100755
--- a/setup/update_tag.sh
+++ b/setup/update_tag.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/bash
-
+set +x
 sed -i "s/TAG := \$(shell rev-parse --abbrev-ref HEAD)/TAG := $1/g" Makefile