imp: auto config

Tardo · Tardo · commit bdaf56eff3a4 · 2026-01-19T23:05:23.000+01:00
diff --git a/10.0.Dockerfile b/10.0.Dockerfile
@@ -172,7 +172,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             GIT_DEPTH_MERGE=500 \
             EXT_DEPS_OVERRIDES="openid:python-openid,ldap:python-ldap,evdev:evdev==1.5.0,usb.core:pyusb,${EXT_DEPS_OVERRIDES}" \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OCONF_addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
 
 ONBUILD COPY --from=deps --chown=odoo:odoo apt.txt /opt/odoo/apt.txt
 ONBUILD COPY --from=deps --chown=odoo:odoo pip.txt /opt/odoo/pip.txt
diff --git a/11.0.Dockerfile b/11.0.Dockerfile
@@ -171,7 +171,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             GIT_DEPTH_MERGE=500 \
             EXT_DEPS_OVERRIDES="ldap:python-ldap,usb.core:pyusb,${EXT_DEPS_OVERRIDES}" \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OCONF_addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
 
 ONBUILD COPY --from=deps --chown=odoo:odoo apt.txt /opt/odoo/apt.txt
 ONBUILD COPY --from=deps --chown=odoo:odoo pip.txt /opt/odoo/pip.txt
diff --git a/12.0.Dockerfile b/12.0.Dockerfile
@@ -171,7 +171,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             GIT_DEPTH_MERGE=500 \
             EXT_DEPS_OVERRIDES="ldap:python-ldap,${EXT_DEPS_OVERRIDES}" \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OCONF_addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
 
 ONBUILD COPY --from=deps --chown=odoo:odoo apt.txt /opt/odoo/apt.txt
 ONBUILD COPY --from=deps --chown=odoo:odoo pip.txt /opt/odoo/pip.txt
diff --git a/13.0.Dockerfile b/13.0.Dockerfile
@@ -171,7 +171,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             GIT_DEPTH_MERGE=500 \
             EXT_DEPS_OVERRIDES="ldap:python-ldap,${EXT_DEPS_OVERRIDES}" \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OCONF_addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
 
 ONBUILD COPY --from=deps --chown=odoo:odoo apt.txt /opt/odoo/apt.txt
 ONBUILD COPY --from=deps --chown=odoo:odoo pip.txt /opt/odoo/pip.txt
diff --git a/14.0.Dockerfile b/14.0.Dockerfile
@@ -164,7 +164,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             GIT_DEPTH_MERGE=500 \
             EXT_DEPS_OVERRIDES="ldap:python-ldap,${EXT_DEPS_OVERRIDES}" \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OCONF_addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
 
 ONBUILD COPY --from=deps --chown=odoo:odoo apt.txt /opt/odoo/apt.txt
 ONBUILD COPY --from=deps --chown=odoo:odoo pip.txt /opt/odoo/pip.txt
diff --git a/15.0.Dockerfile b/15.0.Dockerfile
@@ -164,7 +164,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             GIT_DEPTH_MERGE=500 \
             EXT_DEPS_OVERRIDES="ldap:python-ldap,${EXT_DEPS_OVERRIDES}" \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OCONF_addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
 
 ONBUILD COPY --from=deps --chown=odoo:odoo apt.txt /opt/odoo/apt.txt
 ONBUILD COPY --from=deps --chown=odoo:odoo pip.txt /opt/odoo/pip.txt
diff --git a/16.0.Dockerfile b/16.0.Dockerfile
@@ -161,7 +161,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             GIT_DEPTH_MERGE=500 \
             EXT_DEPS_OVERRIDES="ldap:python-ldap,${EXT_DEPS_OVERRIDES}" \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OCONF_addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
 
 ONBUILD COPY --from=deps --chown=odoo:odoo apt.txt /opt/odoo/apt.txt
 ONBUILD COPY --from=deps --chown=odoo:odoo pip.txt /opt/odoo/pip.txt
diff --git a/17.0.Dockerfile b/17.0.Dockerfile
@@ -161,7 +161,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             GIT_DEPTH_MERGE=500 \
             EXT_DEPS_OVERRIDES="ldap:python-ldap,${EXT_DEPS_OVERRIDES}" \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OCONF_addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
 
 ONBUILD COPY --from=deps --chown=odoo:odoo apt.txt /opt/odoo/apt.txt
 ONBUILD COPY --from=deps --chown=odoo:odoo pip.txt /opt/odoo/pip.txt
