imp: project

Tardo · Tardo · commit a8fddf5215db · 2026-04-17T22:58:29.000+02:00
diff --git a/10.0.Dockerfile b/10.0.Dockerfile
@@ -199,7 +199,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             ODOO_VERSION="${ODOO_VERSION}" \
             ODOO_RC="/etc/odoo/odoo.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
-            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
 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
@@ -207,7 +207,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             ODOO_VERSION="${ODOO_VERSION}" \
             ODOO_RC="/etc/odoo/odoo.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
-            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
 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
@@ -205,7 +205,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             ODOO_VERSION="${ODOO_VERSION}" \
             ODOO_RC="/etc/odoo/odoo.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
-            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
 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
@@ -204,7 +204,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             ODOO_VERSION="${ODOO_VERSION}" \
             ODOO_RC="/etc/odoo/odoo.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
-            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
 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
@@ -192,7 +192,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             ODOO_VERSION="${ODOO_VERSION}" \
             ODOO_RC="/etc/odoo/odoo.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
-            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
 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
@@ -193,7 +193,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             ODOO_VERSION="${ODOO_VERSION}" \
             ODOO_RC="/etc/odoo/odoo.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
-            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
 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
@@ -193,7 +193,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             ODOO_VERSION="${ODOO_VERSION}" \
             ODOO_RC="/etc/odoo/odoo.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
-            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
 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
@@ -193,7 +193,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             ODOO_VERSION="${ODOO_VERSION}" \
             ODOO_RC="/etc/odoo/odoo.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
-            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
 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
@@ -193,7 +193,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             ODOO_VERSION="${ODOO_VERSION}" \
             ODOO_RC="/etc/odoo/odoo.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
-            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
 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
@@ -192,7 +192,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             ODOO_VERSION="${ODOO_VERSION}" \
             ODOO_RC="/etc/odoo/odoo.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
-            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
 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
@@ -157,7 +157,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             ODOO_VERSION="${ODOO_VERSION}" \
             OPENERP_SERVER="/etc/odoo/odoo.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
-            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
 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
@@ -170,7 +170,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             ODOO_VERSION="${ODOO_VERSION}" \
             OPENERP_SERVER="/etc/odoo/odoo.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
-            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
 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
@@ -187,7 +187,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             ODOO_VERSION="${ODOO_VERSION}" \
             OPENERP_SERVER="/etc/odoo/odoo.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
-            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
 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
@@ -205,7 +205,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             ODOO_VERSION="${ODOO_VERSION}" \
             OPENERP_SERVER="/etc/odoo/odoo.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
-            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
 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
@@ -199,7 +199,7 @@ ONBUILD ENV LC_ALL="C.UTF-8" \
             ODOO_VERSION="${ODOO_VERSION}" \
             OPENERP_SERVER="/etc/odoo/odoo.conf" \
             OCONF__options__data_dir="/var/lib/odoo/data" \
-            OCONF__options__addons_path="/var/lib/odoo/core,/var/lib/odoo/extra"
+            OCONF__options__addons_path="/var/lib/odoo/extra,/var/lib/odoo/core"
 
 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
@@ -31,6 +31,9 @@ A lightweight image for running [Odoo CE](https://www.odoo.com/) from 6.0 to the
 
 To configure Odoo, simply use environment variables with the prefix ```OCONF__{section}__{Param Name}```. Example for changing workers: ```OCONF__options__workers=4```.
 
+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).
 
 ### Build Arguments
@@ -118,7 +121,7 @@ ARG ODOO_VERSION
 FROM ghcr.io/grupoisonor/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__options__addons_path="${OCONF__options__addons_path},/var/lib/odoo/private"
