NextERP/Odoo18-Base
5
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

exec @docker @restore_db @no_cleanup
Some checks failed
Setup Native Action / native (3.12.7) (push) Has been skipped
Details
Setup Native Action / docker (3.12.7) (push) Failing after 1m52s
Details

Browse Source
This commit is contained in:
hoangvv 2025-01-15 16:02:09 +07:00
parent c8b202fbca
commit a1a5821446
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -51,3 +51,4 @@ package.json
/src/ /src/
/deployment/postgresql/* /deployment/postgresql/*
/venv/ /venv/
/deployment/backup/*.zip

5
Makefile
View File

@ -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 --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} sudo ${DOCKER_EXEC} ${CONTAINER_ID} odoo db --config=/etc/odoo/${CONFIG} drop testdb-${TAG}
gen_config_docker: 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: build_image:
DOCKER_BUILDKIT=1 ${DOCKER_BUILD} . --progress plain --tag ${ODOO_IMAGE}:${TAG} DOCKER_BUILDKIT=1 ${DOCKER_BUILD} . --progress plain --tag ${ODOO_IMAGE}:${TAG}
push_image: push_image:
@ -56,7 +57,7 @@ run_server_docker:
update_tag: update_tag:
${SETUP_PATH}/update_tag.sh $(CURR_BRANCH) ${SETUP_PATH}/update_tag.sh $(CURR_BRANCH)
restore_database: 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: stop_server_docker:
@if ! docker ps | grep -q "${CONTAINER_ID}"; then \ @if ! docker ps | grep -q "${CONTAINER_ID}"; then \
echo "Container not found. Skipping"; \ echo "Container not found. Skipping"; \

2
deployment/env.template
View File

@ -7,7 +7,7 @@ ODOO_CONTAINER=
# ODOO_CHAT_PORT= # ODOO_CHAT_PORT=
ODOO_ADDONS=./addons ODOO_ADDONS=./addons
ODOO_CONFIG=./etc ODOO_CONFIG=./etc
ODOO_BACKUP=./backup/ce ODOO_BACKUP=./backup
#Database #Database
PG_PORT= PG_PORT=
PG_USER= PG_USER=

2
setup/restore_database.sh → setup/download_backup.sh
View File

@ -52,7 +52,6 @@ main() {
BACKUP_DIR="$DEPLOYMENT_DIR/backup" BACKUP_DIR="$DEPLOYMENT_DIR/backup"
BACKUP_FILE="$BACKUP_DIR/backup.zip" BACKUP_FILE="$BACKUP_DIR/backup.zip"
DOWNLOAD_URL="$1" DOWNLOAD_URL="$1"
CONTAINER_ID="$2"
# Check if the deployment and backup directories exist, create them if not # Check if the deployment and backup directories exist, create them if not
if [[ ! -d "$BACKUP_DIR" ]]; then if [[ ! -d "$BACKUP_DIR" ]]; then
@ -82,7 +81,6 @@ main() {
# Execute the Docker command # Execute the Docker command
Show 2 "Running Docker command to load the backup..." 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 "$@" main "$@"