odoo-devops-tools 1.24.2__tar.gz → 1.24.4__tar.gz

{odoo_devops_tools-1.24.2 → odoo_devops_tools-1.24.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: odoo-devops-tools
-Version: 1.24.2
+Version: 1.24.4
 Summary: Build reproducible Odoo workspaces from a single project definition.
 Author: Roman Lacko
 License-Expression: MIT
@@ -134,7 +134,7 @@ Then start the Docker Compose environment:
 
 ```bash
 cd ./odoo19
-docker compose up -d --build
+docker compose up -d --build --wait
 ```
 
 Optionally initialize the Odoo database from the command line instead of through the web interface:
@@ -174,7 +174,7 @@ Sync the configured addon repositories and refresh the generated Docker workflow
 
 ```bash
 odoo-compose --sync-addons
-docker compose up -d --build
+docker compose up -d --build --wait
 ```
 
 The addon repositories are cloned into `ROOT/odoo-addons/oca-web/` and `ROOT/odoo-addons/oca-helpdesk/` and bind-mounted into the Odoo container.
@@ -215,7 +215,7 @@ Sync the Odoo source and generate the Docker artifacts:
 
 ```bash
 odoo-compose --sync-all
-docker compose up -d --build
+docker compose up -d --build --wait
 ```
 
 The resolved Odoo source is bind-mounted read-only at `/opt/odoo`. The Odoo Python source from the base image is removed while its installed dependencies remain available.
@@ -226,14 +226,14 @@ Enable Mailpit in the local Docker workflow when you need to inspect or test ema
 
 ```bash
 odoo-compose --set docker:mailpit_enabled=true
-docker compose up -d --build
+docker compose up -d --build --wait
 ```
 
 Mailpit is available at http://localhost:8025 by default. When running multiple workspaces, override the host web UI port, for example:
 
 ```bash
 odoo-compose --set docker:mailpit_enabled=true --set docker:mailpit_webui_port=8026
-docker compose up -d --build
+docker compose up -d --build --wait
 ```
 
 The generated local Odoo configuration sends outgoing email to `mailpit:1025`. When Mailpit is enabled, local Docker SMTP connection settings (`smtp_server`, `smtp_port`, `smtp_ssl`, `smtp_user`, and `smtp_password`) are intentionally overridden; the deploy configuration keeps the values from `[config]` unchanged.
@@ -256,7 +256,33 @@ target = /mnt/exchange
 
 `odoo-compose` does not create the source directory or change its ownership or permissions; host provisioning or the deployment process must prepare the directory before Docker starts.
 
-### 1.5. Script reference
+### 1.5. Limiting Docker Compose resources
+
+You can optionally set CPU and memory limits for each service in the generated `compose.yaml` using `[docker]` in `odoo-project.ini`:
+
+```ini
+[docker]
+odoo_cpus = 2.0
+odoo_mem_limit = 4g
+
+db_cpus = 1.0
+db_mem_limit = 2g
+
+mailpit_enabled = true
+mailpit_cpus = 0.5
+mailpit_mem_limit = 256m
+```
+
+Each option is independent and optional. If an option is missing or empty, `odoo-compose` omits that limit from the Compose service; no CPU or memory limit is imposed by the generator. CPU values must be positive decimal numbers (such as `0.5` or `2.0`). Memory limits must be positive amounts (such as `256m`, `2g`, or `4g`); zero and negative values are rejected. A memory limit is a hard container limit: exceeding it may cause an out-of-memory termination, so size it for your workload.
+
+Regenerate the Docker configuration after editing the INI, then start the services:
+
+```bash
+odoo-compose
+docker compose up -d --build --wait
+```
+
+### 1.6. Script reference
 
 The Docker workflow generates platform-specific helper scripts under `ROOT/docker/local/scripts/`. Unix-like systems generate `.sh` helpers; Windows generates the corresponding `.bat` helpers.
 
@@ -283,7 +309,7 @@ ODOO_DOCKER_SUDO=1 ./docker/local/scripts/run.sh --help
 
 Docker helpers use `[config].db_name` when configured, or `odoo` by default.
 
-#### 1.5.1. run
+#### 1.6.1. run
 
 Runs Odoo in a one-off Docker container for the configured database:
 
@@ -297,7 +323,7 @@ Any extra arguments are passed through to Odoo:
 ./docker/local/scripts/run.sh -i base --stop-after-init
 ```
 
-#### 1.5.2. shell
+#### 1.6.2. shell
 
 Opens an Odoo shell for the configured database:
 
@@ -307,7 +333,7 @@ Opens an Odoo shell for the configured database:
 
 Any extra arguments are passed through to the underlying Odoo shell command.
 
-#### 1.5.3. update
+#### 1.6.3. update
 
 Updates installed addons using `click-odoo-update`:
 
@@ -321,7 +347,7 @@ Any extra arguments are passed through to `click-odoo-update`:
 ./docker/local/scripts/update.sh --update-all
 ```
 
-#### 1.5.4. Database backup
+#### 1.6.4. Database backup
 
 Create a PostgreSQL custom-format dump under `ROOT/odoo-backups/`:
 
@@ -341,7 +367,7 @@ Pass an output path explicitly when needed:
 ./docker/local/scripts/backup-db.sh ./odoo-backups/pre-upgrade.dump
 ```
 
-#### 1.5.5. Database restore
+#### 1.6.5. Database restore
 
 Restore a database dump with `pg_restore`:
 
@@ -349,7 +375,7 @@ Restore a database dump with `pg_restore`:
 ./docker/local/scripts/restore-db.sh ./odoo-backups/pre-upgrade.dump
 ```
 
-Database restores use copy semantics by default, matching `click-odoo-restoredb --copy`.
+Database restores use copy semantics by default.
 After `pg_restore`, Odoo database identity parameters are regenerated so the restored
 database can coexist with the source database:
 
@@ -372,7 +398,7 @@ docker compose stop odoo
 docker compose up -d odoo
 ```
 
-#### 1.5.6. Database neutralization
+#### 1.6.6. Database neutralization
 
 For development or test databases restored from production, run the generated neutralization helper explicitly:
 
@@ -407,7 +433,7 @@ docker compose stop odoo
 docker compose up -d odoo
 ```
 
-#### 1.5.7. Filestore backup
+#### 1.6.7. Filestore backup
 
 Create a compressed tar archive of the selected database filestore:
 
@@ -438,7 +464,7 @@ docker compose stop odoo
 docker compose up -d odoo
 ```
 
-#### 1.5.8. Filestore restore
+#### 1.6.8. Filestore restore
 
 Restore a filestore archive:
 
@@ -454,7 +480,7 @@ docker compose stop odoo
 docker compose up -d odoo
 ```
 
-#### 1.5.9. Restic filestore backup
+#### 1.6.9. Restic filestore backup
 
 The generated Docker image also includes `restic`. Restic is an additional option intended especially for large filestores where incremental snapshots and deduplication are useful.
 
@@ -492,7 +518,7 @@ List or inspect snapshots through the generic wrapper:
 ./docker/local/scripts/restic.sh check
 ```
 
-#### 1.5.10. Restic filestore restore
+#### 1.6.10. Restic filestore restore
 
 Restore the latest matching filestore snapshot:
 
@@ -514,7 +540,7 @@ docker compose up -d odoo
 
 With `--force`, the restore helper removes the target database filestore before restoring it. When `latest` is used, the snapshot selection is restricted to the current `RESTIC_HOST` and source filestore path. Use the same `RESTIC_HOST` value that was used when the snapshot was created if the restore is performed from another host.
 
-### 1.6. Creating a Docker deploy build context
+### 1.7. Creating a Docker deploy build context
 
 Use `--create-docker-deploy` to generate a self-contained Docker build context for CI/CD, testing, staging, production, or another non-local deployment workflow.
 
@@ -787,7 +813,7 @@ Restore a database dump with `pg_restore`:
 ./odoo-scripts/restore-db.sh ./odoo-backups/pre-upgrade.dump
 ```
 
-Database restores use copy semantics by default, matching `click-odoo-restoredb --copy`.
+Database restores use copy semantics by default.
 After `pg_restore`, Odoo database identity parameters are regenerated so the restored
 database can coexist with the source database:
 
@@ -1412,6 +1438,10 @@ This section is optional.
 - `mailpit_enabled` — enables a persistent Mailpit service in the local Docker workflow for SMTP and POP3 mail testing. Default: `false`. It does not affect the deploy build context.
 - `mailpit_version` — version of `ghcr.io/axllent/mailpit` in local Compose. Default: `v1.31.3`. An explicitly set value must be a concrete version; empty values and `latest` are invalid.
 - `mailpit_webui_port` — host port used for the Mailpit web UI. Default: `8025`. The internal Mailpit web UI port remains `8025`.
+- `odoo_cpus`, `db_cpus`, `mailpit_cpus` — optional CPU limits for the respective Compose services; positive decimal CPU counts such as `0.5` or `2.0`.
+- `odoo_mem_limit`, `db_mem_limit`, `mailpit_mem_limit` — optional memory limits for the respective Compose services; positive amounts such as `256m` or `4g`.
+
+All six resource options default to unset and are omitted from generated Compose when empty. See [Limiting Docker Compose resources](#17-limiting-docker-compose-resources) for a complete example.
 
 Example:
 

{odoo_devops_tools-1.24.2 → odoo_devops_tools-1.24.4}/README.md

@@ -106,7 +106,7 @@ Then start the Docker Compose environment:
 
 ```bash
 cd ./odoo19
-docker compose up -d --build
+docker compose up -d --build --wait
 ```
 
 Optionally initialize the Odoo database from the command line instead of through the web interface:
@@ -146,7 +146,7 @@ Sync the configured addon repositories and refresh the generated Docker workflow
 
 ```bash
 odoo-compose --sync-addons
-docker compose up -d --build
+docker compose up -d --build --wait
 ```
 
 The addon repositories are cloned into `ROOT/odoo-addons/oca-web/` and `ROOT/odoo-addons/oca-helpdesk/` and bind-mounted into the Odoo container.
@@ -187,7 +187,7 @@ Sync the Odoo source and generate the Docker artifacts:
 
 ```bash
 odoo-compose --sync-all
-docker compose up -d --build
+docker compose up -d --build --wait
 ```
 
 The resolved Odoo source is bind-mounted read-only at `/opt/odoo`. The Odoo Python source from the base image is removed while its installed dependencies remain available.
@@ -198,14 +198,14 @@ Enable Mailpit in the local Docker workflow when you need to inspect or test ema
 
 ```bash
 odoo-compose --set docker:mailpit_enabled=true
-docker compose up -d --build
+docker compose up -d --build --wait
 ```
 
 Mailpit is available at http://localhost:8025 by default. When running multiple workspaces, override the host web UI port, for example:
 
 ```bash
 odoo-compose --set docker:mailpit_enabled=true --set docker:mailpit_webui_port=8026
-docker compose up -d --build
+docker compose up -d --build --wait
 ```
 
 The generated local Odoo configuration sends outgoing email to `mailpit:1025`. When Mailpit is enabled, local Docker SMTP connection settings (`smtp_server`, `smtp_port`, `smtp_ssl`, `smtp_user`, and `smtp_password`) are intentionally overridden; the deploy configuration keeps the values from `[config]` unchanged.
@@ -228,7 +228,33 @@ target = /mnt/exchange
 
 `odoo-compose` does not create the source directory or change its ownership or permissions; host provisioning or the deployment process must prepare the directory before Docker starts.
 
-### 1.5. Script reference
+### 1.5. Limiting Docker Compose resources
+
+You can optionally set CPU and memory limits for each service in the generated `compose.yaml` using `[docker]` in `odoo-project.ini`:
+
+```ini
+[docker]
+odoo_cpus = 2.0
+odoo_mem_limit = 4g
+
+db_cpus = 1.0
+db_mem_limit = 2g
+
+mailpit_enabled = true
+mailpit_cpus = 0.5
+mailpit_mem_limit = 256m
+```
+
+Each option is independent and optional. If an option is missing or empty, `odoo-compose` omits that limit from the Compose service; no CPU or memory limit is imposed by the generator. CPU values must be positive decimal numbers (such as `0.5` or `2.0`). Memory limits must be positive amounts (such as `256m`, `2g`, or `4g`); zero and negative values are rejected. A memory limit is a hard container limit: exceeding it may cause an out-of-memory termination, so size it for your workload.
+
+Regenerate the Docker configuration after editing the INI, then start the services:
+
+```bash
+odoo-compose
+docker compose up -d --build --wait
+```
+
+### 1.6. Script reference
 
 The Docker workflow generates platform-specific helper scripts under `ROOT/docker/local/scripts/`. Unix-like systems generate `.sh` helpers; Windows generates the corresponding `.bat` helpers.
 
@@ -255,7 +281,7 @@ ODOO_DOCKER_SUDO=1 ./docker/local/scripts/run.sh --help
 
 Docker helpers use `[config].db_name` when configured, or `odoo` by default.
 
-#### 1.5.1. run
+#### 1.6.1. run
 
 Runs Odoo in a one-off Docker container for the configured database:
 
@@ -269,7 +295,7 @@ Any extra arguments are passed through to Odoo:
 ./docker/local/scripts/run.sh -i base --stop-after-init
 ```
 
-#### 1.5.2. shell
+#### 1.6.2. shell
 
 Opens an Odoo shell for the configured database:
 
@@ -279,7 +305,7 @@ Opens an Odoo shell for the configured database:
 
 Any extra arguments are passed through to the underlying Odoo shell command.
 
-#### 1.5.3. update
+#### 1.6.3. update
 
 Updates installed addons using `click-odoo-update`:
 
@@ -293,7 +319,7 @@ Any extra arguments are passed through to `click-odoo-update`:
 ./docker/local/scripts/update.sh --update-all
 ```
 
-#### 1.5.4. Database backup
+#### 1.6.4. Database backup
 
 Create a PostgreSQL custom-format dump under `ROOT/odoo-backups/`:
 
@@ -313,7 +339,7 @@ Pass an output path explicitly when needed:
 ./docker/local/scripts/backup-db.sh ./odoo-backups/pre-upgrade.dump
 ```
 
-#### 1.5.5. Database restore
+#### 1.6.5. Database restore
 
 Restore a database dump with `pg_restore`:
 
@@ -321,7 +347,7 @@ Restore a database dump with `pg_restore`:
 ./docker/local/scripts/restore-db.sh ./odoo-backups/pre-upgrade.dump
 ```
 
-Database restores use copy semantics by default, matching `click-odoo-restoredb --copy`.
+Database restores use copy semantics by default.
 After `pg_restore`, Odoo database identity parameters are regenerated so the restored
 database can coexist with the source database:
 
@@ -344,7 +370,7 @@ docker compose stop odoo
 docker compose up -d odoo
 ```
 
-#### 1.5.6. Database neutralization
+#### 1.6.6. Database neutralization
 
 For development or test databases restored from production, run the generated neutralization helper explicitly:
 
@@ -379,7 +405,7 @@ docker compose stop odoo
 docker compose up -d odoo
 ```
 
-#### 1.5.7. Filestore backup
+#### 1.6.7. Filestore backup
 
 Create a compressed tar archive of the selected database filestore:
 
@@ -410,7 +436,7 @@ docker compose stop odoo
 docker compose up -d odoo
 ```
 
-#### 1.5.8. Filestore restore
+#### 1.6.8. Filestore restore
 
 Restore a filestore archive:
 
@@ -426,7 +452,7 @@ docker compose stop odoo
 docker compose up -d odoo
 ```
 
-#### 1.5.9. Restic filestore backup
+#### 1.6.9. Restic filestore backup
 
 The generated Docker image also includes `restic`. Restic is an additional option intended especially for large filestores where incremental snapshots and deduplication are useful.
 
@@ -464,7 +490,7 @@ List or inspect snapshots through the generic wrapper:
 ./docker/local/scripts/restic.sh check
 ```
 
-#### 1.5.10. Restic filestore restore
+#### 1.6.10. Restic filestore restore
 
 Restore the latest matching filestore snapshot:
 
@@ -486,7 +512,7 @@ docker compose up -d odoo
 
 With `--force`, the restore helper removes the target database filestore before restoring it. When `latest` is used, the snapshot selection is restricted to the current `RESTIC_HOST` and source filestore path. Use the same `RESTIC_HOST` value that was used when the snapshot was created if the restore is performed from another host.
 
-### 1.6. Creating a Docker deploy build context
+### 1.7. Creating a Docker deploy build context
 
 Use `--create-docker-deploy` to generate a self-contained Docker build context for CI/CD, testing, staging, production, or another non-local deployment workflow.
 
@@ -759,7 +785,7 @@ Restore a database dump with `pg_restore`:
 ./odoo-scripts/restore-db.sh ./odoo-backups/pre-upgrade.dump
 ```
 
-Database restores use copy semantics by default, matching `click-odoo-restoredb --copy`.
+Database restores use copy semantics by default.
 After `pg_restore`, Odoo database identity parameters are regenerated so the restored
 database can coexist with the source database:
 
@@ -1384,6 +1410,10 @@ This section is optional.
 - `mailpit_enabled` — enables a persistent Mailpit service in the local Docker workflow for SMTP and POP3 mail testing. Default: `false`. It does not affect the deploy build context.
 - `mailpit_version` — version of `ghcr.io/axllent/mailpit` in local Compose. Default: `v1.31.3`. An explicitly set value must be a concrete version; empty values and `latest` are invalid.
 - `mailpit_webui_port` — host port used for the Mailpit web UI. Default: `8025`. The internal Mailpit web UI port remains `8025`.
+- `odoo_cpus`, `db_cpus`, `mailpit_cpus` — optional CPU limits for the respective Compose services; positive decimal CPU counts such as `0.5` or `2.0`.
+- `odoo_mem_limit`, `db_mem_limit`, `mailpit_mem_limit` — optional memory limits for the respective Compose services; positive amounts such as `256m` or `4g`.
+
+All six resource options default to unset and are omitted from generated Compose when empty. See [Limiting Docker Compose resources](#17-limiting-docker-compose-resources) for a complete example.
 
 Example:
 

odoo_devops_tools-1.24.4/odoo_devops_tools/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.24.4"

{odoo_devops_tools-1.24.2 → odoo_devops_tools-1.24.4}/odoo_devops_tools/env.py

@@ -25,6 +25,7 @@ import sys
 import tempfile
 import zipfile
 from dataclasses import asdict, dataclass, field, replace
+from decimal import Decimal
 from datetime import datetime, timezone
 from pathlib import Path, PurePosixPath
 from typing import Any, Dict, Optional
@@ -153,6 +154,12 @@ _INI_SET_SUPPORTED_OPTIONS = {
         "mailpit_enabled",
         "mailpit_version",
         "mailpit_webui_port",
+        "odoo_cpus",
+        "odoo_mem_limit",
+        "db_cpus",
+        "db_mem_limit",
+        "mailpit_cpus",
+        "mailpit_mem_limit",
     },
 }
 _INI_SET_ADDON_SUPPORTED_OPTIONS = {
@@ -239,6 +246,12 @@ class DockerConfig:
     mailpit_enabled: bool = False
     mailpit_version: str = _DEFAULT_DOCKER_MAILPIT_VERSION
     mailpit_webui_port: int = _DEFAULT_DOCKER_MAILPIT_WEBUI_PORT
+    odoo_cpus: Optional[str] = None
+    odoo_mem_limit: Optional[str] = None
+    db_cpus: Optional[str] = None
+    db_mem_limit: Optional[str] = None
+    mailpit_cpus: Optional[str] = None
+    mailpit_mem_limit: Optional[str] = None
     shares: Dict[str, DockerShareSpec] = field(default_factory=dict)
 
 
@@ -1049,10 +1062,27 @@ def _parse_odoo_version(odoo_version: str) -> int:
 
 def _validate_docker_image(value: str, option: str) -> str:
     image = (value or "").strip()
-    if not image:
+    # This value is embedded directly into Dockerfile FROM instructions.
+    # Require a single Docker image reference (registry, tag and digest allowed).
+    component = r"[a-z0-9]+(?:(?:[._]|__|-+)[a-z0-9]+)*"
+    label = r"[A-Za-z0-9](?:[A-Za-z0-9-]*[A-Za-z0-9])?"
+    registry = rf"(?:{label}(?:\.{label})*(?::[0-9]+)?|\[[0-9A-Fa-f:.]+\](?::[0-9]+)?)"
+    tag = r"[A-Za-z0-9_][A-Za-z0-9_.-]{0,127}"
+    digest = r"[A-Za-z][A-Za-z0-9_+.-]*:[A-Za-z0-9=_-]{32,}"
+    if (
+        not image
+        or len(image) > 512
+        or "\n" in (value or "")
+        or "\r" in (value or "")
+        or re.fullmatch(
+            rf"(?:{registry}/)?{component}(?:/{component})*(?::{tag})?(?:@{digest})?",
+            image,
+            flags=re.ASCII,
+        ) is None
+    ):
         raise Exception(
             f"Invalid option '{option}' in section [docker] "
-            "(expected non-empty Docker image name/tag)."
+            "(expected a single Docker image reference, optionally with registry, tag or digest)."
         )
 
     return image
@@ -1113,6 +1143,37 @@ def _validate_tcp_port(value: str, option: str) -> int:
     return port
 
 
+def _validate_docker_cpus(value: str, option: str) -> Optional[str]:
+    raw = (value or "").strip()
+    if not raw:
+        return None
+    if (
+        len(raw) > 32
+        or re.fullmatch(r"[0-9]+(?:\.[0-9]+)?", raw, flags=re.ASCII) is None
+        or Decimal(raw) <= 0
+    ):
+        raise Exception(
+            f"Invalid option '{option}' in section [docker] "
+            "(expected a positive CPU count, for example 0.5 or 2.0)."
+        )
+    return str(Decimal(raw))
+
+
+def _validate_docker_mem_limit(value: str, option: str) -> Optional[str]:
+    raw = (value or "").strip()
+    if not raw:
+        return None
+    # Docker Compose memory values are positive byte counts with optional units.
+    if len(raw) > 32 or re.fullmatch(
+        r"[1-9][0-9]*(?:b|[kmgpt](?:b|ib)?)?", raw, flags=re.ASCII | re.IGNORECASE
+    ) is None:
+        raise Exception(
+            f"Invalid option '{option}' in section [docker] "
+            "(expected a positive memory amount, for example 256m or 4g)."
+        )
+    return raw.lower()
+
+
 def _get_default_virtualenv_settings(odoo_version: str) -> tuple[str, list[str], list[str]]:
     odoo_major_version = _parse_odoo_version(odoo_version)
 
@@ -1271,6 +1332,13 @@ def load_project_config(
     for sec in cp.sections():
         if sec.startswith("addons."):
             name = sec.split(".", 1)[1]
+            # Git addon destinations are ROOT/odoo-addons/<name>. Keep the
+            # section name a single, portable path component (also on Windows).
+            if not re.fullmatch(r"[A-Za-z0-9][A-Za-z0-9_.-]*", name) or name.endswith("."):
+                raise Exception(
+                    f"Invalid addon section name [{sec}]: use letters, digits, '.', '_' or '-' "
+                    "without path separators or traversal components."
+                )
 
             has_path = cp.has_option(sec, "path")
             has_repo = cp.has_option(sec, "repo")
@@ -1368,13 +1436,21 @@ def load_project_config(
             "mailpit_enabled",
             "mailpit_version",
             "mailpit_webui_port",
+            "odoo_cpus",
+            "odoo_mem_limit",
+            "db_cpus",
+            "db_mem_limit",
+            "mailpit_cpus",
+            "mailpit_mem_limit",
         }
         for key in cp._sections.get("docker", {}).keys():
             if key not in supported_docker_options:
                 raise Exception(
                     f"Unsupported option '{key}' in section [docker]. "
                     "Supported options: base_image, mailpit_enabled, mailpit_version, "
-                    "mailpit_webui_port, odoo_source, postgres_version, restic_version."
+                    "mailpit_webui_port, odoo_source, postgres_version, restic_version, "
+                    "odoo_cpus, odoo_mem_limit, db_cpus, db_mem_limit, "
+                    "mailpit_cpus, mailpit_mem_limit."
                 )
 
         base_image = (
@@ -1414,6 +1490,30 @@ def load_project_config(
                 if cp.has_option("docker", "mailpit_webui_port")
                 else _DEFAULT_DOCKER_MAILPIT_WEBUI_PORT
             ),
+            odoo_cpus=(
+                _validate_docker_cpus(cp.get("docker", "odoo_cpus"), "odoo_cpus")
+                if cp.has_option("docker", "odoo_cpus") else None
+            ),
+            odoo_mem_limit=(
+                _validate_docker_mem_limit(cp.get("docker", "odoo_mem_limit"), "odoo_mem_limit")
+                if cp.has_option("docker", "odoo_mem_limit") else None
+            ),
+            db_cpus=(
+                _validate_docker_cpus(cp.get("docker", "db_cpus"), "db_cpus")
+                if cp.has_option("docker", "db_cpus") else None
+            ),
+            db_mem_limit=(
+                _validate_docker_mem_limit(cp.get("docker", "db_mem_limit"), "db_mem_limit")
+                if cp.has_option("docker", "db_mem_limit") else None
+            ),
+            mailpit_cpus=(
+                _validate_docker_cpus(cp.get("docker", "mailpit_cpus"), "mailpit_cpus")
+                if cp.has_option("docker", "mailpit_cpus") else None
+            ),
+            mailpit_mem_limit=(
+                _validate_docker_mem_limit(cp.get("docker", "mailpit_mem_limit"), "mailpit_mem_limit")
+                if cp.has_option("docker", "mailpit_mem_limit") else None
+            ),
             shares=docker_shares,
         )
 
@@ -2151,7 +2251,22 @@ def _validate_local_odoo_path(layout: Layout, spec: OdooSpec) -> Path:
 
 
 def _resolve_addon_path(layout: Layout, addon_name: str, spec: AddonSpec) -> Path:
-    return _resolve_workspace_path(layout, spec.path or "", layout.addons_root / addon_name)
+    if spec.is_local:
+        return _resolve_workspace_path(layout, spec.path or "", layout.addons_root / addon_name)
+    dest = layout.addons_root / addon_name
+    # Implicit Git destinations must not follow symlinks into another repo,
+    # outside the workspace, or back onto the addons root itself.
+    if (
+        not _is_path_within(layout.addons_root, layout.root)
+        or dest.is_symlink()
+        or not _is_path_within(dest, layout.addons_root)
+        or dest.resolve() == layout.addons_root.resolve()
+    ):
+        raise Exception(
+            f"Unsafe addon destination for [addons.{addon_name}]: {dest} "
+            f"must resolve inside {layout.addons_root}. Use an explicit 'path' for local addons."
+        )
+    return dest
 
 
 def _validate_local_addon_path(layout: Layout, addon_name: str, spec: AddonSpec) -> Path:
@@ -2498,11 +2613,44 @@ def _native_default_db_name(cfg: ProjectConfig) -> str:
     db_name = str(cfg.config.get("db_name") or "").strip()
     if not db_name:
         raise Exception("Native database helpers require [config].db_name.")
-    if db_name in (".", "..") or any(c in db_name for c in ("/", "\\", "\x00", "\r", "\n")):
-        raise Exception("Database helpers require a single database name, not a path.")
+    # These names become PostgreSQL identifiers, filesystem path components and
+    # Windows batch variables. Reject traversal, CMD metacharacters and names
+    # that PostgreSQL could silently truncate to another database name.
+    if len(db_name) > 63 or not re.fullmatch(r"[A-Za-z0-9_][A-Za-z0-9_.-]*", db_name):
+        raise Exception(
+            "Invalid [config].db_name: expected 1-63 ASCII letters, digits, "
+            "underscores, dots or hyphens, starting with a letter, digit or underscore."
+        )
     return db_name
 
 
+def _native_filestore_data_dir_sh(layout: Layout) -> str:
+    # Preserve workspace-relative paths when the workspace is moved.
+    try:
+        relative = layout.data_dir.relative_to(layout.root)
+    except ValueError:
+        return shlex.quote(str(layout.data_dir))
+    return f'"${{ROOT_DIR}}"/{shlex.quote(relative.as_posix())}'
+
+
+def _native_filestore_data_dir_bat(layout: Layout) -> str:
+    # Paths cannot contain double quotes on Windows; reject control characters
+    # rather than generating unsafe batch assignments.
+    if any(char in str(layout.data_dir) for char in ('"', '\r', '\n', '\x00')):
+        raise Exception("Native filestore data_dir contains invalid Windows path characters.")
+    try:
+        relative = layout.data_dir.relative_to(layout.root)
+    except ValueError:
+        value = str(layout.data_dir)
+    else:
+        suffix = '' if str(relative) == '.' else '\\' + str(relative)
+        value = '%ROOT_DIR%' + suffix
+    # Keep %ROOT_DIR% expandable while escaping literal percent signs in paths.
+    if value.startswith('%ROOT_DIR%'):
+        return '%ROOT_DIR%' + value[len('%ROOT_DIR%'):].replace('%', '%%').replace('^', '^^')
+    return value.replace('%', '%%').replace('^', '^^')
+
+
 def _native_pg_env(cfg: ProjectConfig) -> dict[str, str]:
     # libpq reads these environment variables, keeping passwords out of command
     # arguments. Missing/False options leave libpq defaults and .pgpass intact.
@@ -2857,6 +3005,7 @@ echo "INFO: Database neutralization completed: ${{DB_NAME}}"
 
 def write_native_backup_filestore_sh(layout: Layout, cfg: ProjectConfig) -> Path:
     configured_db_name = shlex.quote(_native_default_db_name(cfg))
+    configured_data_dir = _native_filestore_data_dir_sh(layout)
     content = fr"""#!/usr/bin/env bash
 set -euo pipefail
 
@@ -2865,7 +3014,8 @@ ROOT_DIR="$(cd "${{SCRIPT_DIR}}/.." && pwd)"
 
 BACKUPS_DIR="${{ROOT_DIR}}/odoo-backups"
 DB_NAME={configured_db_name}
-FILESTORE_PATH="${{ROOT_DIR}}/odoo-data/filestore/${{DB_NAME}}"
+DATA_DIR={configured_data_dir}
+FILESTORE_PATH="${{DATA_DIR}}/filestore/${{DB_NAME}}"
 TIMESTAMP="$(date +%Y%m%d_%H%M%S)"
 OUTPUT="${{1:-${{BACKUPS_DIR}}/${{DB_NAME}}_${{TIMESTAMP}}_filestore.tar.gz}}"
 TMP_OUTPUT="${{OUTPUT}}.tmp"
@@ -2887,6 +3037,7 @@ echo "INFO: Filestore backup created: ${{OUTPUT}}"
 
 def write_native_restore_filestore_sh(layout: Layout, cfg: ProjectConfig) -> Path:
     configured_db_name = shlex.quote(_native_default_db_name(cfg))
+    configured_data_dir = _native_filestore_data_dir_sh(layout)
     content = fr"""#!/usr/bin/env bash
 set -euo pipefail
 
@@ -2894,7 +3045,8 @@ SCRIPT_DIR="$(cd "$(dirname "${{BASH_SOURCE[0]}}")" && pwd)"
 ROOT_DIR="$(cd "${{SCRIPT_DIR}}/.." && pwd)"
 
 DB_NAME={configured_db_name}
-FILESTORE_PATH="${{ROOT_DIR}}/odoo-data/filestore/${{DB_NAME}}"
+DATA_DIR={configured_data_dir}
+FILESTORE_PATH="${{DATA_DIR}}/filestore/${{DB_NAME}}"
 FORCE=false
 SOURCE=""
 
@@ -2959,6 +3111,7 @@ echo "INFO: Filestore restore completed: ${{DB_NAME}}"
 
 def write_native_backup_filestore_restic_sh(layout: Layout, cfg: ProjectConfig) -> Path:
     configured_db_name = shlex.quote(_native_default_db_name(cfg))
+    configured_data_dir = _native_filestore_data_dir_sh(layout)
     content = fr'''#!/usr/bin/env bash
 set -euo pipefail
 
@@ -2967,7 +3120,8 @@ ROOT_DIR="$(cd "${{SCRIPT_DIR}}/.." && pwd)"
 RESTIC="${{SCRIPT_DIR}}/restic.sh"
 DB_NAME={configured_db_name}
 RESTIC_HOST_NAME="${{RESTIC_HOST:-$(hostname -f 2>/dev/null || hostname)}}"
-FILESTORE_PATH="${{ROOT_DIR}}/odoo-data/filestore/${{DB_NAME}}"
+DATA_DIR={configured_data_dir}
+FILESTORE_PATH="${{DATA_DIR}}/filestore/${{DB_NAME}}"
 
 if [[ ! -x "${{RESTIC}}" ]]; then
   echo "ERROR: restic helper not found: ${{RESTIC}}" >&2
@@ -2994,6 +3148,7 @@ echo "INFO: Backing up filestore for database '${{DB_NAME}}' with restic."
 
 def write_native_restore_filestore_restic_sh(layout: Layout, cfg: ProjectConfig) -> Path:
     configured_db_name = shlex.quote(_native_default_db_name(cfg))
+    configured_data_dir = _native_filestore_data_dir_sh(layout)
     restic_command = _native_restic_command_sh()
     content = fr'''#!/usr/bin/env bash
 set -euo pipefail
@@ -3008,8 +3163,9 @@ RESTIC_HOST_NAME="${{RESTIC_HOST:-$(hostname -f 2>/dev/null || hostname)}}"
 FORCE=false
 SNAPSHOT="latest"
 SNAPSHOT_SET=false
-SOURCE_FILESTORE_PATH="${{ROOT_DIR}}/odoo-data/filestore/${{SOURCE_DB_NAME}}"
-TARGET_FILESTORE_PATH="${{ROOT_DIR}}/odoo-data/filestore/${{DB_NAME}}"
+DATA_DIR={configured_data_dir}
+SOURCE_FILESTORE_PATH="${{DATA_DIR}}/filestore/${{SOURCE_DB_NAME}}"
+TARGET_FILESTORE_PATH="${{DATA_DIR}}/filestore/${{DB_NAME}}"
 
 usage() {{
   echo "Usage: $(basename "$0") [--force] [SNAPSHOT]" >&2
@@ -3371,6 +3527,7 @@ exit /b 0
 
 def write_native_backup_filestore_bat(layout: Layout, cfg: ProjectConfig) -> Path:
     configured_db_name = _native_default_db_name(cfg).replace("%", "%%")
+    configured_data_dir = _native_filestore_data_dir_bat(layout)
     content = rf"""@echo off
 setlocal DisableDelayedExpansion
 
@@ -3379,7 +3536,8 @@ if "%SCRIPT_DIR:~-1%"=="\" set "SCRIPT_DIR=%SCRIPT_DIR:~0,-1%"
 for %%I in ("%SCRIPT_DIR%\..") do set "ROOT_DIR=%%~fI"
 set "BACKUPS_DIR=%ROOT_DIR%\odoo-backups"
 set "DB_NAME={configured_db_name}"
-set "FILESTORE_PATH=%ROOT_DIR%\odoo-data\filestore\%DB_NAME%"
+set "DATA_DIR={configured_data_dir}"
+set "FILESTORE_PATH=%DATA_DIR%\filestore\%DB_NAME%"
 
 for /f %%I in ('powershell -NoProfile -Command "Get-Date -Format yyyyMMdd_HHmmss"') do set "TIMESTAMP=%%I"
 if "%~1"=="" (
@@ -3412,6 +3570,7 @@ endlocal
 
 def write_native_restore_filestore_bat(layout: Layout, cfg: ProjectConfig) -> Path:
     configured_db_name = _native_default_db_name(cfg).replace("%", "%%")
+    configured_data_dir = _native_filestore_data_dir_bat(layout)
     content = rf"""@echo off
 setlocal DisableDelayedExpansion
 
@@ -3419,7 +3578,8 @@ set "SCRIPT_DIR=%~dp0"
 if "%SCRIPT_DIR:~-1%"=="\" set "SCRIPT_DIR=%SCRIPT_DIR:~0,-1%"
 for %%I in ("%SCRIPT_DIR%\..") do set "ROOT_DIR=%%~fI"
 set "DB_NAME={configured_db_name}"
-set "FILESTORE_PATH=%ROOT_DIR%\odoo-data\filestore\%DB_NAME%"
+set "DATA_DIR={configured_data_dir}"
+set "FILESTORE_PATH=%DATA_DIR%\filestore\%DB_NAME%"
 set "FORCE=false"
 set "SOURCE="
 
@@ -3484,6 +3644,7 @@ exit /b 2
 
 def write_native_backup_filestore_restic_bat(layout: Layout, cfg: ProjectConfig) -> Path:
     configured_db_name = _native_default_db_name(cfg).replace("%", "%%")
+    configured_data_dir = _native_filestore_data_dir_bat(layout)
     content = rf"""@echo off
 setlocal DisableDelayedExpansion
 
@@ -3497,7 +3658,8 @@ if defined RESTIC_HOST (
 ) else (
   for /f "delims=" %%H in ('hostname') do set "RESTIC_HOST_NAME=%%H"
 )
-set "FILESTORE_PATH=%ROOT_DIR%\odoo-data\filestore\%DB_NAME%"
+set "DATA_DIR={configured_data_dir}"
+set "FILESTORE_PATH=%DATA_DIR%\filestore\%DB_NAME%"
 
 if not exist "%RESTIC%" (
   echo ERROR: restic helper not found: %RESTIC%
@@ -3519,6 +3681,7 @@ exit /b %ERRORLEVEL%
 
 def write_native_restore_filestore_restic_bat(layout: Layout, cfg: ProjectConfig) -> Path:
     configured_db_name = _native_default_db_name(cfg).replace("%", "%%")
+    configured_data_dir = _native_filestore_data_dir_bat(layout)
     restic_command = _native_restic_command_bat()
     content = rf"""@echo off
 setlocal DisableDelayedExpansion
@@ -3541,8 +3704,9 @@ if defined RESTIC_HOST (
 set "FORCE=false"
 set "SNAPSHOT=latest"
 set "SNAPSHOT_SET=false"
-set "SOURCE_FILESTORE_PATH=%ROOT_DIR%\odoo-data\filestore\%SOURCE_DB_NAME%"
-set "TARGET_FILESTORE_PATH=%ROOT_DIR%\odoo-data\filestore\%DB_NAME%"
+set "DATA_DIR={configured_data_dir}"
+set "SOURCE_FILESTORE_PATH=%DATA_DIR%\filestore\%SOURCE_DB_NAME%"
+set "TARGET_FILESTORE_PATH=%DATA_DIR%\filestore\%DB_NAME%"
 
 goto parse_args
 
@@ -4224,18 +4388,23 @@ def render_docker_compose(layout: Layout, cfg: ProjectConfig) -> str:
     )
 
     mailpit_service = ""
-    depends_on = ["      - db"]
+    depends_on = ["      db:", "        condition: service_healthy"]
     named_volumes = [
         "  odoo-db-data:",
         "  odoo-data:",
     ]
 
     if cfg.docker.mailpit_enabled:
+        mailpit_resources = ""
+        if cfg.docker.mailpit_cpus is not None:
+            mailpit_resources += f"    cpus: {cfg.docker.mailpit_cpus}\n"
+        if cfg.docker.mailpit_mem_limit is not None:
+            mailpit_resources += f"    mem_limit: {cfg.docker.mailpit_mem_limit}\n"
         mailpit_service = f"""
   mailpit:
     image: ghcr.io/axllent/mailpit:{cfg.docker.mailpit_version}
     restart: unless-stopped
-    environment:
+{mailpit_resources}    environment:
       MP_DATABASE: /data/mailpit.db
       MP_DISABLE_VERSION_CHECK: "true"
       MP_POP3_BIND_ADDR: "0.0.0.0:{_DEFAULT_DOCKER_MAILPIT_POP3_PORT}"
@@ -4245,18 +4414,26 @@ def render_docker_compose(layout: Layout, cfg: ProjectConfig) -> str:
     volumes:
       - mailpit-data:/data
 """
-        depends_on.append("      - mailpit")
         named_volumes.append("  mailpit-data:")
 
     depends_on_block = "\n".join(depends_on)
     named_volumes_block = "\n".join(named_volumes)
-
-    return f"""# Generated by odoo-compose for local development.
-services:
+    db_resources = ""
+    if cfg.docker.db_cpus is not None:
+        db_resources += f"    cpus: {cfg.docker.db_cpus}\n"
+    if cfg.docker.db_mem_limit is not None:
+        db_resources += f"    mem_limit: {cfg.docker.db_mem_limit}\n"
+    odoo_resources = ""
+    if cfg.docker.odoo_cpus is not None:
+        odoo_resources += f"    cpus: {cfg.docker.odoo_cpus}\n"
+    if cfg.docker.odoo_mem_limit is not None:
+        odoo_resources += f"    mem_limit: {cfg.docker.odoo_mem_limit}\n"
+
+    return f"""services:
   db:
     image: postgres:{cfg.docker.postgres_version}
     restart: unless-stopped
-    logging:
+{db_resources}    logging:
       driver: local
       options:
         max-size: "50m"
@@ -4265,6 +4442,12 @@ services:
       POSTGRES_DB: postgres
       POSTGRES_USER: odoo
       POSTGRES_PASSWORD: odoo
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -q -h 127.0.0.1 -U $${{POSTGRES_USER}} -d $${{POSTGRES_DB}}"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+      start_period: 30s
     volumes:
       - odoo-db-data:{postgres_data_path}
 {mailpit_service}
@@ -4272,13 +4455,19 @@ services:
     build:
       context: {build_context}
     restart: unless-stopped
-    logging:
+{odoo_resources}    logging:
       driver: local
       options:
         max-size: "50m"
         max-file: "10"
     depends_on:
 {depends_on_block}
+    healthcheck:
+      test: ["CMD", "curl", "--fail", "--silent", "--show-error", "--max-time", "5", "--output", "/dev/null", "http://127.0.0.1:8069/web/login"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+      start_period: 90s
     ports:
 {ports}
     environment:
@@ -4294,23 +4483,66 @@ volumes:
 """
 
 
-def write_docker_compose(layout: Layout, cfg: ProjectConfig) -> Path:
-    """Write ROOT/compose.yaml for local development, overwriting the generated file."""
+def write_docker_compose(
+        layout: Layout,
+        cfg: ProjectConfig,
+        source_ini: Path,
+        effective_ini_sha256: str,
+) -> Path:
+    """Write ROOT/compose.yaml, preserving its timestamp if the content is unchanged."""
     path = _docker_compose_path(layout)
 
     if path.exists() and not path.is_file():
         raise Exception(f"Docker Compose path exists but is not a file: {path}")
 
-    path.write_text(render_docker_compose(layout, cfg), encoding="utf-8")
-    _logger.info("Generated local Docker Compose file: %s", path)
+    source_sha256 = hashlib.sha256(source_ini.read_bytes()).hexdigest()
+    header = (
+        "# =============================================================================\n"
+        "# AUTO-GENERATED FILE - DO NOT EDIT MANUALLY\n"
+        "# Generator: odoo-devops-tools (odoo-compose)\n"
+        f"# Version: {__version__}\n"
+        f"# Source: {source_ini.name}\n"
+        f"# Source SHA256: {source_sha256}\n"
+        f"# Effective SHA256: {effective_ini_sha256}\n"
+        "# Effective SHA256 includes INI interpolation and CLI overrides.\n"
+        "# Generated: __GENERATED_AT__\n"
+        "# Update the source INI and regenerate this file.\n"
+        "# =============================================================================\n\n"
+    )
+    compose_content = render_docker_compose(layout, cfg)
+
+    if path.is_file():
+        existing = path.read_text(encoding="utf-8", errors="replace")
+        previous_generated_at = re.search(
+            r"(?m)^# Generated: (\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z)$",
+            existing,
+        )
+        if previous_generated_at:
+            unchanged = header.replace(
+                "__GENERATED_AT__", previous_generated_at.group(1)
+            ) + compose_content
+            if existing == unchanged:
+                _logger.info("Docker Compose file is unchanged: %s", path)
+                return path
+
+    header = header.replace("__GENERATED_AT__", _utc_now_iso())
+    path.write_text(header + compose_content, encoding="utf-8")
+    _logger.info("Generated Docker Compose file: %s", path)
     return path
 
 
 def _docker_default_db_name(cfg: ProjectConfig) -> str:
     db_name = cfg.config.get("db_name")
-    if isinstance(db_name, str) and db_name.strip():
-        return db_name.strip()
-    return "odoo"
+    if not isinstance(db_name, str) or not db_name.strip():
+        return "odoo"
+    db_name = db_name.strip()
+    # The same name is used by database and destructive filestore helpers.
+    if len(db_name) > 63 or not re.fullmatch(r"[A-Za-z0-9_][A-Za-z0-9_.-]*", db_name):
+        raise Exception(
+            "Invalid [config].db_name: expected 1-63 ASCII letters, digits, "
+            "underscores, dots or hyphens, starting with a letter, digit or underscore."
+        )
+    return db_name
 
 
 def _write_docker_local_script(
@@ -5714,6 +5946,8 @@ def create_local_docker_artifacts(
         layout: Layout,
         cfg: ProjectConfig,
         addon_requirement_files: list[Path],
+        source_ini: Path,
+        effective_ini_sha256: str,
 ) -> dict[str, Any]:
     """Generate the default local-development Docker context and ROOT/compose.yaml."""
     if layout.docker_local_dir.exists():
@@ -5741,7 +5975,7 @@ def create_local_docker_artifacts(
         include_addons=False,
         include_config=False,
     )
-    compose_path = write_docker_compose(layout, cfg)
+    compose_path = write_docker_compose(layout, cfg, source_ini, effective_ini_sha256)
     script_paths = write_docker_local_scripts(layout, cfg)
 
     _logger.info("Generated local Docker build context: %s", layout.docker_local_dir)
@@ -6855,10 +7089,18 @@ def _sync_project_impl(
 
     if target == "docker":
         _logger.info("Generating local-development Docker artifacts.")
+        effective_ini = _ini_for_effective_file(_read_ini(
+            ini_path,
+            vars_overrides=vars_overrides,
+            ini_overrides=ini_overrides,
+            log_overrides=False,
+        ))
         local_docker_artifacts = create_local_docker_artifacts(
             layout=layout,
             cfg=cfg,
             addon_requirement_files=addon_req_files,
+            source_ini=ini_path,
+            effective_ini_sha256=hashlib.sha256(effective_ini.encode("utf-8")).hexdigest(),
         )
     else:
         _logger.info("Skipping Docker artifacts (target=venv).")

{odoo_devops_tools-1.24.2 → odoo_devops_tools-1.24.4}/odoo_devops_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: odoo-devops-tools
-Version: 1.24.2
+Version: 1.24.4
 Summary: Build reproducible Odoo workspaces from a single project definition.
 Author: Roman Lacko
 License-Expression: MIT
@@ -134,7 +134,7 @@ Then start the Docker Compose environment:
 
 ```bash
 cd ./odoo19
-docker compose up -d --build
+docker compose up -d --build --wait
 ```
 
 Optionally initialize the Odoo database from the command line instead of through the web interface:
@@ -174,7 +174,7 @@ Sync the configured addon repositories and refresh the generated Docker workflow
 
 ```bash
 odoo-compose --sync-addons
-docker compose up -d --build
+docker compose up -d --build --wait
 ```
 
 The addon repositories are cloned into `ROOT/odoo-addons/oca-web/` and `ROOT/odoo-addons/oca-helpdesk/` and bind-mounted into the Odoo container.
@@ -215,7 +215,7 @@ Sync the Odoo source and generate the Docker artifacts:
 
 ```bash
 odoo-compose --sync-all
-docker compose up -d --build
+docker compose up -d --build --wait
 ```
 
 The resolved Odoo source is bind-mounted read-only at `/opt/odoo`. The Odoo Python source from the base image is removed while its installed dependencies remain available.
@@ -226,14 +226,14 @@ Enable Mailpit in the local Docker workflow when you need to inspect or test ema
 
 ```bash
 odoo-compose --set docker:mailpit_enabled=true
-docker compose up -d --build
+docker compose up -d --build --wait
 ```
 
 Mailpit is available at http://localhost:8025 by default. When running multiple workspaces, override the host web UI port, for example:
 
 ```bash
 odoo-compose --set docker:mailpit_enabled=true --set docker:mailpit_webui_port=8026
-docker compose up -d --build
+docker compose up -d --build --wait
 ```
 
 The generated local Odoo configuration sends outgoing email to `mailpit:1025`. When Mailpit is enabled, local Docker SMTP connection settings (`smtp_server`, `smtp_port`, `smtp_ssl`, `smtp_user`, and `smtp_password`) are intentionally overridden; the deploy configuration keeps the values from `[config]` unchanged.
@@ -256,7 +256,33 @@ target = /mnt/exchange
 
 `odoo-compose` does not create the source directory or change its ownership or permissions; host provisioning or the deployment process must prepare the directory before Docker starts.
 
-### 1.5. Script reference
+### 1.5. Limiting Docker Compose resources
+
+You can optionally set CPU and memory limits for each service in the generated `compose.yaml` using `[docker]` in `odoo-project.ini`:
+
+```ini
+[docker]
+odoo_cpus = 2.0
+odoo_mem_limit = 4g
+
+db_cpus = 1.0
+db_mem_limit = 2g
+
+mailpit_enabled = true
+mailpit_cpus = 0.5
+mailpit_mem_limit = 256m
+```
+
+Each option is independent and optional. If an option is missing or empty, `odoo-compose` omits that limit from the Compose service; no CPU or memory limit is imposed by the generator. CPU values must be positive decimal numbers (such as `0.5` or `2.0`). Memory limits must be positive amounts (such as `256m`, `2g`, or `4g`); zero and negative values are rejected. A memory limit is a hard container limit: exceeding it may cause an out-of-memory termination, so size it for your workload.
+
+Regenerate the Docker configuration after editing the INI, then start the services:
+
+```bash
+odoo-compose
+docker compose up -d --build --wait
+```
+
+### 1.6. Script reference
 
 The Docker workflow generates platform-specific helper scripts under `ROOT/docker/local/scripts/`. Unix-like systems generate `.sh` helpers; Windows generates the corresponding `.bat` helpers.
 
@@ -283,7 +309,7 @@ ODOO_DOCKER_SUDO=1 ./docker/local/scripts/run.sh --help
 
 Docker helpers use `[config].db_name` when configured, or `odoo` by default.
 
-#### 1.5.1. run
+#### 1.6.1. run
 
 Runs Odoo in a one-off Docker container for the configured database:
 
@@ -297,7 +323,7 @@ Any extra arguments are passed through to Odoo:
 ./docker/local/scripts/run.sh -i base --stop-after-init
 ```
 
-#### 1.5.2. shell
+#### 1.6.2. shell
 
 Opens an Odoo shell for the configured database:
 
@@ -307,7 +333,7 @@ Opens an Odoo shell for the configured database:
 
 Any extra arguments are passed through to the underlying Odoo shell command.
 
-#### 1.5.3. update
+#### 1.6.3. update
 
 Updates installed addons using `click-odoo-update`:
 
@@ -321,7 +347,7 @@ Any extra arguments are passed through to `click-odoo-update`:
 ./docker/local/scripts/update.sh --update-all
 ```
 
-#### 1.5.4. Database backup
+#### 1.6.4. Database backup
 
 Create a PostgreSQL custom-format dump under `ROOT/odoo-backups/`:
 
@@ -341,7 +367,7 @@ Pass an output path explicitly when needed:
 ./docker/local/scripts/backup-db.sh ./odoo-backups/pre-upgrade.dump
 ```
 
-#### 1.5.5. Database restore
+#### 1.6.5. Database restore
 
 Restore a database dump with `pg_restore`:
 
@@ -349,7 +375,7 @@ Restore a database dump with `pg_restore`:
 ./docker/local/scripts/restore-db.sh ./odoo-backups/pre-upgrade.dump
 ```
 
-Database restores use copy semantics by default, matching `click-odoo-restoredb --copy`.
+Database restores use copy semantics by default.
 After `pg_restore`, Odoo database identity parameters are regenerated so the restored
 database can coexist with the source database:
 
@@ -372,7 +398,7 @@ docker compose stop odoo
 docker compose up -d odoo
 ```
 
-#### 1.5.6. Database neutralization
+#### 1.6.6. Database neutralization
 
 For development or test databases restored from production, run the generated neutralization helper explicitly:
 
@@ -407,7 +433,7 @@ docker compose stop odoo
 docker compose up -d odoo
 ```
 
-#### 1.5.7. Filestore backup
+#### 1.6.7. Filestore backup
 
 Create a compressed tar archive of the selected database filestore:
 
@@ -438,7 +464,7 @@ docker compose stop odoo
 docker compose up -d odoo
 ```
 
-#### 1.5.8. Filestore restore
+#### 1.6.8. Filestore restore
 
 Restore a filestore archive:
 
@@ -454,7 +480,7 @@ docker compose stop odoo
 docker compose up -d odoo
 ```
 
-#### 1.5.9. Restic filestore backup
+#### 1.6.9. Restic filestore backup
 
 The generated Docker image also includes `restic`. Restic is an additional option intended especially for large filestores where incremental snapshots and deduplication are useful.
 
@@ -492,7 +518,7 @@ List or inspect snapshots through the generic wrapper:
 ./docker/local/scripts/restic.sh check
 ```
 
-#### 1.5.10. Restic filestore restore
+#### 1.6.10. Restic filestore restore
 
 Restore the latest matching filestore snapshot:
 
@@ -514,7 +540,7 @@ docker compose up -d odoo
 
 With `--force`, the restore helper removes the target database filestore before restoring it. When `latest` is used, the snapshot selection is restricted to the current `RESTIC_HOST` and source filestore path. Use the same `RESTIC_HOST` value that was used when the snapshot was created if the restore is performed from another host.
 
-### 1.6. Creating a Docker deploy build context
+### 1.7. Creating a Docker deploy build context
 
 Use `--create-docker-deploy` to generate a self-contained Docker build context for CI/CD, testing, staging, production, or another non-local deployment workflow.
 
@@ -787,7 +813,7 @@ Restore a database dump with `pg_restore`:
 ./odoo-scripts/restore-db.sh ./odoo-backups/pre-upgrade.dump
 ```
 
-Database restores use copy semantics by default, matching `click-odoo-restoredb --copy`.
+Database restores use copy semantics by default.
 After `pg_restore`, Odoo database identity parameters are regenerated so the restored
 database can coexist with the source database:
 
@@ -1412,6 +1438,10 @@ This section is optional.
 - `mailpit_enabled` — enables a persistent Mailpit service in the local Docker workflow for SMTP and POP3 mail testing. Default: `false`. It does not affect the deploy build context.
 - `mailpit_version` — version of `ghcr.io/axllent/mailpit` in local Compose. Default: `v1.31.3`. An explicitly set value must be a concrete version; empty values and `latest` are invalid.
 - `mailpit_webui_port` — host port used for the Mailpit web UI. Default: `8025`. The internal Mailpit web UI port remains `8025`.
+- `odoo_cpus`, `db_cpus`, `mailpit_cpus` — optional CPU limits for the respective Compose services; positive decimal CPU counts such as `0.5` or `2.0`.
+- `odoo_mem_limit`, `db_mem_limit`, `mailpit_mem_limit` — optional memory limits for the respective Compose services; positive amounts such as `256m` or `4g`.
+
+All six resource options default to unset and are omitted from generated Compose when empty. See [Limiting Docker Compose resources](#17-limiting-docker-compose-resources) for a complete example.
 
 Example:
 

{odoo_devops_tools-1.24.2 → odoo_devops_tools-1.24.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "odoo-devops-tools"
-version = "1.24.2"
+version = "1.24.4"
 description = "Build reproducible Odoo workspaces from a single project definition."
 readme = "README.md"
 license = "MIT"

odoo_devops_tools-1.24.2/odoo_devops_tools/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.24.2"