+ENV OCONF__options__addons_path="/var/lib/odoo/private,${OCONF__options__addons_path}"
 ```
 
 ### docker-compose.yaml
@@ -142,7 +145,7 @@ services:
       OCONF__options__log_level: debug
       OCONF__options__db_filter: odoodb$
       OCONF__options__db_user: odoo
-      OCONF__options__db_password: odoo
+      FOCONF__options__db_password: /run/secrets/odoo_db_password
       OCONF__options__db_host: odoo-db
       OCONF__options__db_name: odoodb
       OCONF__options__proxy_mode: false
@@ -154,7 +157,7 @@ services:
     image: postgres:18.0-alpine
     environment:
       POSTGRES_DB: odoodb
-      POSTGRES_PASSWORD: odoo
+      POSTGRES_PASSWORD_FILE: /run/secrets/odoo_db_password
       POSTGRES_USER: odoo
       POSTGRES_INITDB_ARGS: --locale=C --encoding=UTF8
     volumes:
@@ -167,6 +170,10 @@ services:
       retries: 5
       start_period: 30s
 
+secrets:
+  odoo_db_password:
+    x-podman.relabel: Z
+    file: ./secrets/odoo_db_password.txt
 
 volumes:
   filestore:
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -27,8 +27,9 @@ 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="${OCONF__options__db_password}" --timeout="${PSQL_WAIT_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="${db_pass}" --timeout="${PSQL_WAIT_TIMEOUT:-30}"
 deactivate
 
 # Use odoo python environment
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -231,7 +231,6 @@ def docker_env(env_info):
         compose_project_name=COMPOSE_PROJECT_NAME,
     )
 
-    # Initialize Database
     init_params = [
         "odoo",
         "-c",
@@ -247,48 +246,56 @@ def docker_env(env_info):
             "--no-xmlrpc" if odoo_ver in OLDER_VERSIONS else "--no-http",
         ]
 
-    if client_type == "podman":
-        subprocess.run(
-            [
-                "podman",
-                "compose",
-                "-p",
-                COMPOSE_PROJECT_NAME,
-                "run",
-                "--rm",
+    try:
+        # Initialize Database
+        if client_type == "podman":
+            subprocess.run(
+                [
+                    "podman",
+                    "compose",
+                    "-p",
+                    COMPOSE_PROJECT_NAME,
+                    "run",
+                    "--rm",
+                    "odoo",
+                ]
+                + init_params,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+                timeout=60,
+                check=True,
+            )
+        else:
+            docker.compose.run(
                 "odoo",
-            ]
-            + init_params,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-            timeout=60,
-            check=True,
-        )
-    else:
-        docker.compose.run(
-            "odoo",
-            init_params,
-            remove=True,
-        )
-
-    # Up Services
-    if client_type == "podman":
-        subprocess.Popen(
-            ["podman", "compose", "-p", COMPOSE_PROJECT_NAME, "up", "--remove-orphans"],
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-        )
-    else:
-        docker.compose.up(
-            detach=True,
-            remove_orphans=True,
-        )
+                init_params,
+                remove=True,
+            )
+
+        # Up Services
+        if client_type == "podman":
+            subprocess.Popen(
+                [
+                    "podman",
+                    "compose",
+                    "-p",
+                    COMPOSE_PROJECT_NAME,
+                    "up",
+                    "--remove-orphans",
+                ],
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+            )
+        else:
+            docker.compose.up(
+                detach=True,
+                remove_orphans=True,
+            )
 
-    print("Waiting Odoo...")
-    _wait_for_odoo(env_info["ip"], env_info["ports"]["odoo"])
+        print("Waiting Odoo...")
+        _wait_for_odoo(env_info["ip"], env_info["ports"]["odoo"])
 
-    try:
         yield docker
     finally:
         docker.compose.down(remove_orphans=True, volumes=True)
diff --git a/tests/data/project_demo/Dockerfile b/tests/data/project_demo/Dockerfile
@@ -3,4 +3,4 @@ FROM localhost/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__options__addons_path="${OCONF__options__addons_path},/var/lib/odoo/private"
+ENV OCONF__options__addons_path="/var/lib/odoo/private,${OCONF__options__addons_path}"
diff --git a/tests/data/project_demo/docker-compose.yaml b/tests/data/project_demo/docker-compose.yaml
@@ -3,9 +3,11 @@ services:
     image: docker.io/library/postgres:${PYTEST_PG_VERSION:-9.3}-alpine
     tty: false
     stdin_open: false
+    secrets:
+      - odoo_db_password
     environment:
       POSTGRES_DB: odoodb
-      POSTGRES_PASSWORD: odoo
+      POSTGRES_PASSWORD_FILE: /run/secrets/odoo_db_password
       POSTGRES_USER: odoo
       POSTGRES_INITDB_ARGS: --locale=C --encoding=UTF8
     hostname: odoo-db
@@ -27,15 +29,22 @@ services:
     ports:
       - '127.0.0.1:8080:8080'
       - '127.0.0.1:8069:8069'
+    secrets:
+      - odoo_db_password
     environment:
       OCONF__options__log_level: debug
       OCONF__options__db_filter: odoodb$
       OCONF__options__db_user: odoo
-      OCONF__options__db_password: odoo
+      FOCONF__options__db_password: /run/secrets/odoo_db_password
       OCONF__options__db_host: odoo-db
       OCONF__options__db_name: odoodb
       OCONF__options__proxy_mode: false
       OCONF__options__workers: 0
       OCONF__options__max_cron_threads: 0
       OCONF__options__without_demo: all
     hostname: odoo
+
+secrets:
+  odoo_db_password:
+    x-podman.relabel: Z
+    file: ./secrets/odoo_db_password.txt
diff --git a/tests/data/project_demo/secrets/odoo_db_password.txt b/tests/data/project_demo/secrets/odoo_db_password.txt
@@ -0,0 +1 @@
+odoo
diff --git a/tools/isodoo_generate_config.py b/tools/isodoo_generate_config.py
@@ -3,6 +3,7 @@
 import os
 import configparser
 import argparse
+from pathlib import Path
 from collections import defaultdict
 
 parser = argparse.ArgumentParser(
@@ -22,15 +23,17 @@
 
 to_write = defaultdict(dict)
 for key, value in os.environ.items():
-    if key.startswith("OCONF__"):
+    if key.startswith(("OCONF__", "FOCONF__")):
+        if key.startswith("FOCONF__") and os.path.isfile(value):
+            value = Path(value).read_text().strip()
         _, 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)
+    for config_key in sorted(to_write[config_section].keys()):
+        config.set(config_section, config_key, to_write[config_section][config_key])
 
-with open(args.output, "w") as configfile:
+with open(args.output, "w", encoding="utf-8") as configfile:
     config.write(configfile)
