From a1a58214460c866a2ee9f59c03c63a4a05177764 Mon Sep 17 00:00:00 2001
From: hoangvv <shintheman12@gmail.com>
Date: Wed, 15 Jan 2025 16:02:09 +0700
Subject: [PATCH] exec @docker @restore_db @no_cleanup

---
 .gitignore                                        | 1 +
 Makefile                                          | 5 +++--
 deployment/env.template                           | 2 +-
 setup/{restore_database.sh => download_backup.sh} | 2 --
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename setup/{restore_database.sh => download_backup.sh} (94%)

diff --git a/.gitignore b/.gitignore
index 5ca64c950..55a140535 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@ package.json
 /src/
 /deployment/postgresql/*
 /venv/
+/deployment/backup/*.zip
diff --git a/Makefile b/Makefile
index ef9e597f9..ac8446408 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,8 @@ 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-${TAG} --stop-after-init --config=/etc/odoo/${CONFIG} --xmlrpc-port=8071 && \
 	sudo ${DOCKER_EXEC} ${CONTAINER_ID} odoo db --config=/etc/odoo/${CONFIG} drop testdb-${TAG}  
 gen_config_docker:
-	${PWD}/setup/init_config.sh --docker ${ODOO_IMAGE} ${TAG} ${CONTAINER_ID} ${VERSION} 
+	${PWD}/setup/init_config.sh --docker ${ODOO_IMAGE} ${TAG} ${CONTAINER_ID} ${VERSION} && \
+	${SETUP_PATH}/download_backup.sh ${BACKUP}
 build_image:
 	DOCKER_BUILDKIT=1 ${DOCKER_BUILD} . --progress plain --tag ${ODOO_IMAGE}:${TAG}
 push_image:
@@ -56,7 +57,7 @@ run_server_docker:
 update_tag:
 	${SETUP_PATH}/update_tag.sh $(CURR_BRANCH)
 restore_database:
-	${SETUP_PATH}/restore_database.sh ${BACKUP} ${CONTAINER_ID}
+	sudo ${DOCKER_EXEC} ${CONTAINER_ID} odoo db -c /etc/odoo/odoo.conf load backup /etc/odoo/backup/backup.zip
 stop_server_docker:
 	@if ! docker ps | grep -q "${CONTAINER_ID}"; then \
 		echo "Container not found. Skipping"; \
diff --git a/deployment/env.template b/deployment/env.template
index 7020421d3..009edac12 100755
--- a/deployment/env.template
+++ b/deployment/env.template
@@ -7,7 +7,7 @@ ODOO_CONTAINER=
 # ODOO_CHAT_PORT=
 ODOO_ADDONS=./addons
 ODOO_CONFIG=./etc
-ODOO_BACKUP=./backup/ce
+ODOO_BACKUP=./backup
 #Database
 PG_PORT=
 PG_USER=
diff --git a/setup/restore_database.sh b/setup/download_backup.sh
similarity index 94%
rename from setup/restore_database.sh
rename to setup/download_backup.sh
index bb18ac0cb..9da43a9c0 100755
--- a/setup/restore_database.sh
+++ b/setup/download_backup.sh
@@ -52,7 +52,6 @@ main() {
     BACKUP_DIR="$DEPLOYMENT_DIR/backup"
     BACKUP_FILE="$BACKUP_DIR/backup.zip"
     DOWNLOAD_URL="$1"
-    CONTAINER_ID="$2"
 
     # Check if the deployment and backup directories exist, create them if not
     if [[ ! -d "$BACKUP_DIR" ]]; then
@@ -82,7 +81,6 @@ main() {
 
     # Execute the Docker command
     Show 2 "Running Docker command to load the backup..."
-    sudo docker exec "${CONTAINER_ID}" odoo db --config=/etc/odoo/odoo.conf load backup /etc/odoo/backup/backup.zip
 }
 
 main "$@"
\ No newline at end of file