imp: support custom configurations

Tardo · Tardo · commit a56beef79152 · 2026-04-18T17:58:28.000+02:00
diff --git a/10.0.Dockerfile b/10.0.Dockerfile
@@ -197,7 +197,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             VERIFY_MISSING_MODULES=true \
             AUTO_FILL_REPOS=true \
             ODOO_VERSION="${ODOO_VERSION}" \
-            ODOO_RC="/etc/odoo/odoo.conf" \
+            ODOO_RC="/etc/odoo/odoo.auto.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
             OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
diff --git a/11.0.Dockerfile b/11.0.Dockerfile
@@ -205,7 +205,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             VERIFY_MISSING_MODULES=true \
             AUTO_FILL_REPOS=true \
             ODOO_VERSION="${ODOO_VERSION}" \
-            ODOO_RC="/etc/odoo/odoo.conf" \
+            ODOO_RC="/etc/odoo/odoo.auto.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
             OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
diff --git a/12.0.Dockerfile b/12.0.Dockerfile
@@ -203,7 +203,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             VERIFY_MISSING_MODULES=true \
             AUTO_FILL_REPOS=true \
             ODOO_VERSION="${ODOO_VERSION}" \
-            ODOO_RC="/etc/odoo/odoo.conf" \
+            ODOO_RC="/etc/odoo/odoo.auto.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
             OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
diff --git a/13.0.Dockerfile b/13.0.Dockerfile
@@ -202,7 +202,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             VERIFY_MISSING_MODULES=true \
             AUTO_FILL_REPOS=true \
             ODOO_VERSION="${ODOO_VERSION}" \
-            ODOO_RC="/etc/odoo/odoo.conf" \
+            ODOO_RC="/etc/odoo/odoo.auto.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
             OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
diff --git a/14.0.Dockerfile b/14.0.Dockerfile
@@ -190,7 +190,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             VERIFY_MISSING_MODULES=true \
             AUTO_FILL_REPOS=true \
             ODOO_VERSION="${ODOO_VERSION}" \
-            ODOO_RC="/etc/odoo/odoo.conf" \
+            ODOO_RC="/etc/odoo/odoo.auto.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
             OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
diff --git a/15.0.Dockerfile b/15.0.Dockerfile
@@ -191,7 +191,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             VERIFY_MISSING_MODULES=true \
             AUTO_FILL_REPOS=true \
             ODOO_VERSION="${ODOO_VERSION}" \
-            ODOO_RC="/etc/odoo/odoo.conf" \
+            ODOO_RC="/etc/odoo/odoo.auto.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
             OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
diff --git a/16.0.Dockerfile b/16.0.Dockerfile
@@ -191,7 +191,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             VERIFY_MISSING_MODULES=true \
             AUTO_FILL_REPOS=true \
             ODOO_VERSION="${ODOO_VERSION}" \
-            ODOO_RC="/etc/odoo/odoo.conf" \
+            ODOO_RC="/etc/odoo/odoo.auto.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
             OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
diff --git a/17.0.Dockerfile b/17.0.Dockerfile
@@ -191,7 +191,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             VERIFY_MISSING_MODULES=true \
             AUTO_FILL_REPOS=true \
             ODOO_VERSION="${ODOO_VERSION}" \
-            ODOO_RC="/etc/odoo/odoo.conf" \
+            ODOO_RC="/etc/odoo/odoo.auto.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
             OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
diff --git a/18.0.Dockerfile b/18.0.Dockerfile
@@ -191,7 +191,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             VERIFY_MISSING_MODULES=true \
             AUTO_FILL_REPOS=true \
             ODOO_VERSION="${ODOO_VERSION}" \
-            ODOO_RC="/etc/odoo/odoo.conf" \
+            ODOO_RC="/etc/odoo/odoo.auto.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
             OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
diff --git a/19.0.Dockerfile b/19.0.Dockerfile
@@ -190,7 +190,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             VERIFY_MISSING_MODULES=true \
             AUTO_FILL_REPOS=true \
             ODOO_VERSION="${ODOO_VERSION}" \
-            ODOO_RC="/etc/odoo/odoo.conf" \
+            ODOO_RC="/etc/odoo/odoo.auto.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
             OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
