From 228690b7874449c629fa5e78e0f1faeb80ab4ef9 Mon Sep 17 00:00:00 2001 From: KaySar12 Date: Fri, 28 Mar 2025 16:40:10 +0700 Subject: [PATCH] update --- .gitignore | 1 + docker-compose.yml | 6 ++++-- entrypoint.sh | 6 ++++++ etc/odoo.conf | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8399a74..c6842c0 100644 --- a/.gitignore +++ b/.gitignore @@ -53,6 +53,7 @@ package.json /venv/ /deployment/backup/*.zip /extra-addons/ +/data/filestore/ *.pyc /pragtech_hotel_management_addons/ pragtech_hotel_management_addons diff --git a/docker-compose.yml b/docker-compose.yml index 629b160..2aca3e8 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,8 +6,8 @@ services: ports: - ${ODOO_PORT:-8069}:8069 # - "${ODOO_CHAT_PORT:-8072}:8072" - entrypoint: ./entrypoint.sh tty: true + user: root command: -- environment: - HOST=${HOST:-localhost} @@ -16,6 +16,8 @@ services: volumes: - ${ODOO_ADDONS:-./addons}:/mnt/extra-addons - ${ODOO_CONFIG:-./etc}:/etc/odoo - - ${ODOO_BACKUP:-./backup}:/var/lib/odoo/backup + - ${ODOO_FILESTORE:-./data/filestore}:/var/lib/odoo/filestore + + - ./entrypoint.sh:/entrypoint.sh restart: always diff --git a/entrypoint.sh b/entrypoint.sh index 9395443..0e6074c 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -5,6 +5,12 @@ set -e if [ -v PASSWORD_FILE ]; then PASSWORD="$(< $PASSWORD_FILE)" fi +# if ! command -v soffice --version >/dev/null 2>&1; then +# apt update +# apt install -y libreoffice +# else +# echo 'libreoffice already installed' +# fi # set the postgres database host, port, user and password according to the environment # and pass them as arguments to the odoo process if not present in the config file diff --git a/etc/odoo.conf b/etc/odoo.conf index 702ee0d..78ec870 100644 --- a/etc/odoo.conf +++ b/etc/odoo.conf @@ -6,4 +6,5 @@ db_port = 5433 db_user = odoo18 db_password = smartyourlife proxy_mode = True +admin_passwd = $pbkdf2-sha512$600000$EKK0di5FyLl3jvHee4.xdg$HJczTCneidP9vAwA4BQBtfdPT7ZIYhXE0FPYDY/yvxnHQON/6Ulq0GoHyKSGF6P0ARKO9PXnyKNvKAayMoW6bQ