From 917a3ef73a187c353ff9770d7b6032912a4ea6b0 Mon Sep 17 00:00:00 2001 From: hoangvv Date: Tue, 7 Jan 2025 22:51:33 +0700 Subject: [PATCH] update makefile: add restore database --- Jenkinsfile | 1 + Makefile | 11 ++++++++++- deployment/etc/odoo.conf | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index fc5134ca2..44f4c3366 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,6 +9,7 @@ node('Node-Dev-100163') { sh 'make stop_server_docker' sh 'make gen_config' sh 'make build_image' + sh 'make restore_database' } stage('Start'){ sh 'make run_server_docker' diff --git a/Makefile b/Makefile index c9c0817fb..ccc0a056c 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,8 @@ install: sudo apt -y update && \ sudo apt install -y python3-full python3-pip libldap2-dev libpq-dev libsasl2-dev run_test_docker: - sudo docker exec ${CONTAINER_ID} odoo --test-tags :TestAccountMove.test_out_invoice_auto_post_monthly,TestAccountMove.test_included_tax --log-level=test --test-enable -d testdb --stop-after-init --config=/etc/odoo/${CONFIG} --xmlrpc-port=8071 + sudo docker exec ${CONTAINER_ID} odoo --test-tags :TestAccountMove.test_out_invoice_auto_post_monthly,TestAccountMove.test_included_tax --log-level=test --test-enable -d testdb --stop-after-init --config=/etc/odoo/${CONFIG} --xmlrpc-port=8071 && \ + sudo docker exec ${CONTAINER_ID} odoo db --config=/etc/odoo/${CONFIG} drop testdb run_test_local: odoo-bin -i all_modules --log-level=test --test-enable -d testdb --stop-after-init --config=${CONFIG} gen_config: @@ -38,6 +39,13 @@ run_server_docker: fi cd ${DEPLOY_PATH} &&\ ${DOCKER_COMPOSE_CMD} up -d +restore_database: + @if [ ! -f ${DEPLOY_PATH}/backup/backup.zip ]; then \ + echo "Backup file does not exist. Skipping restoration."; \ + else \ + echo "Restoring database from backup..."; \ + sudo docker exec ${CONTAINER_ID} odoo db --config=/etc/odoo/${CONFIG} load new_db ${DEPLOY_PATH}/backup/backup.zip; \ + fi stop_server_docker: @if ! docker ps | grep -q "${CONTAINER_ID}"; then \ echo "Container not found. Skipping"; \ @@ -55,6 +63,7 @@ clean_up: find "${DEPLOY_PATH}" -mindepth 1 -maxdepth 1 \ ! -name "etc" \ ! -name "addons" \ + ! -name "backup" \ ! -name "*.sh" \ ! -name "*.template" \ ! -name "*.py" \ diff --git a/deployment/etc/odoo.conf b/deployment/etc/odoo.conf index e28d47509..a04529ae2 100644 --- a/deployment/etc/odoo.conf +++ b/deployment/etc/odoo.conf @@ -5,4 +5,5 @@ db_host = db db_port = 5432 db_user = nexterp db_password = smartyourlife +proxy_mode = True