diff --git a/6.0.Dockerfile b/6.0.Dockerfile
@@ -155,7 +155,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             VERIFY_MISSING_MODULES=true \
             AUTO_FILL_REPOS=true \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OPENERP_SERVER="/etc/odoo/odoo.conf" \
+            OPENERP_SERVER="/etc/odoo/odoo.auto.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
             OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
diff --git a/6.1.Dockerfile b/6.1.Dockerfile
@@ -168,7 +168,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             VERIFY_MISSING_MODULES=true \
             AUTO_FILL_REPOS=true \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OPENERP_SERVER="/etc/odoo/odoo.conf" \
+            OPENERP_SERVER="/etc/odoo/odoo.auto.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
             OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
diff --git a/7.0.Dockerfile b/7.0.Dockerfile
@@ -185,7 +185,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             VERIFY_MISSING_MODULES=true \
             AUTO_FILL_REPOS=true \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OPENERP_SERVER="/etc/odoo/odoo.conf" \
+            OPENERP_SERVER="/etc/odoo/odoo.auto.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
             OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
diff --git a/8.0.Dockerfile b/8.0.Dockerfile
@@ -203,7 +203,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             VERIFY_MISSING_MODULES=true \
             AUTO_FILL_REPOS=true \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OPENERP_SERVER="/etc/odoo/odoo.conf" \
+            OPENERP_SERVER="/etc/odoo/odoo.auto.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
             OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
diff --git a/9.0.Dockerfile b/9.0.Dockerfile
@@ -197,7 +197,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             VERIFY_MISSING_MODULES=true \
             AUTO_FILL_REPOS=true \
             ODOO_VERSION="${ODOO_VERSION}" \
-            OPENERP_SERVER="/etc/odoo/odoo.conf" \
+            OPENERP_SERVER="/etc/odoo/odoo.auto.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
             OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
