diff --git a/Makefile b/Makefile index 8162786cb..e9a1ce718 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ 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} && \ ${SETUP_PATH}/download_backup.sh ${BACKUP} build_image: DOCKER_BUILDKIT=1 ${DOCKER_BUILD} . --progress plain --tag ${ODOO_IMAGE}:${TAG} diff --git a/setup/gen_config_docker.py b/setup/gen_config_docker.py index 7e1249f55..ce15bc55f 100755 --- a/setup/gen_config_docker.py +++ b/setup/gen_config_docker.py @@ -87,7 +87,7 @@ def main(): set_key(dotenv_path=env_file_path, key_to_set="ODOO_IMAGE", value_to_set=image,quote_mode="never") set_key(dotenv_path=env_file_path, key_to_set="ODOO_TAG", value_to_set=tag,quote_mode="never") set_key(dotenv_path=env_file_path, key_to_set="ODOO_CONTAINER", value_to_set=container,quote_mode="never") - set_key(dotenv_path=env_file_path, key_to_set="ODOO_BACKUP", value_to_set=f'{base_dir}/backup',quote_mode="never") + set_key(dotenv_path=env_file_path, key_to_set="ODOO_BACKUP", value_to_set=backup,quote_mode="never") if __name__ == "__main__": main() diff --git a/setup/init_config.sh b/setup/init_config.sh index a82c18c2a..6f3d6745e 100755 --- a/setup/init_config.sh +++ b/setup/init_config.sh @@ -10,6 +10,7 @@ PIP=$(pwd)/venv/bin/pip PYTHON=$(pwd)/venv/bin/python ODOO_ADDONS=./addons ODOO_CONFIG=./etc +ODOO_BACKUP=./backup # System DEPENDS_PACKAGE=('wget' 'curl' 'git' 'unzip' 'make' 'wkhtmltopdf' 'postgresql-client') DEPENDS_COMMAND=('wget' 'curl' 'git' 'unzip' 'make' 'wkhtmltopdf' 'psql') @@ -181,7 +182,6 @@ Generate_Config_Docker(){ ODOO_IMAGE=${1:-} ODOO_TAG=${2:-} ODOO_CONTAINER=${3:-} - VERSION=${4:-} if [[ ! -f "${DEPLOY_PATH}/.env" ]]; then cp "${DEPLOY_PATH}/env.template" "${DEPLOY_PATH}/.env" fi @@ -190,7 +190,7 @@ Generate_Config_Docker(){ USER="${USER,,}" ${PYTHON} "$SETUP_PATH/gen_config_docker.py" --db_port 5432 --db_user $USER --deploy_path "$DEPLOY_PATH" \ --image "${ODOO_IMAGE}" --container "${ODOO_CONTAINER}" --tag "${ODOO_TAG:=latest}" \ - --addons "${ODOO_ADDONS}" --config "${ODOO_CONFIG}" --backup "${VERSION}" + --addons "${ODOO_ADDONS}" --config "${ODOO_CONFIG}" --backup "${ODOO_BACKUP}" Show 0 " Generate Config Complete" } Generate_Config_Native(){ @@ -233,7 +233,7 @@ main(){ Generate_Config_Native $2 ;; --docker) - Generate_Config_Docker $2 $3 $4 $5 + Generate_Config_Docker $2 $3 $4 ;; *) # else @@ -242,4 +242,4 @@ main(){ esac } -main ${1:-} ${2:-} ${3:-} ${4:-} ${5:-} +main ${1:-} ${2:-} ${3:-} ${4:-}