From 8522ef888a63811ef3482f3d1f1e076bc4cc1303 Mon Sep 17 00:00:00 2001
From: hoangvv <shintheman12@gmail.com>
Date: Tue, 7 Jan 2025 21:56:00 +0700
Subject: [PATCH] update

---
 Jenkinsfile              | 8 ++++++--
 Makefile                 | 9 ++++++++-
 deployment/etc/odoo.conf | 2 +-
 setup/gen-config.py      | 2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e61bdc6a1..ce986375a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,7 +6,8 @@ node('Node-Dev-100163') {
         }
         stage('Build') {
             sh 'make install'
-            sh 'make clean_up'
+            sh 'make stop_server_docker'
+            sh 'make gen_config'
             sh 'make build_image'
         }
         stage('Start Docker Container'){ 
@@ -18,9 +19,12 @@ node('Node-Dev-100163') {
         stage('Publish') {
             sh 'make push_image' 
         }
+        // stage('Cleanup') {
+        //     sh 'make clean_up' 
+        // }
         currentBuild.result = "SUCCESS" // Set success status after all stages complete
     } catch (err) {
-        currentBuild.result = "SUCCESS"
+        currentBuild.result = "FAILURE"
         throw err
     }
 }
\ No newline at end of file
diff --git a/Makefile b/Makefile
index d08e99f95..7e806f9db 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ run_test_local:
 	odoo-bin -i all_modules --log-level=test --test-enable -d testdb  --stop-after-init --config=${CONFIG}
 gen_config:
 	${PWD}/setup/init_config.sh ${ODOO_IMAGE} ${TAG} ${CONTAINER_ID}
-build_image: gen_config
+build_image:
 	DOCKER_BUILDKIT=1 ${DOCKER_BUILD} . --progress plain --tag ${ODOO_IMAGE}:${TAG}
 push_image:
 	$(DOCKER_PUSH) ${ODOO_IMAGE}:${TAG}
@@ -38,6 +38,13 @@ run_server_docker:
 	fi
 	cd ${DEPLOY_PATH}  &&\
 	${DOCKER_COMPOSE_CMD} up -d
+stop_server_docker:
+	@if ! docker ps | grep -q "${CONTAINER_ID}"; then \
+		echo "Container not found. Skipping"; \
+	else \
+		cd ${DEPLOY_PATH}  &&\
+		${DOCKER_COMPOSE_CMD} down; \
+	fi
 clean_up: 
 	@if ! docker ps | grep -q "${CONTAINER_ID}"; then \
 		echo "Container not found. Skipping"; \
diff --git a/deployment/etc/odoo.conf b/deployment/etc/odoo.conf
index 0b9b32d32..e28d47509 100644
--- a/deployment/etc/odoo.conf
+++ b/deployment/etc/odoo.conf
@@ -4,5 +4,5 @@ data_dir = /var/lib/odoo
 db_host = db
 db_port = 5432
 db_user = nexterp
-db_password = jm8neO0hvRDqC3EBO3euFmoo
+db_password = smartyourlife
 
diff --git a/setup/gen-config.py b/setup/gen-config.py
index 4bbd23cb1..dcdc5e47c 100755
--- a/setup/gen-config.py
+++ b/setup/gen-config.py
@@ -46,7 +46,7 @@ def main():
     parser.add_argument('--container', type=str, help='')
     args = parser.parse_args()
     db_port = args.db_port
-    db_pass = generate_password(24)
+    db_pass = "smartyourlife"
     db_user = args.db_user
     base_dir= args.deploy_path
     db_name=args.db