diff --git a/README.md b/README.md
@@ -33,9 +33,10 @@ To configure Odoo, simply use environment variables with the prefix ```OCONF__{s
 
 You can also use ```FOCONF__{section}__{Param Name}``` to read the value from a file! Example for db_password: ```FOCONF__options__db_password: /run/secrets/odoo_db_password```
 
-
 ** 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).
 
+** If you set up your own configuration file and change the path in ```$ODOO_RC``` or ```$OPENERP_SERVER```, configuration via environment variables will be disabled.
+
 ### Build Arguments
 
 | Name | Description |
@@ -71,8 +72,8 @@ You can also use ```FOCONF__{section}__{Param Name}``` to read the value from a
 | VERIFY_MISSING_MODULES | Indicates whether all modules (and other modules on which it depends) are available | No | True |
 | AUTO_FILL_REPOS | Indicates whether repos.yaml should be adjusted to match what is used in addons.yaml (OCA repositories only) | No | True |
 | PSQL_WAIT_TIMEOUT | Timeout to wait for the database | No | 30 |
-| OPENERP_SERVER | Indicates the location of the Odoo configuration file (version 9.0 and older) | Yes | /etc/odoo/odoo.conf |
-| ODOO_RC | Indicates the location of the Odoo configuration file (10.0+) | Yes | /etc/odoo/odoo.conf |
+| OPENERP_SERVER | Indicates the location of the Odoo configuration file (version 9.0 and older) | No | /etc/odoo/odoo.auto.conf |
+| ODOO_RC | Indicates the location of the Odoo configuration file (10.0+) | No | /etc/odoo/odoo.auto.conf |
 
 ** Check the Dockerfile for more configuration variables/args.
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -26,17 +26,42 @@ if command -v wkhtmltopdf >/dev/null 2>&1; then
 fi
 echo "[entrypoint] ==== END SYSTEM INFO ===="
 echo "[entrypoint] Generating Odoo configuration..."
-isodoo_generate_config /etc/odoo/odoo.conf
-db_pass=$(python -c "import configparser; c = configparser.ConfigParser(); c.read('/etc/odoo/odoo.conf'); print(c['options']['db_password'])")
-echo "[entrypoint] Waiting for postgres database..."
-wait_for_psql --db_host="$OCONF__options__db_host" --db_port="${OCONF__options__db_port:-5432}" --db_user="${OCONF__options__db_user}" --db_password="${db_pass}" --timeout="${PSQL_WAIT_TIMEOUT:-30}"
+if [[ -n "${ODOO_RC:-}" ]]; then
+    CONFIG="$ODOO_RC"
+elif [[ -n "${OPENERP_SERVER:-}" ]]; then
+    CONFIG="$OPENERP_SERVER"
+else
+    echo "[entrypoint] No configuration defined! Fallback to 'auto' mode..."
+    CONFIG="/etc/odoo/odoo.auto.conf"
+    export ODOO_RC="$CONFIG"
+    export OPENERP_SERVER="$CONFIG"
+fi
+if [[ $CONFIG == "/etc/odoo/odoo.auto.conf" ]]; then
+    isodoo_generate_config "$CONFIG"
+fi
+RAW_ODOO_INFO=$(python3 -c "
+import configparser
+c = configparser.ConfigParser()
+if not c.read('${CONFIG}'):
+    exit(1)
+opts = c['options']
+print(f\"{opts.get('db_host', 'localhost')}|{opts.get('db_port', '5432')}|{opts.get('db_user', 'odoo')}|{opts['db_password']}\")
+" 2>/dev/null)
+if [[ -z "$RAW_ODOO_INFO" ]]; then
+    echo "[ERROR] Could not read configuration or missing db_password in $CONFIG"
+    exit 1
+fi
+IFS='|' read -ra odoo_db_info <<< "$RAW_ODOO_INFO"
+echo "[entrypoint] Waiting for postgres database at ${odoo_db_info[0]}..."
+wait_for_psql --db_host="${odoo_db_info[0]}" --db_port="${odoo_db_info[1]}" --db_user="${odoo_db_info[2]}" --db_password="${odoo_db_info[3]}" --timeout="${PSQL_WAIT_TIMEOUT:-30}"
 deactivate
 
 # Use odoo python environment
 . /opt/odoo/.venv/bin/activate
 echo "[entrypoint] ==== ODOO ENV. INFO ===="
+echo "[entrypoint] - Odoo config: $CONFIG"
 if [ -d /opt/odoo/git/odoo ]; then
-    INFO_ODOO_SRC_HASH=$(git -C /opt/odoo/git/odoo rev-parse HEAD 2>&1)
+    INFO_ODOO_SRC_HASH=$(git -C /opt/odoo/git/odoo rev-parse HEAD 2>/dev/null || echo "UNKNOWN")
     echo "[entrypoint] - Odoo source hash: $INFO_ODOO_SRC_HASH"
 else
     echo "[entrypoint] - Odoo source hash: NO SOURCE DETECTED!"
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -233,8 +233,6 @@ def docker_env(env_info):
 
     init_params = [
         "odoo",
-        "-c",
-        "/etc/odoo/odoo.conf",
         "-i",
         "base",
         "--stop-after-init",
@@ -319,8 +317,6 @@ def _run(modname):
             "odoo",
             [
                 "odoo",
-                "-c",
-                "/etc/odoo/odoo.conf",
                 "-i",
                 modname,
                 "--stop-after-init",
diff --git a/tests/test_isodoo.py b/tests/test_isodoo.py
@@ -118,7 +118,7 @@ def test_odoo_private_addons(self, exec_docker, install_module, env_info):
         assert check_msg in addons_info
 
     def test_odoo_config(self, exec_docker):
-        config_info = exec_docker("odoo", ["cat", "/etc/odoo/odoo.conf"])
+        config_info = exec_docker("odoo", ["cat", "/etc/odoo/odoo.auto.conf"])
         assert "db_name = odoodb" in config_info
 
     def test_auto_download(self, exec_docker, env_info):
diff --git a/tools/isodoo_generate_config.py b/tools/isodoo_generate_config.py
@@ -7,7 +7,7 @@
 from collections import defaultdict
 
 parser = argparse.ArgumentParser(
-    description="Collects OCONF_ environment variables and saves them to an .conf file"
+    description="Collects OCONF__|FOCONF__ environment variables and saves them to an .conf file"
 )
 parser.add_argument("output", help="Path to the output .conf file")
 args = parser.parse_args()
