diff --git a/.env.dist b/.env.dist index cc46ba7..7e315da 100644 --- a/.env.dist +++ b/.env.dist @@ -1,4 +1,4 @@ -ODOO_VERSION=17.0 -COMMAND=-d odoo +COMMAND= PG_VERSION=14.12 #Moved to 14.15 in Odoo 18 -ENTERPRISE_PATH=/local/path/to/enterprise/modules \ No newline at end of file +ENTERPRISE_PATH=/local/path/to/enterprise/modules +OPENUPGRADE_PATH=/home/user/openupgrade/15 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 69e6c18..af048ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,5 +5,6 @@ RUN apt update RUN apt install -y git RUN pip3 install --ignore-installed git+https://github.com/OCA/openupgradelib.git@master RUN pip3 install lxml_html_clean -RUN export OPENUPGRADE_TARGET_VERSION=16.0 +# Uncomment if target version is higher than 15 +# RUN export OPENUPGRADE_TARGET_VERSION=17.0 USER odoo \ No newline at end of file diff --git a/config/odoo.conf b/config/odoo.conf index f1d69f5..dc1be9d 100644 --- a/config/odoo.conf +++ b/config/odoo.conf @@ -6,7 +6,7 @@ server_wide_modules = base,web,openupgrade_framework admin_passwd = odoo ; csv_internal_sep = , ; db_maxconn = 64 -db_name = fenua15 +; db_name = odoo db_user = odoo db_password = odoo ; db_template = template1 diff --git a/docker-compose.yml b/docker-compose.yml index 941334a..0b08352 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: - odoo-web:/var/lib/odoo - ./config:/etc/odoo - ./modules:/mnt/extra-addons - - /home/matt/Dev/src/openupgrade/15:/mnt/openupgrade + - ${OPENUPGRADE_PATH}:/mnt/openupgrade command: "odoo ${COMMAND}" db: image: postgres:12.20