diff --git a/18.0.Dockerfile b/18.0.Dockerfile
@@ -161,7 +161,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             GIT_DEPTH_MERGE=500 \
             EXT_DEPS_OVERRIDES="ldap:python-ldap,${EXT_DEPS_OVERRIDES}" \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OCONF_addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
 
 ONBUILD COPY --from=deps --chown=odoo:odoo apt.txt /opt/odoo/apt.txt
 ONBUILD COPY --from=deps --chown=odoo:odoo pip.txt /opt/odoo/pip.txt
diff --git a/19.0.Dockerfile b/19.0.Dockerfile
@@ -161,7 +161,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             GIT_DEPTH_MERGE=500 \
             EXT_DEPS_OVERRIDES="ldap:python-ldap,${EXT_DEPS_OVERRIDES}" \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OCONF_addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
 
 ONBUILD COPY --from=deps --chown=odoo:odoo apt.txt /opt/odoo/apt.txt
 ONBUILD COPY --from=deps --chown=odoo:odoo pip.txt /opt/odoo/pip.txt
diff --git a/6.0.Dockerfile b/6.0.Dockerfile
@@ -148,7 +148,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             GIT_DEPTH_MERGE=500 \
             EXT_DEPS_OVERRIDES="openid:python-openid,ldap:python-ldap,${EXT_DEPS_OVERRIDES}" \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OCONF_addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
 
 ONBUILD COPY --from=deps --chown=odoo:odoo apt.txt /opt/odoo/apt.txt
 ONBUILD COPY --from=deps --chown=odoo:odoo pip.txt /opt/odoo/pip.txt
diff --git a/6.1.Dockerfile b/6.1.Dockerfile
@@ -159,7 +159,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             GIT_DEPTH_MERGE=500 \
             EXT_DEPS_OVERRIDES="openid:python-openid,ldap:python-ldap,${EXT_DEPS_OVERRIDES}" \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OCONF_addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
 
 ONBUILD COPY --from=deps --chown=odoo:odoo apt.txt /opt/odoo/apt.txt
 ONBUILD COPY --from=deps --chown=odoo:odoo pip.txt /opt/odoo/pip.txt
diff --git a/7.0.Dockerfile b/7.0.Dockerfile
@@ -166,7 +166,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             GIT_DEPTH_MERGE=500 \
             EXT_DEPS_OVERRIDES="openid:python-openid,ldap:python-ldap,${EXT_DEPS_OVERRIDES}" \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OCONF_addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
 
 ONBUILD COPY --from=deps --chown=odoo:odoo apt.txt /opt/odoo/apt.txt
 ONBUILD COPY --from=deps --chown=odoo:odoo pip.txt /opt/odoo/pip.txt
diff --git a/8.0.Dockerfile b/8.0.Dockerfile
@@ -179,7 +179,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             GIT_DEPTH_MERGE=500 \
             EXT_DEPS_OVERRIDES="openid:python-openid,ldap:python-ldap,evdev:evdev==1.5.0,usb.core:pyusb,${EXT_DEPS_OVERRIDES}" \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OCONF_addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
 
 ONBUILD COPY --from=deps --chown=odoo:odoo apt.txt /opt/odoo/apt.txt
 ONBUILD COPY --from=deps --chown=odoo:odoo pip.txt /opt/odoo/pip.txt
diff --git a/9.0.Dockerfile b/9.0.Dockerfile
@@ -172,7 +172,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             GIT_DEPTH_MERGE=500 \
             EXT_DEPS_OVERRIDES="openid:python-openid,ldap:python-ldap,evdev:evdev==1.5.0,usb.core:pyusb,${EXT_DEPS_OVERRIDES}" \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OCONF_addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
 
 ONBUILD COPY --from=deps --chown=odoo:odoo apt.txt /opt/odoo/apt.txt
 ONBUILD COPY --from=deps --chown=odoo:odoo pip.txt /opt/odoo/pip.txt
diff --git a/README.md b/README.md
@@ -17,9 +17,9 @@ A lightweight image for running Odoo from 6.0 to the moon! Strongly inspired by
 
 ## :page_facing_up: Documentation
 
-To configure Odoo, simply use environment variables with the prefix ```OCONF_{Param Name}```. Example for changing workers: ```OCONF_workers=4```.
+To configure Odoo, simply use environment variables with the prefix ```OCONF__{section}__{Param Name}```. Example for changing workers: ```OCONF__options__workers=4```.
 
-** On Odoo 6.x you can use environment variables with the prefix ```OWCONF_{Param Name}``` (taking into account that the underscores will be replaced by dots).
+** On Odoo 6.x you can use environment variables with the prefix ```OWCONF__{section}__{Param Name}``` (taking into account that the underscores will be replaced by dots).
 
 ### Build Arguments
 
