Compare commits

..

No commits in common. "195110a6658e80683c99f256d99ffb8bceac3897" and "98bc91076de8a6571037d0b7101b18b150dfcd51" have entirely different histories.

4 changed files with 15 additions and 27 deletions

View file

@ -1,4 +1,4 @@
COMMAND= ODOO_VERSION=17.0
COMMAND=-d odoo
PG_VERSION=14.12 #Moved to 14.15 in Odoo 18 PG_VERSION=14.12 #Moved to 14.15 in Odoo 18
ENTERPRISE_PATH=/local/path/to/enterprise/modules ENTERPRISE_PATH=/local/path/to/enterprise/modules
OPENUPGRADE_PATH=/home/user/openupgrade/15

View file

@ -1,10 +0,0 @@
FROM odoo:15.0
USER root
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
# Uncomment if target version is higher than 15
# RUN export OPENUPGRADE_TARGET_VERSION=17.0
USER odoo

View file

@ -1,24 +1,22 @@
[options] [options]
addons_path = /mnt/extra-addons,/mnt/openupgrade addons_path = /mnt/extra-addons,/mnt/enterprise
upgrade_path = /mnt/openupgrade/openupgrade_scripts/scripts
server_wide_modules = base,web,openupgrade_framework
; data_dir = /var/lib/odoo ; data_dir = /var/lib/odoo
admin_passwd = odoo admin_passwd = odoo
; csv_internal_sep = , ; csv_internal_sep = ,
; db_maxconn = 64 ; db_maxconn = 64
; db_name = odoo db_name = odoo
db_user = odoo db_user = odoo
db_password = odoo db_password = odoo
; db_template = template1 ; db_template = template1
dbfilter = .* dbfilter = .*
debug_mode = True debug_mode = True
without_demo = all ; without_demo = all
; email_from = False ; email_from = False
; limit_memory_hard = 26843545600 ; limit_memory_hard = 2684354560
; limit_memory_soft = 21474836480 ; limit_memory_soft = 2147483648
; limit_request = 81920 ; limit_request = 8192
; limit_time_cpu = 600 ; limit_time_cpu = 60
; limit_time_real = 1200 ; limit_time_real = 120
; list_db = True ; list_db = True
; log_db = False ; log_db = False
; log_handler = [':INFO'] ; log_handler = [':INFO']
@ -33,7 +31,7 @@ smtp_port = 1025
smtp_server = mailcatcher smtp_server = mailcatcher
; smtp_ssl = False ; smtp_ssl = False
; smtp_user = False ; smtp_user = False
; workers = 7 ; workers = 0
; xmlrpc = True ; xmlrpc = True
; xmlrpc_interface = ; xmlrpc_interface =
; xmlrpc_port = 8069 ; xmlrpc_port = 8069

View file

@ -1,6 +1,6 @@
services: services:
web: web:
build: . image: "odoo:${ODOO_VERSION}"
depends_on: depends_on:
- db - db
ports: ports:
@ -9,10 +9,10 @@ services:
- odoo-web:/var/lib/odoo - odoo-web:/var/lib/odoo
- ./config:/etc/odoo - ./config:/etc/odoo
- ./modules:/mnt/extra-addons - ./modules:/mnt/extra-addons
- ${OPENUPGRADE_PATH}:/mnt/openupgrade - ${ENTERPRISE_PATH}:/mnt/enterprise
command: "odoo ${COMMAND}" command: "odoo ${COMMAND}"
db: db:
image: postgres:12.20 image: "postgres:${PG_VERSION}"
environment: environment:
- POSTGRES_DB=postgres - POSTGRES_DB=postgres
- POSTGRES_PASSWORD=odoo - POSTGRES_PASSWORD=odoo