@@ -75,7 +75,7 @@ ARG ODOO_VERSION
 FROM isodoo:${ODOO_VERSION} AS isodoo-runtime
 FROM isodoo-runtime AS isodoo-runtime-private
 COPY --from=private --chown=odoo:odoo / /var/lib/odoo/private
-ENV OCONF_addons_path="${OCONF_addons_path},/var/lib/odoo/private"
+ENV OCONF__options__addons_path="${OCONF__options__addons_path},/var/lib/odoo/private"
 ```
 
 ### Docker Compose
@@ -99,13 +99,13 @@ services:
       - frontend
       - dbnet
     environment:
-      OCONF_log_level: debug
-      OCONF_db_filter: odoodb$
-      OCONF_db_user: odoo
-      OCONF_db_password: odoo
-      OCONF_db_host: odoo-db
-      OCONF_db_name: odoodb
-      OCONF_proxy_mode: false
+      OCONF__options__log_level: debug
+      OCONF__options__db_filter: odoodb$
+      OCONF__options__db_user: odoo
+      OCONF__options__db_password: odoo
+      OCONF__options__db_host: odoo-db
+      OCONF__options__db_name: odoodb
+      OCONF__options__proxy_mode: false
     hostname: odoo
 
   db:
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -32,7 +32,7 @@ fi
 echo "[entrypoint] Generating Odoo configuration..."
 generate_config /etc/odoo/odoo.conf
 echo "[entrypoint] Waiting for postgres database..."
-wait_for_psql --db_host="$OCONF_db_host" --db_port="${OCONF_db_port:-5432}" --db_user="${OCONF_db_user}" --db_password="${OCONF_db_password}" --timeout=30
+wait_for_psql --db_host="$OCONF__options__db_host" --db_port="${OCONF__options__db_port:-5432}" --db_user="${OCONF__options__db_user}" --db_password="${OCONF__options__db_password}" --timeout=30
 deactivate
 
 # Use odoo python environment
diff --git a/tests/data/project_demo/Dockerfile b/tests/data/project_demo/Dockerfile
@@ -3,4 +3,4 @@ FROM test:docker-isodoo-${ODOO_VERSION} AS isodoo-runtime
 FROM isodoo-runtime AS isodoo-runtime-private
 # hadolint ignore=DL3022
 COPY --from=private --chown=odoo:odoo / /var/lib/odoo/private
-ENV OCONF_addons_path="${OCONF_addons_path},/var/lib/odoo/private"
+ENV OCONF__options__addons_path="${OCONF__options__addons_path},/var/lib/odoo/private"
diff --git a/tests/data/project_demo/docker-compose.yaml b/tests/data/project_demo/docker-compose.yaml
@@ -34,14 +34,14 @@ services:
         ipv4_address: 10.99.2.38
       dbnet:
     environment:
-      OCONF_log_level: debug
-      OCONF_db_filter: odoodb$
-      OCONF_db_user: odoo
-      OCONF_db_password: odoo
-      OCONF_db_host: odoo-db
-      OCONF_db_name: odoodb
-      OCONF_proxy_mode: false
-      OCONF_workers: 0
+      OCONF__options__log_level: debug
+      OCONF__options__db_filter: odoodb$
+      OCONF__options__db_user: odoo
+      OCONF__options__db_password: odoo
+      OCONF__options__db_host: odoo-db
+      OCONF__options__db_name: odoodb
+      OCONF__options__proxy_mode: false
+      OCONF__options__workers: 0
     hostname: odoo
 
 
diff --git a/tools/generate_config.py b/tools/generate_config.py
@@ -3,6 +3,7 @@
 import os
 import configparser
 import argparse
+from collections import defaultdict
 
 parser = argparse.ArgumentParser(
     description="Collects OCONF_ environment variables and saves them to an .conf file"
@@ -19,10 +20,17 @@
 else:
     config.add_section("options")
 
+to_write = defaultdict(dict)
 for key, value in os.environ.items():
-    if key.startswith("OCONF_"):
-        config_key = key[6:].lower()
-        config.set("options", config_key, value)
+    if key.startswith("OCONF__"):
+        _, config_section, config_key = key.split("__", 2)
+        to_write[config_section][config_key] = value
+
+for config_section, config_values in to_write.items():
+    if not config.has_section(config_section):
+        config.add_section(config_section)
+    for config_key, value in config_values.items():
+        config.set(config_section, config_key, value)
 
 with open(args.output, "w") as configfile:
     config.write(configfile)
